===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/dp-supp.c,v
retrieving revision 1.43
retrieving revision 1.45
diff -u -p -r1.43 -r1.45
--- OpenXM_contrib2/asir2000/builtin/dp-supp.c	2007/09/07 00:45:50	1.43
+++ OpenXM_contrib2/asir2000/builtin/dp-supp.c	2007/09/16 09:08:25	1.45
@@ -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/builtin/dp-supp.c,v 1.42 2007/09/06 02:23:40 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/dp-supp.c,v 1.44 2007/09/15 10:17:08 noro Exp $ 
 */
 #include "ca.h"
 #include "base.h"
@@ -860,6 +860,34 @@ void dp_red_marked(DP p0,DP p1,DP p2,DP hp2,DP *head,D
 	*head = h; *rest = r; *dnp = (P)c2;
 }
 
+void dp_red_marked_mod(DP p0,DP p1,DP p2,DP hp2,int mod,DP *head,DP *rest,P *dnp)
+{
+	int i,n;
+	DL d1,d2,d;
+	MP m;
+	DP t,s,r,h;
+	P c1,c2,g,u;
+
+	n = p1->nv; d1 = BDY(p1)->dl; d2 = BDY(hp2)->dl;
+	NEWDL(d,n); d->td = d1->td - d2->td;
+	for ( i = 0; i < n; i++ )
+		d->d[i] = d1->d[i]-d2->d[i];
+	c1 = (P)BDY(p1)->c; c2 = (P)BDY(hp2)->c;
+	gcdprsmp(CO,mod,c1,c2,&g);
+	divsmp(CO,mod,c1,g,&u); c1 = u; divsmp(CO,mod,c2,g,&u); c2 = u;
+	if ( NUM(c2) ) {
+		divsmp(CO,mod,c1,c2,&u); c1 = u; c2 = (P)ONEM;
+	}
+	NEWMP(m); m->dl = d; chsgnmp(mod,(P)c1,&m->c); NEXT(m) = 0;
+	MKDP(n,m,s); s->sugar = d->td; mulmd(CO,mod,s,p2,&t);
+	if ( NUM(c2) ) {
+		addmd(CO,mod,p1,t,&r); h = p0;
+	} else {
+		mulmdc(CO,mod,p1,c2,&s); addmd(CO,mod,s,t,&r); mulmdc(CO,mod,p0,c2,&h);
+	}
+	*head = h; *rest = r; *dnp = c2;
+}
+
 /* m-reduction over a field */
 
 void dp_red_f(DP p1,DP p2,DP *rest)
@@ -1125,6 +1153,57 @@ last:
 	*rp = d; *nmp = nm; *dnp = dn;
 }
 
+void dp_true_nf_marked_mod(NODE b,DP g,DP *ps,DP *hps,int mod,DP *rp,P *dnp)
+{
+	DP hp,u,p,d,s,t;
+	NODE l;
+	MP m,mr;
+	int i,n;
+	int *wb;
+	int sugar,psugar;
+	P dn,tdn,tdn1;
+
+	dn = (P)ONEM;
+	if ( !g ) {
+		*rp = 0; *dnp = dn; return;
+	}
+	for ( n = 0, l = b; l; l = NEXT(l), n++ );
+		wb = (int *)ALLOCA(n*sizeof(int));
+	for ( i = 0, l = b; i < n; l = NEXT(l), i++ )
+		wb[i] = QTOS((Q)BDY(l));
+	sugar = g->sugar;
+	for ( d = 0; g; ) {
+		for ( u = 0, i = 0; i < n; i++ ) {
+			if ( dp_redble(g,hp = hps[wb[i]]) ) {
+				p = ps[wb[i]];
+				dp_red_marked_mod(d,g,p,hp,mod,&t,&u,&tdn);	
+				psugar = (BDY(g)->dl->td - BDY(p)->dl->td) + p->sugar;
+				sugar = MAX(sugar,psugar);
+				if ( !u ) {
+					if ( d )
+						d->sugar = sugar;
+					*rp = d; *dnp = dn; return;
+				} else {
+					d = t;
+					mulmp(CO,mod,dn,tdn,&tdn1); dn = tdn1;
+				}
+				break;
+			}
+		}
+		if ( u )
+			g = u;
+		else {
+			m = BDY(g); NEWMP(mr); mr->dl = m->dl; mr->c = m->c;
+			NEXT(mr) = 0; MKDP(g->nv,mr,t); t->sugar = mr->dl->td;
+			addmd(CO,mod,d,t,&s); d = s;
+			dp_rest(g,&t); g = t;
+		}
+	}
+	if ( d )
+		d->sugar = sugar;
+	*rp = d; *dnp = dn;
+}
+
 /* nf computation over Z */
 
 void dp_nf_z(NODE b,DP g,DP *ps,int full,int multiple,DP *rp)
@@ -2626,4 +2705,70 @@ NODE compute_last_w(NODE g,NODE gh,int n,int **w,
 	}
 	NEXT(r) = 0;
 	return r0;
+}
+
+/* compute a sufficient set of d(f)=u-v */
+
+NODE compute_essential_df(DP *g,DP *gh,int ng)
+{
+	int nv,i,j,k,t,lj;
+	NODE r,r1,ri,rt,r0;
+	MP m;
+	MP *mj;
+	DL di,hj,dl,dlt;
+	int *d,*dt;
+	LIST l;
+	Q q;
+
+	nv = g[0]->nv;
+	r = 0;
+	for ( j = 0; j < ng; j++ ) {
+		for ( m = BDY(g[j]), lj = 0; m; m = NEXT(m), lj++ );
+		mj = (MP *)ALLOCA(lj*sizeof(MP));
+		for ( m = BDY(g[j]), k = 0; m; m = NEXT(m), k++ )
+			mj[k] = m;
+		for ( i = 0; i < lj; i++ ) {
+			for ( di = mj[i]->dl, k = i+1; k < lj; k++ )
+				if ( _dl_redble(di,mj[k]->dl,nv) ) break;
+			if ( k < lj ) mj[i] = 0;
+		}
+		hj = BDY(gh[j])->dl;
+		_NEWDL(dl,nv); d = dl->d;
+		r0 = r;
+		for ( i = 0; i < lj; i++ ) {
+			if ( mj[i] && !dl_equal(nv,di=mj[i]->dl,hj) ) {
+				for ( k = 0, t = 0; k < nv; k++ ) {
+					d[k] = hj->d[k]-di->d[k];
+					t += d[k];
+				}
+				dl->td = t;	
+#if 1
+				for ( rt = r0; rt; rt = NEXT(rt) ) {
+					dlt = (DL)BDY(rt);
+					if ( dlt->td != dl->td ) continue;
+					for ( dt = dlt->d, k = 0; k < nv; k++ )
+						if ( d[k] != dt[k] ) break;
+					if ( k == nv ) break;
+				}
+#else
+				rt = 0;
+#endif
+				if ( !rt ) {
+					MKNODE(r1,dl,r); r = r1;
+					_NEWDL(dl,nv); d = dl->d;
+				}
+			}
+		}
+	}
+	for ( rt = r; rt; rt = NEXT(rt) ) {
+		dl = (DL)BDY(rt); d = dl->d;
+		ri = 0;
+		for ( k = nv-1; k >= 0; k-- ) {
+			STOQ(d[k],q);
+			MKNODE(r1,q,ri); ri = r1;
+		}
+		MKNODE(r1,0,ri); MKLIST(l,r1);
+		BDY(rt) = (pointer)l;
+	}
+	return r;
 }