===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/dist.c,v
retrieving revision 1.39
retrieving revision 1.52
diff -u -p -r1.39 -r1.52
--- OpenXM_contrib2/asir2000/engine/dist.c	2005/12/21 23:18:16	1.39
+++ OpenXM_contrib2/asir2000/engine/dist.c	2017/08/31 02:36:21	1.52
@@ -45,7 +45,7 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/engine/dist.c,v 1.38 2005/11/27 00:07:05 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/engine/dist.c,v 1.51 2015/09/24 04:43:13 noro Exp $ 
 */
 #include "ca.h"
 
@@ -65,10 +65,15 @@
 #define ORD_HOMO_WW_DRL_ZIGZAG 13
 
 int cmpdl_drl_zigzag(), cmpdl_homo_ww_drl_zigzag();
+int cmpdl_top_weight();
 
 int (*cmpdl)()=cmpdl_revgradlex;
+int (*cmpdl_tie_breaker)();
 int (*primitive_cmpdl[3])() = {cmpdl_revgradlex,cmpdl_gradlex,cmpdl_lex};
 
+Obj current_top_weight;
+int current_top_weight_len;
+
 int do_weyl;
 
 int dp_nelim,dp_fcoeffs;
@@ -79,7 +84,9 @@ int *dp_dl_work;
 void comm_muld_trunc(VL vl,DP p1,DP p2,DL dl,DP *pr);
 void comm_quod(VL vl,DP p1,DP p2,DP *pr);
 void muldm_trunc(VL vl,DP p,MP m0,DL dl,DP *pr);
-void muldc_trunc(VL vl,DP p,P c,DL dl,DP *pr);
+void muldc_trunc(VL vl,DP p,Obj c,DL dl,DP *pr);
+int create_order_spec(VL vl,Obj obj,struct order_spec **specp);
+void create_modorder_spec(int id,LIST shift,struct modorder_spec **s);
 
 void order_init()
 {
@@ -90,6 +97,8 @@ void order_init()
 	create_modorder_spec(0,0,&dp_current_modspec);
 }
 
+int has_sfcoef_p(Obj f);
+
 int has_sfcoef(DP f)
 {
 	MP t;
@@ -102,7 +111,7 @@ int has_sfcoef(DP f)
 	return t ? 1 : 0;
 }
 
-int has_sfcoef_p(P f)
+int has_sfcoef_p(Obj f)
 {
 	DCP dc;
 
@@ -110,16 +119,31 @@ int has_sfcoef_p(P f)
 		return 0;
 	else if ( NUM(f) )
 		return (NID((Num)f) == N_GFS) ? 1 : 0;
-	else {
-		for ( dc = DC(f); dc; dc = NEXT(dc) )
-			if ( has_sfcoef_p(COEF(dc)) )
+	else if ( POLY(f) ) {
+		for ( dc = DC((P)f); dc; dc = NEXT(dc) )
+			if ( has_sfcoef_p((Obj)COEF(dc)) )
 				return 1;
 		return 0;
-	}
+	} else
+    return 0;
 }
 
+extern Obj nd_top_weight;
+
+void reset_top_weight()
+{
+	cmpdl = cmpdl_tie_breaker;
+	cmpdl_tie_breaker = 0;
+	nd_top_weight = 0;
+	current_top_weight = 0;
+	current_top_weight_len = 0;
+}
+
 void initd(struct order_spec *spec)
 {
+	int len,i,k,row;
+    Q **mat;
+
 	switch ( spec->id ) {
 		case 3:
 			cmpdl = cmpdl_composite;
@@ -165,12 +189,39 @@ void initd(struct order_spec *spec)
 			}
 			break;
 	}
+	if ( current_top_weight ) {
+		cmpdl_tie_breaker = cmpdl;
+		cmpdl = cmpdl_top_weight;
+		if ( OID(current_top_weight) == O_VECT ) {
+		   mat = (Q **)&BDY((VECT)current_top_weight);
+		   row = 1;
+		} else {
+		   mat = (Q **)BDY((MAT)current_top_weight);
+		   row = ((MAT)current_top_weight)->row;
+		}
+        for ( k = 0, len = 0; k < row; k++ )
+		    for ( i = 0; i < spec->nv; i++ )
+			    if ( mat[k][i] )
+				    len = MAX(PL(NM(mat[k][i])),len);
+		current_top_weight_len = len;
+	}
 	dp_current_spec = spec;
 }
 
+int dpm_ispot;
+
+/* type=0 => TOP, type=1 => POT */
+void initdpm(struct order_spec *spec,int type)
+{
+	int len,i,k,row;
+    Q **mat;
+
+  initd(spec);
+  dpm_ispot = type;
+}
+
 void ptod(VL vl,VL dvl,P p,DP *pr)
 {
-	int isconst = 0;
 	int n,i,j,k;
 	VL tvl;
 	V v;
@@ -183,11 +234,13 @@ void ptod(VL vl,VL dvl,P p,DP *pr)
 
 	if ( !p )
 		*pr = 0;
+  else if ( OID(p) > O_P )
+    error("ptod : only polynomials can be converted.");
 	else {
 		for ( n = 0, tvl = dvl; tvl; tvl = NEXT(tvl), n++ );
 		if ( NUM(p) ) {
 			NEWDL(d,n);
-			NEWMP(m); m->dl = d; C(m) = p; NEXT(m) = 0; MKDP(n,m,*pr); (*pr)->sugar = 0;
+			NEWMP(m); m->dl = d; C(m) = (Obj)p; NEXT(m) = 0; MKDP(n,m,*pr); (*pr)->sugar = 0;
 		} else {
 			for ( i = 0, tvl = dvl, v = VR(p);
 				tvl && tvl->v != v; tvl = NEXT(tvl), i++ );
@@ -199,7 +252,7 @@ void ptod(VL vl,VL dvl,P p,DP *pr)
 
 				for ( j = k-1, s = 0, MKV(v,x); j >= 0; j-- ) {
 					ptod(vl,dvl,COEF(w[j]),&t); pwrp(vl,x,DEG(w[j]),&c);
-					muldc(vl,t,c,&r); addd(vl,r,s,&t); s = t;
+					muldc(vl,t,(Obj)c,&r); addd(vl,r,s,&t); s = t;
 				}
 				*pr = s;
 			} else {
@@ -212,7 +265,7 @@ void ptod(VL vl,VL dvl,P p,DP *pr)
 					ptod(vl,dvl,COEF(w[j]),&t);
 					NEWDL(d,n); d->d[i] = QTOS(DEG(w[j]));
 					d->td = MUL_WEIGHT(d->d[i],i);
-					NEWMP(m); m->dl = d; C(m) = (P)ONE; NEXT(m) = 0; MKDP(n,m,u); u->sugar = d->td;
+					NEWMP(m); m->dl = d; C(m) = (Obj)ONE; NEXT(m) = 0; MKDP(n,m,u); u->sugar = d->td;
 					comm_muld(vl,t,u,&r); addd(vl,r,s,&t); s = t;
 				}
 				*pr = s;
@@ -225,13 +278,14 @@ void ptod(VL vl,VL dvl,P p,DP *pr)
 #endif
 }
 
-void dtop(VL vl,VL dvl,DP p,P *pr)
+void dtop(VL vl,VL dvl,DP p,Obj *pr)
 {
 	int n,i,j,k;
 	DL d;
 	MP m;
 	MP *a;
-	P r,s,t,u,w;
+	P r;
+  Obj t,w,s,u;
 	Q q;
 	VL tvl;
 
@@ -247,14 +301,14 @@ void dtop(VL vl,VL dvl,DP p,P *pr)
 			m = a[j];
 			t = C(m);
 			if ( NUM(t) && NID((Num)t) == N_M ) {
-				mptop(t,&u); t = u;
+				mptop((P)t,(P *)&u); t = u;
 			}
 			for ( i = 0, d = m->dl, tvl = dvl;
 				i < n; tvl = NEXT(tvl), i++ ) {
-				MKV(tvl->v,r); STOQ(d->d[i],q); pwrp(vl,r,q,&u);
-				mulp(vl,t,u,&w); t = w;
+				MKV(tvl->v,r); STOQ(d->d[i],q); pwrp(vl,r,q,(P *)&u);
+				arf_mul(vl,t,(Obj)u,&w); t = w;
 			}
-			addp(vl,s,t,&u); s = u;
+			arf_add(vl,s,t,&u); s = u;
 		}
 		*pr = s;
 	}
