===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/nd.c,v
retrieving revision 1.16
retrieving revision 1.19
diff -u -p -r1.16 -r1.19
--- OpenXM_contrib2/asir2000/engine/nd.c	2003/07/31 02:56:13	1.16
+++ OpenXM_contrib2/asir2000/engine/nd.c	2003/07/31 07:30:27	1.19
@@ -1,10 +1,8 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.15 2003/07/31 01:02:39 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.18 2003/07/31 05:42:22 noro Exp $ */
 
 #include "ca.h"
 #include "inline.h"
 
-#define USE_NDV 1
-
 #if defined(__GNUC__)
 #define INLINE inline
 #elif defined(VISUAL)
@@ -67,7 +65,7 @@ typedef struct oND_pairs {
 } *ND_pairs;
 
 static unsigned int **nd_bound;
-int nd_mod,nd_nvar;
+int nd_nvar;
 int is_rlex;
 int nd_epw,nd_bpe,nd_wpd;
 unsigned int nd_mask[32];
@@ -141,10 +139,10 @@ void nd_free_private_storage();
 void _NM_alloc();
 void _ND_alloc();
 int ndl_td(unsigned int *d);
-ND nd_add(ND p1,ND p2);
-ND nd_mul_nm(ND p,NM m0);
-ND nd_mul_ind_nm(int index,NM m0);
-ND nd_mul_term(ND p,int td,unsigned int *d);
+ND nd_add(int mod,ND p1,ND p2);
+ND nd_add_q(ND p1,ND p2);
+ND nd_mul_nm(int mod,ND p,NM m0);
+ND nd_mul_ind_nm(int mod,int index,NM m0);
 int nd_sp(int mod,ND_pairs p,ND *nf);
 int nd_find_reducer(ND g);
 int nd_nf(int mod,ND g,int full,ND *nf);
@@ -158,8 +156,8 @@ void ndv_print(NDV p);
 void ndv_print_q(NDV p);
 void ndp_print(ND_pairs d);
 int nd_length(ND p);
-void nd_monic(ND p);
-void nd_mul_c(ND p,int mul);
+void nd_monic(int mod,ND p);
+void nd_mul_c(int mod,ND p,int mul);
 void nd_free_redlist();
 void nd_append_red(unsigned int *d,int td,int i);
 unsigned int *nd_compute_bound(ND p);
@@ -170,7 +168,6 @@ void nd_realloc(ND p,int obpe);
 ND nd_copy(ND p);
 void ndl_dup(int obpe,unsigned int *d,unsigned int *r);
 
-#if USE_NDV
 static NDV *nd_ps;
 
 #define NMV_ADV(m) (m = (NMV)(((char *)m)+nmv_adv))
@@ -181,8 +178,8 @@ int nmv_adv;
 int nmv_len;
 NDV ndv_red;
 
-void ndv_mul_c(NDV p,int mul);
-ND ndv_add(ND p1,NDV p2);
+void ndv_mul_c(int mod,NDV p,int mul);
+ND ndv_add(int mod,ND p1,NDV p2);
 ND ndv_add_q(ND p1,NDV p2);
 NDV ndtondv(int mod,ND p);
 void ndv_mul_nm(int mod,NDV pv,NM m,NDV r);
@@ -190,11 +187,8 @@ ND ndv_mul_nm_create(int mod,NDV p,NM m0);
 void ndv_realloc(NDV p,int obpe,int oadv);
 NDV dptondv(int,DP);
 DP ndvtodp(int,NDV);
-#else
-static ND *nd_ps;
-ND dptond(DP);
-DP ndtodp(ND);
-#endif
+ND dptond(int,DP);
+DP ndtodp(int,ND);
 
 void nd_free_private_storage()
 {
@@ -550,205 +544,6 @@ int ndl_disjoint(unsigned int *d1,unsigned int *d2)
 	}
 }
 
