===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/nd.c,v
retrieving revision 1.13
retrieving revision 1.18
diff -u -p -r1.13 -r1.18
--- OpenXM_contrib2/asir2000/engine/nd.c	2003/07/30 00:55:41	1.13
+++ OpenXM_contrib2/asir2000/engine/nd.c	2003/07/31 05:42:22	1.18
@@ -1,10 +1,8 @@
-/* $OpenXM$ */
+/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.17 2003/07/31 05:30:38 noro Exp $ */
 
 #include "ca.h"
 #include "inline.h"
 
-#define USE_NDV 1
-
 #if defined(__GNUC__)
 #define INLINE inline
 #elif defined(VISUAL)
@@ -35,13 +33,19 @@ typedef struct oNDV {
 
 typedef struct oNM {
 	struct oNM *next;
-	int c;
+	union {
+		int m;
+		Q z;
+	} c;
 	int td;
 	unsigned int dl[1];
 } *NM;
 
 typedef struct oNMV {
-	int c;
+	union {
+		int m;
+		Q z;
+	} c;
 	int td;
 	unsigned int dl[1];
 } *NMV;
@@ -85,9 +89,17 @@ NODE append_one(NODE,int);
 
 #define HTD(d) ((d)->body->td)
 #define HDL(d) ((d)->body->dl)
-#define HC(d) ((d)->body->c)
+#define HCM(d) ((d)->body->c.m)
+#define HCQ(d) ((d)->body->c.z)
+#define CM(a) ((a)->c.m)
+#define CQ(a) ((a)->c.z)
+#define DL(a) ((a)->dl)
+#define TD(a) ((a)->td)
+#define SG(a) ((a)->sugar)
+#define LEN(a) ((a)->len)
 
-#define NEWRHist(r) ((r)=(RHist)MALLOC(sizeof(struct oRHist)))
+#define NEWRHist(r) \
+((r)=(RHist)MALLOC(sizeof(struct oRHist)+(nd_wpd-1)*sizeof(unsigned int)))
 #define NEWND_pairs(m) if(!_ndp_free_list)_NDP_alloc(); (m)=_ndp_free_list; _ndp_free_list = NEXT(_ndp_free_list)   
 #define NEWNM(m) if(!_nm_free_list)_NM_alloc(); (m)=_nm_free_list; _nm_free_list = NEXT(_nm_free_list)   
 #define MKND(n,m,d) if(!_nd_free_list)_ND_alloc(); (d)=_nd_free_list; _nd_free_list = (ND)BDY(_nd_free_list); (d)->nv=(n); BDY(d)=(m)
@@ -105,10 +117,15 @@ if(!(r)){(c)=(r)=(s);}else{NEXT(c)=(s);(c)=(s);}
 #define NEXTND_pairs(r,c) \
 if(!(r)){NEWND_pairs(r);(c)=(r);}else{NEWND_pairs(NEXT(c));(c)=NEXT(c);}
 
+void nd_removecont(ND p);
+void ndv_removecont(NDV p);
+void ndv_mul_c_q(NDV p,Q mul);
+void nd_mul_c_q(ND p,Q mul);
+
 ND_pairs crit_B( ND_pairs d, int s );
 void nd_gr(LIST f,LIST v,int m,struct order_spec *ord,LIST *rp);
-NODE nd_setup(NODE f);
-int nd_newps(ND a);
+NODE nd_setup(int mod,NODE f);
+int nd_newps(int mod,ND a);
 ND_pairs nd_minp( ND_pairs d, ND_pairs *prest );
 NODE update_base(NODE nd,int ndp);
 static ND_pairs equivalent_pairs( ND_pairs d1, ND_pairs *prest );
@@ -117,23 +134,26 @@ ND_pairs crit_F( ND_pairs d1 );
 ND_pairs crit_M( ND_pairs d1 );
 ND_pairs nd_newpairs( NODE g, int t );
 ND_pairs update_pairs( ND_pairs d, NODE /* of index */ g, int t);
-NODE nd_gb(NODE f);
+NODE nd_gb(int m,NODE f);
 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);
-int nd_sp(ND_pairs p,ND *nf);
+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(ND g,int full,ND *nf);
+int nd_nf(int mod,ND g,int full,ND *nf);
 ND nd_reduce(ND p1,ND p2);
 ND nd_reduce_special(ND p1,ND p2);
 void nd_free(ND p);
 void ndl_print(unsigned int *dl);
 void nd_print(ND p);
+void nd_print_q(ND p);
+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);
@@ -148,12 +168,11 @@ 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))
 #define NEWNDV(d) ((d)=(NDV)MALLOC(sizeof(struct oNDV)))
-#define MKNDV(n,m,l,d) NEWNDV(d); (d)->nv=(n); BDY(d)=(m); (d)->len = l;
+#define MKNDV(n,m,l,d) NEWNDV(d); NV(d)=(n); BDY(d)=(m); LEN(d) = l;
 
 int nmv_adv;
 int nmv_len;
@@ -161,17 +180,15 @@ NDV ndv_red;
 
 void ndv_mul_c(NDV p,int mul);
 ND ndv_add(ND p1,NDV p2);
-NDV ndtondv(ND p);
-void ndv_mul_nm(NDV pv,NM m,NDV r);
-ND ndv_mul_nm_create(NDV p,NM m0);
+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);
+ND ndv_mul_nm_create(int mod,NDV p,NM m0);
 void ndv_realloc(NDV p,int obpe,int oadv);
