===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/dalg.c,v
retrieving revision 1.9
retrieving revision 1.13
diff -u -p -r1.9 -r1.13
--- OpenXM_contrib2/asir2000/engine/dalg.c	2005/07/11 00:24:02	1.9
+++ OpenXM_contrib2/asir2000/engine/dalg.c	2006/01/05 00:21:20	1.13
@@ -1,5 +1,5 @@
 /*
- * $OpenXM: OpenXM_contrib2/asir2000/engine/dalg.c,v 1.8 2005/01/23 14:03:47 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2000/engine/dalg.c,v 1.12 2005/10/12 14:43:36 noro Exp $
 */
 
 #include "ca.h"
@@ -65,6 +65,48 @@ void setfield_dalg(NODE alist)
 		mb[dim-i-1] = (DP)BDY(t);	
 }
 
+void setfield_gb(NODE gb,VL vl,struct order_spec *spec)
+{
+	NumberField nf;
+	VL vl1,vl2;
+	int n,i,dim;
+	Alg *gen;
+	P *defpoly;
+	P p;
+	Q c,iq,two;
+	DP *ps,*mb;
+	DP one;
+	NODE t,b,b1,b2,hlist,mblist;
+	struct order_spec *current_spec;
+
+	nf = (NumberField)MALLOC(sizeof(struct oNumberField));
+	current_numberfield = nf;
+	for ( vl1 = vl, n = 0; vl1; vl1 = NEXT(vl1), n++ );
+	nf->n = n;
+	nf->psn = length(gb);
+	nf->vl = vl;
+	nf->defpoly = defpoly = (P *)MALLOC(nf->psn*sizeof(P));
+	nf->ps = ps = (DP *)MALLOC(nf->psn*sizeof(DP));
+	current_spec = dp_current_spec;
+	nf->spec = spec;
+	initd(nf->spec);	
+	for ( b = hlist = 0, i = 0, t = gb; i < nf->psn; t = NEXT(t), i++ ) {
+		ptozp((P)BDY(t),1,&c,&defpoly[i]);
+		ptod(CO,vl,defpoly[i],&ps[i]);
+		STOQ(i,iq); MKNODE(b1,(pointer)iq,b); b = b1;
+		MKNODE(b2,(pointer)ps[i],hlist); hlist = b2;
+	}
+	ptod(ALG,vl,(P)ONE,&one);
+	MKDAlg(one,ONE,nf->one);
+	nf->ind = b;
+	dp_mbase(hlist,&mblist);
+	initd(current_spec);
+	nf->dim = dim = length(mblist);
+	nf->mb = mb = (DP *)MALLOC(dim*sizeof(DP));
+	for ( i = 0, t = mblist; t; t = NEXT(t), i++ )
+		mb[dim-i-1] = (DP)BDY(t);	
+}
+
 void qtodalg(Q q,DAlg *r)
 {
 	NumberField nf;
@@ -358,10 +400,13 @@ void simpdalg(DAlg da,DAlg *r)
 	}
 	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);
+	if ( !nm ) *r = 0;
+	else {
+		initd(current_spec);
+		mulq(da->dn,dn,&dn1);
+		MKDAlg(nm,dn1,d);
+		rmcontdalg(d,r);
+	}
 }
 
 void adddalg(DAlg a,DAlg b,DAlg *c)
@@ -606,6 +651,7 @@ NODE inv_or_split_dalg(DAlg a,DAlg *c)
 	struct order_spec *current_spec;
 	struct oEGT eg0,eg1;
 	extern struct oEGT eg_le;
+	extern int DP_Print;
 
 	if ( !(nf=current_numberfield) )
 		error("invdalg : current_numberfield is not set");
@@ -624,21 +670,27 @@ NODE inv_or_split_dalg(DAlg a,DAlg *c)
 	simp = (DAlg *)ALLOCA(dim*sizeof(DAlg));
 	current_spec = dp_current_spec; initd(nf->spec);
 	for ( i = 0; i < dim; i++ ) {
+		if ( DP_Print ) { fprintf(asir_out,"."); fflush(asir_out); }
 		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]);
+			if ( simp[j] ) {
+				muld(CO,d,simp[j]->nm,&u);
+				MKDAlg(u,simp[j]->dn,t);
+				simpdalg(t,&simp[i]);
+			} else
+				simp[i] = 0;
 		} 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);
+		if ( 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);
@@ -646,15 +698,17 @@ NODE inv_or_split_dalg(DAlg a,DAlg *c)
 	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);
-			}
+		if ( simp[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);
+	rank = generic_gauss_elim_hensel_dalg(mobj,&sol,&dnsol,&rinfo,&cinfo);
 	get_eg(&eg1); add_eg(&eg_le,&eg0,&eg1);
 	if ( cinfo[0] == dim ) {
 		/* the input is invertible */
@@ -672,21 +726,12 @@ NODE inv_or_split_dalg(DAlg a,DAlg *c)
 		return 0;
 	} else {
 		/* the input is not invertible */
-		nparam = (dim+1)-rank;
-		/* the index 'dim' should not be in cinfo[] */
+		nparam = sol->col;
 		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 */
+			m = mb[cinfo[k]];
 			mp0 = 0;
 			NEXTMP(mp0,mp);
 			chsgnq(dnsol,&dn1); mp->c = (P)dn1;