-ND nd_reduce(ND p1,ND p2)
-{
-	int c,c1,c2,t,td,td2,mul;
-	NM m2,prev,head,cur,new;
-	unsigned int *d;
-
-	if ( !p1 )
-		return 0;
-	else {
-		c2 = invm(HCM(p2),nd_mod);
-		c1 = nd_mod-HCM(p1);
-		DMAR(c1,c2,0,nd_mod,mul);
-		td = HTD(p1)-HTD(p2);
-		d = (unsigned int *)ALLOCA(nd_wpd*sizeof(unsigned int));
-		ndl_sub(HDL(p1),HDL(p2),d);
-		prev = 0; head = cur = BDY(p1);
-		NEWNM(new);
-		for ( m2 = BDY(p2); m2; ) {
-			td2 = TD(new) = TD(m2)+td;
-			ndl_add(DL(m2),d,DL(new));
-			if ( !cur ) {
-				c1 = CM(m2);
-				DMAR(c1,mul,0,nd_mod,c2);
-				CM(new) = c2;
-				if ( !prev ) {
-					prev = new;
-					NEXT(prev) = 0;
-					head = prev;
-				} else {
-					NEXT(prev) = new;
-					NEXT(new) = 0;
-					prev = new;
-				}
-				m2 = NEXT(m2);
-				NEWNM(new);
-				continue;
-			}
-			if ( TD(cur) > td2 )
-				c = 1;
-			else if ( TD(cur) < td2 )
-				c = -1;
-			else
-				c = ndl_compare(DL(cur),DL(new));
-			switch ( c ) {
-				case 0:
-					c2 = CM(m2);
-					c1 = CM(cur);
-					DMAR(c2,mul,c1,nd_mod,t);
-					if ( t )
-						CM(cur) = t;
-					else if ( !prev ) {
-						head = NEXT(cur);
-						FREENM(cur);
-						cur = head;
-					} else {
-						NEXT(prev) = NEXT(cur);
-						FREENM(cur);
-						cur = NEXT(prev);
-					}
-					m2 = NEXT(m2);
-					break;
-				case 1:
-					prev = cur;
-					cur = NEXT(cur);
-					break;
-				case -1:
-					if ( !prev ) {
-						/* cur = head */
-						prev = new;
-						c2 = CM(m2);
-						DMAR(c2,mul,0,nd_mod,c1);
-						CM(prev) = c1;
-						NEXT(prev) = head;
-						head = prev;
-					} else {
-						c2 = CM(m2);
-						DMAR(c2,mul,0,nd_mod,c1);
-						CM(new) = c1;
-						NEXT(prev) = new;
-						NEXT(new) = cur;
-						prev = new;
-					}
-					NEWNM(new);
-					m2 = NEXT(m2);
-					break;
-			}
-		}
-		FREENM(new);
-		if ( head ) {
-			BDY(p1) = head;
-			SG(p1) = MAX(SG(p1),SG(p2)+td);
-			return p1;
-		} else {
-			FREEND(p1);
-			return 0;
-		}
-			
-	}
-}
-
-/* HDL(p1) = HDL(p2) */
-
-ND nd_reduce_special(ND p1,ND p2)
-{
-	int c,c1,c2,t,td,td2,mul;
-	NM m2,prev,head,cur,new;
-
-	if ( !p1 )
-		return 0;
-	else {
-		c2 = invm(HCM(p2),nd_mod);
-		c1 = nd_mod-HCM(p1);
-		DMAR(c1,c2,0,nd_mod,mul);
-		prev = 0; head = cur = BDY(p1);
-		NEWNM(new);
-		for ( m2 = BDY(p2); m2; ) {
-			td2 = TD(new) = TD(m2);
-			if ( !cur ) {
-				c1 = CM(m2);
-				DMAR(c1,mul,0,nd_mod,c2);
-				CM(new) = c2;
-				bcopy(DL(m2),DL(new),nd_wpd*sizeof(unsigned int));
-				if ( !prev ) {
-					prev = new;
-					NEXT(prev) = 0;
-					head = prev;
-				} else {
-					NEXT(prev) = new;
-					NEXT(new) = 0;
-					prev = new;
-				}
-				m2 = NEXT(m2);
-				NEWNM(new);
-				continue;
-			}
-			if ( TD(cur) > td2 )
-				c = 1;
-			else if ( TD(cur) < td2 )
-				c = -1;
-			else
-				c = ndl_compare(DL(cur),DL(m2));
-			switch ( c ) {
-				case 0:
-					c2 = CM(m2);
-					c1 = CM(cur);
-					DMAR(c2,mul,c1,nd_mod,t);
-					if ( t )
-						CM(cur) = t;
-					else if ( !prev ) {
-						head = NEXT(cur);
-						FREENM(cur);
-						cur = head;
-					} else {
-						NEXT(prev) = NEXT(cur);
-						FREENM(cur);
-						cur = NEXT(prev);
-					}
-					m2 = NEXT(m2);
-					break;
-				case 1:
-					prev = cur;
-					cur = NEXT(cur);
-					break;
-				case -1:
-					bcopy(DL(m2),DL(new),nd_wpd*sizeof(unsigned int));
-					if ( !prev ) {
-						/* cur = head */
-						prev = new;
-						c2 = CM(m2);
-						DMAR(c2,mul,0,nd_mod,c1);
-						CM(prev) = c1;
-						NEXT(prev) = head;
-						head = prev;
-					} else {
-						c2 = CM(m2);
-						DMAR(c2,mul,0,nd_mod,c1);
-						CM(new) = c1;
-						NEXT(prev) = new;
-						NEXT(new) = cur;
-						prev = new;
-					}
-					NEWNM(new);
-					m2 = NEXT(m2);
-					break;
-			}
-		}
-		FREENM(new);
-		if ( head ) {
-			BDY(p1) = head;
-			SG(p1)= MAX(SG(p1),SG(p2)+td);
-			return p1;
-		} else {
-			FREEND(p1);
-			return 0;
-		}
-			
-	}
-}
-
 int ndl_check_bound2(int index,unsigned int *d2)
 {
 	unsigned int u2;
@@ -864,7 +659,7 @@ INLINE int nd_find_reducer(ND g)
 	return -1;
 }
 
