===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/dalg.c,v
retrieving revision 1.3
retrieving revision 1.6
diff -u -p -r1.3 -r1.6
--- OpenXM_contrib2/asir2000/engine/dalg.c	2004/12/02 13:48:43	1.3
+++ OpenXM_contrib2/asir2000/engine/dalg.c	2004/12/07 15:15:52	1.6
@@ -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.5 2004/12/04 09:39:27 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;
@@ -58,6 +65,208 @@ void setfield_dalg(NODE alist)
 		mb[i] = (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;
@@ -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,7 @@ void muldalg(DAlg a,DAlg b,DAlg *c)
 
 void divdalg(DAlg a,DAlg b,DAlg *c)
 {
-	DAlg inv;
+	DAlg inv,t;
 
 	if ( !current_numberfield )
 		error("divdalg : current_numberfield is not set");
@@ -254,6 +471,7 @@ void divdalg(DAlg a,DAlg b,DAlg *c)
 	if ( !a )
 		c = 0;
 	else {
+		qtodalg((Q)a,&t); a = t; qtodalg((Q)b,&t); b = t;
 		invdalg(b,&inv);
 		muldalg(a,inv,c);
 	}
@@ -293,11 +511,17 @@ void invdalg(DAlg a,DAlg *c)
 	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");
 	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;
@@ -335,7 +559,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] ) {
@@ -351,9 +577,12 @@ void invdalg(DAlg a,DAlg *c)
 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,12 +592,17 @@ void pwrdalg(DAlg a,Q e,DAlg *c)
 {
 	NumberField nf;
 	DAlg t,z,y;
+	Q q;
 	N en,qn;
 	int r;
 
 	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;