===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/dalg.c,v
retrieving revision 1.3
retrieving revision 1.9
diff -u -p -r1.3 -r1.9
--- OpenXM_contrib2/asir2000/engine/dalg.c	2004/12/02 13:48:43	1.3
+++ OpenXM_contrib2/asir2000/engine/dalg.c	2005/07/11 00:24:02	1.9
@@ -1,5 +1,5 @@
 /*
- * $OpenXM: OpenXM_contrib2/asir2000/engine/dalg.c,v 1.2 2004/12/02 08:39:54 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2000/engine/dalg.c,v 1.8 2005/01/23 14:03:47 noro Exp $
 */
 
 #include "ca.h"
@@ -8,9 +8,16 @@
 static NumberField current_numberfield;
 extern struct order_spec *dp_current_spec;
 void simpdalg(DAlg da,DAlg *r);
-void invdalg(DAlg a,DAlg *c);
+int invdalg(DAlg a,DAlg *c);
 void rmcontdalg(DAlg a, DAlg *c);
+void algtodalg(Alg a,DAlg *r);
+void dalgtoalg(DAlg da,Alg *r);
 
+NumberField get_numberfield()
+{
+	return current_numberfield;
+}
+
 void setfield_dalg(NODE alist)
 {
 	NumberField nf;
@@ -55,9 +62,211 @@ void setfield_dalg(NODE alist)
 	nf->dim = dim = length(mblist);
 	nf->mb = mb = (DP *)MALLOC(dim*sizeof(DP));
 	for ( i = 0, t = mblist; t; t = NEXT(t), i++ )
-		mb[i] = (DP)BDY(t);	
+		mb[dim-i-1] = (DP)BDY(t);	
 }
 