@@ -282,10 +336,53 @@ void nodetod(NODE node,DP *dp)
 		}
 	}
 	d->td = td;
-	NEWMP(m); m->dl = d; C(m) = (P)ONE; NEXT(m) = 0;
+	NEWMP(m); m->dl = d; C(m) = (Obj)ONE; NEXT(m) = 0;
 	MKDP(len,m,u); u->sugar = td; *dp = u;
 }
 
+void nodetodpm(NODE node,Obj pos,DPM *dp)
+{
+	NODE t;
+	int len,i,td;
+	Q e;
+	DL d;
+	DMM m;
+	DPM u;
+
+	for ( t = node, len = 0; t; t = NEXT(t), len++ );
+	NEWDL(d,len);
+	for ( t = node, i = 0, td = 0; i < len; t = NEXT(t), i++ ) {
+		e = (Q)BDY(t);
+		if ( !e )
+			d->d[i] = 0;
+		else if ( !NUM(e) || !RATN(e) || !INT(e) )
+			error("nodetodpm : invalid input");
+		else {
+			d->d[i] = QTOS((Q)e); td += MUL_WEIGHT(d->d[i],i);
+		}
+	}
+	d->td = td;
+	NEWDMM(m); m->dl = d; m->pos = QTOS((Q)pos); C(m) = (Obj)ONE; NEXT(m) = 0;
+	MKDPM(len,m,u); u->sugar = td; *dp = u;
+}
+
+void dtodpm(DP d,int pos,DPM *dp)
+{
+  DMM mr0,mr;
+  MP m;
+
+  if ( !d ) *dp = 0;
+  else {
+    for ( m = BDY(d), mr0 = 0; m; m = NEXT(m) ) {
+      NEXTDMM(mr0,mr);
+      mr->dl = m->dl;
+      mr->pos = pos;
+      C(mr) = C(m);
+    }
+    MKDPM(d->nv,mr0,*dp); (*dp)->sugar = d->sugar;
+  }
+}
+
 int sugard(MP m)
 {
 	int s;
@@ -298,8 +395,8 @@ int sugard(MP m)
 void addd(VL vl,DP p1,DP p2,DP *pr)
 {
 	int n;
-	MP m1,m2,mr,mr0;
-	P t;
+	MP m1,m2,mr=0,mr0;
+	Obj t;
 	DL d;
 
 	if ( !p1 )
@@ -309,18 +406,18 @@ void addd(VL vl,DP p1,DP p2,DP *pr)
 	else {
 		if ( OID(p1) <= O_R ) {
 			n = NV(p2);	NEWDL(d,n);
-			NEWMP(m1); m1->dl = d; C(m1) = (P)p1; NEXT(m1) = 0;
+			NEWMP(m1); m1->dl = d; C(m1) = (Obj)p1; NEXT(m1) = 0;
 			MKDP(n,m1,p1); (p1)->sugar = 0;
 		}
 		if ( OID(p2) <= O_R ) {
 			n = NV(p1);	NEWDL(d,n);
-			NEWMP(m2); m2->dl = d; C(m2) = (P)p2; NEXT(m2) = 0;
+			NEWMP(m2); m2->dl = d; C(m2) = (Obj)p2; NEXT(m2) = 0;
 			MKDP(n,m2,p2); (p2)->sugar = 0;
 		}
 		for ( n = NV(p1), m1 = BDY(p1), m2 = BDY(p2), mr0 = 0; m1 && m2; )
 			switch ( (*cmpdl)(n,m1->dl,m2->dl) ) {
 				case 0:
-					addp(vl,C(m1),C(m2),&t);
+					arf_add(vl,C(m1),C(m2),&t);
 					if ( t ) {
 						NEXTMP(mr0,mr); mr->dl = m1->dl; C(mr) = t;
 					}
@@ -358,7 +455,7 @@ void addd(VL vl,DP p1,DP p2,DP *pr)
 void symb_addd(DP p1,DP p2,DP *pr)
 {
 	int n;
-	MP m1,m2,mr,mr0;
+	MP m1,m2,mr=0,mr0;
 
 	if ( !p1 )
 		*pr = p2;
@@ -366,7 +463,7 @@ void symb_addd(DP p1,DP p2,DP *pr)
 		*pr = p1;
 	else {
 		for ( n = NV(p1), m1 = BDY(p1), m2 = BDY(p2), mr0 = 0; m1 && m2; ) {
-			NEXTMP(mr0,mr); C(mr) = (P)ONE;
+			NEXTMP(mr0,mr); C(mr) = (Obj)ONE;
 			switch ( (*cmpdl)(n,m1->dl,m2->dl) ) {
 				case 0:
 					mr->dl = m1->dl;
@@ -409,8 +506,7 @@ void symb_addd(DP p1,DP p2,DP *pr)
 
 NODE symb_merge(NODE m1,NODE m2,int n)
 {
-	NODE top,prev,cur,m,t;
-	int c,i;
+	NODE top=0,prev,cur,m=0,t;
 	DL d1,d2;
 
 	if ( !m1 )
@@ -509,7 +605,7 @@ NODE symb_mul_merge(NODE m1,DL dl,DP f,int n)
 					if ( !cur ) {
 						MKDP(n,m,g);
 						NEXT(prev) = mul_dllist(dl,g);
-						return;
+						return top;
 					}
 					m = NEXT(m);
 					if ( m ) _adddl(n,m->dl,dl,t);
@@ -519,7 +615,7 @@ NODE symb_mul_merge(NODE m1,DL dl,DP f,int n)
 					if ( !cur ) {
 						MKDP(n,m,g);
 						NEXT(prev) = mul_dllist(dl,g);
-						return;
+						return top;
 					}
 					break;
 				case -1:
@@ -595,16 +691,16 @@ void subd(VL vl,DP p1,DP p2,DP *pr)
 
 void chsgnd(DP p,DP *pr)
 {
-	MP m,mr,mr0;
+	MP m,mr=0,mr0;
 	Obj r;
 
 	if ( !p )
 		*pr = 0;
 	else if ( OID(p) <= O_R ) {
-		chsgnr((Obj)p,&r); *pr = (DP)r;
+		arf_chsgn((Obj)p,&r); *pr = (DP)r;
 	} else {
 		for ( mr0 = 0, m = BDY(p); m; m = NEXT(m) ) {
-			NEXTMP(mr0,mr); chsgnp(C(m),&C(mr)); mr->dl = m->dl;
+			NEXTMP(mr0,mr); arf_chsgn(C(m),&C(mr)); mr->dl = m->dl;
 		}
 		NEXT(mr) = 0; MKDP(NV(p),mr0,*pr);
 		if ( *pr )
@@ -630,10 +726,10 @@ void comm_muld(VL vl,DP p1,DP p2,DP *pr)
 
 	if ( !p1 || !p2 )
 		*pr = 0;
-	else if ( OID(p1) <= O_P )
-		muldc(vl,p2,(P)p1,pr);
-	else if ( OID(p2) <= O_P )
-		muldc(vl,p1,(P)p2,pr);
+	else if ( OID(p1) != O_DP )
+		muldc(vl,p2,(Obj)p1,pr);
+	else if ( OID(p2) != O_DP )
+		muldc(vl,p1,(Obj)p2,pr);
 	else {
 		for ( m = BDY(p1), l1 = 0; m; m = NEXT(m), l1++ );
 		for ( m = BDY(p2), l = 0; m; m = NEXT(m), l++ );
@@ -642,7 +738,7 @@ void comm_muld(VL vl,DP p1,DP p2,DP *pr)
 			l = l1;
 		}
 		if ( l > wlen ) {
-			if ( w ) GC_free(w);
+			if ( w ) GCFREE(w);
 			w = (MP *)MALLOC(l*sizeof(MP));
 			wlen = l;
 		}
@@ -668,10 +764,10 @@ void comm_muld_trunc(VL vl,DP p1,DP p2,DL dl,DP *pr)
 
 	if ( !p1 || !p2 )
 		*pr = 0;
-	else if ( OID(p1) <= O_P )
-		muldc_trunc(vl,p2,(P)p1,dl,pr);
-	else if ( OID(p2) <= O_P )
-		muldc_trunc(vl,p1,(P)p2,dl,pr);
+	else if ( OID(p1) != O_DP )
+		muldc_trunc(vl,p2,(Obj)p1,dl,pr);
+	else if ( OID(p2) != O_DP )
+		muldc_trunc(vl,p1,(Obj)p2,dl,pr);
 	else {
 		for ( m = BDY(p1), l1 = 0; m; m = NEXT(m), l1++ );
 		for ( m = BDY(p2), l = 0; m; m = NEXT(m), l++ );
@@ -680,7 +776,7 @@ void comm_muld_trunc(VL vl,DP p1,DP p2,DL dl,DP *pr)
 			l = l1;
 		}
 		if ( l > wlen ) {
-			if ( w ) GC_free(w);
+			if ( w ) GCFREE(w);
 			w = (MP *)MALLOC(l*sizeof(MP));
 			wlen = l;
 		}
@@ -696,7 +792,7 @@ void comm_muld_trunc(VL vl,DP p1,DP p2,DL dl,DP *pr)
 
 void comm_quod(VL vl,DP p1,DP p2,DP *pr)
 {
-	MP m,m0;
+	MP m=0,m0;
 	DP s,t;
 	int i,n,sugar;
 	DL d1,d2,d;
@@ -720,10 +816,10 @@ void comm_quod(VL vl,DP p1,DP p2,DP *pr)
 			NEXTMP(m0,m);
 			m->dl = d;
 			divq((Q)BDY(p1)->c,(Q)BDY(p2)->c,&a); chsgnq(a,&b);
-			C(m) = (P)b;
+			C(m) = (Obj)b;
 			muldm_trunc(vl,p2,m,d2,&t);
 			addd(vl,p1,t,&s); p1 = s;
-			C(m) = (P)a;
+			C(m) = (Obj)a;
 		}
 		if ( m0 ) {
 			NEXT(m) = 0; MKDP(n,m0,*pr);
@@ -737,8 +833,8 @@ void comm_quod(VL vl,DP p1,DP p2,DP *pr)
 
 void muldm(VL vl,DP p,MP m0,DP *pr)
 {
-	MP m,mr,mr0;
-	P c;
+	MP m,mr=0,mr0;
+	Obj c;
 	DL d;
 	int n;
 
@@ -751,7 +847,7 @@ void muldm(VL vl,DP p,MP m0,DP *pr)
 			if ( NUM(C(m)) && RATN(C(m)) && NUM(c) && RATN(c) )
 				mulq((Q)C(m),(Q)c,(Q *)&C(mr));
 			else
-				mulp(vl,C(m),c,&C(mr));
+				arf_mul(vl,C(m),c,&C(mr));
 			adddl(n,m->dl,d,&mr->dl);
 		}
 		NEXT(mr) = 0; MKDP(NV(p),mr0,*pr);
@@ -762,8 +858,8 @@ void muldm(VL vl,DP p,MP m0,DP *pr)
 
 void muldm_trunc(VL vl,DP p,MP m0,DL dl,DP *pr)
 {
-	MP m,mr,mr0;
-	P c;
+	MP m,mr=0,mr0;
+	Obj c;
 	DL d,tdl;
 	int n,i;
 
@@ -786,7 +882,7 @@ void muldm_trunc(VL vl,DP p,MP m0,DL dl,DP *pr)
 			if ( NUM(C(m)) && RATN(C(m)) && NUM(c) && RATN(c) )
 				mulq((Q)C(m),(Q)c,(Q *)&C(mr));
 			else
-				mulp(vl,C(m),c,&C(mr));
+				arf_mul(vl,C(m),(Obj)c,&C(mr));
 		}
 		if ( mr0 ) {
 			NEXT(mr) = 0; MKDP(NV(p),mr0,*pr);
@@ -807,14 +903,14 @@ void weyl_muld(VL vl,DP p1,DP p2,DP *pr)
 
 	if ( !p1 || !p2 )
 		*pr = 0;
-	else if ( OID(p1) <= O_P )
-		muldc(vl,p2,(P)p1,pr);
-	else if ( OID(p2) <= O_P )
-		muldc(vl,p1,(P)p2,pr);
+	else if ( OID(p1) != O_DP )
+		muldc(vl,p2,(Obj)p1,pr);
+	else if ( OID(p2) != O_DP )
+		muldc(vl,p1,(Obj)p2,pr);
 	else {
 		for ( m = BDY(p1), l = 0; m; m = NEXT(m), l++ );
 		if ( l > wlen ) {
-			if ( w ) GC_free(w);
+			if ( w ) GCFREE(w);
 			w = (MP *)MALLOC(l*sizeof(MP));
 			wlen = l;
 		}
@@ -828,6 +924,54 @@ void weyl_muld(VL vl,DP p1,DP p2,DP *pr)
 	}
 }
 
+void actm(VL vl,int nv,MP m1,MP m2,DP *pr)
+{
+  DL d1,d2,d;
+  int n2,i,j,k;
+  Q jq,c,c1;
+  MP m;
+  Obj t;
+
+  d1 = m1->dl;
+  d2 = m2->dl;
+  for ( i = 0; i < nv; i++ )
+    if ( d1->d[i] > d2->d[i] ) {
+      *pr = 0; return;
+    }
+  NEWDL(d,nv);
+  c = ONE;
+  for ( i = 0; i < nv; i++ ) {
+    for ( j = d2->d[i], k = d1->d[i]; k > 0; k--, j-- ) {
+      STOQ(j,jq); mulq(c,jq,&c1); c = c1;
+    }
+    d->d[i] = d2->d[i]-d1->d[i];
+  }
+  arf_mul(vl,C(m1),C(m2),&t);
+  NEWMP(m);
+  arf_mul(vl,(Obj)c,t,&C(m));
+  m->dl = d;
+  MKDP(nv,m,*pr);
+}
+
+void weyl_actd(VL vl,DP p1,DP p2,DP *pr)
+{
+  int n;
+  MP m1,m2;
+  DP d,r,s;
+
+  if ( !p1 || !p2 ) *pr = 0;
+  else {
+    n = NV(p1);
+    r = 0;
+    for ( m1 = BDY(p1); m1; m1 = NEXT(m1) )
+      for ( m2 = BDY(p2); m2; m2 = NEXT(m2) ) {
+        actm(vl,n,m1,m2,&d);
+        addd(vl,r,d,&s); r = s;
+      }
+    *pr = r;
+  }
+}
+
 /* monomial * polynomial */
 
 void weyl_muldm(VL vl,MP m0,DP p,DP *pr)
@@ -846,7 +990,7 @@ void weyl_muldm(VL vl,MP m0,DP p,DP *pr)
 	else {
 		for ( m = BDY(p), l = 0; m; m = NEXT(m), l++ );
 		if ( l > wlen ) {
-			if ( w ) GC_free(w);
+			if ( w ) GCFREE(w);
 			w = (MP *)MALLOC(l*sizeof(MP));
 			wlen = l;
 		}
@@ -858,8 +1002,8 @@ void weyl_muldm(VL vl,MP m0,DP p,DP *pr)
 		for ( i = 0, tlen = 1; i < n2; i++ )
 			tlen *= d0->d[n2+i]+1;
 		if ( tlen > rtlen ) {
-			if ( tab ) GC_free(tab);
-			if ( psum ) GC_free(psum);
+			if ( tab ) GCFREE(tab);
+			if ( psum ) GCFREE(psum);
 			rtlen = tlen;
 			tab = (struct cdl *)MALLOC(rtlen*sizeof(struct cdl));
 			psum = (MP *)MALLOC(rtlen*sizeof(MP));
@@ -870,7 +1014,7 @@ void weyl_muldm(VL vl,MP m0,DP p,DP *pr)
 			weyl_mulmm(vl,m0,w[i],n,tab,tlen);
 			for ( j = 0; j < tlen; j++ ) {
 				if ( tab[j].c ) {
-					NEWMP(m); m->dl = tab[j].d; C(m) = tab[j].c; NEXT(m) = psum[j];
+					NEWMP(m); m->dl = tab[j].d; C(m) = (Obj)tab[j].c; NEXT(m) = psum[j];
 					psum[j] = m;
 				}
 			}
@@ -890,7 +1034,7 @@ void weyl_muldm(VL vl,MP m0,DP p,DP *pr)
 
 void weyl_mulmm(VL vl,MP m0,MP m1,int n,struct cdl *rtab,int rtablen)
 {
-	P c,c0,c1;
+  Obj c,c0,c1;
 	DL d,d0,d1,dt;
 	int i,j,a,b,k,l,n2,s,min,curlen;
 	struct cdl *p;
@@ -907,7 +1051,7 @@ void weyl_mulmm(VL vl,MP m0,MP m1,int n,struct cdl *rt
 		return;
 	}
 	c0 = C(m0); c1 = C(m1);
-	mulp(vl,c0,c1,&c);
+	arf_mul(vl,c0,c1,&c);
 	d0 = m0->dl; d1 = m1->dl;
 	n2 = n>>1;
 	curlen = 1;
@@ -921,7 +1065,7 @@ void weyl_mulmm(VL vl,MP m0,MP m1,int n,struct cdl *rt
 	rtab[0].d = d;
 
 	if ( rtablen > tmptablen ) {
-		if ( tmptab ) GC_free(tmptab);
+		if ( tmptab ) GCFREE(tmptab);
 		tmptab = (struct cdl *)MALLOC(rtablen*sizeof(struct cdl));
 		tmptablen = rtablen;
 	}
@@ -947,8 +1091,8 @@ void weyl_mulmm(VL vl,MP m0,MP m1,int n,struct cdl *rt
 			continue;
 		}
 		if ( k+1 > tablen ) {
-			if ( tab ) GC_free(tab);
-			if ( ctab ) GC_free(ctab);
+			if ( tab ) GCFREE(tab);
+			if ( ctab ) GCFREE(ctab);
 			tablen = k+1;
 			tab = (struct cdl *)MALLOC(tablen*sizeof(struct cdl));
 			ctab = (Q *)MALLOC(tablen*sizeof(Q));
@@ -964,7 +1108,7 @@ void weyl_mulmm(VL vl,MP m0,MP m1,int n,struct cdl *rt
 				d->td = s;
 				d->d[n-1] = s-(MUL_WEIGHT(a-j,i)+MUL_WEIGHT(b-j,n2+i));
 				tab[j].d = d;
-				tab[j].c = (P)ctab[j];
+				tab[j].c = (Obj)ctab[j];
 			}
 		else
 			for ( j = 0; j <= min; j++ ) {
@@ -972,7 +1116,7 @@ void weyl_mulmm(VL vl,MP m0,MP m1,int n,struct cdl *rt
 				d->d[i] = a-j; d->d[n2+i] = b-j;
 				d->td = MUL_WEIGHT(a-j,i)+MUL_WEIGHT(b-j,n2+i); /* XXX */
 				tab[j].d = d;
-				tab[j].c = (P)ctab[j];
+				tab[j].c = (Obj)ctab[j];
 			}
 		bzero(ctab,(min+1)*sizeof(Q));
 		comm_muld_tab(vl,n,rtab,curlen,tab,k+1,tmptab);
@@ -994,27 +1138,27 @@ void comm_muld_tab(VL vl,int nv,struct cdl *t,int n,st
 {
 	int i,j;
 	struct cdl *p;
-	P c;
+	Obj c;
 	DL d;
 
 	bzero(rt,n*n1*sizeof(struct cdl));
 	for ( j = 0, p = rt; j < n1; j++ ) {
-		c = t1[j].c;
+		c = (Obj)t1[j].c;
 		d = t1[j].d;
 		if ( !c )
 			break;
 		for ( i = 0; i < n; i++, p++ ) {
 			if ( t[i].c ) {
-				mulp(vl,t[i].c,c,&p->c);
+				arf_mul(vl,(Obj)t[i].c,c,(Obj *)&p->c);
 				adddl(nv,t[i].d,d,&p->d);
 			}
 		}
 	}
 }
 
-void muldc(VL vl,DP p,P c,DP *pr)
+void muldc(VL vl,DP p,Obj c,DP *pr)
 {
-	MP m,mr,mr0;
+	MP m,mr=0,mr0;
 
 	if ( !p || !c )
 		*pr = 0;
@@ -1028,7 +1172,7 @@ void muldc(VL vl,DP p,P c,DP *pr)
 			if ( NUM(C(m)) && RATN(C(m)) && NUM(c) && RATN(c) )
 				mulq((Q)C(m),(Q)c,(Q *)&C(mr));
 			else
-				mulp(vl,C(m),c,&C(mr));
+				arf_mul(vl,C(m),c,&C(mr));
 			mr->dl = m->dl;
 		}
 		NEXT(mr) = 0; MKDP(NV(p),mr0,*pr);
@@ -1037,9 +1181,17 @@ void muldc(VL vl,DP p,P c,DP *pr)
 	}
 }
 
-void muldc_trunc(VL vl,DP p,P c,DL dl,DP *pr)
+void divdc(VL vl,DP p,Obj c,DP *pr)
 {
-	MP m,mr,mr0;
+  Obj inv;
+
+  arf_div(vl,(Obj)ONE,c,&inv);
+  muld(vl,p,(DP)inv,pr);
+}
+
+void muldc_trunc(VL vl,DP p,Obj c,DL dl,DP *pr)
+{
+	MP m,mr=0,mr0;
 	DL mdl;
 	int i,n;
 
@@ -1058,7 +1210,7 @@ void muldc_trunc(VL vl,DP p,P c,DL dl,DP *pr)
 		if ( NUM(C(m)) && RATN(C(m)) && NUM(c) && RATN(c) )
 			mulq((Q)C(m),(Q)c,(Q *)&C(mr));
 		else
-			mulp(vl,C(m),c,&C(mr));
+			arf_mul(vl,C(m),c,&C(mr));
 		mr->dl = m->dl;
 	}
 	NEXT(mr) = 0; MKDP(NV(p),mr0,*pr);
@@ -1068,15 +1220,17 @@ void muldc_trunc(VL vl,DP p,P c,DL dl,DP *pr)
 
 void divsdc(VL vl,DP p,P c,DP *pr)
 {
-	MP m,mr,mr0;
+	MP m,mr=0,mr0;
 
 	if ( !c )
 		error("disvsdc : division by 0");
 	else if ( !p )
 		*pr = 0;
+  else if ( OID(p) > O_P )
+		error("divsdc : invalid argument");
 	else {
 		for ( mr0 = 0, m = BDY(p); m; m = NEXT(m) ) {
-			NEXTMP(mr0,mr); divsp(vl,C(m),c,&C(mr)); mr->dl = m->dl;
+			NEXTMP(mr0,mr); divsp(vl,(P)C(m),c,(P *)&C(mr)); mr->dl = m->dl;
 		}
 		NEXT(mr) = 0; MKDP(NV(p),mr0,*pr);
 		if ( *pr )
@@ -1089,16 +1243,10 @@ void adddl(int n,DL d1,DL d2,DL *dr)
 	DL dt;
 	int i;
 
-	if ( !d1->td )
-		*dr = d2;
-	else if ( !d2->td )
-		*dr = d1;
-	else {
-		*dr = dt = (DL)MALLOC_ATOMIC((n+1)*sizeof(int));
-		dt->td = d1->td + d2->td;
-		for ( i = 0; i < n; i++ )
-			dt->d[i] = d1->d[i]+d2->d[i];
-	}
+	*dr = dt = (DL)MALLOC_ATOMIC((n+1)*sizeof(int));
+	dt->td = d1->td + d2->td;
+	for ( i = 0; i < n; i++ )
+		dt->d[i] = d1->d[i]+d2->d[i];
 }
 
 /* d1 += d2 */
@@ -1121,13 +1269,14 @@ int compd(VL vl,DP p1,DP p2)
 		return p2 ? -1 : 0;
 	else if ( !p2 )
 		return 1;
-	else if ( NV(p1) != NV(p2) )
+	else if ( NV(p1) != NV(p2) ) {
 		error("compd : size mismatch");
-	else {
+		return 0; /* XXX */
+	} else {
 		for ( n = NV(p1), m1 = BDY(p1), m2 = BDY(p2);
 			m1 && m2; m1 = NEXT(m1), m2 = NEXT(m2) )
 			if ( (t = (*cmpdl)(n,m1->dl,m2->dl)) ||
-				(t = compp(vl,C(m1),C(m2)) ) )
+				(t = arf_comp(vl,C(m1),C(m2)) ) )
 				return t;
 		if ( m1 )
 			return 1;
@@ -1244,7 +1393,7 @@ int cmpdl_blex(int n,DL d1,DL d2)
 {
 	int c;
 
-	if ( c = cmpdl_lex(n-1,d1,d2) )
+	if ( (c = cmpdl_lex(n-1,d1,d2)) )
 		return c;
 	else {
 		c = d1->d[n-1] - d2->d[n-1];
@@ -1449,8 +1598,8 @@ int cmpdl_drl_zigzag(int n,DL d1,DL d2)
 	else {
 		m = n>>1;
 		for ( i= m - 1, p1 = d1->d, p2 = d2->d; i >= 0; i-- ) {
-			if ( t = p1[m+i] - p2[m+i] ) return t > 0 ? -1 : 1;
-			if ( t = p1[i] - p2[i] ) return t > 0 ? -1 : 1;
+			if ( (t = p1[m+i] - p2[m+i]) ) return t > 0 ? -1 : 1;
+			if ( (t = p1[i] - p2[i]) ) return t > 0 ? -1 : 1;
 		}
 		return 0;
 	}
@@ -1484,8 +1633,8 @@ int cmpdl_homo_ww_drl_zigzag(int n,DL d1,DL d2)
 		return -1;
 
 	for ( i= m - 1, p1 = d1->d, p2 = d2->d; i >= 0; i-- ) {
-		if ( t = p1[m+i] - p2[m+i] ) return t > 0 ? -1 : 1;
-		if ( t = p1[i] - p2[i] ) return t > 0 ? -1 : 1;
+		if ( (t = p1[m+i] - p2[m+i]) ) return t > 0 ? -1 : 1;
+		if ( (t = p1[i] - p2[i]) ) return t > 0 ? -1 : 1;
 	}
 	return 0;
 }
@@ -1640,6 +1789,60 @@ int cmpdl_matrix(int n,DL d1,DL d2)
 	return 0;
 }
 
+int cmpdl_top_weight(int n,DL d1,DL d2)
+{
+	int *w;
+	N sum,wm,wma,t;
+	Q **mat;
+	Q *a;
+	struct oN tn;
+	int len,i,sgn,tsgn,row,k;
+	int *t1,*t2;
+
+	w = (int *)ALLOCA(n*sizeof(int));
+	len = current_top_weight_len+3;
+	t1 = d1->d; t2 = d2->d;
+	for ( i = 0; i < n; i++ ) w[i] = t1[i]-t2[i];
+	sum = (N)W_ALLOC(len); sgn = 0;
+	wm = (N)W_ALLOC(len);
+	wma = (N)W_ALLOC(len);
+	if ( OID(current_top_weight) == O_VECT ) {
+	    mat = (Q **)&BDY((VECT)current_top_weight);
+		row = 1;
+	} else {
+	    mat = (Q **)BDY((MAT)current_top_weight);
+		row = ((MAT)current_top_weight)->row;
+	}
+	for ( k = 0; k < row; k++ ) {
+		a = mat[k];
+	    for ( i = 0; i < n; i++ ) {
+		    if ( !a[i] || !w[i] ) continue;
+		    tn.p = 1;
+		    if ( w[i] > 0 ) {
+			    tn.b[0] = w[i]; tsgn = 1;
+		    } else {
+			    tn.b[0] = -w[i]; tsgn = -1;
+		    }
+		    _muln(NM(a[i]),&tn,wm);
+		    if ( !sgn ) {
+			    sgn = tsgn;
+			    t = wm; wm = sum; sum = t;
+		    } else if ( sgn == tsgn ) {
+			    _addn(sum,wm,wma);
+			    if ( !PL(wma) )
+				    sgn = 0;
+			    t = wma; wma = sum; sum = t;
+		    } else {
+			    sgn *= _subn(sum,wm,wma);
+			    t = wma; wma = sum; sum = t;
+		    }
+	    }
+	    if ( sgn > 0 ) return 1;
+	    else if ( sgn < 0 ) return -1;
+	}
+    return (*cmpdl_tie_breaker)(n,d1,d2);
+}
+
 GeoBucket create_bucket()
 {
 	GeoBucket g;
@@ -1649,6 +1852,8 @@ GeoBucket create_bucket()
 	return g;
 }
 
+int length(NODE d);
+
 void add_bucket(GeoBucket g,NODE d,int nv)
 {
 	int l,k,m;
@@ -1772,12 +1977,13 @@ int compdv(VL vl,DPV p1,DPV p2)
 {
 	int i,t,len;
 
-	if ( p1->len != p2->len )
+	if ( p1->len != p2->len ) {
 		error("compdv : size mismatch");
-	else {
+		return 0; /* XXX */
+	} else {
 		len = p1->len;
 		for ( i = 0; i < len; i++ )
-			if ( t = compd(vl,p1->body[i],p2->body[i]) )
+			if ( (t = compd(vl,p1->body[i],p2->body[i])) )
 				return t;
 		return 0;
 	}
@@ -1803,17 +2009,26 @@ int ni_next(int *a,int n)
 
 int comp_nbm(NBM a,NBM b)
 {
-	int d,i,w;
+	int d,i,ai,bi;
 	int *ab,*bb;
 
 	if ( a->d > b->d ) return 1;
 	else if ( a->d < b->d ) return -1;
 	else {
 		d = a->d; ab = a->b; bb = b->b;
+#if 0
 		w = (d+31)/32;
 		for ( i = 0; i < w; i++ ) 
 			if ( ab[i] > bb[i] ) return 1;
 			else if ( ab[i] < bb[i] ) return -1;
+#else
+		for ( i = 0; i < d; i++ ) {
+			ai = NBM_GET(ab,i);
+			bi = NBM_GET(bb,i);
+			if ( ai > bi ) return 1;
+			else if ( ai < bi ) return -1;
+		}
+#endif
 		return 0;
 	}
 }
@@ -1823,14 +2038,11 @@ NBM mul_nbm(NBM a,NBM b)
 	int ad,bd,d,i,j;
 	int *ab,*bb,*mb;
 	NBM m;
-	Q c,c1;
-	NODE r;
-	NBP u;
 
 	ad = a->d; bd = b->d; ab = a->b; bb = b->b;
 	d = ad + bd;
 	NEWNBM(m); NEWNBMBDY(m,d);
-	m->d = d; mulq(a->c,b->c,&m->c); mb = m->b; 
+	m->d = d; mulp(CO,a->c,b->c,&m->c); mb = m->b; 
 	j = 0;
 	for ( i = 0; i < ad; i++, j++ )
 		if ( NBM_GET(ab,i) ) NBM_SET(mb,j);
@@ -1853,7 +2065,7 @@ NBP nbmtonbp(NBM m)
 
 /* a=c*x*rest -> a0= x*rest, ah=x, ar=rest */
 
-Q separate_nbm(NBM a,NBP *a0,NBP *ah,NBP *ar)
+P separate_nbm(NBM a,NBP *a0,NBP *ah,NBP *ar)
 {
 	int i,d1;
 	NBM t;
@@ -1861,12 +2073,12 @@ Q separate_nbm(NBM a,NBP *a0,NBP *ah,NBP *ar)
 	if ( !a->d ) error("separate_nbm : invalid argument");
 
 	if ( a0 ) {
-		NEWNBM(t); t->d = a->d; t->b = a->b; t->c = ONE;
+		NEWNBM(t); t->d = a->d; t->b = a->b; t->c = (P)ONE;
 		*a0 = nbmtonbp(t);
 	}
 
 	if ( ah ) {
-		NEWNBM(t); NEWNBMBDY(t,1); t->d = 1; t->c = ONE;
+		NEWNBM(t); NEWNBMBDY(t,1); t->d = 1; t->c = (P)ONE;
 		if ( NBM_GET(a->b,0) ) NBM_SET(t->b,0);
 		else NBM_CLR(t->b,0);
 		*ah = nbmtonbp(t);
@@ -1874,7 +2086,7 @@ Q separate_nbm(NBM a,NBP *a0,NBP *ah,NBP *ar)
 
 	if ( ar ) {
 		d1 = a->d-1;
-		NEWNBM(t); NEWNBMBDY(t,d1); t->d = d1; t->c = ONE;
+		NEWNBM(t); NEWNBMBDY(t,d1); t->d = d1; t->c = (P)ONE;
 		for ( i = 0; i < d1; i++ ) {
 			if ( NBM_GET(a->b,i+1) ) NBM_SET(t->b,i);
 			else NBM_CLR(t->b,i);
@@ -1885,12 +2097,46 @@ Q separate_nbm(NBM a,NBP *a0,NBP *ah,NBP *ar)
 	return a->c;
 }
 
+/* a=c*rest*x -> a0= rest*x, ar=rest, at=x */
+
+P separate_tail_nbm(NBM a,NBP *a0,NBP *ar,NBP *at)
+{
+	int i,d,d1;
+	NBM t;
+
+	if ( !(d=a->d) ) error("separate_tail_nbm : invalid argument");
+
+	if ( a0 ) {
+		NEWNBM(t); t->d = a->d; t->b = a->b; t->c = (P)ONE;
+		*a0 = nbmtonbp(t);
+	}
+
+	d1 = a->d-1;
+	if ( at ) {
+		NEWNBM(t); NEWNBMBDY(t,1); t->d = 1; t->c = (P)ONE;
+		if ( NBM_GET(a->b,d1) ) NBM_SET(t->b,0);
+		else NBM_CLR(t->b,0);
+		*at = nbmtonbp(t);
+	}
+
+	if ( ar ) {
+		NEWNBM(t); NEWNBMBDY(t,d1); t->d = d1; t->c = (P)ONE;
+		for ( i = 0; i < d1; i++ ) {
+			if ( NBM_GET(a->b,i) ) NBM_SET(t->b,i);
+			else NBM_CLR(t->b,i);
+		}
+		*ar = nbmtonbp(t);
+	}
+
+	return a->c;
+}
+
 NBP make_xky(int k)
 {
 	int k1,i;
 	NBM t;
 
-	NEWNBM(t); NEWNBMBDY(t,k); t->d = k; t->c = ONE;
+	NEWNBM(t); NEWNBMBDY(t,k); t->d = k; t->c = (P)ONE;
 	k1 = k-1;
 	for ( i = 0; i < k1; i++ ) NBM_SET(t->b,i);
 	NBM_CLR(t->b,i);
@@ -1899,7 +2145,7 @@ NBP make_xky(int k)
 
 /* a=c*x^(k-1)*y*rest -> a0= x^(k-1)*y*rest, ah=x^(k-1)*y, ar=rest */
 
-Q separate_xky_nbm(NBM a,NBP *a0,NBP *ah,NBP *ar)
+P separate_xky_nbm(NBM a,NBP *a0,NBP *ah,NBP *ar)
 {
 	int i,d1,k,k1;
 	NBM t;
@@ -1913,12 +2159,12 @@ Q separate_xky_nbm(NBM a,NBP *a0,NBP *ah,NBP *ar)
 	k = i+1;
 
 	if ( a0 ) {
-		NEWNBM(t); t->d = a->d; t->b = a->b; t->c = ONE;
+		NEWNBM(t); t->d = a->d; t->b = a->b; t->c = (P)ONE;
 		*a0 = nbmtonbp(t);
 	}
 
 	if ( ah ) {
-		NEWNBM(t); NEWNBMBDY(t,k); t->d = k; t->c = ONE;
+		NEWNBM(t); NEWNBMBDY(t,k); t->d = k; t->c = (P)ONE;
 		for ( i = 0; i < k1; i++ ) NBM_SET(t->b,i);
 		NBM_CLR(t->b,i);
 		*ah = nbmtonbp(t);
@@ -1926,7 +2172,7 @@ Q separate_xky_nbm(NBM a,NBP *a0,NBP *ah,NBP *ar)
 
 	if ( ar ) {
 		d1 = a->d-k;
-		NEWNBM(t); NEWNBMBDY(t,d1); t->d = d1; t->c = ONE;
+		NEWNBM(t); NEWNBMBDY(t,d1); t->d = d1; t->c = (P)ONE;
 		for ( i = 0; i < d1; i++ ) {
 			if ( NBM_GET(a->b,i+k) ) NBM_SET(t->b,i);
 			else NBM_CLR(t->b,i);
@@ -1945,14 +2191,14 @@ void mulnbpnbm(VL vl,NBP p,NBM m, NBP *rp);
 NBP shuffle_mul_nbm(NBM a,NBM b)
 {
 	NBP u,a0,ah,ar,b0,bh,br,a1,b1,t;
-	Q ac,bc,c;
+	P ac,bc,c;
 
 	if ( !a->d || !b->d )
 		u = nbmtonbp(mul_nbm(a,b));
 	else {
 		ac = separate_nbm(a,&a0,&ah,&ar);
 		bc = separate_nbm(b,&b0,&bh,&br);
-		mulq(ac,bc,&c);
+		mulp(CO,ac,bc,&c);
 		shuffle_mulnbp(CO,ar,b0,&t); mulnbp(CO,ah,t,&a1);
 		shuffle_mulnbp(CO,a0,br,&t); mulnbp(CO,bh,t,&b1);
 		addnbp(CO,a1,b1,&t); mulnbp(CO,(NBP)c,t,&u);
@@ -1963,15 +2209,15 @@ NBP shuffle_mul_nbm(NBM a,NBM b)
 NBP harmonic_mul_nbm(NBM a,NBM b)
 {
 	NBP u,a0,ah,ar,b0,bh,br,a1,b1,t,s,abk,ab1;
-	Q ac,bc,c;
+	P ac,bc,c;
 
 	if ( !a->d || !b->d )
 		u = nbmtonbp(mul_nbm(a,b));
 	else {
-		mulq(a->c,b->c,&c);
+		mulp(CO,a->c,b->c,&c);
 		ac = separate_xky_nbm(a,&a0,&ah,&ar);
 		bc = separate_xky_nbm(b,&b0,&bh,&br);
-		mulq(ac,bc,&c);
+		mulp(CO,ac,bc,&c);
 		harmonic_mulnbp(CO,ar,b0,&t); mulnbp(CO,ah,t,&a1);
 		harmonic_mulnbp(CO,a0,br,&t); mulnbp(CO,bh,t,&b1);
 		abk = make_xky(((NBM)BDY(BDY(ah)))->d+((NBM)BDY(BDY(bh)))->d);
@@ -1984,9 +2230,9 @@ NBP harmonic_mul_nbm(NBM a,NBM b)
 
 void addnbp(VL vl,NBP p1,NBP p2, NBP *rp)
 {
-	NODE b1,b2,br,br0;
+	NODE b1,b2,br=0,br0;
 	NBM m1,m2,m;
-	Q c;
+	P c;
 
 	if ( !p1 )
 		*rp = p2;
@@ -1997,7 +2243,7 @@ void addnbp(VL vl,NBP p1,NBP p2, NBP *rp)
 			m1 = (NBM)BDY(b1); m2 = (NBM)BDY(b2);
 			switch ( comp_nbm(m1,m2) ) {
 				case 0:
-					addq(m1->c,m2->c,&c);
+					addp(CO,m1->c,m2->c,&c);
 					if ( c ) {
 						NEXTNODE(br0,br);
 						NEWNBM(m); m->d = m1->d; m->c = c; m->b = m1->b;
@@ -2041,13 +2287,13 @@ void subnbp(VL vl,NBP p1,NBP p2, NBP *rp)
 
 void chsgnnbp(NBP p,NBP *rp)
 {
-	NODE r0,r,b;
+	NODE r0,r=0,b;
 	NBM m,m1;
 
 	for ( r0 = 0, b = BDY(p); b; b = NEXT(b) ) {
 		NEXTNODE(r0,r);
 		m = (NBM)BDY(b);
-		NEWNBM(m1); m1->d = m->d; m1->b = m->b; chsgnq(m->c,&m1->c);
+		NEWNBM(m1); m1->d = m->d; m1->b = m->b; chsgnp(m->c,&m1->c);
 		BDY(r) = m1;
 	}
 	if ( r0 ) NEXT(r) = 0;
@@ -2064,15 +2310,15 @@ void mulnbp(VL vl,NBP p1,NBP p2, NBP *rp)
 		*rp = 0; return;
 	}
 	if ( OID(p1) != O_NBP ) {
-		if ( !NUM(p1) || !RATN(p1) ) 
+		if ( !POLY(p1) )
 			error("mulnbp : invalid argument");
-		NEWNBM(m); m->d = 0; m->b = 0; m->c = (Q)p1;	
+		NEWNBM(m); m->d = 0; m->b = 0; m->c = (P)p1;	
 		MKNODE(n,m,0); MKNBP(p1,n);
 	}
 	if ( OID(p2) != O_NBP ) {
-		if ( !NUM(p2) || !RATN(p2) ) 
+		if ( !POLY(p2) )
 			error("mulnbp : invalid argument");
-		NEWNBM(m); m->d = 0; m->b = 0; m->c = (Q)p2;	
+		NEWNBM(m); m->d = 0; m->b = 0; m->c = (P)p2;	
 		MKNODE(n,m,0); MKNBP(p2,n);
 	}
 	if ( length(BDY(p1)) < length(BDY(p2)) ) {
@@ -2092,7 +2338,7 @@ void mulnbp(VL vl,NBP p1,NBP p2, NBP *rp)
 
 void mulnbmnbp(VL vl,NBM m,NBP p, NBP *rp)
 {
-	NODE b,r0,r;
+	NODE b,r0,r=0;
 
 	if ( !p ) *rp = 0;
 	else {
@@ -2107,7 +2353,7 @@ void mulnbmnbp(VL vl,NBM m,NBP p, NBP *rp)
 
 void mulnbpnbm(VL vl,NBP p,NBM m, NBP *rp)
 {
-	NODE b,r0,r;
+	NODE b,r0,r=0;
 
 	if ( !p ) *rp = 0;
 	else {
@@ -2130,7 +2376,7 @@ void pwrnbp(VL vl,NBP a,Q q,NBP *c)
 	NODE r;
 
 	if ( !q ) {
-		 NEWNBM(m); m->d = 0; m->c = ONE; m->b = 0;
+		 NEWNBM(m); m->d = 0; m->c = (P)ONE; m->b = 0;
 		 MKNODE(r,m,0); MKNBP(*c,r);
 	} else if ( !a )
 		*c = 0;
@@ -2161,7 +2407,7 @@ int compnbp(VL vl,NBP p1,NBP p2)
 		for ( n1 = BDY(p1), n2 = BDY(p2);
 			n1 && n2; n1 = NEXT(n1), n2 = NEXT(n2) ) {
 			m1 = (NBM)BDY(n1); m2 = (NBM)BDY(n2);
-			if ( (t = comp_nbm(m1,m2)) || (t = cmpq(m1->c,m2->c) ) )
+			if ( (t = comp_nbm(m1,m2)) || (t = compp(CO,m1->c,m2->c) ) )
 				return t;
 		}
 		if ( n1 )
@@ -2183,15 +2429,15 @@ void shuffle_mulnbp(VL vl,NBP p1,NBP p2, NBP *rp)
 		*rp = 0; return;
 	}
 	if ( OID(p1) != O_NBP ) {
-		if ( !NUM(p1) || !RATN(p1) ) 
+		if ( !POLY(p1) )
 			error("shuffle_mulnbp : invalid argument");
-		NEWNBM(m); m->d = 0; m->b = 0; m->c = (Q)p1;	
+		NEWNBM(m); m->d = 0; m->b = 0; m->c = (P)p1;	
 		MKNODE(n,m,0); MKNBP(p1,n);
 	}
 	if ( OID(p2) != O_NBP ) {
-		if ( !NUM(p2) || !RATN(p2) ) 
+		if ( !POLY(p2) )
 			error("shuffle_mulnbp : invalid argument");
-		NEWNBM(m); m->d = 0; m->b = 0; m->c = (Q)p2;	
+		NEWNBM(m); m->d = 0; m->b = 0; m->c = (P)p2;	
 		MKNODE(n,m,0); MKNBP(p2,n);
 	}
 	for ( r = 0, b1 = BDY(p1); b1; b1 = NEXT(b1) )
@@ -2212,15 +2458,15 @@ void harmonic_mulnbp(VL vl,NBP p1,NBP p2, NBP *rp)
 		*rp = 0; return;
 	}
 	if ( OID(p1) != O_NBP ) {
-		if ( !NUM(p1) || !RATN(p1) ) 
+		if ( !POLY(p1) )
 			error("harmonic_mulnbp : invalid argument");
-		NEWNBM(m); m->d = 0; m->b = 0; m->c = (Q)p1;	
+		NEWNBM(m); m->d = 0; m->b = 0; m->c = (P)p1;	
 		MKNODE(n,m,0); MKNBP(p1,n);
 	}
 	if ( OID(p2) != O_NBP ) {
-		if ( !NUM(p2) || !RATN(p2) ) 
+		if ( !POLY(p2) )
 			error("harmonic_mulnbp : invalid argument");
-		NEWNBM(m); m->d = 0; m->b = 0; m->c = (Q)p2;	
+		NEWNBM(m); m->d = 0; m->b = 0; m->c = (P)p2;	
 		MKNODE(n,m,0); MKNBP(p2,n);
 	}
 	for ( r = 0, b1 = BDY(p1); b1; b1 = NEXT(b1) )
@@ -2237,7 +2483,7 @@ NBP shuffle_mul_nbm(NBM a,NBM b)
 	int ad,bd,d,i,ai,bi,bit,s;
 	int *ab,*bb,*wmb,*w;
 	NBM wm,tm;
-	Q c,c1;
+	P c,c1;
 	NODE r,t,t1,p;
 	NBP u;
 
@@ -2247,7 +2493,7 @@ NBP shuffle_mul_nbm(NBM a,NBM b)
 	NEWNBM(wm); NEWNBMBDY(wm,d); wmb = wm->b;
 	for ( i = 0; i < ad; i++ ) w[i] = 1;
 	for ( ; i < d; i++ ) w[i] = 0;
-	mulq(a->c,b->c,&c);
+	mulp(CO,a->c,b->c,&c);
 	r = 0;
 	do {
 		wm->d = d; wm->c = c;
@@ -2270,7 +2516,7 @@ NBP shuffle_mul_nbm(NBM a,NBM b)
 				break;
 			} else if ( s == 0 ) {
 				/* add coefs */
-				addq(tm->c,c,&c1);
+				addp(CO,tm->c,c,&c1);
 				if ( c1 ) tm->c = c1;
 				else NEXT(p) = NEXT(t);
 				break;
@@ -2308,7 +2554,7 @@ NBP harmonic_mul_nbm(NBM a,NBM b)
 	int da,db,d,la,lb,lmax,lmin,l,lab,la1,lb1,lab1;
 	int i,j,k,ia,ib,s;
 	int *wa,*wb,*w,*wab,*wa1,*wmb;
-	Q c,c1;
+	P c,c1;
 	NBM wm,tm;
 	NODE r,t1,t,p;
 	NBP u;
@@ -2318,7 +2564,7 @@ NBP harmonic_mul_nbm(NBM a,NBM b)
 	wb = (int *)ALLOCA(db*sizeof(int));
 	la = nbmtoxky(a,wa);
 	lb = nbmtoxky(b,wb);
-	mulq(a->c,b->c,&c);
+	mulp(CO,a->c,b->c,&c);
 	/* wa[0],..,wa[la-1] <-> x^wa[0]y x^wa[1]y .. */	
 	/* lmax : total length */
 	lmax = la+lb;
@@ -2365,7 +2611,7 @@ NBP harmonic_mul_nbm(NBM a,NBM b)
 						break;
 					} else if ( s == 0 ) {
 						/* add coefs */
-						addq(tm->c,c,&c1);
+						addp(CO,tm->c,c,&c1);
 						if ( c1 ) tm->c = c1;
 						else NEXT(p) = NEXT(t);
 						break;
@@ -2385,3 +2631,253 @@ NBP harmonic_mul_nbm(NBM a,NBM b)
 	return u;
 }
 #endif
+
+/* DPM functions */
+
+int compdmm(int n,DMM m1,DMM m2)
+{
+  int t;
+
+  if ( dpm_ispot ) {
+    if ( m1->pos < m2->pos ) return 1;
+    else if ( m1->pos > m2->pos ) return -1;
+    else return (*cmpdl)(n,m1->dl,m2->dl);
+  } else {
+    t = (*cmpdl)(n,m1->dl,m2->dl);
+    if ( t ) return t;
+    else if ( m1->pos < m2->pos ) return 1;
+    else if ( m1->pos > m2->pos ) return -1;
+    else return 0;
+  }
+}
+
+void adddpm(VL vl,DPM p1,DPM p2,DPM *pr)
+{
+	int n;
+	DMM m1,m2,mr=0,mr0;
+	Obj t;
+	DL d;
+
+	if ( !p1 )
+		*pr = p2;
+	else if ( !p2 )
+		*pr = p1;
+	else {
+		for ( n = NV(p1), m1 = BDY(p1), m2 = BDY(p2), mr0 = 0; m1 && m2; )
+			switch ( compdmm(n,m1,m2) ) {
+				case 0:
+					arf_add(vl,C(m1),C(m2),&t);
+					if ( t ) {
+						NEXTDMM(mr0,mr); mr->pos = m1->pos; mr->dl = m1->dl; C(mr) = t;
+					}
+					m1 = NEXT(m1); m2 = NEXT(m2); break;
+				case 1:
+					NEXTDMM(mr0,mr); mr->pos = m1->pos; mr->dl = m1->dl; C(mr) = C(m1);
+					m1 = NEXT(m1); break;
+				case -1:
+					NEXTDMM(mr0,mr); mr->pos = m2->pos; mr->dl = m2->dl; C(mr) = C(m2);
+					m2 = NEXT(m2); break;
+			}
+		if ( !mr0 )
+			if ( m1 )
+				mr0 = m1;
+			else if ( m2 )
+				mr0 = m2;
+			else {
+				*pr = 0;
+				return;
+			}
+		else if ( m1 )
+			NEXT(mr) = m1;
+		else if ( m2 )
+			NEXT(mr) = m2;
+		else
+			NEXT(mr) = 0;
+		MKDPM(NV(p1),mr0,*pr);
+		if ( *pr )
+			(*pr)->sugar = MAX(p1->sugar,p2->sugar);
+	}
+}
+
+void subdpm(VL vl,DPM p1,DPM p2,DPM *pr)
+{
+	DPM t;
+
+	if ( !p2 )
+		*pr = p1;
+	else {
+		chsgndpm(p2,&t); adddpm(vl,p1,t,pr);
+	}
+}
+
+void chsgndpm(DPM p,DPM *pr)
+{
+	DMM m,mr=0,mr0;
+	Obj r;
+
+	if ( !p )
+		*pr = 0;
+  else {
+		for ( mr0 = 0, m = BDY(p); m; m = NEXT(m) ) {
+			NEXTDMM(mr0,mr); arf_chsgn(C(m),&C(mr)); mr->pos = m->pos; mr->dl = m->dl;
+		}
+		NEXT(mr) = 0; MKDPM(NV(p),mr0,*pr);
+		if ( *pr )
+			(*pr)->sugar = p->sugar;
+	}
+}
+
+void mulcdpm(VL vl,Obj c,DPM p,DPM *pr)
+{
+	DMM m,mr=0,mr0;
+
+	if ( !p || !c )
+		*pr = 0;
+	else if ( NUM(c) && UNIQ((Q)c) )
+		*pr = p;
+	else if ( NUM(c) && MUNIQ((Q)c) )
+		chsgndpm(p,pr);
+	else {
+		for ( mr0 = 0, m = BDY(p); m; m = NEXT(m) ) {
+			NEXTDMM(mr0,mr);
+		  arf_mul(vl,C(m),c,&C(mr));
+      mr->pos = m->pos;
+			mr->dl = m->dl;
+		}
+		NEXT(mr) = 0; MKDPM(NV(p),mr0,*pr);
+		if ( *pr )
+			(*pr)->sugar = p->sugar;
+	}
+}
+
+void comm_mulmpdpm(VL vl,MP m0,DPM p,DPM *pr)
+{
+	DMM m,mr=0,mr0;
+  DL d;
+  Obj c;
+  int n;
+
+	if ( !p )
+		*pr = 0;
+	else {
+    n = NV(p);
+    d = m0->dl;
+    c = C(m0);
+		for ( mr0 = 0, m = BDY(p); m; m = NEXT(m) ) {
+			NEXTDMM(mr0,mr);
+		  arf_mul(vl,C(m),c,&C(mr));
+      mr->pos = m->pos;
+			adddl(n,m->dl,d,&mr->dl);
+		}
+		NEXT(mr) = 0; MKDPM(NV(p),mr0,*pr);
+		if ( *pr )
+			(*pr)->sugar = p->sugar;
+	}
+}
+
+void weyl_mulmpdpm(VL vl,MP m0,DPM p,DPM *pr)
+{
+	DPM r,t,t1;
+	DMM m;
+	DL d0;
+	int n,n2,l,i,j,tlen;
+  struct oMP mp;
+	static DMM *w,*psum;
+	static struct cdl *tab;
+	static int wlen;
+	static int rtlen;
+
+	if ( !p )
+		*pr = 0;
+	else {
+		for ( m = BDY(p), l = 0; m; m = NEXT(m), l++ );
+		if ( l > wlen ) {
+			if ( w ) GCFREE(w);
+			w = (DMM *)MALLOC(l*sizeof(DMM));
+			wlen = l;
+		}
+		for ( m = BDY(p), i = 0; i < l; m = NEXT(m), i++ )
+			w[i] = m;
+
+		n = NV(p); n2 = n>>1;
+		d0 = m0->dl;
+		for ( i = 0, tlen = 1; i < n2; i++ )
+			tlen *= d0->d[n2+i]+1;
+		if ( tlen > rtlen ) {
+			if ( tab ) GCFREE(tab);
+			if ( psum ) GCFREE(psum);
+			rtlen = tlen;
+			tab = (struct cdl *)MALLOC(rtlen*sizeof(struct cdl));
+			psum = (DMM *)MALLOC(rtlen*sizeof(DMM));
+		}
+		bzero(psum,tlen*sizeof(DMM));
+		for ( i = l-1; i >= 0; i-- ) {
+			bzero(tab,tlen*sizeof(struct cdl));
+      mp.dl = w[i]->dl; mp.c = C(w[i]); mp.next = 0;
+			weyl_mulmm(vl,m0,&mp,n,tab,tlen);
+			for ( j = 0; j < tlen; j++ ) {
+				if ( tab[j].c ) {
+					NEWDMM(m); m->dl = tab[j].d; m->pos = w[i]->pos; C(m) = (Obj)tab[j].c; NEXT(m) = psum[j];
+					psum[j] = m;
+				}
+			}
+		}
+		for ( j = tlen-1, r = 0; j >= 0; j-- ) 
+			if ( psum[j] ) {
+				MKDPM(n,psum[j],t); adddpm(vl,r,t,&t1); r = t1;
+			}
+		if ( r )
+			r->sugar = p->sugar + m0->dl->td;
+		*pr = r;
+	}
+}
+
+void mulobjdpm(VL vl,Obj p1,DPM p2,DPM *pr)
+{
+	MP m;
+	DPM s,t,u;
+
+	if ( !p1 || !p2 )
+		*pr = 0;
+	else if ( OID(p1) != O_DP )
+		mulcdpm(vl,p1,p2,pr);
+	else {
+    s = 0;
+    for ( m = BDY((DP)p1); m; m = NEXT(m) ) {
+      if ( do_weyl )
+			  weyl_mulmpdpm(vl,m,p2,&t);
+      else
+			  comm_mulmpdpm(vl,m,p2,&t);
+      adddpm(vl,s,t,&u); s = u;
+		}
+		*pr = s;
+	}
+}
+
+int compdpm(VL vl,DPM p1,DPM p2)
+{
+	int n,t;
+	DMM m1,m2;
+
+	if ( !p1 )
+		return p2 ? -1 : 0;
+	else if ( !p2 )
+		return 1;
+	else if ( NV(p1) != NV(p2) ) {
+		error("compdpm : size mismatch");
+		return 0; /* XXX */
+	} else {
+		for ( n = NV(p1), m1 = BDY(p1), m2 = BDY(p2);
+			m1 && m2; m1 = NEXT(m1), m2 = NEXT(m2) )
+			if ( (t = compdmm(n,m1,m2)) ||
+				(t = arf_comp(vl,C(m1),C(m2)) ) )
+				return t;
+		if ( m1 )
+			return 1;
+		else if ( m2 )
+			return -1;
+		else
+			return 0;
+	}
+}
+