-ND nd_add(ND p1,ND p2)
+ND nd_add(int mod,ND p1,ND p2)
 {
 	int n,c;
 	int t;
@@ -885,9 +680,9 @@ ND nd_add(ND p1,ND p2)
 				c = ndl_compare(DL(m1),DL(m2));
 			switch ( c ) {
 				case 0:
-					t = ((CM(m1))+(CM(m2))) - nd_mod;
+					t = ((CM(m1))+(CM(m2))) - mod;
 					if ( t < 0 )
-						t += nd_mod;
+						t += mod;
 					s = m1; m1 = NEXT(m1);
 					if ( t ) {
 						NEXTNM2(mr0,mr,s); CM(mr) = (t);
@@ -924,6 +719,64 @@ ND nd_add(ND p1,ND p2)
 	}
 }
 
+ND nd_add_q(ND p1,ND p2)
+{
+	int n,c;
+	ND r;
+	NM m1,m2,mr0,mr,s;
+	Q t;
+
+	if ( !p1 )
+		return p2;
+	else if ( !p2 )
+		return p1;
+	else {
+		for ( n = NV(p1), m1 = BDY(p1), m2 = BDY(p2), mr0 = 0; m1 && m2; ) {
+			if ( TD(m1) > TD(m2) )
+				c = 1;
+			else if ( TD(m1) < TD(m2) )
+				c = -1;
+			else
+				c = ndl_compare(DL(m1),DL(m2));
+			switch ( c ) {
+				case 0:
+					addq(CQ(m1),CQ(m2),&t);
+					s = m1; m1 = NEXT(m1);
+					if ( t ) {
+						NEXTNM2(mr0,mr,s); CQ(mr) = (t);
+					} else {
+						FREENM(s);
+					}
+					s = m2; m2 = NEXT(m2); FREENM(s);
+					break;
+				case 1:
+					s = m1; m1 = NEXT(m1); NEXTNM2(mr0,mr,s);
+					break;
+				case -1:
+					s = m2; m2 = NEXT(m2); NEXTNM2(mr0,mr,s);
+					break;
+			}
+		}
+		if ( !mr0 )
+			if ( m1 )
+				mr0 = m1;
+			else if ( m2 )
+				mr0 = m2;
+			else
+				return 0;
+		else if ( m1 )
+			NEXT(mr) = m1;
+		else if ( m2 )
+			NEXT(mr) = m2;
+		else
+			NEXT(mr) = 0;
+		BDY(p1) = mr0;
+		SG(p1) = MAX(SG(p1),SG(p2));
+		FREEND(p2);
+		return p1;
+	}
+}
+
 #if 1
 /* ret=1 : success, ret=0 : overflow */
 int nd_nf(int mod,ND g,int full,ND *rp)
@@ -933,11 +786,8 @@ int nd_nf(int mod,ND g,int full,ND *rp)
 	NM mul;
 	int n,sugar,psugar,sugar0,stat,index;
 	int c,c1,c2;
-#if USE_NDV
+	RHist h;
 	NDV p,red;
-#else
-	ND p,red;
-#endif
 	Q cg,cred,gcd;
 
 	if ( !g ) {
@@ -950,9 +800,9 @@ int nd_nf(int mod,ND g,int full,ND *rp)
 	for ( d = 0; g; ) {
 		index = nd_find_reducer(g);
 		if ( index >= 0 ) {
-			p = nd_ps[index];
-			ndl_sub(HDL(g),HDL(p),DL(mul));
-			TD(mul) = HTD(g)-HTD(p);
+			h = nd_psh[index];
+			ndl_sub(HDL(g),DL(h),DL(mul));
+			TD(mul) = HTD(g)-TD(h);
 #if 0
 			if ( d && (SG(p)+TD(mul)) > sugar ) {
 				goto afo;				
@@ -962,28 +812,22 @@ int nd_nf(int mod,ND g,int full,ND *rp)
 				nd_free(g); nd_free(d);
 				return 0;
 			}
-#if USE_NDV
 			if ( mod ) {
-				c1 = invm(HCM(p),nd_mod); c2 = nd_mod-HCM(g);
-				DMAR(c1,c2,0,nd_mod,c); CM(mul) = c;
-				ndv_mul_nm(mod,nd_ps[index],mul,ndv_red);
-				g = ndv_add(g,ndv_red);
+				p = nd_ps[index];
+				c1 = invm(HCM(p),mod); c2 = mod-HCM(g);
+				DMAR(c1,c2,0,mod,c); CM(mul) = c;
+				ndv_mul_nm(mod,p,mul,ndv_red);
+				g = ndv_add(mod,g,ndv_red);
 			} else {
-				igcd_cofactor(HCQ(g),HCQ(nd_ps[index]),&gcd,&cg,&cred);
+				p = nd_ps[index];
+				igcd_cofactor(HCQ(g),HCQ(p),&gcd,&cg,&cred);
 				chsgnq(cg,&CQ(mul));
 				nd_mul_c_q(d,cred);
 				nd_mul_c_q(g,cred);
-				ndv_mul_nm(mod,nd_ps[index],mul,ndv_red);
+				ndv_mul_nm(mod,p,mul,ndv_red);
 				g = ndv_add_q(g,ndv_red);
 			}
 			sugar = MAX(sugar,SG(ndv_red));
-#else
-			c1 = invm(HCM(p),nd_mod); c2 = nd_mod-HCM(g);
-			DMAR(c1,c2,0,nd_mod,c); CM(mul) = c;
-			red = nd_mul_ind_nm(index,mul);
-			g = nd_add(g,red);
-			sugar = MAX(sugar,SG(red));
-#endif
 		} else if ( !full ) {
 			*rp = g;
 			return 1;
@@ -1034,23 +878,23 @@ PGeoBucket create_pbucket()
 	return g;
 }
 
-void add_pbucket(PGeoBucket g,ND d)
+void add_pbucket(int mod,PGeoBucket g,ND d)
 {
 	int l,k,m;
 
 	l = nd_length(d);
 	for ( k = 0, m = 1; l > m; k++, m <<= 2 );
 	/* 4^(k-1) < l <= 4^k */
-	d = nd_add(g->body[k],d);
+	d = nd_add(mod,g->body[k],d);
 	for ( ; d && nd_length(d) > 1<<(2*k); k++ ) {
 		g->body[k] = 0;
-		d = nd_add(g->body[k+1],d);
+		d = nd_add(int mod,g->body[k+1],d);
 	}
 	g->body[k] = d;
 	g->m = MAX(g->m,k);
 }
 
-int head_pbucket(PGeoBucket g)
+int head_pbucket(int mod,PGeoBucket g)
 {
 	int j,i,c,k,nv,sum;
 	unsigned int *di,*dj;
@@ -1086,9 +930,9 @@ int head_pbucket(PGeoBucket g)
 					dj = HDL(gj);
 					sum = HCM(gj);
 				} else if ( c == 0 ) {
-					sum = sum+HCM(gi)-nd_mod;
+					sum = sum+HCM(gi)-mod;
 					if ( sum < 0 )
-						sum += nd_mod;
+						sum += mod;
 					g->body[i] = nd_remove_head(gi);
 				}
 			}
@@ -1110,7 +954,7 @@ ND normalize_pbucket(PGeoBucket g)
 
 	r = 0;
 	for ( i = 0; i <= g->m; i++ )
-		r = nd_add(r,g->body[i]);
+		r = nd_add(mod,r,g->body[i]);
 	return r;
 }
 
@@ -1506,22 +1350,17 @@ int nd_newps(int mod,ND a)
 	if ( nd_psn == nd_pslen ) {
 		nd_pslen *= 2;
 		nd_psl = (int *)REALLOC((char *)nd_psl,nd_pslen*sizeof(int));
-#if USE_NDV
 		nd_ps = (NDV *)REALLOC((char *)nd_ps,nd_pslen*sizeof(NDV));
-#else
-		nd_ps = (ND *)REALLOC((char *)nd_ps,nd_pslen*sizeof(ND));
-#endif
 		nd_psh = (RHist *)REALLOC((char *)nd_psh,nd_pslen*sizeof(RHist));
 		nd_bound = (unsigned int **)
 			REALLOC((char *)nd_bound,nd_pslen*sizeof(unsigned int *));
 	}
 	if ( mod )
-		nd_monic(a);
+		nd_monic(mod,a);
 	else
 		nd_removecont(a);
 	nd_bound[nd_psn] = nd_compute_bound(a);
 	NEWRHist(r); TD(r) = HTD(a); ndl_copy(HDL(a),DL(r)); nd_psh[nd_psn] = r;
-#if USE_NDV
 	nd_ps[nd_psn]= ndtondv(mod,a);
 	nd_free(a);
 	nd_psl[nd_psn] = len = LEN(nd_ps[nd_psn]);
@@ -1529,10 +1368,6 @@ int nd_newps(int mod,ND a)
 		nmv_len = 2*len;
 		BDY(ndv_red) = (NMV)REALLOC(BDY(ndv_red),nmv_len*nmv_adv);
 	}