+void qtodalg(Q q,DAlg *r)
+{
+	NumberField nf;
+	Q t;
+	DP nm;
+
+	if ( !(nf=current_numberfield) )
+		error("qtodalg : current_numberfield is not set");
+	if ( !q )
+		*r = 0;
+	else if ( NID(q) == N_DA )
+		*r = (DAlg)q;
+	else if ( NID(q) == N_Q ) {
+		if ( INT(q) ) {
+			muldc(CO,nf->one->nm,(P)q,&nm);
+			MKDAlg(nm,ONE,*r);
+		} else {
+			NTOQ(NM(q),SGN(q),t);
+			muldc(CO,nf->one->nm,(P)t,&nm);
+			NTOQ(DN(q),1,t);
+			MKDAlg(nm,t,*r);
+		}
+	} else
+		error("qtodalg : invalid argument");
+}
+
+void obj_algtodalg(Obj obj,Obj *r)
+{
+	DAlg d;
+	DCP dc,dcr0,dcr;
+	P c,p;
+	Obj t;
+	Obj nm,dn;
+	NODE b,s,s0;
+	R rat;
+	VECT v;
+	MAT mat;
+	LIST list;
+	pointer *a;
+	pointer **m;
+	int len,row,col,i,j,l;
+
+	if ( !obj ) {
+		*r = 0;
+		return;
+	}
+	switch ( OID(obj) ) {
+		case O_N:
+			algtodalg((Alg)obj,&d); *r = (Obj)d;
+			break;
+		case O_P:
+			for ( dcr0 = 0, dc = DC((P)obj); dc; dc = NEXT(dc) ) {
+				obj_algtodalg((Obj)COEF(dc),&t);
+				if ( t ) {
+					NEXTDC(dcr0,dcr);
+					COEF(dcr) = (P)t;
+					DEG(dcr) = DEG(dc);
+				}
+			}
+			if ( dcr0 ) {
+				MKP(VR((P)obj),dcr0,p);
+				*r = (Obj)p;
+			} else
+				*r = 0;
+			break;
+		case O_R:
+			obj_algtodalg((Obj)NM((R)obj),&nm);
+			obj_algtodalg((Obj)DN((R)obj),&dn);
+			if ( !dn )
+				error("obj_algtodalg : division by 0");
+			if ( !nm )
+				*r = 0;
+			else {
+				MKRAT((P)nm,(P)dn,0,rat); *r = (Obj)rat;
+			}
+			break;
+		case O_LIST:
+			s0 = 0;
+			for ( b = BDY((LIST)obj); b; b = NEXT(b) ) {
+				NEXTNODE(s0,s);
+				obj_algtodalg((Obj)BDY(b),&t);
+				BDY(s) = (pointer)t;
+			}
+			NEXT(s) = 0;
+			MKLIST(list,s0);
+			*r = (Obj)list;
+			break;
+		case O_VECT:
+			l = ((VECT)obj)->len;
+			a = BDY((VECT)obj);
+			MKVECT(v,l);
+			for ( i = 0; i < l; i++ ) {
+				obj_algtodalg((Obj)a[i],&t);
+				BDY(v)[i] = (pointer)t;
+			}
+			*r = (Obj)v;
+			break;
+		case O_MAT:
+			row = ((MAT)obj)->row; col = ((MAT)obj)->col;
+			m = BDY((MAT)obj);
+			MKMAT(mat,row,col);
+			for ( i = 0; i < row; i++ )
+				for ( j = 0; j < col; j++ ) {
+					obj_algtodalg((Obj)m[i][j],&t);
+					BDY(mat)[i][j] = (pointer)t;
+				}
+			*r = (Obj)mat;
+			break;
+		default:
+			*r = obj;
+			break;
+	}
+}
+
+void obj_dalgtoalg(Obj obj,Obj *r)
+{
+	Alg d;
+	DCP dc,dcr0,dcr;
+	P c,p;
+	Obj t;
+	Obj nm,dn;
+	NODE b,s,s0;
+	R rat;
+	VECT v;
+	MAT mat;
+	LIST list;
+	pointer *a;
+	pointer **m;
+	int len,row,col,i,j,l;
+
+	if ( !obj ) {
+		*r = 0;
+		return;
+	}
+	switch ( OID(obj) ) {
+		case O_N:
+			dalgtoalg((DAlg)obj,&d); *r = (Obj)d;
+			break;
+		case O_P:
+			for ( dcr0 = 0, dc = DC((P)obj); dc; dc = NEXT(dc) ) {
+				obj_dalgtoalg((Obj)COEF(dc),&t);
+				if ( t ) {
+					NEXTDC(dcr0,dcr);
+					COEF(dcr) = (P)t;
+					DEG(dcr) = DEG(dc);
+				}
+			}
+			if ( dcr0 ) {
+				MKP(VR((P)obj),dcr0,p);
+				*r = (Obj)p;
+			} else
+				*r = 0;
+			break;
+		case O_R:
+			obj_dalgtoalg((Obj)NM((R)obj),&nm);
+			obj_dalgtoalg((Obj)DN((R)obj),&dn);
+			if ( !dn )
+				error("obj_dalgtoalg : division by 0");
+			if ( !nm )
+				*r = 0;
+			else {
+				MKRAT((P)nm,(P)dn,0,rat); *r = (Obj)rat;
+			}
+			break;
+		case O_LIST:
+			s0 = 0;
+			for ( b = BDY((LIST)obj); b; b = NEXT(b) ) {
+				NEXTNODE(s0,s);
+				obj_dalgtoalg((Obj)BDY(b),&t);
+				BDY(s) = (pointer)t;
+			}
+			NEXT(s) = 0;
+			MKLIST(list,s0);
+			*r = (Obj)list;
+			break;
+		case O_VECT:
+			l = ((VECT)obj)->len;
+			a = BDY((VECT)obj);
+			MKVECT(v,l);
+			for ( i = 0; i < l; i++ ) {
+				obj_dalgtoalg((Obj)a[i],&t);
+				BDY(v)[i] = (pointer)t;
+			}
+			*r = (Obj)v;
+			break;
+		case O_MAT:
+			row = ((MAT)obj)->row; col = ((MAT)obj)->col;
+			m = BDY((MAT)obj);
+			MKMAT(mat,row,col);
+			for ( i = 0; i < row; i++ )
+				for ( j = 0; j < col; j++ ) {
+					obj_dalgtoalg((Obj)m[i][j],&t);
+					BDY(mat)[i][j] = (pointer)t;
+				}
+			*r = (Obj)mat;
+			break;
+		default:
+			*r = obj;
+			break;
+	}
+}
+
 void algtodalg(Alg a,DAlg *r)
 {
 	P ap,p,p1;
@@ -85,7 +294,7 @@ void algtodalg(Alg a,DAlg *r)
 				NTOQ(NM(c),SGN(c),c1);
 				NTOQ(DN(c),1,d1);
 				muldc(CO,nf->one->nm,(P)c1,&dp);
-				MKDAlg(dp,c1,*r);
+				MKDAlg(dp,d1,*r);
 			}
 			break;
 		case N_A:
