===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/nd.c,v
retrieving revision 1.115
retrieving revision 1.121
diff -u -p -r1.115 -r1.121
--- OpenXM_contrib2/asir2000/engine/nd.c	2004/11/18 08:29:11	1.115
+++ OpenXM_contrib2/asir2000/engine/nd.c	2004/12/09 08:56:43	1.121
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.114 2004/10/25 04:19:50 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.120 2004/12/07 15:15:52 noro Exp $ */
 
 #include "nd.h"
 
@@ -8,6 +8,8 @@ NM _nm_free_list;
 ND _nd_free_list;
 ND_pairs _ndp_free_list;
 
+static int nd_ntrans;
+static int nd_nalg;
 #if 0
 static int ndv_alloc;
 #endif
@@ -41,8 +43,10 @@ static int nd_found,nd_create,nd_notfirst;
 static int nmv_adv;
 static int nd_demand;
 
+NumberField get_numberfield();
 UINT *nd_det_compute_bound(NDV **dm,int n,int j);
 void nd_det_reconstruct(NDV **dm,int n,int j,NDV d);
+int nd_monic(int m,ND *p);
 
 void nd_free_private_storage()
 {
@@ -1580,7 +1584,7 @@ NODE nd_gb(int m,int ishomo,int checkonly)
 	NODE r,g,t;
 	ND_pairs d;
 	ND_pairs l;
-	ND h,nf,s,head;
+	ND h,nf,s,head,nf1;
 	NDV nfv;
 	Q q,num,den;
 	union oNDC dn;
@@ -1619,6 +1623,10 @@ again:
 			if ( checkonly ) return 0;
 			if ( DP_Print ) { printf("+"); fflush(stdout); }
 			nd_removecont(m,nf);
+			if ( !m && nd_nalg ) {
+				nd_monic(0,&nf);
+				nd_removecont(m,nf);
+			}
 			nfv = ndtondv(m,nf); nd_free(nf);
 			nh = ndv_newps(m,nfv,0);
 			d = update_pairs(d,g,nh);
@@ -1685,6 +1693,9 @@ void do_diagonalize_trace(int sugar,int m)
 	}
 }
 
+static struct oEGT eg_invdalg;
+struct oEGT eg_le;
+
 NODE nd_gb_trace(int m,int ishomo)
 {
 	int i,nh,sugar,stat;
@@ -1695,7 +1706,11 @@ NODE nd_gb_trace(int m,int ishomo)
 	NDV nfv,nfqv;
 	Q q,den,num;
 	union oNDC dn;
+	struct oEGT eg_monic,egm0,egm1;
 
+	init_eg(&eg_monic);
+	init_eg(&eg_invdalg);
+	init_eg(&eg_le);
 	g = 0; d = 0;
 	for ( i = 0; i < nd_psn; i++ ) {
 		d = update_pairs(d,g,i);
@@ -1743,8 +1758,17 @@ again:
 				if ( !rem(NM(HCQ(nfq)),m) ) return 0;
 
 				if ( DP_Print ) { printf("+"); fflush(stdout); }
-				nd_removecont(m,nf); nfv = ndtondv(m,nf); nd_free(nf);
-				nd_removecont(0,nfq); nfqv = ndtondv(0,nfq); nd_free(nfq);
+				if ( nd_nalg ) {
+					/* m|DN(HC(nf)^(-1)) => failure */
+					get_eg(&egm0);
+					if ( !nd_monic(m,&nfq) ) return 0;
+					get_eg(&egm1); add_eg(&eg_monic,&egm0,&egm1);
+					nd_removecont(0,nfq); nfqv = ndtondv(0,nfq); nd_free(nfq);
+					nfv = ndv_dup(0,nfqv); ndv_mod(m,nfv); nd_free(nf);
+				} else {
+					nd_removecont(0,nfq); nfqv = ndtondv(0,nfq); nd_free(nfq);
+					nd_removecont(m,nf); nfv = ndtondv(m,nf); nd_free(nf);
+				}
 				nh = ndv_newps(0,nfv,nfqv);
 				d = update_pairs(d,g,nh);
 				g = update_base(g,nh);
@@ -1762,6 +1786,11 @@ again:
 	else
 		for ( t = g; t; t = NEXT(t) )
 			BDY(t) = (pointer)nd_ps_trace[(int)BDY(t)];
+	if ( nd_nalg ) {
+		print_eg("monic",&eg_monic);
+		print_eg("invdalg",&eg_invdalg);
+		print_eg("le",&eg_le);
+	}
 	return g;
 }
 
@@ -2183,13 +2212,124 @@ void ndv_setup(int mod,int trace,NODE f)
 	}
 }
 