-NDV dptondv(DP);
-DP ndvtodp(NDV);
-#else
-static ND *nd_ps;
-ND dptond(DP);
-DP ndtodp(ND);
-#endif
+NDV dptondv(int,DP);
+DP ndvtodp(int,NDV);
+ND dptond(int,DP);
+DP ndtodp(int,ND);
 
 void nd_free_private_storage()
 {
@@ -527,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(HC(p2),nd_mod);
-		c1 = nd_mod-HC(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 = new->td = m2->td+td;
-			ndl_add(m2->dl,d,new->dl);
-			if ( !cur ) {
-				c1 = C(m2);
-				DMAR(c1,mul,0,nd_mod,c2);
-				C(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 ( cur->td > td2 )
-				c = 1;
-			else if ( cur->td < td2 )
-				c = -1;
-			else
-				c = ndl_compare(cur->dl,new->dl);
-			switch ( c ) {
-				case 0:
-					c2 = C(m2);
-					c1 = C(cur);
-					DMAR(c2,mul,c1,nd_mod,t);
-					if ( t )
-						C(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 = C(m2);
-						DMAR(c2,mul,0,nd_mod,c1);
-						C(prev) = c1;
-						NEXT(prev) = head;
-						head = prev;
-					} else {
-						c2 = C(m2);
-						DMAR(c2,mul,0,nd_mod,c1);
-						C(new) = c1;
-						NEXT(prev) = new;
-						NEXT(new) = cur;
-						prev = new;
-					}
-					NEWNM(new);
-					m2 = NEXT(m2);
-					break;
-			}
-		}
-		FREENM(new);
-		if ( head ) {
-			BDY(p1) = head;
-			p1->sugar = MAX(p1->sugar,p2->sugar+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(HC(p2),nd_mod);
-		c1 = nd_mod-HC(p1);
-		DMAR(c1,c2,0,nd_mod,mul);
-		prev = 0; head = cur = BDY(p1);
-		NEWNM(new);
-		for ( m2 = BDY(p2); m2; ) {
-			td2 = new->td = m2->td;
-			if ( !cur ) {
-				c1 = C(m2);
-				DMAR(c1,mul,0,nd_mod,c2);
-				C(new) = c2;
-				bcopy(m2->dl,new->dl,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 ( cur->td > td2 )
-				c = 1;
-			else if ( cur->td < td2 )
-				c = -1;
-			else
-				c = ndl_compare(cur->dl,m2->dl);
-			switch ( c ) {
-				case 0:
-					c2 = C(m2);
-					c1 = C(cur);
-					DMAR(c2,mul,c1,nd_mod,t);
-					if ( t )
-						C(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(m2->dl,new->dl,nd_wpd*sizeof(unsigned int));
-					if ( !prev ) {
-						/* cur = head */
-						prev = new;
-						c2 = C(m2);
-						DMAR(c2,mul,0,nd_mod,c1);
-						C(prev) = c1;
-						NEXT(prev) = head;
-						head = prev;
-					} else {
-						c2 = C(m2);
-						DMAR(c2,mul,0,nd_mod,c1);
-						C(new) = c1;
-						NEXT(prev) = new;
-						NEXT(new) = cur;
-						prev = new;
-					}
-					NEWNM(new);
-					m2 = NEXT(m2);
-					break;
-			}
-		}
-		FREENM(new);
-		if ( head ) {
-			BDY(p1) = head;
-			p1->sugar = MAX(p1->sugar,p2->sugar+td);
-			return p1;
-		} else {
-			FREEND(p1);
-			return 0;
-		}
-			
-	}
-}
-
 int ndl_check_bound2(int index,unsigned int *d2)
 {
 	unsigned int u2;
@@ -813,7 +631,7 @@ INLINE int nd_find_reducer(ND g)
 
 	d = ndl_hash_value(HTD(g),HDL(g));
 	for ( r = nd_red[d], k = 0; r; r = NEXT(r), k++ ) {
-		if ( HTD(g) == r->td && ndl_equal(HDL(g),r->dl) ) {
+		if ( HTD(g) == TD(r) && ndl_equal(HDL(g),DL(r)) ) {
 			if ( k > 0 ) nd_notfirst++;
 			nd_found++;
 			return r->index;
@@ -823,7 +641,7 @@ INLINE int nd_find_reducer(ND g)
 	if ( Reverse )
 		for ( i = nd_psn-1; i >= 0; i-- ) {
 			r = nd_psh[i];
-			if ( HTD(g) >= r->td && ndl_reducible(HDL(g),r->dl) ) {
+			if ( HTD(g) >= TD(r) && ndl_reducible(HDL(g),DL(r)) ) {
 				nd_create++;
 				nd_append_red(HDL(g),HTD(g),i);
 				return i;
@@ -832,7 +650,7 @@ INLINE int nd_find_reducer(ND g)
 	else
 		for ( i = 0; i < nd_psn; i++ ) {
 			r = nd_psh[i];
-			if ( HTD(g) >= r->td && ndl_reducible(HDL(g),r->dl) ) {
+			if ( HTD(g) >= TD(r) && ndl_reducible(HDL(g),DL(r)) ) {
 				nd_create++;
 				nd_append_red(HDL(g),HTD(g),i);
 				return i;
@@ -854,20 +672,20 @@ ND nd_add(ND p1,ND p2)
 		return p1;
 	else {
 		for ( n = NV(p1), m1 = BDY(p1), m2 = BDY(p2), mr0 = 0; m1 && m2; ) {
-			if ( m1->td > m2->td )
+			if ( TD(m1) > TD(m2) )
 				c = 1;
-			else if ( m1->td < m2->td )
+			else if ( TD(m1) < TD(m2) )
 				c = -1;
 			else
-				c = ndl_compare(m1->dl,m2->dl);
+				c = ndl_compare(DL(m1),DL(m2));
 			switch ( c ) {
 				case 0:
-					t = ((C(m1))+(C(m2))) - nd_mod;
+					t = ((CM(m1))+(CM(m2))) - nd_mod;
 					if ( t < 0 )
 						t += nd_mod;
 					s = m1; m1 = NEXT(m1);
 					if ( t ) {
-						NEXTNM2(mr0,mr,s); C(mr) = (t);
+						NEXTNM2(mr0,mr,s); CM(mr) = (t);
 					} else {
 						FREENM(s);
 					}
@@ -895,60 +713,121 @@ ND nd_add(ND p1,ND p2)
 		else
 			NEXT(mr) = 0;
 		BDY(p1) = mr0;
-		p1->sugar = MAX(p1->sugar,p2->sugar);
+		SG(p1) = MAX(SG(p1),SG(p2));
 		FREEND(p2);
 		return p1;
 	}
 }
 
+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(ND g,int full,ND *rp)
+int nd_nf(int mod,ND g,int full,ND *rp)
 {
 	ND d;
 	NM m,mrd,tail;
 	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 ) {
 		*rp = 0;
 		return 1;
 	}
-	sugar0 = sugar = g->sugar;
+	sugar0 = sugar = SG(g);
 	n = NV(g);
 	mul = (NM)ALLOCA(sizeof(struct oNM)+(nd_wpd-1)*sizeof(unsigned int));
 	for ( d = 0; g; ) {
 		index = nd_find_reducer(g);
 		if ( index >= 0 ) {
-			p = nd_ps[index];
-			ndl_sub(HDL(g),HDL(p),mul->dl);
-			mul->td = 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 && (p->sugar+mul->td) > sugar ) {
+			if ( d && (SG(p)+TD(mul)) > sugar ) {
 				goto afo;				
 			}
 #endif
-			if ( ndl_check_bound2(index,mul->dl) ) {
+			if ( ndl_check_bound2(index,DL(mul)) ) {
 				nd_free(g); nd_free(d);
 				return 0;
 			}
-			c1 = invm(HC(p),nd_mod); c2 = nd_mod-HC(g);
-			DMAR(c1,c2,0,nd_mod,c); C(mul) = c;
-#if USE_NDV
-			ndv_mul_nm(nd_ps[index],mul,ndv_red);
-			g = ndv_add(g,ndv_red);
-			sugar = MAX(sugar,ndv_red->sugar);
-#else
-			red = nd_mul_ind_nm(index,mul);
-			g = nd_add(g,red);
-			sugar = MAX(sugar,red->sugar);
-#endif
+			if ( mod ) {
+				p = nd_ps[index];
+				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,p,mul,ndv_red);
+				g = ndv_add(g,ndv_red);
+			} else {
+				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,p,mul,ndv_red);
+				g = ndv_add_q(g,ndv_red);
+			}
+			sugar = MAX(sugar,SG(ndv_red));
 		} else if ( !full ) {
 			*rp = g;
 			return 1;
@@ -970,7 +849,7 @@ afo:
 		}
 	}
 	if ( d )
-		d->sugar = sugar;
+		SG(d) = sugar;
 	*rp = d;
 	return 1;
 }
@@ -1031,7 +910,7 @@ int head_pbucket(PGeoBucket g)
 				j = i;
 				gj = g->body[j];
 				dj = HDL(gj);
-				sum = HC(gj);
+				sum = HCM(gj);
 			} else {
 				di = HDL(gi);
 				nv = NV(gi);
@@ -1043,15 +922,15 @@ int head_pbucket(PGeoBucket g)
 					c = ndl_compare(di,dj);
 				if ( c > 0 ) {
 					if ( sum )
-						HC(gj) = sum;
+						HCM(gj) = sum;
 					else
 						g->body[j] = nd_remove_head(gj);
 					j = i;
 					gj = g->body[j];
 					dj = HDL(gj);
-					sum = HC(gj);
+					sum = HCM(gj);
 				} else if ( c == 0 ) {
-					sum = sum+HC(gi)-nd_mod;
+					sum = sum+HCM(gi)-nd_mod;
 					if ( sum < 0 )
 						sum += nd_mod;
 					g->body[i] = nd_remove_head(gi);
@@ -1061,7 +940,7 @@ int head_pbucket(PGeoBucket g)
 		if ( j < 0 )
 			return -1;
 		else if ( sum ) {
-			HC(gj) = sum;
+			HCM(gj) = sum;
 			return j;
 		} else
 			g->body[j] = nd_remove_head(gj);
@@ -1090,8 +969,8 @@ ND nd_nf(ND g,int full)
 	if ( !g ) {
 		return 0;
 	}
-	sugar = g->sugar;
-	n = g->nv;
+	sugar = SG(g);
+	n = NV(g);
 	bucket = create_pbucket();
 	add_pbucket(bucket,g);
 	d = 0;
@@ -1099,7 +978,7 @@ ND nd_nf(ND g,int full)
 		h = head_pbucket(bucket);
 		if ( h < 0 ) {
 			if ( d )
-				d->sugar = sugar;
+				SG(d) = sugar;
 			return d;
 		}
 		g = bucket->body[h];
@@ -1108,11 +987,11 @@ ND nd_nf(ND g,int full)
 			bucket->body[h] = nd_remove_head(g);
 			red = nd_remove_head(red);
 			add_pbucket(bucket,red);
-			sugar = MAX(sugar,red->sugar);
+			sugar = MAX(sugar,SG(red));
 		} else if ( !full ) {
 			g = normalize_pbucket(bucket);
 			if ( g )
-				g->sugar = sugar;
+				SG(g) = sugar;
 			return g;
 		} else {
 			m = BDY(g); 
@@ -1134,7 +1013,7 @@ ND nd_nf(ND g,int full)
 }
 #endif
 
-NODE nd_gb(NODE f)
+NODE nd_gb(int m,NODE f)
 {
 	int i,nh,sugar,stat;
 	NODE r,g,gall;
@@ -1152,24 +1031,24 @@ NODE nd_gb(NODE f)
 	while ( d ) {
 again:
 		l = nd_minp(d,&d);
-		if ( l->sugar != sugar ) {
-			sugar = l->sugar;
+		if ( SG(l) != sugar ) {
+			sugar = SG(l);
 			fprintf(asir_out,"%d",sugar);
 		}
-		stat = nd_sp(l,&h);
+		stat = nd_sp(m,l,&h);
 		if ( !stat ) {
 			NEXT(l) = d; d = l;
 			d = nd_reconstruct(d);
 			goto again;
 		}
-		stat = nd_nf(h,!Top,&nf);
+		stat = nd_nf(m,h,!Top,&nf);
 		if ( !stat ) {
 			NEXT(l) = d; d = l;
 			d = nd_reconstruct(d);
 			goto again;
 		} else if ( nf ) {
 			printf("+"); fflush(stdout);
-			nh = nd_newps(nf);
+			nh = nd_newps(m,nf);
 			d = update_pairs(d,g,nh);
 			g = update_base(g,nh);
 			gall = append_one(gall,nh);
@@ -1226,15 +1105,15 @@ ND_pairs nd_newpairs( NODE g, int t )
 
 	dl = HDL(nd_ps[t]);
 	td = HTD(nd_ps[t]);
-	ts = nd_ps[t]->sugar - td;
+	ts = SG(nd_ps[t]) - td;
 	for ( r0 = 0, h = g; h; h = NEXT(h) ) {
 		NEXTND_pairs(r0,r);
 		r->i1 = (int)BDY(h);
 		r->i2 = t;
 		ndl_lcm(HDL(nd_ps[r->i1]),dl,r->lcm);
-		r->td = ndl_td(r->lcm);
-		s = nd_ps[r->i1]->sugar-HTD(nd_ps[r->i1]);
-		r->sugar = MAX(s,ts) + r->td;
+		TD(r) = ndl_td(r->lcm);
+		s = SG(nd_ps[r->i1])-HTD(nd_ps[r->i1]);
+		SG(r) = MAX(s,ts) + TD(r);
 	}
 	NEXT(r) = 0;
 	return r0;
@@ -1283,11 +1162,11 @@ ND_pairs crit_M( ND_pairs d1 )
 			return e;
 		}
 		id = e->lcm;
-		itd = e->td;
+		itd = TD(e);
 		for ( d3 = 0; d2; d2 = p ) {
 			p = NEXT(d2),
 			jd = d2->lcm;
-			jtd = d2->td;
+			jtd = TD(d2);
 			if ( jtd == itd  )
 				if ( id == jd );
 				else if ( ndl_reducible(jd,id) ) continue;
@@ -1324,7 +1203,7 @@ ND_pairs crit_F( ND_pairs d1 )
 
 	for ( head = last = 0, p = d1; NEXT(p); ) {
 		r = w = equivalent_pairs(p,&rest);
-		s = r->sugar;
+		s = SG(r);
 		w = NEXT(w);
 		while ( w ) {
 			if ( crit_2(w->i1,w->i2) ) {
@@ -1336,10 +1215,10 @@ ND_pairs crit_F( ND_pairs d1 )
 					FREENDP(remove);
 				}
 				break;
-			} else if ( w->sugar < s ) {
+			} else if ( SG(w) < s ) {
 				FREENDP(r);
 				r = w;
-				s = r->sugar;
+				s = SG(r);
 				w = NEXT(w);
 			} else {
 				remove = w;
@@ -1371,12 +1250,12 @@ static ND_pairs equivalent_pairs( ND_pairs d1, ND_pair
 
 	w = d1;
 	d = w->lcm;
-	td = w->td;
+	td = TD(w);
 	s = NEXT(w);
 	NEXT(w) = 0;
 	for ( r = 0; s; s = p ) {
 		p = NEXT(s);
-		if ( td == s->td && ndl_equal(d,s->lcm) ) {
+		if ( td == TD(s) && ndl_equal(d,s->lcm) ) {
 			NEXT(s) = w;
 			w = s;
 		} else {
@@ -1423,16 +1302,16 @@ ND_pairs nd_minp( ND_pairs d, ND_pairs *prest )
 		return m;
 	}
 	lcm = m->lcm;
-	s = m->sugar;
-	td = m->td;
+	s = SG(m);
+	td = TD(m);
 	len = nd_psl[m->i1]+nd_psl[m->i2];
 	for ( ml = 0, l = m; p; p = NEXT(l = p) ) {
-		if (p->sugar < s)
+		if (SG(p) < s)
 			goto find;
-		else if ( p->sugar == s ) {
-			if ( p->td < td )
+		else if ( SG(p) == s ) {
+			if ( TD(p) < td )
 				goto find;
-			else if ( p->td == td ) {
+			else if ( TD(p) == td ) {
 				c = ndl_compare(p->lcm,lcm);
 				if ( c < 0 )
 					goto find;
@@ -1450,8 +1329,8 @@ find:
 		ml = l;
 		m = p;
 		lcm = m->lcm;
-		s = m->sugar;
-		td = m->td;
+		s = SG(m);
+		td = TD(m);
 		len = tlen;
 	}
 	if ( !ml ) *prest = NEXT(m);
@@ -1463,7 +1342,7 @@ find:
 	return m;
 }
 
-int nd_newps(ND a)
+int nd_newps(int mod,ND a)
 {
 	int len;
 	RHist r;
@@ -1471,34 +1350,28 @@ int nd_newps(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 *));
 	}
-	nd_monic(a);
+	if ( mod )
+		nd_monic(a);
+	else
+		nd_removecont(a);
 	nd_bound[nd_psn] = nd_compute_bound(a);
-	NEWRHist(r); r->td = HTD(a); ndl_copy(HDL(a),r->dl); nd_psh[nd_psn] = r;
-#if USE_NDV
-	nd_ps[nd_psn]= ndtondv(a);
+	NEWRHist(r); TD(r) = HTD(a); ndl_copy(HDL(a),DL(r)); nd_psh[nd_psn] = r;
+	nd_ps[nd_psn]= ndtondv(mod,a);
 	nd_free(a);
-	nd_psl[nd_psn] = len = nd_ps[nd_psn]->len;
+	nd_psl[nd_psn] = len = LEN(nd_ps[nd_psn]);
 	if ( len > nmv_len ) {
 		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++;
 }
 
-NODE nd_setup(NODE f)
+NODE nd_setup(int mod,NODE f)
 {
 	int i,j,td,len,max;
 	NODE s,s0,f0;
@@ -1509,11 +1382,7 @@ NODE nd_setup(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) ) {
@@ -1542,23 +1411,21 @@ NODE nd_setup(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((DP)BDY(f));
-		ndv_mul_c(nd_ps[i],invm(HC(nd_ps[i]),nd_mod));
-		len = MAX(len,nd_ps[i]->len);
-#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); r->td = HTD(nd_ps[i]); ndl_copy(HDL(nd_ps[i]),r->dl);
+		nd_ps[i] = dptondv(mod,(DP)BDY(f));
+		if ( mod )
+			ndv_mul_c(nd_ps[i],invm(HCM(nd_ps[i]),nd_mod));
+		else
+			ndv_removecont(nd_ps[i]);
+		len = MAX(len,LEN(nd_ps[i]));
+		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);
-	BDY(ndv_red) = (NMV)MALLOC_ATOMIC(nmv_len*nmv_adv);
-#endif
+	if ( mod )
+		BDY(ndv_red) = (NMV)MALLOC_ATOMIC(nmv_len*nmv_adv);
+	else
+		BDY(ndv_red) = (NMV)MALLOC(nmv_len*nmv_adv);
 	for ( s0 = 0, i = 0; i < nd_psn; i++ ) {
 		NEXTNODE(s0,s); BDY(s) = (pointer)i;
 	}
@@ -1591,25 +1458,27 @@ void nd_gr(LIST f,LIST v,int m,struct order_spec *ord,
 	nd_mod = m;
 	for ( fd0 = 0, t = BDY(f); t; t = NEXT(t) ) {
 		ptod(CO,vv,(P)BDY(t),&b);
-		_dp_mod(b,m,0,&c);
+		if ( m )
+			_dp_mod(b,m,0,&c);
+		else
+			c = b;
 		if ( c ) {
 			NEXTNODE(fd0,fd); BDY(fd) = (pointer)c;
 		}
 	}
 	if ( fd0 ) NEXT(fd) = 0;
-	s = nd_setup(fd0);
-	x = nd_gb(s);
+	s = nd_setup(m,fd0);
+	x = nd_gb(m,s);
 #if 0
 	x = nd_reduceall(x,m);
 #endif
 	for ( r0 = 0; x; x = NEXT(x) ) {
 		NEXTNODE(r0,r); 
-#if USE_NDV
-		a = ndvtodp(nd_ps[(int)BDY(x)]);
-#else
-		a = ndtodp(nd_ps[(int)BDY(x)]);
-#endif
-		_dtop_mod(CO,vv,a,(P *)&BDY(r));
+		a = ndvtodp(m,nd_ps[(int)BDY(x)]);
+		if ( m )
+			_dtop_mod(CO,vv,a,(P *)&BDY(r));
+		else
+			dtop(CO,vv,a,(P *)&BDY(r));
 	}
 	if ( r0 ) NEXT(r) = 0;
 	MKLIST(*rp,r0);
@@ -1639,7 +1508,7 @@ DL ndltodl(int n,int td,unsigned int *ndl)
 	int i;
 
 	NEWDL(dl,n);
-	dl->td = td;
+	TD(dl) = td;
 	d = dl->d;
 	if ( is_rlex )
 		for ( i = 0; i < n; i++ )
@@ -1652,7 +1521,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;
@@ -1665,18 +1534,21 @@ ND dptond(DP p)
 	m0 = 0;
 	for ( t = BDY(p); t; t = NEXT(t) ) {
 		NEXTNM(m0,m);
-		m->c = ITOS(t->c);
-		m->td = t->dl->td;
-		dltondl(n,t->dl,m->dl);
+		if ( mod )
+			CM(m) = ITOS(C(t));
+		else
+			CQ(m) = (Q)C(t);
+		TD(m) = TD(DL(t));
+		dltondl(n,DL(t),DL(m));
 	}
 	NEXT(m) = 0;
 	MKND(n,m0,d);
-	d->nv = n;
-	d->sugar = p->sugar;
+	NV(d) = n;
+	SG(d) = SG(p);
 	return d;
 }
 
-DP ndtodp(ND p)
+DP ndtodp(int mod,ND p)
 {
 	DP d;
 	MP m0,m;
@@ -1689,12 +1561,15 @@ DP ndtodp(ND p)
 	m0 = 0;
 	for ( t = BDY(p); t; t = NEXT(t) ) {
 		NEXTMP(m0,m);
-		m->c = STOI(t->c);
-		m->dl = ndltodl(n,t->td,t->dl);
+		if ( mod )
+			C(m) = STOI(CM(t));
+		else
+			C(m) = (P)CQ(t);
+		DL(m) = ndltodl(n,TD(t),DL(t));
 	}
 	NEXT(m) = 0;
 	MKDP(n,m0,d);
-	d->sugar = p->sugar;
+	SG(d) = SG(p);
 	return d;
 }
 
@@ -1726,13 +1601,30 @@ void nd_print(ND p)
 		printf("0\n");
 	else {
 		for ( m = BDY(p); m; m = NEXT(m) ) {
-			printf("+%d*",m->c);
-			ndl_print(m->dl);
+			printf("+%d*",CM(m));
+			ndl_print(DL(m));
 		}
 		printf("\n");
 	}
 }
 
+void nd_print_q(ND p)
+{
+	NM m;
+
+	if ( !p )
+		printf("0\n");
+	else {
+		for ( m = BDY(p); m; m = NEXT(m) ) {
+			printf("+");
+			printexpr(CO,CQ(m));
+			printf("*");
+			ndl_print(DL(m));
+		}
+		printf("\n");
+	}
+}
+
 void ndp_print(ND_pairs d)
 {
 	ND_pairs t;
@@ -1743,12 +1635,48 @@ void ndp_print(ND_pairs d)
 	printf("\n");
 }
 
+void nd_removecont(ND p)
+{
+	int i,n;
+	Q *w;
+	Q dvr,t;
+	NM m;
+
+	for ( m = BDY(p), n = 0; m; m = NEXT(m), n++ );
+	w = (Q *)ALLOCA(n*sizeof(Q));
+	for ( m = BDY(p), i = 0; i < n; m = NEXT(m), i++ )
+		w[i] = CQ(m);
+	sortbynm(w,n);
+	qltozl(w,n,&dvr);
+	for ( m = BDY(p); m; m = NEXT(m) ) {
+		divq(CQ(m),dvr,&t); CQ(m) = t;
+	}
+}
+
+void ndv_removecont(NDV p)
+{
+	int i,len;
+	Q *w;
+	Q dvr,t;
+	NMV m;
+
+	len = p->len;
+	w = (Q *)ALLOCA(len*sizeof(Q));
+	for ( m = BDY(p), i = 0; i < len; NMV_ADV(m), i++ )
+		w[i] = CQ(m);
+	sortbynm(w,len);
+	qltozl(w,len,&dvr);
+	for ( m = BDY(p), i = 0; i < len; NMV_ADV(m), i++ ) {
+		divq(CQ(m),dvr,&t); CQ(m) = t;
+	}
+}
+
 void nd_monic(ND p)
 {
 	if ( !p )
 		return;
 	else
-		nd_mul_c(p,invm(HC(p),nd_mod));
+		nd_mul_c(p,invm(HCM(p),nd_mod));
 }
 
 void nd_mul_c(ND p,int mul)
@@ -1759,12 +1687,24 @@ void nd_mul_c(ND p,int mul)
 	if ( !p )
 		return;
 	for ( m = BDY(p); m; m = NEXT(m) ) {
-		c1 = C(m);
+		c1 = CM(m);
 		DMAR(c1,mul,0,nd_mod,c);
-		C(m) = c;
+		CM(m) = c;
 	}
 }
 
+void nd_mul_c_q(ND p,Q mul)
+{
+	NM m;
+	Q c;
+
+	if ( !p )
+		return;
+	for ( m = BDY(p); m; m = NEXT(m) ) {
+		mulq(CQ(m),mul,&c); CQ(m) = c;
+	}
+}
+
 void nd_free(ND p)
 {
 	NM t,s;
@@ -1788,8 +1728,8 @@ void nd_append_red(unsigned int *d,int td,int i)
 	NEWRHist(m);
 	h = ndl_hash_value(td,d);
 	m->index = i;
-	m->td = td;
-	ndl_copy(d,m->dl);
+	TD(m) = td;
+	ndl_copy(d,DL(m));
 	NEXT(m) = nd_red[h];
 	nd_red[h] = m;
 }
@@ -1805,9 +1745,9 @@ unsigned int *dp_compute_bound(DP p)
 	d1 = (unsigned int *)ALLOCA(nd_nvar*sizeof(unsigned int));
 	d2 = (unsigned int *)ALLOCA(nd_nvar*sizeof(unsigned int));
 	m = BDY(p);
-	bcopy(m->dl->d,d1,nd_nvar*sizeof(unsigned int));
+	bcopy(DL(m)->d,d1,nd_nvar*sizeof(unsigned int));
 	for ( m = NEXT(BDY(p)); m; m = NEXT(m) ) {
-		d = m->dl->d;
+		d = DL(m)->d;
 		for ( i = 0; i < nd_nvar; i++ )
 			d2[i] = d[i] > d1[i] ? d[i] : d1[i];
 		t = d1; d1 = d2; d2 = t;
@@ -1831,7 +1771,7 @@ unsigned int *nd_compute_bound(ND p)
 	d2 = (unsigned int *)ALLOCA(nd_wpd*sizeof(unsigned int));
 	bcopy(HDL(p),d1,nd_wpd*sizeof(unsigned int));
 	for ( m = NEXT(BDY(p)); m; m = NEXT(m) ) {
-		ndl_lcm(m->dl,d1,d2);
+		ndl_lcm(DL(m),d1,d2);
 		t = d1; d1 = d2; d2 = t;
 	}
 	l = nd_nvar+31;
@@ -1859,9 +1799,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)
@@ -1871,11 +1809,9 @@ ND_pairs nd_reconstruct(ND_pairs d)
 	RHist mr0,mr;
 	RHist r;
 	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 )
@@ -1895,41 +1831,35 @@ 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) ) {
 		NEXTND_pairs(s0,s);
 		s->i1 = t->i1;
 		s->i2 = t->i2;
-		s->td = t->td;
-		s->sugar = t->sugar;
+		TD(s) = TD(t);
+		SG(s) = SG(t);
 		ndl_dup(obpe,t->lcm,s->lcm);
 	}
 	for ( i = 0; i < REDTAB_LEN; i++ ) {
 		for ( mr0 = 0, r = nd_red[i]; r; r = NEXT(r) ) {
-			NEXTRHist(mr0,r);
+			NEXTRHist(mr0,mr);
 			mr->index = r->index;
-			mr->td = r->td;
-			ndl_dup(obpe,r->dl,mr->dl);
+			TD(mr) = TD(r);
+			ndl_dup(obpe,DL(r),DL(mr));
 		}
 		if ( mr0 ) NEXT(mr) = 0;
 		nd_red[i] = mr0;
 	}
 	for ( i = 0; i < nd_psn; i++ ) {
-		NEWRHist(r); r->td = nd_psh[i]->td; ndl_dup(obpe,nd_psh[i]->dl,r->dl);
+		NEWRHist(r); TD(r) = TD(nd_psh[i]); ndl_dup(obpe,DL(nd_psh[i]),DL(r));
 		nd_psh[i] = r;
 	}
 	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;
 }
@@ -1942,6 +1872,8 @@ void ndl_dup(int obpe,unsigned int *d,unsigned int *r)
 	oepw = (sizeof(unsigned int)*8)/obpe;
 	cepw = nd_epw;
 	cbpe = nd_bpe;
+	for ( i = 0; i < nd_wpd; i++ )
+		r[i] = 0;
 	if ( is_rlex )
 		for ( i = 0; i < n; i++ ) {
 			ei = (d[(n-1-i)/oepw]>>((oepw-((n-1-i)%oepw)-1)*obpe))
@@ -1964,9 +1896,9 @@ void nd_realloc(ND p,int obpe)
 		m = BDY(p);
 		for ( mr0 = 0; m; m = NEXT(m) ) {
 			NEXTNM(mr0,mr);
-			C(mr) = C(m);
-			mr->td = m->td;
-			ndl_dup(obpe,m->dl,mr->dl);
+			CM(mr) = CM(m);
+			TD(mr) = TD(m);
+			ndl_dup(obpe,DL(m),DL(mr));
 		}
 		NEXT(mr) = 0; 
 		BDY(p) = mr0;
@@ -1985,19 +1917,18 @@ ND nd_copy(ND p)
 		s = sizeof(struct oNM)+(nd_wpd-1)*sizeof(unsigned int);
 		for ( mr0 = 0, m = BDY(p); m; m = NEXT(m) ) {
 			NEXTNM(mr0,mr);
-			C(mr) = C(m);
-			mr->td = m->td;
-			ndl_copy(m->dl,mr->dl);
+			CM(mr) = CM(m);
+			TD(mr) = TD(m);
+			ndl_copy(DL(m),DL(mr));
 		}
 		NEXT(mr) = 0; 
 		MKND(NV(p),mr0,r);
-		r->sugar = p->sugar;
+		SG(r) = SG(p);
 		return r;
 	}
 }
 
-#if USE_NDV
-int nd_sp(ND_pairs p,ND *rp)
+int nd_sp(int mod,ND_pairs p,ND *rp)
 {
 	NM m;
 	NDV p1,p2;
@@ -2008,20 +1939,29 @@ int nd_sp(ND_pairs p,ND *rp)
 	p1 = nd_ps[p->i1];
 	p2 = nd_ps[p->i2];
 	lcm = p->lcm;
-	td = p->td;
+	td = TD(p);
 	NEWNM(m);
-	C(m) = HC(p2); m->td = td-HTD(p1); ndl_sub(lcm,HDL(p1),m->dl);
-	if ( ndl_check_bound2(p->i1,m->dl) )
+	if ( mod ) CM(m) = HCM(p2);
+	else CQ(m) = HCQ(p2);
+	TD(m) = td-HTD(p1); ndl_sub(lcm,HDL(p1),DL(m));
+	if ( ndl_check_bound2(p->i1,DL(m)) )
 		return 0;
-	t1 = ndv_mul_nm_create(p1,m);
-	C(m) = nd_mod-HC(p1); m->td = td-HTD(p2); ndl_sub(lcm,HDL(p2),m->dl);
-	if ( ndl_check_bound2(p->i2,m->dl) ) {
+	t1 = ndv_mul_nm_create(mod,p1,m);
+	if ( mod )
+		CM(m) = mod-HCM(p1); 
+	else
+		chsgnq(HCQ(p1),&CQ(m));
+	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;
 	}
-	ndv_mul_nm(p2,m,ndv_red);
+	ndv_mul_nm(mod,p2,m,ndv_red);
 	FREENM(m);
-	*rp = ndv_add(t1,ndv_red);
+	if ( mod )
+		*rp = ndv_add(t1,ndv_red);
+	else
+		*rp = ndv_add_q(t1,ndv_red);
 	return 1;
 }
 
@@ -2032,63 +1972,99 @@ void ndv_mul_c(NDV p,int mul)
 
 	if ( !p )
 		return;
-	len = p->len;
+	len = LEN(p);
 	for ( m = BDY(p), i = 0; i < len; i++, NMV_ADV(m) ) {
-		c1 = C(m);
+		c1 = CM(m);
 		DMAR(c1,mul,0,nd_mod,c);
-		C(m) = c;
+		CM(m) = c;
 	}
 }
 
-void ndv_mul_nm(NDV p,NM m0,NDV r)
+void ndv_mul_c_q(NDV p,Q mul)
 {
+	NMV m;
+	Q c;
+	int len,i;
+
+	if ( !p )
+		return;
+	len = LEN(p);
+	for ( m = BDY(p), i = 0; i < len; i++, NMV_ADV(m) ) {
+		mulq(CQ(m),mul,&c); CQ(m) = c;
+	}
+}
+
+void ndv_mul_nm(int mod,NDV p,NM m0,NDV r)
+{
 	NMV m,mr,mr0;
 	unsigned int *d,*dt,*dm;
 	int c,n,td,i,c1,c2,len;
+	Q q;
 
 	if ( !p )
 		/* XXX */
-		r->len = 0;
+		LEN(r) = 0;
 	else {
-		n = NV(p); m = BDY(p); len = p->len;
-		d = m0->dl; td = m0->td; c = C(m0);
+		n = NV(p); m = BDY(p); len = LEN(p);
+		d = DL(m0); td = TD(m0);
 		mr = BDY(r);
-		for ( ; len > 0; len--, NMV_ADV(m), NMV_ADV(mr) ) {
-			c1 = C(m); DMAR(c1,c,0,nd_mod,c2); C(mr) = c2;
-			mr->td = m->td+td; ndl_add(m->dl,d,mr->dl);
+		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;
+				TD(mr) = TD(m)+td; ndl_add(DL(m),d,DL(mr));
+			}
+		} else {
+			q = CQ(m0);
+			for ( ; len > 0; len--, NMV_ADV(m), NMV_ADV(mr) ) {
+				mulq(CQ(m),q,&CQ(mr));
+				TD(mr) = TD(m)+td; ndl_add(DL(m),d,DL(mr));
+			}
 		}
 		NV(r) = NV(p);
-		r->len = p->len;
-		r->sugar = p->sugar + td;
+		LEN(r) = LEN(p);
+		SG(r) = SG(p) + td;
 	}
 }
 
-ND ndv_mul_nm_create(NDV p,NM m0)
+ND ndv_mul_nm_create(int mod,NDV p,NM m0)
 {
 	NM mr,mr0;
 	NMV m;
 	unsigned int *d,*dt,*dm;
 	int c,n,td,i,c1,c2,len;
+	Q q;
 	ND r;
 
 	if ( !p )
 		return 0;
 	else {
 		n = NV(p); m = BDY(p);
-		d = m0->dl; td = m0->td; c = C(m0);
-		len = p->len;
+		d = DL(m0); td = TD(m0); 
+		len = LEN(p);
 		mr0 = 0;
-		for ( i = 0; i < len; i++, NMV_ADV(m) ) {
-			NEXTNM(mr0,mr);
-			c1 = C(m);
-			DMAR(c1,c,0,nd_mod,c2);
-			C(mr) = c2;
-			mr->td = m->td+td;
-			ndl_add(m->dl,d,mr->dl);
+		if ( mod ) {
+			c = CM(m0);
+			for ( i = 0; i < len; i++, NMV_ADV(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));
+			}
+		} else {
+			q = CQ(m0);
+			for ( i = 0; i < len; i++, NMV_ADV(m) ) {
+				NEXTNM(mr0,mr);
+				mulq(CQ(m),q,&CQ(mr));
+				TD(mr) = TD(m)+td;
+				ndl_add(DL(m),d,DL(mr));
+			}
 		}
 		NEXT(mr) = 0; 
 		MKND(NV(p),mr0,r);
-		r->sugar = p->sugar + td;
+		SG(r) = SG(p) + td;
 		return r;
 	}
 }
@@ -2100,29 +2076,30 @@ ND ndv_add(ND p1,NDV p2)
 	NM head;
 	unsigned int *d;
 	NMV m2;
+	Q q;
 
 	if ( !p1 )
 		return 0;
 	else {
 		prev = 0; head = cur = BDY(p1);
-		NEWNM(new); len = p2->len;
+		NEWNM(new); len = LEN(p2);
 		for ( m2 = BDY(p2), i = 0; cur && i < len; ) {
-			td2 = new->td = m2->td;
-			if ( cur->td > td2 ) {
+			td2 = TD(new) = TD(m2);
+			if ( TD(cur) > td2 ) {
 				prev = cur; cur = NEXT(cur);
 				continue;
-			} else if ( cur->td < td2 ) c = -1;
+			} else if ( TD(cur) < td2 ) c = -1;
 			else if ( nd_wpd == 1 ) {
-				if ( cur->dl[0] > m2->dl[0] ) c = is_rlex ? -1 : 1;
-				else if ( cur->dl[0] < m2->dl[0] ) c = is_rlex ? 1 : -1;
+				if ( DL(cur)[0] > DL(m2)[0] ) c = is_rlex ? -1 : 1;
+				else if ( DL(cur)[0] < DL(m2)[0] ) c = is_rlex ? 1 : -1;
 				else c = 0;
 			}
-			else c = ndl_compare(cur->dl,m2->dl);
+			else c = ndl_compare(DL(cur),DL(m2));
 			switch ( c ) {
 				case 0:
-					t = C(m2)+C(cur)-nd_mod;
+					t = CM(m2)+CM(cur)-nd_mod;
 					if ( t < 0 ) t += nd_mod;
-					if ( t ) C(cur) = t;
+					if ( t ) CM(cur) = t;
 					else if ( !prev ) {
 						head = NEXT(cur); FREENM(cur); cur = head;
 					} else {
@@ -2134,8 +2111,8 @@ ND ndv_add(ND p1,NDV p2)
 					prev = cur; cur = NEXT(cur);
 					break;
 				case -1:
-					ndl_copy(m2->dl,new->dl);
-					C(new) = C(m2);
+					ndl_copy(DL(m2),DL(new));
+					CQ(new) = CQ(m2);
 					if ( !prev ) {
 						/* cur = head */
 						prev = new; NEXT(prev) = head; head = prev;
@@ -2147,7 +2124,7 @@ ND ndv_add(ND p1,NDV p2)
 			}
 		}
 		for ( ; i < len; i++, NMV_ADV(m2) ) {
-			td2 = new->td = m2->td; C(new) = C(m2); ndl_copy(m2->dl,new->dl);
+			td2 = TD(new) = TD(m2); CQ(new) = CQ(m2); ndl_copy(DL(m2),DL(new));
 			if ( !prev ) {
 				prev = new; NEXT(prev) = 0; head = prev;
 			} else {
@@ -2157,7 +2134,7 @@ ND ndv_add(ND p1,NDV p2)
 		}
 		FREENM(new);
 		if ( head ) {
-			BDY(p1) = head; p1->sugar = MAX(p1->sugar,p2->sugar);
+			BDY(p1) = head; SG(p1) = MAX(SG(p1),SG(p2));
 			return p1;
 		} else {
 			FREEND(p1);
@@ -2167,6 +2144,81 @@ ND ndv_add(ND p1,NDV p2)
 	}
 }
 
+ND ndv_add_q(ND p1,NDV p2)
+{
+	register NM prev,cur,new;
+	int c,c1,c2,t,td,td2,mul,len,i;
+	NM head;
+	unsigned int *d;
+	NMV m2;
+	Q q;
+
+	if ( !p1 )
+		return 0;
+	else {
+		prev = 0; head = cur = BDY(p1);
+		NEWNM(new); len = LEN(p2);
+		for ( m2 = BDY(p2), i = 0; cur && i < len; ) {
+			td2 = TD(new) = TD(m2);
+			if ( TD(cur) > td2 ) {
+				prev = cur; cur = NEXT(cur);
+				continue;
+			} else if ( TD(cur) < td2 ) c = -1;
+			else if ( nd_wpd == 1 ) {
+				if ( DL(cur)[0] > DL(m2)[0] ) c = is_rlex ? -1 : 1;
+				else if ( DL(cur)[0] < DL(m2)[0] ) c = is_rlex ? 1 : -1;
+				else c = 0;
+			}
+			else c = ndl_compare(DL(cur),DL(m2));
+			switch ( c ) {
+				case 0:
+					addq(CQ(cur),CQ(m2),&q);
+					if ( q )
+						CQ(cur) = q;
+					else if ( !prev ) {
+						head = NEXT(cur); FREENM(cur); cur = head;
+					} else {
+						NEXT(prev) = NEXT(cur); FREENM(cur); cur = NEXT(prev);
+					}
+					NMV_ADV(m2); i++;
+					break;
+				case 1:
+					prev = cur; cur = NEXT(cur);
+					break;
+				case -1:
+					ndl_copy(DL(m2),DL(new));
+					CQ(new) = CQ(m2);
+					if ( !prev ) {
+						/* cur = head */
+						prev = new; NEXT(prev) = head; head = prev;
+					} else {
+						NEXT(prev) = new; NEXT(new) = cur; prev = new;
+					}
+					NEWNM(new); NMV_ADV(m2); i++;
+					break;
+			}
+		}
+		for ( ; i < len; i++, NMV_ADV(m2) ) {
+			td2 = TD(new) = TD(m2); CQ(new) = CQ(m2); ndl_copy(DL(m2),DL(new));
+			if ( !prev ) {
+				prev = new; NEXT(prev) = 0; head = prev;
+			} else {
+				NEXT(prev) = new; NEXT(new) = 0; prev = new;
+			}
+			NEWNM(new);
+		}
+		FREENM(new);
+		if ( head ) {
+			BDY(p1) = head; SG(p1) = MAX(SG(p1),SG(p2));
+			return p1;
+		} else {
+			FREEND(p1);
+			return 0;
+		}
+			
+	}
+}
+
 void ndv_realloc(NDV p,int obpe,int oadv)
 {
 	NMV m,mr,mr0,t;
@@ -2176,25 +2228,28 @@ void ndv_realloc(NDV p,int obpe,int oadv)
 #define NMV_PREV(m) (m = (NMV)(((char *)m)-nmv_adv))
 
 	if ( p ) {
-		m = BDY(p); len = p->len;
-		mr0 = (NMV)REALLOC(BDY(p),len*nmv_adv);
+		m = BDY(p); len = LEN(p);
+		if ( nmv_adv > oadv )
+			mr0 = (NMV)REALLOC(BDY(p),len*nmv_adv);
+		else
+			mr0 = BDY(p);
 		m = (NMV)((char *)mr0+(len-1)*oadv);
 		mr = (NMV)((char *)mr0+(len-1)*nmv_adv);
 		t = (NMV)ALLOCA(nmv_adv);
 		for ( i = 0; i < len; i++, NMV_OPREV(m), NMV_PREV(mr) ) {
-			C(t) = C(m);
-			t->td = m->td;
-			for ( k = 0; k < nd_wpd; k++ ) t->dl[k] = 0;
-			ndl_dup(obpe,m->dl,t->dl);
-			C(mr) = C(t);
-			mr->td = t->td;
-			ndl_copy(t->dl,mr->dl);
+			CQ(t) = CQ(m);
+			TD(t) = TD(m);
+			for ( k = 0; k < nd_wpd; k++ ) DL(t)[k] = 0;
+			ndl_dup(obpe,DL(m),DL(t));
+			CQ(mr) = CQ(t);
+			TD(mr) = TD(t);
+			ndl_copy(DL(t),DL(mr));
 		}
 		BDY(p) = mr0;
 	}
 }
 
-NDV ndtondv(ND p)
+NDV ndtondv(int mod,ND p)
 {
 	NDV d;
 	NMV m,m0;
@@ -2204,18 +2259,21 @@ NDV ndtondv(ND p)
 	if ( !p )
 		return 0;
 	len = nd_length(p);	
-	m0 = m = (NMV)MALLOC_ATOMIC(len*nmv_adv);
+	if ( mod )
+		m0 = m = (NMV)MALLOC_ATOMIC(len*nmv_adv);
+	else
+		m0 = m = (NMV)MALLOC(len*nmv_adv);
 	for ( t = BDY(p), i = 0; t; t = NEXT(t), i++, NMV_ADV(m) ) {
-		m->td = t->td;
-		ndl_copy(t->dl,m->dl);
-		m->c = t->c;
+		TD(m) = TD(t);
+		ndl_copy(DL(t),DL(m));
+		CQ(m) = CQ(t);
 	}
 	MKNDV(NV(p),m0,len,d);
-	d->sugar = p->sugar;
+	SG(d) = SG(p);
 	return d;
 }
 
-NDV dptondv(DP p)
+NDV dptondv(int mod,DP p)
 {
 	NDV d;
 	NMV m0,m;
@@ -2225,19 +2283,25 @@ NDV dptondv(DP p)
 	if ( !p )
 		return 0;
 	for ( t = BDY(p), l = 0; t; t = NEXT(t), l++ );
-	m0 = m = (NMV)MALLOC_ATOMIC(l*nmv_adv);
+	if ( mod )
+		m0 = m = (NMV)MALLOC_ATOMIC(l*nmv_adv);
+	else
+		m0 = m = (NMV)MALLOC(l*nmv_adv);
 	n = NV(p);
 	for ( t = BDY(p), i = 0; i < l; i++, t = NEXT(t), NMV_ADV(m) ) {
-		m->c = ITOS(t->c);
-		m->td = t->dl->td;
-		dltondl(n,t->dl,m->dl);
+		if ( mod )
+			CM(m) = ITOS(C(t));
+		else
+			CQ(m) = (Q)C(t);
+		TD(m) = TD(DL(t));
+		dltondl(n,DL(t),DL(m));
 	}
 	MKNDV(n,m0,l,d);
-	d->sugar = p->sugar;
+	SG(d) = SG(p);
 	return d;
 }
 
-DP ndvtodp(NDV p)
+DP ndvtodp(int mod,NDV p)
 {
 	DP d;
 	MP m0,m;
@@ -2247,16 +2311,19 @@ DP ndvtodp(NDV p)
 	if ( !p )
 		return 0;
 	m0 = 0;
-	len = p->len;
+	len = LEN(p);
 	n = NV(p);
 	for ( t = BDY(p), i = 0; i < len; i++, NMV_ADV(t) ) {
 		NEXTMP(m0,m);
-		m->c = STOI(t->c);
-		m->dl = ndltodl(n,t->td,t->dl);
+		if ( mod ) 
+			C(m) = STOI(CM(t));
+		else
+			C(m) = (P)CQ(t);
+		DL(m) = ndltodl(n,TD(t),DL(t));
 	}
 	NEXT(m) = 0;
 	MKDP(NV(p),m0,d);
-	d->sugar = p->sugar;
+	SG(d) = SG(p);
 	return d;
 }
 
@@ -2268,126 +2335,30 @@ void ndv_print(NDV p)
 	if ( !p )
 		printf("0\n");
 	else {
-		len = p->len;
+		len = LEN(p);
 		for ( m = BDY(p), i = 0; i < len; i++, NMV_ADV(m) ) {
-			printf("+%d*",m->c);
-			ndl_print(m->dl);
+			printf("+%d*",CM(m));
+			ndl_print(DL(m));
 		}
 		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 = p->td;
-	NEWNM(m);
-	C(m) = HC(p2); m->td = td-HTD(p1); ndl_sub(lcm,HDL(p1),m->dl);
-	if ( ndl_check_bound2(p->i1,m->dl) )
-		return 0;
-	t1 = nd_mul_ind_nm(p->i1,m);
-	C(m) = nd_mod-HC(p1); m->td = td-HTD(p2); ndl_sub(lcm,HDL(p2),m->dl);
-	if ( ndl_check_bound2(p->i2,m->dl) ) {
-		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)
+void ndv_print_q(NDV p)
 {
-	NM m,mr,mr0;
-	unsigned int *d,*dt,*dm;
-	int c,n,td,i,c1,c2;
-	int *pt,*p1,*p2;
-	ND r;
-
+	NMV m;
+	int i,len;
+    
 	if ( !p )
-		return 0;
+		printf("0\n");
 	else {
-		n = NV(p); m = BDY(p);
-		d = m0->dl; td = m0->td; c = C(m0);
-		mr0 = 0;
-		for ( ; m; m = NEXT(m) ) {
-			NEXTNM(mr0,mr);
-			c1 = C(m);
-			DMAR(c1,c,0,nd_mod,c2);
-			C(mr) = c2;
-			mr->td = m->td+td;
-			ndl_add(m->dl,d,mr->dl);
+		len = LEN(p);
+		for ( m = BDY(p), i = 0; i < len; i++, NMV_ADV(m) ) {
+			printf("+");
+			printexpr(CO,CQ(m));
+			printf("*");
+			ndl_print(DL(m));
 		}
-		NEXT(mr) = 0; 
-		MKND(NV(p),mr0,r);
-		r->sugar = p->sugar + td;
-		return r;
+		printf("\n");
 	}
 }
-
-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 = m0->dl; td = m0->td; c = C(m0);
-
-	NEWNM(mr0);
-	c1 = C(m); DMAR(c1,c,0,nd_mod,c2); C(mr0) = c2;
-	mr0->td = m->td+td; ndl_add(m->dl,d,mr0->dl);
-	prev = mr0; m = NEXT(m);
-	len--;
-
-	switch ( nd_wpd ) {
-		case 1:
-			d0 = d[0];
-			while ( len-- ) {
-				c1 = C(m); DMAR(c1,c,0,nd_mod,c2); 
-				NEWNM(new); C(new) = c2;
-				new->td = m->td+td; new->dl[0] = m->dl[0]+d0;
-				m = NEXT(m); NEXT(prev) = new; prev = new;
-			}
-			break;
-		case 2:
-			d0 = d[0]; d1 = d[1];
-			while ( len-- ) {
-				c1 = C(m); DMAR(c1,c,0,nd_mod,c2); 
-				NEWNM(new); C(new) = c2;
-				new->td = m->td+td; 
-				new->dl[0] = m->dl[0]+d0;
-				new->dl[1] = m->dl[1]+d1;
-				m = NEXT(m); NEXT(prev) = new; prev = new;
-			}
-			break;
-		default:
-			while ( len-- ) {
-				c1 = C(m); DMAR(c1,c,0,nd_mod,c2);
-				NEWNM(new); C(new) = c2;
-				new->td = m->td+td; ndl_add(m->dl,d,new->dl);
-				m = NEXT(m); NEXT(prev) = new; prev = new;
-			}
-			break;
-	}
-
-	NEXT(prev) = 0; 
-	MKND(NV(p),mr0,r);
-	r->sugar = p->sugar + td;
-	return r;
-}
-#endif