@@ -139,6 +348,7 @@ void simpdalg(DAlg da,DAlg *r)
 	DP nm;
 	DAlg d;
 	Q dn,dn1;
+	struct order_spec *current_spec;
 
 	if ( !(nf=current_numberfield) )
 		error("simpdalg : current_numberfield is not set");
@@ -146,7 +356,9 @@ void simpdalg(DAlg da,DAlg *r)
 		*r = 0;
 		return;
 	}
+	current_spec = dp_current_spec; initd(nf->spec);
 	dp_true_nf(nf->ind,da->nm,nf->ps,1,&nm,&dn);
+	initd(current_spec);
 	mulq(da->dn,dn,&dn1);
 	MKDAlg(nm,dn1,d);
 	rmcontdalg(d,r);
@@ -157,6 +369,7 @@ void adddalg(DAlg a,DAlg b,DAlg *c)
 	NumberField nf;
 	Q dna,dnb,a1,b1,dn,g;
 	N an,bn,gn;
+	DAlg t;
 	DP ta,tb,nm;
 	struct order_spec *current_spec;
 
@@ -167,6 +380,7 @@ void adddalg(DAlg a,DAlg b,DAlg *c)
 	else if ( !b )
 		*c = a;
 	else {
+		qtodalg((Q)a,&t); a = t; qtodalg((Q)b,&t); b = t;
 		dna = a->dn;
 		dnb = b->dn;
 		gcdn(NM(dna),NM(dnb),&gn);
@@ -192,6 +406,7 @@ void subdalg(DAlg a,DAlg b,DAlg *c)
 	Q dna,dnb,a1,b1,dn,g;
 	N an,bn,gn;
 	DP ta,tb,nm;
+	DAlg t;
 	struct order_spec *current_spec;
 
 	if ( !(nf=current_numberfield) )
@@ -201,6 +416,7 @@ void subdalg(DAlg a,DAlg b,DAlg *c)
 	else if ( !b )
 		*c = a;
 	else {
+		qtodalg((Q)a,&t); a = t; qtodalg((Q)b,&t); b = t;
 		dna = a->dn;
 		dnb = b->dn;
 		gcdn(NM(dna),NM(dnb),&gn);
@@ -233,6 +449,7 @@ void muldalg(DAlg a,DAlg b,DAlg *c)
 	if ( !a || !b )
 		*c = 0;
 	else {
+		qtodalg((Q)a,&t); a = t; qtodalg((Q)b,&t); b = t;
 		current_spec = dp_current_spec; initd(nf->spec);
 		muld(CO,a->nm,b->nm,&nm);
 		initd(current_spec);
@@ -245,7 +462,8 @@ void muldalg(DAlg a,DAlg b,DAlg *c)
 
 void divdalg(DAlg a,DAlg b,DAlg *c)
 {
-	DAlg inv;
+	DAlg inv,t;
+	int ret;
 
 	if ( !current_numberfield )
 		error("divdalg : current_numberfield is not set");
@@ -254,7 +472,11 @@ void divdalg(DAlg a,DAlg b,DAlg *c)
 	if ( !a )
 		c = 0;
 	else {
-		invdalg(b,&inv);
+		qtodalg((Q)a,&t); a = t; qtodalg((Q)b,&t); b = t;
+		ret = invdalg(b,&inv);
+		if ( !ret ) {
+			error("divdalg : the denominator is not invertible");
+		}
 		muldalg(a,inv,c);
 	}
 }
@@ -278,39 +500,48 @@ void rmcontdalg(DAlg a, DAlg *r)
 	}
 }
 
-void invdalg(DAlg a,DAlg *c)
+int invdalg(DAlg a,DAlg *c)
 {
 	NumberField nf;
-	int dim,n,i,j;
+	int dim,n,i,j,k,l;
 	DP *mb;
 	DP m,d,u;
 	N ln,gn,qn;
 	DAlg *simp;
 	DAlg t,a0,r;
-	Q dn,dnsol,mul;
+	Q dn,dnsol,mul,nmc,dn1;
 	MAT mobj,sol;
 	Q **mat,**solmat;
 	MP mp0,mp;
 	int *rinfo,*cinfo;
+	int rank,nparam;
+	NODE nd0,nd,ndt;
 	struct order_spec *current_spec;
+	struct oEGT eg0,eg1;
+	extern struct oEGT eg_le;
 
 	if ( !(nf=current_numberfield) )
 		error("invdalg : current_numberfield is not set");
 	if ( !a )
 		error("invdalg : division by 0");
+	else if ( NID(a) == N_Q ) {
+		invq((Q)a,&dn); *c = (DAlg)dn;
+		return;
+	}
 	dim = nf->dim;
 	mb = nf->mb;
 	n = nf->n;
 	ln = ONEN;
-	MKDAlg(a->nm,ONE,a0);
+	dp_ptozp(a->nm,&u); divq((Q)BDY(a->nm)->c,(Q)BDY(u)->c,&nmc);
+	MKDAlg(u,ONE,a0);
 	simp = (DAlg *)ALLOCA(dim*sizeof(DAlg));
 	current_spec = dp_current_spec; initd(nf->spec);
-	for ( i = dim-1; i >= 0; i-- ) {
+	for ( i = 0; i < dim; i++ ) {
 		m = mb[i];
-		for ( j = i+1; j < dim; j++ )
+		for ( j = i-1; j >= 0; j-- )
 			if ( dp_redble(m,mb[j]) )
 				break;
-		if ( j < dim ) {
+		if ( j >= 0 ) {
 			dp_subd(m,mb[j],&d);
 			muld(CO,d,simp[j]->nm,&u);
 			MKDAlg(u,simp[j]->dn,t);
@@ -326,34 +557,167 @@ void invdalg(DAlg a,DAlg *c)
 	NTOQ(ln,1,dn);
 	MKMAT(mobj,dim,dim+1);
 	mat = (Q **)BDY(mobj);
-	mulq(dn,a->dn,&mat[dim-1][dim]);
+	mulq(dn,a->dn,&mat[0][dim]);
 	for ( j = 0; j < dim; j++ ) {
 		divq(dn,simp[j]->dn,&mul);
-		for ( i = 0, mp = BDY(simp[j]->nm); mp && i < dim; i++ )
+		for ( i = dim-1, mp = BDY(simp[j]->nm); mp && i >= 0; i-- )
 			if ( dl_equal(n,BDY(mb[i])->dl,mp->dl) ) {
 				mulq(mul,(Q)mp->c,&mat[i][j]);
 				mp = NEXT(mp);
 			}
 	}
-	generic_gauss_elim_hensel(mobj,&sol,&dnsol,&rinfo,&cinfo);
-	solmat = (Q **)BDY(sol);
-	for ( i = 0, mp0 = 0; i < dim; i++ )
-		if ( solmat[i][0] ) {
+	get_eg(&eg0);
+	rank = generic_gauss_elim_hensel(mobj,&sol,&dnsol,&rinfo,&cinfo);
+	get_eg(&eg1); add_eg(&eg_le,&eg0,&eg1);
+	if ( cinfo[0] == dim ) {
+		/* the input is invertible */
+		solmat = (Q **)BDY(sol);
+		for ( i = dim-1, mp0 = 0; i >= 0; i-- )
+			if ( solmat[i][0] ) {
+				NEXTMP(mp0,mp);
+				mp->c = (P)solmat[i][0];
+				mp->dl = BDY(mb[i])->dl;
+			}
+		NEXT(mp) = 0; MKDP(n,mp0,u);
+		mulq(dnsol,nmc,&dn1);
+		MKDAlg(u,dn1,r);
+		rmcontdalg(r,c);
+		return 1;
+	} else
+		return 0;
+}
+
+NODE inv_or_split_dalg(DAlg a,DAlg *c)
+{
+	NumberField nf;
+	int dim,n,i,j,k,l;
+	DP *mb;
+	DP m,d,u;
+	N ln,gn,qn;
+	DAlg *simp;
+	DAlg t,a0,r;
+	Q dn,dnsol,mul,nmc,dn1;
+	MAT mobj,sol;
+	Q **mat,**solmat;
+	MP mp0,mp;
+	int *rinfo,*cinfo;
+	int rank,nparam;
+	NODE nd0,nd,ndt;
+	struct order_spec *current_spec;
+	struct oEGT eg0,eg1;
+	extern struct oEGT eg_le;
+
+	if ( !(nf=current_numberfield) )
+		error("invdalg : current_numberfield is not set");
+	if ( !a )
+		error("invdalg : division by 0");
+	else if ( NID(a) == N_Q ) {
+		invq((Q)a,&dn); *c = (DAlg)dn;
+		return;
+	}
+	dim = nf->dim;
+	mb = nf->mb;
+	n = nf->n;
+	ln = ONEN;
+	dp_ptozp(a->nm,&u); divq((Q)BDY(a->nm)->c,(Q)BDY(u)->c,&nmc);
+	MKDAlg(u,ONE,a0);
+	simp = (DAlg *)ALLOCA(dim*sizeof(DAlg));
+	current_spec = dp_current_spec; initd(nf->spec);
+	for ( i = 0; i < dim; i++ ) {
+		m = mb[i];
+		for ( j = i-1; j >= 0; j-- )
+			if ( dp_redble(m,mb[j]) )
+				break;
+		if ( j >= 0 ) {
+			dp_subd(m,mb[j],&d);
+			muld(CO,d,simp[j]->nm,&u);
+			MKDAlg(u,simp[j]->dn,t);
+			simpdalg(t,&simp[i]);
+		} else {
+			MKDAlg(m,ONE,t);
+			muldalg(t,a0,&simp[i]);
+		}
+		gcdn(NM(simp[i]->dn),ln,&gn); divsn(ln,gn,&qn);
+		muln(NM(simp[i]->dn),qn,&ln);
+	}
+	initd(current_spec);
+	NTOQ(ln,1,dn);
+	MKMAT(mobj,dim,dim+1);
+	mat = (Q **)BDY(mobj);
+	mulq(dn,a->dn,&mat[0][dim]);
+	for ( j = 0; j < dim; j++ ) {
+		divq(dn,simp[j]->dn,&mul);
+		for ( i = dim-1, mp = BDY(simp[j]->nm); mp && i >= 0; i-- )
+			if ( dl_equal(n,BDY(mb[i])->dl,mp->dl) ) {
+				mulq(mul,(Q)mp->c,&mat[i][j]);
+				mp = NEXT(mp);
+			}
+	}
+	get_eg(&eg0);
+	rank = generic_gauss_elim_hensel(mobj,&sol,&dnsol,&rinfo,&cinfo);
+	get_eg(&eg1); add_eg(&eg_le,&eg0,&eg1);
+	if ( cinfo[0] == dim ) {
+		/* the input is invertible */
+		solmat = (Q **)BDY(sol);
+		for ( i = dim-1, mp0 = 0; i >= 0; i-- )
+			if ( solmat[i][0] ) {
+				NEXTMP(mp0,mp);
+				mp->c = (P)solmat[i][0];
+				mp->dl = BDY(mb[i])->dl;
+			}
+		NEXT(mp) = 0; MKDP(n,mp0,u);
+		mulq(dnsol,nmc,&dn1);
+		MKDAlg(u,dn1,r);
+		rmcontdalg(r,c);
+		return 0;
+	} else {
+		/* the input is not invertible */
+		nparam = (dim+1)-rank;
+		/* the index 'dim' should not be in cinfo[] */
+		solmat = (Q **)BDY(sol);
+		for ( k = 0; k < nparam; k++ )
+			if ( cinfo[k] == dim )
+				error("invdalg : cannot happen");
+		nd0 = 0;
+		for ( k = 0; k < nparam; k++ ) {
+			m = mb[cinfo[k]];
+			for ( ndt = nd0; ndt; ndt = NEXT(ndt) ) {
+				if ( dp_redble(m,(DP)BDY(ndt)) ) break;
+			}
+			/* skip a redundunt basis element */
+			if ( ndt ) continue;
+			/* construct a new basis element */
+			mp0 = 0;
 			NEXTMP(mp0,mp);
-			mp->c = (P)solmat[i][0];
-			mp->dl = BDY(mb[i])->dl;
+			chsgnq(dnsol,&dn1); mp->c = (P)dn1;
+			mp->dl = BDY(m)->dl;
+			/* skip the last parameter */
+			for ( l = rank-2; l >= 0; l-- ) {
+				if ( solmat[l][k] ) {
+					NEXTMP(mp0,mp);
+					mp->c = (P)solmat[l][k];
+					mp->dl = BDY(mb[rinfo[l]])->dl;
+				}
+			}
+			NEXT(mp) = 0; MKDP(n,mp0,u);
+			NEXTNODE(nd0,nd);
+			BDY(nd) = (pointer)u;
+			NEXT(nd) = 0;
 		}
-	NEXT(mp) = 0; MKDP(n,mp0,u);
-	MKDAlg(u,dnsol,r);
-	rmcontdalg(r,c);
+		NEXT(nd) = 0;
+		return nd0;
+	}
 }
 
 void chsgndalg(DAlg a,DAlg *c)
 {
 	DP nm;
+	Q t;
 
 	if ( !a ) *c = 0;
-	else {
+	else if ( NID(a) == N_Q ) {
+		chsgnq((Q)a,&t); *c = (DAlg)t;
+	} else {
 		chsgnd(a->nm,&nm);
 		MKDAlg(nm,a->dn,*c);
 	}
@@ -363,18 +727,27 @@ void pwrdalg(DAlg a,Q e,DAlg *c)
 {
 	NumberField nf;
 	DAlg t,z,y;
+	Q q;
 	N en,qn;
 	int r;
+	int ret;
 
 	if ( !(nf=current_numberfield) )
 		error("pwrdalg : current_numberfield is not set");
-	if ( !e )
+	if ( !a )
+		*c = !e ? (DAlg)ONE : 0;
+	else if ( NID(a) == N_Q ) {
+		pwrq((Q)a,e,&q); *c = (DAlg)q;
+	} else if ( !e )
 		*c = nf->one;
 	else if ( UNIQ(e) )
 		*c = a;
 	else {
 		if ( SGN(e) < 0 ) {
-			invdalg(a,&t); a = t;
+			ret = invdalg(a,&t); 
+			if ( !ret )
+				error("pwrdalg : the denominator is not invertible");
+			a = t;
 		}
 		en = NM(e);
 		y = nf->one;
@@ -402,3 +775,48 @@ int cmpdalg(DAlg a,DAlg b)
 	else
 		return SGN((Q)BDY(c->nm)->c);
 }
+
+/* convert da to a univariate poly; return the position of variable */
+
+int dalgtoup(DAlg da,P *up,Q *dn)
+{
+	int nv,i,hi,current_d;
+	DCP dc0,dc;
+	MP h,mp0,mp,t;
+	DL hd,d;
+	DP c;
+	DAlg cc;
+	P v;
+
+	nv = da->nm->nv;
+	h = BDY(da->nm);
+	*dn = da->dn;
+	hd = h->dl;
+	for ( i = 0; i < nv; i++ )
+		if ( hd->d[i] ) break;
+	hi = i;
+	current_d = hd->d[i];
+	dc0 = 0;
+	mp0 = 0;
+	for ( t = h; t; t = NEXT(t) ) {
+		NEWDL(d,nv);
+		for ( i = 0; i <= hi; i++ ) d->d[i] = 0;
+		for ( ; i < nv; i++ ) d->d[i] = t->dl->d[i];
+		d->td = t->dl->td - t->dl->d[hi];
+		if ( t->dl->d[hi] != current_d ) {
+			NEXT(mp) = 0; MKDP(nv,mp0,c); MKDAlg(c,ONE,cc);
+			NEXTDC(dc0,dc); STOQ(current_d,DEG(dc)); COEF(dc) = (P)cc;
+			current_d = t->dl->d[hi];
+			mp0 = 0;
+		}
+		NEXTMP(mp0,mp);
+		mp->c = t->c; mp->dl = d;
+	}
+	NEXT(mp) = 0; MKDP(nv,mp0,c); MKDAlg(c,ONE,cc);
+	NEXTDC(dc0,dc); STOQ(current_d,DEG(dc)); COEF(dc) = (P)cc;
+	NEXT(dc) = 0;
+	makevar("x",&v);
+	MKP(VR(v),dc0,*up);
+	return hi;
+}
+