-#else
-	nd_ps[nd_psn] = a;
-	nd_psl[nd_psn] = nd_length(a);
-#endif
 	return nd_psn++;
 }
 
@@ -1547,11 +1382,7 @@ NODE nd_setup(int mod,NODE f)
 
 	nd_psn = length(f); nd_pslen = 2*nd_psn;
 	nd_psl = (int *)MALLOC(nd_pslen*sizeof(int));
-#if USE_NDV
 	nd_ps = (NDV *)MALLOC(nd_pslen*sizeof(NDV));
-#else
-	nd_ps = (ND *)MALLOC(nd_pslen*sizeof(ND));
-#endif
 	nd_psh = (RHist *)MALLOC(nd_pslen*sizeof(RHist));
 	nd_bound = (unsigned int **)MALLOC(nd_pslen*sizeof(unsigned int *));
 	for ( max = 0, i = 0, s = f; i < nd_psn; i++, s = NEXT(s) ) {
@@ -1580,29 +1411,21 @@ NODE nd_setup(int mod,NODE f)
 	nd_free_private_storage();
 	len = 0;
 	for ( i = 0; i < nd_psn; i++, f = NEXT(f) ) {
-#if USE_NDV
 		nd_ps[i] = dptondv(mod,(DP)BDY(f));
 		if ( mod )
-			ndv_mul_c(nd_ps[i],invm(HCM(nd_ps[i]),nd_mod));
+			ndv_mul_c(mod,nd_ps[i],invm(HCM(nd_ps[i]),mod));
 		else
 			ndv_removecont(nd_ps[i]);
 		len = MAX(len,LEN(nd_ps[i]));
-#else
-		nd_ps[i] = dptond((DP)BDY(f));
-		nd_mul_c(nd_ps[i],1);
-		nd_psl[i] = nd_length(nd_ps[i]);
-#endif
 		NEWRHist(r); TD(r) = HTD(nd_ps[i]); ndl_copy(HDL(nd_ps[i]),DL(r));
 		nd_psh[i] = r;
 	}
-#if USE_NDV
 	nmv_len = 16*len;
 	NEWNDV(ndv_red);
 	if ( mod )
 		BDY(ndv_red) = (NMV)MALLOC_ATOMIC(nmv_len*nmv_adv);
 	else
 		BDY(ndv_red) = (NMV)MALLOC(nmv_len*nmv_adv);
-#endif
 	for ( s0 = 0, i = 0; i < nd_psn; i++ ) {
 		NEXTNODE(s0,s); BDY(s) = (pointer)i;
 	}
@@ -1632,7 +1455,6 @@ void nd_gr(LIST f,LIST v,int m,struct order_spec *ord,
 			error("nd_gr : unsupported order");
 	}
 	initd(ord);
-	nd_mod = m;
 	for ( fd0 = 0, t = BDY(f); t; t = NEXT(t) ) {
 		ptod(CO,vv,(P)BDY(t),&b);
 		if ( m )
@@ -1651,11 +1473,7 @@ void nd_gr(LIST f,LIST v,int m,struct order_spec *ord,
 #endif
 	for ( r0 = 0; x; x = NEXT(x) ) {
 		NEXTNODE(r0,r); 
-#if USE_NDV
 		a = ndvtodp(m,nd_ps[(int)BDY(x)]);
-#else
-		a = ndtodp(m,nd_ps[(int)BDY(x)]);
-#endif
 		if ( m )
 			_dtop_mod(CO,vv,a,(P *)&BDY(r));
 		else
@@ -1702,7 +1520,7 @@ DL ndltodl(int n,int td,unsigned int *ndl)
 	return dl;
 }
 
-ND dptond(DP p)
+ND dptond(int mod,DP p)
 {
 	ND d;
 	NM m0,m;
@@ -1715,7 +1533,10 @@ ND dptond(DP p)
 	m0 = 0;
 	for ( t = BDY(p); t; t = NEXT(t) ) {
 		NEXTNM(m0,m);
-		CM(m) = ITOS(C(t));
+		if ( mod )
+			CM(m) = ITOS(C(t));
+		else
+			CQ(m) = (Q)C(t);
 		TD(m) = TD(DL(t));
 		dltondl(n,DL(t),DL(m));
 	}
@@ -1726,7 +1547,7 @@ ND dptond(DP p)
 	return d;
 }
 
-DP ndtodp(ND p)
+DP ndtodp(int mod,ND p)
 {
 	DP d;
 	MP m0,m;
@@ -1739,7 +1560,10 @@ DP ndtodp(ND p)
 	m0 = 0;
 	for ( t = BDY(p); t; t = NEXT(t) ) {
 		NEXTMP(m0,m);
-		C(m) = STOI(CM(t));
+		if ( mod )
+			C(m) = STOI(CM(t));
+		else
+			C(m) = (P)CQ(t);
 		DL(m) = ndltodl(n,TD(t),DL(t));
 	}
 	NEXT(m) = 0;
@@ -1846,15 +1670,15 @@ void ndv_removecont(NDV p)
 	}
 }
 
-void nd_monic(ND p)
+void nd_monic(int mod,ND p)
 {
 	if ( !p )
 		return;
 	else
-		nd_mul_c(p,invm(HCM(p),nd_mod));
+		nd_mul_c(mod,p,invm(HCM(p),mod));
 }
 
-void nd_mul_c(ND p,int mul)
+void nd_mul_c(int mod,ND p,int mul)
 {
 	NM m;
 	int c,c1;
@@ -1863,7 +1687,7 @@ void nd_mul_c(ND p,int mul)
 		return;
 	for ( m = BDY(p); m; m = NEXT(m) ) {
 		c1 = CM(m);
-		DMAR(c1,mul,0,nd_mod,c);
+		DMAR(c1,mul,0,mod,c);
 		CM(m) = c;
 	}
 }
@@ -1974,9 +1798,7 @@ void nd_setup_parameters() {
 		nd_mask1 |= (1<<(nd_bpe-1))<<(i*nd_bpe);
 	}
 	nm_adv = sizeof(struct oNM)+(nd_wpd-1)*sizeof(unsigned int);
-#if USE_NDV
 	nmv_adv = sizeof(struct oNMV)+(nd_wpd-1)*sizeof(unsigned int);
-#endif
 }
 
 ND_pairs nd_reconstruct(ND_pairs d)
@@ -1988,9 +1810,7 @@ ND_pairs nd_reconstruct(ND_pairs d)
 	ND_pairs s0,s,t,prev_ndp_free_list;
 
 	obpe = nd_bpe;
-#if USE_NDV
 	oadv = nmv_adv;
-#endif
 	if ( obpe < 4 )
 		nd_bpe = 4;
 	else if ( obpe < 6 )
@@ -2010,11 +1830,7 @@ ND_pairs nd_reconstruct(ND_pairs d)
 	_nm_free_list = 0;
 	_ndp_free_list = 0;
 	for ( i = nd_psn-1; i >= 0; i-- ) {
-#if USE_NDV
 		ndv_realloc(nd_ps[i],obpe,oadv);
-#else
-		nd_realloc(nd_ps[i],obpe);
-#endif
 	}
 	s0 = 0;
 	for ( t = d; t; t = NEXT(t) ) {
@@ -2042,9 +1858,7 @@ ND_pairs nd_reconstruct(ND_pairs d)
 	if ( s0 ) NEXT(s) = 0;
 	prev_nm_free_list = 0;
 	prev_ndp_free_list = 0;
-#if USE_NDV
 	BDY(ndv_red) = (NMV)REALLOC(BDY(ndv_red),nmv_len*nmv_adv);
-#endif
 	GC_gcollect();
 	return s0;
 }
@@ -2113,7 +1927,6 @@ ND nd_copy(ND p)
 	}
 }
 
