===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/dalg.c,v
retrieving revision 1.4
retrieving revision 1.7
diff -u -p -r1.4 -r1.7
--- OpenXM_contrib2/asir2000/engine/dalg.c	2004/12/03 07:16:34	1.4
+++ OpenXM_contrib2/asir2000/engine/dalg.c	2004/12/10 02:45:02	1.7
@@ -1,5 +1,5 @@
 /*
- * $OpenXM: OpenXM_contrib2/asir2000/engine/dalg.c,v 1.3 2004/12/02 13:48:43 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2000/engine/dalg.c,v 1.6 2004/12/07 15:15:52 noro Exp $
 */
 
 #include "ca.h"
@@ -10,7 +10,14 @@ extern struct order_spec *dp_current_spec;
 void simpdalg(DAlg da,DAlg *r);
 void 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;
@@ -84,6 +91,182 @@ void qtodalg(Q q,DAlg *r)
 		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;
@@ -165,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");
@@ -172,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);
@@ -319,12 +505,14 @@ void invdalg(DAlg a,DAlg *c)
 	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;
 	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");
@@ -338,7 +526,8 @@ void invdalg(DAlg a,DAlg *c)
 	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-- ) {
@@ -371,7 +560,9 @@ void invdalg(DAlg a,DAlg *c)
 				mp = NEXT(mp);
 			}
 	}
+	get_eg(&eg0);
 	generic_gauss_elim_hensel(mobj,&sol,&dnsol,&rinfo,&cinfo);
+	get_eg(&eg1); add_eg(&eg_le,&eg0,&eg1);
 	solmat = (Q **)BDY(sol);
 	for ( i = 0, mp0 = 0; i < dim; i++ )
 		if ( solmat[i][0] ) {
@@ -380,7 +571,8 @@ void invdalg(DAlg a,DAlg *c)
 			mp->dl = BDY(mb[i])->dl;
 		}
 	NEXT(mp) = 0; MKDP(n,mp0,u);
-	MKDAlg(u,dnsol,r);
+	mulq(dnsol,nmc,&dn1);
+	MKDAlg(u,dn1,r);
 	rmcontdalg(r,c);
 }