+struct order_spec *append_block(struct order_spec *spec,
+    int nv,int nalg,int ord);
+
+extern VECT current_dl_weight_vector_obj;
+static VECT prev_weight_vector_obj;
+
+void preprocess_algcoef(VL vv,VL av,struct order_spec *ord,LIST f,
+	struct order_spec **ord1p,LIST *f1p,NODE *alistp)
+{
+	NODE alist,t,s,r0,r,arg;
+	VL tv;
+	P poly;
+	DP d;
+	Alg alpha,dp;
+	DAlg inv,da,hc;
+	MP m;
+	int i,nvar,nalg,n;
+	NumberField nf;
+	LIST f1,f2;
+	struct order_spec *current_spec;
+	VECT obj,obj0;
+	Obj tmp;
+
+	for ( nvar = 0, tv = vv; tv; tv = NEXT(tv), nvar++);
+	for ( nalg = 0, tv = av; tv; tv = NEXT(tv), nalg++);
+
+	for ( alist = 0, tv = av; tv; tv = NEXT(tv) ) {
+		NEXTNODE(alist,t); MKV(tv->v,poly); 
+		MKAlg(poly,alpha); BDY(t) = (pointer)alpha;
+		tv->v = tv->v->priv;
+	}
+	NEXT(t) = 0;
+
+	/* simplification, makeing polynomials monic */
+	setfield_dalg(alist);
+	obj_algtodalg(f,&f1);
+	for ( t = BDY(f); t; t = NEXT(t) ) {
+		initd(ord); ptod(vv,vv,(P)BDY(t),&d);			
+		hc = (DAlg)BDY(d)->c;
+		if ( NID(hc) == N_DA ) {
+			invdalg(hc,&inv);
+			for ( m = BDY(d); m; m = NEXT(m) ) {
+				muldalg(inv,(DAlg)m->c,&da); m->c = (P)da;
+			}
+		}
+		initd(ord); dtop(vv,vv,d,&poly); BDY(f) = (pointer)poly;
+	}
+	obj_dalgtoalg(f1,&f);
+
+	/* append alg vars to the var list */
+	for ( tv = vv; NEXT(tv); tv = NEXT(tv) );
+	NEXT(tv) = av;
+
+	/* append a block to ord */
+	*ord1p = append_block(ord,nvar,nalg,2);
+
+	/* create generator list */
+	nf = get_numberfield();
+	for ( i = nalg-1, t = BDY(f); i >= 0; i-- ) {
+		MKAlg(nf->defpoly[i],dp);
+		MKNODE(s,dp,t); t = s;
+	}
+	MKLIST(f1,t);
+	*alistp = alist;
+	algobjtorat(f1,f1p);
+
+	/* creating a new weight vector */
+	prev_weight_vector_obj = obj0 = current_dl_weight_vector_obj;
+	n = nvar+nalg+1;
+	MKVECT(obj,n);
+	if ( obj0 && obj0->len == nvar )
+		for ( i = 0; i < nvar; i++ ) BDY(obj)[i] = BDY(obj0)[i];
+	else
+		for ( i = 0; i < nvar; i++ ) BDY(obj)[i] = (pointer)ONE;
+	for ( i = 0; i < nalg; i++ ) BDY(obj)[i+nvar] = 0;
+	BDY(obj)[n-1] = (pointer)ONE;
+	arg = mknode(1,obj);
+	Pdp_set_weight(arg,&tmp);
+}
+
+NODE postprocess_algcoef(VL av,NODE alist,NODE r)
+{
+	NODE s,t,u0,u;
+	P p;
+	VL tv;
+	Obj obj,tmp;
+	NODE arg;
+
+	u0 = 0;
+	for ( t = r; t; t = NEXT(t) ) {
+		p = (P)BDY(t);
+		for ( tv = av, s = alist; tv; tv = NEXT(tv), s = NEXT(s) ) {
+			substr(CO,0,(Obj)p,tv->v,(Obj)BDY(s),&obj); p = (P)obj;
+		}
+		if ( OID(p) == O_P || (OID(p) == O_N && NID((Num)p) != N_A) ) {
+			NEXTNODE(u0,u);
+			BDY(u) = (pointer)p;
+		}
+	}	
+	arg = mknode(1,prev_weight_vector_obj);
+	Pdp_set_weight(arg,&tmp);
+
+	return u0;
+}
+
 void nd_gr(LIST f,LIST v,int m,int f4,struct order_spec *ord,LIST *rp)
 {
-	VL tv,fv,vv,vc;
-	NODE fd,fd0,r,r0,t,x,s,xx;
-	int e,max,nvar;
+	VL tv,fv,vv,vc,av;
+	NODE fd,fd0,r,r0,t,x,s,xx,alist;
+	int e,max,nvar,i;
 	NDV b;
-	int ishomo;
+	int ishomo,nalg;
+	Alg alpha,dp;
+	P p;
+	LIST f1,f2;
+	Obj obj;
+	NumberField nf;
+	struct order_spec *ord1;
 
 	if ( !m && Demand ) nd_demand = 1;
 	else nd_demand = 0;
@@ -2207,6 +2347,20 @@ void nd_gr(LIST f,LIST v,int m,int f4,struct order_spe
 		default:
 			break;
 	}
+	nd_nalg = 0;
+	if ( !m ) {
+		get_algtree((Obj)f,&av);
+		for ( nalg = 0, tv = av; tv; tv = NEXT(tv), nalg++ );
+		nd_ntrans = nvar;
+		nd_nalg = nalg;
+		/* #i -> t#i */
+		if ( nalg ) {
+			preprocess_algcoef(vv,av,ord,f,&ord1,&f1,&alist);
+			ord = ord1;
+			f = f1;
+		}
+		nvar += nalg;
+	}
 	nd_init_ord(ord);
 	for ( t = BDY(f), max = 0; t; t = NEXT(t) )
 		for ( tv = vv; tv; tv = NEXT(tv) ) {
@@ -2233,6 +2387,8 @@ void nd_gr(LIST f,LIST v,int m,int f4,struct order_spe
 		BDY(r) = ndvtop(m,CO,vv,BDY(t));
 	}
 	if ( r0 ) NEXT(r) = 0;
+	if ( nalg )
+		r0 = postprocess_algcoef(av,alist,r0);
 	MKLIST(*rp,r0);
 #if 0
 	fprintf(asir_out,"ndv_alloc=%d\n",ndv_alloc);
@@ -2241,15 +2397,20 @@ void nd_gr(LIST f,LIST v,int m,int f4,struct order_spe
 
 void nd_gr_trace(LIST f,LIST v,int trace,int homo,struct order_spec *ord,LIST *rp)
 {
-	struct order_spec *ord1;
-	VL tv,fv,vv,vc;
-	NODE fd,fd0,in0,in,r,r0,t,s,cand;
+	VL tv,fv,vv,vc,av;
+	NODE fd,fd0,in0,in,r,r0,t,s,cand,alist;
 	int m,nocheck,nvar,mindex,e,max;
 	NDV c;
 	NMV a;
 	P p;
 	EPOS oepos;
-	int obpe,oadv,wmax,i,len,cbpe,ishomo;
+	int obpe,oadv,wmax,i,len,cbpe,ishomo,nalg;
+	Alg alpha,dp;
+	P poly;
+	LIST f1,f2;
+	Obj obj;
+	NumberField nf;
+	struct order_spec *ord1;
 
 	get_vars((Obj)f,&fv); pltovl(v,&vv);
 	for ( nvar = 0, tv = vv; tv; tv = NEXT(tv), nvar++ );
@@ -2261,6 +2422,19 @@ void nd_gr_trace(LIST f,LIST v,int trace,int homo,stru
 		default:
 			break;
 	}
+
+	get_algtree((Obj)f,&av);
+	for ( nalg = 0, tv = av; tv; tv = NEXT(tv), nalg++ );
+	nd_ntrans = nvar;
+	nd_nalg = nalg;
+	/* #i -> t#i */
+	if ( nalg ) {
+		preprocess_algcoef(vv,av,ord,f,&ord1,&f1,&alist);
+		ord = ord1;
+		f = f1;
+	}
+	nvar += nalg;
+
 	nocheck = 0;
 	mindex = 0;
 
@@ -2350,7 +2524,10 @@ void nd_gr_trace(LIST f,LIST v,int trace,int homo,stru
 	/* dp->p */
 	nd_bpe = cbpe;
 	nd_setup_parameters(nd_nvar,0);
-	for ( r = cand; r; r = NEXT(r) ) BDY(r) = (pointer)ndvtop(0,CO,vv,BDY(r));
+	for ( r = cand; r; r = NEXT(r) )
+		BDY(r) = (pointer)ndvtop(0,CO,vv,BDY(r));
+	if ( nalg )
+		cand = postprocess_algcoef(av,alist,cand);
 	MKLIST(*rp,cand);
 }
 
@@ -3717,6 +3894,10 @@ void nd_nf_p(P f,LIST g,LIST v,int m,struct order_spec
 	int stat,nvar,max,e;
 	union oNDC dn;
 
+	if ( !f ) {
+		*rp = 0;
+		return;
+	}
 	pltovl(v,&vv);
 	for ( nvar = 0, tv = vv; tv; tv = NEXT(tv), nvar++ );
 
@@ -5091,4 +5272,130 @@ UINT *nd_det_compute_bound(NDV **dm,int n,int j)
 	r = (UINT *)ALLOCA(nd_wpd*sizeof(UINT));
 	for ( k = 0; k < nd_wpd; k++ ) r[k] = d0[k];
 	return r;
+}
+
+DL nd_separate_d(UINT *d,UINT *trans)
+{
+	int n,td,i,e,j;
+	DL a;
+
+	ndl_zero(trans);
+	td = 0;
+	for ( i = 0; i < nd_ntrans; i++ ) {
+		e = GET_EXP(d,i);
+		PUT_EXP(trans,i,e);
+		td += MUL_WEIGHT(e,i);
+	}
+	if ( nd_ntrans+nd_nalg < nd_nvar ) {
+		/* homogenized */
+		i = nd_nvar-1;
+		e = GET_EXP(d,i);
+		PUT_EXP(trans,i,e);
+		td += MUL_WEIGHT(e,i);
+	}
+	TD(trans) = td;
+	if ( nd_blockmask) ndl_weight_mask(trans);
+	NEWDL(a,nd_nalg);
+	td = 0;
+	for ( i = 0; i < nd_nalg; i++ ) {
+		j = nd_ntrans+i;
+		e = GET_EXP(d,j);
+		a->d[i] = e;
+		td += e;
+	}
+	a->td = td;
+	return a;
+}
+
+int nd_monic(int mod,ND *p)
+{
+	UINT *trans,*t;
+	DL alg;
+	MP mp0,mp;
+	NM m,m0,m1,ma0,ma,mb,mr0,mr;
+	ND r;
+	DL dl;
+	DP nm;
+	NDV ndv;
+	DAlg inv,cd;
+	ND s,c;
+	Q l,mul;
+	N ln;
+	int n,ntrans,i,e,td,is_lc,len;
+	NumberField nf;
+	struct oEGT eg0,eg1;
+
+	if ( !(nf = get_numberfield()) )
+		error("nd_monic : current_numberfield is not set");
+
+	/* Q coef -> DAlg coef */
+	NEWNM(ma0); ma = ma0;
+	m = BDY(*p); 
+	is_lc = 1;
+	while ( 1 ) {
+		NEWMP(mp0); mp = mp0;
+		mp->c = (P)CQ(m);
+		mp->dl = nd_separate_d(DL(m),DL(ma));
+		NEWNM(mb);
+		for ( m = NEXT(m); m; m = NEXT(m) ) {
+			alg = nd_separate_d(DL(m),DL(mb));
+			if ( !ndl_equal(DL(ma),DL(mb)) )
+				break;
+			NEXTMP(mp0,mp); mp->c = (P)CQ(m); mp->dl = alg;
+		}
+		NEXT(mp) = 0;
+		MKDP(nd_nalg,mp0,nm);
+		MKDAlg(nm,ONE,cd);
+		if ( is_lc == 1 ) {
+			/* if the lc is a rational number, we have nothing to do */
+			if ( !mp0->dl->td )
+				return 1;
+
+			get_eg(&eg0);
+			invdalg(cd,&inv);
+			get_eg(&eg1); add_eg(&eg_invdalg,&eg0,&eg1);
+			/* check the validity of inv */
+			if ( mod && !rem(NM(inv->dn),mod) )
+				return 0;
+			CA(ma) = nf->one;
+			is_lc = 0;
+			ln = ONEN;
+		} else {
+			muldalg(cd,inv,&CA(ma));	
+			lcmn(ln,NM(CA(ma)->dn),&ln);
+		}
+		if ( m ) {
+			NEXT(ma) = mb; ma = mb;
+		} else {
+			NEXT(ma) = 0;
+			break;
+		}
+	}
+	/* l = lcm(denoms) */
+	NTOQ(ln,1,l);
+	for ( mr0 = 0, m = ma0; m; m = NEXT(m) ) {
+		divq(l,CA(m)->dn,&mul);
+		for ( mp = BDY(CA(m)->nm); mp; mp = NEXT(mp) ) {
+			NEXTNM(mr0,mr);
+			mulq((Q)mp->c,mul,&CQ(mr));
+			dl = mp->dl;
+			td = TD(DL(m));
+			ndl_copy(DL(m),DL(mr));
+			for ( i = 0; i < nd_nalg; i++ ) {
+				e = dl->d[i];
+				PUT_EXP(DL(mr),i+nd_ntrans,e);
+				td += MUL_WEIGHT(e,i+nd_ntrans);
+			}
+			TD(DL(mr)) = td;
+			if ( nd_blockmask) ndl_weight_mask(DL(mr));
+		}
+	}
+	NEXT(mr) = 0;
+	for ( len = 0, mr = mr0; mr; mr = NEXT(mr), len++ );
+	MKND(NV(*p),mr0,len,r);
+	/* XXX */
+	SG(r) = SG(*p);
+	nd_free(*p);
+	*p = r;
+	return 1;
 }