-#if USE_NDV
 int nd_sp(int mod,ND_pairs p,ND *rp)
 {
 	NM m;
@@ -2145,13 +1958,13 @@ int nd_sp(int mod,ND_pairs p,ND *rp)
 	ndv_mul_nm(mod,p2,m,ndv_red);
 	FREENM(m);
 	if ( mod )
-		*rp = ndv_add(t1,ndv_red);
+		*rp = ndv_add(mod,t1,ndv_red);
 	else
 		*rp = ndv_add_q(t1,ndv_red);
 	return 1;
 }
 
-void ndv_mul_c(NDV p,int mul)
+void ndv_mul_c(int mod,NDV p,int mul)
 {
 	NMV m;
 	int c,c1,len,i;
@@ -2161,7 +1974,7 @@ void ndv_mul_c(NDV p,int mul)
 	len = LEN(p);
 	for ( m = BDY(p), i = 0; i < len; i++, NMV_ADV(m) ) {
 		c1 = CM(m);
-		DMAR(c1,mul,0,nd_mod,c);
+		DMAR(c1,mul,0,mod,c);
 		CM(m) = c;
 	}
 }
@@ -2197,7 +2010,7 @@ void ndv_mul_nm(int mod,NDV p,NM m0,NDV r)
 		if ( mod ) {
 			c = CM(m0);
 			for ( ; len > 0; len--, NMV_ADV(m), NMV_ADV(mr) ) {
-				c1 = CM(m); DMAR(c1,c,0,nd_mod,c2); CM(mr) = c2;
+				c1 = CM(m); DMAR(c1,c,0,mod,c2); CM(mr) = c2;
 				TD(mr) = TD(m)+td; ndl_add(DL(m),d,DL(mr));
 			}
 		} else {
@@ -2234,7 +2047,7 @@ ND ndv_mul_nm_create(int mod,NDV p,NM m0)
 			for ( i = 0; i < len; i++, NMV_ADV(m) ) {
 				NEXTNM(mr0,mr);
 				c1 = CM(m);
-				DMAR(c1,c,0,nd_mod,c2);
+				DMAR(c1,c,0,mod,c2);
 				CM(mr) = c2;
 				TD(mr) = TD(m)+td;
 				ndl_add(DL(m),d,DL(mr));
@@ -2255,7 +2068,7 @@ ND ndv_mul_nm_create(int mod,NDV p,NM m0)
 	}
 }
 
-ND ndv_add(ND p1,NDV p2)
+ND ndv_add(int mod,ND p1,NDV p2)
 {
 	register NM prev,cur,new;
 	int c,c1,c2,t,td,td2,mul,len,i;
@@ -2283,8 +2096,8 @@ ND ndv_add(ND p1,NDV p2)
 			else c = ndl_compare(DL(cur),DL(m2));
 			switch ( c ) {
 				case 0:
-					t = CM(m2)+CM(cur)-nd_mod;
-					if ( t < 0 ) t += nd_mod;
+					t = CM(m2)+CM(cur)-mod;
+					if ( t < 0 ) t += mod;
 					if ( t ) CM(cur) = t;
 					else if ( !prev ) {
 						head = NEXT(cur); FREENM(cur); cur = head;
@@ -2474,18 +2287,13 @@ NDV dptondv(int mod,DP p)
 	else
 		m0 = m = (NMV)MALLOC(l*nmv_adv);
 	n = NV(p);
-	if ( mod ) {
-		for ( t = BDY(p), i = 0; i < l; i++, t = NEXT(t), NMV_ADV(m) ) {
+	for ( t = BDY(p), i = 0; i < l; i++, t = NEXT(t), NMV_ADV(m) ) {
+		if ( mod )
 			CM(m) = ITOS(C(t));
-			TD(m) = TD(DL(t));
-			dltondl(n,DL(t),DL(m));
-		}
-	} else {
-		for ( t = BDY(p), i = 0; i < l; i++, t = NEXT(t), NMV_ADV(m) ) {
+		else
 			CQ(m) = (Q)C(t);
-			TD(m) = TD(DL(t));
-			dltondl(n,DL(t),DL(m));
-		}
+		TD(m) = TD(DL(t));
+		dltondl(n,DL(t),DL(m));
 	}
 	MKNDV(n,m0,l,d);
 	SG(d) = SG(p);
@@ -2504,18 +2312,13 @@ DP ndvtodp(int mod,NDV p)
 	m0 = 0;
 	len = LEN(p);
 	n = NV(p);
-	if ( mod ) {
-		for ( t = BDY(p), i = 0; i < len; i++, NMV_ADV(t) ) {
-			NEXTMP(m0,m);
+	for ( t = BDY(p), i = 0; i < len; i++, NMV_ADV(t) ) {
+		NEXTMP(m0,m);
+		if ( mod ) 
 			C(m) = STOI(CM(t));
-			DL(m) = ndltodl(n,TD(t),DL(t));
-		}
-	} else {
-		for ( t = BDY(p), i = 0; i < len; i++, NMV_ADV(t) ) {
-			NEXTMP(m0,m);
+		else
 			C(m) = (P)CQ(t);
-			DL(m) = ndltodl(n,TD(t),DL(t));
-		}
+		DL(m) = ndltodl(n,TD(t),DL(t));
 	}
 	NEXT(m) = 0;
 	MKDP(NV(p),m0,d);
@@ -2558,118 +2361,3 @@ void ndv_print_q(NDV p)
 		printf("\n");
 	}
 }
-#else
-int nd_sp(ND_pairs p,ND *rp)
-{
-	NM m;
-	ND p1,p2;
-	ND t1,t2;
-	unsigned int *lcm;
-	int td;
-
-	p1 = nd_ps[p->i1];
-	p2 = nd_ps[p->i2];
-	lcm = p->lcm;
-	td = TD(p);
-	NEWNM(m);
-	CM(m) = HCM(p2); TD(m) = td-HTD(p1); ndl_sub(lcm,HDL(p1),DL(m));
-	if ( ndl_check_bound2(p->i1,DL(m)) )
-		return 0;
-	t1 = nd_mul_ind_nm(p->i1,m);
-	CM(m) = nd_mod-HCM(p1); TD(m) = td-HTD(p2); ndl_sub(lcm,HDL(p2),DL(m));
-	if ( ndl_check_bound2(p->i2,DL(m)) ) {
-		nd_free(t1);
-		return 0;
-	}
-	t2 = nd_mul_ind_nm(p->i2,m);
-	FREENM(m);
-	*rp = nd_add(t1,t2);
-	return 1;
-}
-
-ND nd_mul_nm(ND p,NM m0)
-{
-	NM m,mr,mr0;
-	unsigned int *d,*dt,*dm;
-	int c,n,td,i,c1,c2;
-	int *pt,*p1,*p2;
-	ND r;
-
-	if ( !p )
-		return 0;
-	else {
-		n = NV(p); m = BDY(p);
-		d = DL(m0); td = TD(m0); c = CM(m0);
-		mr0 = 0;
-		for ( ; m; m = NEXT(m) ) {
-			NEXTNM(mr0,mr);
-			c1 = CM(m);
-			DMAR(c1,c,0,nd_mod,c2);
-			CM(mr) = c2;
-			TD(mr) = TD(m)+td;
-			ndl_add(DL(m),d,DL(mr));
-		}
-		NEXT(mr) = 0; 
-		MKND(NV(p),mr0,r);
-		SG(r) = SG(p) + td;
-		return r;
-	}
-}
-
-ND nd_mul_ind_nm(int index,NM m0)
-{
-	register int c1,c2,c;
-	register NM m,new,prev;
-	NM mr0;
-	unsigned int *d;
-	int n,td,i,len,d0,d1;
-	ND p,r;
-
-	p = nd_ps[index];
-	len = nd_psl[index];
-	n = NV(p); m = BDY(p);
-	d = DL(m0); td = TD(m0); c = CM(m0);
-
-	NEWNM(mr0);
-	c1 = CM(m); DMAR(c1,c,0,nd_mod,c2); CM(mr0) = c2;
-	TD(mr0) = TD(m)+td; ndl_add(DL(m),d,DL(mr0));
-	prev = mr0; m = NEXT(m);
-	len--;
-
-	switch ( nd_wpd ) {
-		case 1:
-			d0 = d[0];
-			while ( len-- ) {
-				c1 = CM(m); DMAR(c1,c,0,nd_mod,c2); 
-				NEWNM(new); CM(new) = c2;
-				TD(new) = TD(m)+td; DL(new)[0] = DL(m)[0]+d0;
-				m = NEXT(m); NEXT(prev) = new; prev = new;
-			}
-			break;
-		case 2:
-			d0 = d[0]; d1 = d[1];
-			while ( len-- ) {
-				c1 = CM(m); DMAR(c1,c,0,nd_mod,c2); 
-				NEWNM(new); CM(new) = c2;
-				TD(new) = TD(m)+td; 
-				DL(new)[0] = DL(m)[0]+d0;
-				DL(new)[1] = DL(m)[1]+d1;
-				m = NEXT(m); NEXT(prev) = new; prev = new;
-			}
-			break;
-		default:
-			while ( len-- ) {
-				c1 = CM(m); DMAR(c1,c,0,nd_mod,c2);
-				NEWNM(new); CM(new) = c2;
-				TD(new) = TD(m)+td; ndl_add(DL(m),d,DL(new));
-				m = NEXT(m); NEXT(prev) = new; prev = new;
-			}
-			break;
-	}
-
-	NEXT(prev) = 0; 
-	MKND(NV(p),mr0,r);
-	SG(r) = SG(p) + td;
-	return r;
-}
-#endif