===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/algnum.c,v
retrieving revision 1.7
retrieving revision 1.9
diff -u -p -r1.7 -r1.9
--- OpenXM_contrib2/asir2000/builtin/algnum.c	2004/12/02 13:48:43	1.7
+++ OpenXM_contrib2/asir2000/builtin/algnum.c	2004/12/06 09:29:34	1.9
@@ -45,7 +45,7 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/builtin/algnum.c,v 1.6 2004/12/01 08:49:42 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/algnum.c,v 1.8 2004/12/06 01:15:18 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -62,6 +62,7 @@ void algtorat(Num,Obj *);
 void rattoalg(Obj,Alg *);
 void ptoalgp(P,P *);
 void clctalg(P,VL *);
+void get_algtree(Obj f,VL *r);
 
 struct ftab alg_tab[] = {
 	{"set_field",Pset_field,1},
@@ -266,6 +267,7 @@ LIST *rp;
 	Alg b;
 	NODE n0,n;
 
+#if 0
 	if ( !(a = (Num)ARG0(arg)) || NID(a) <= N_R )
 		vl = 0;
 	else {
@@ -281,6 +283,9 @@ LIST *rp;
 				vl = 0; break;
 		}
 	}
+#else
+	get_algtree((Obj)ARG0(arg),&vl);
+#endif
 	for ( n0 = 0; vl; vl = NEXT(vl) ) {
 		NEXTNODE(n0,n); MKV(vl->v,p); MKAlg(p,b); BDY(n) = (pointer)b;
 	}
@@ -576,4 +581,158 @@ void invalg_le(Alg a,LIST *r)
 	divq(c2,cont,&c3);
 	b = mknode(2,inv,c3);
 	MKLIST(*r,b);
+}
+
+void get_algtree(Obj f,VL *r)
+{
+	VL vl1,vl2,vl3;
+	Obj t;
+	DCP dc;
+	NODE b;
+	pointer *a;
+	pointer **m;
+	int len,row,col,i,j,l;
+
+	if ( !f ) *r = 0;
+	else
+		switch ( OID(f) ) {
+			case O_N:
+				if ( NID((Num)f) != N_A ) *r = 0;
+				else  {
+					t = BDY((Alg)f);
+					switch ( OID(t) ) {
+						case O_P:
+							clctalg((P)t,r); break;
+						case O_R:
+							clctalg(NM((R)t),&vl1);
+							clctalg(DN((R)t),&vl2);
+							mergev(ALG,vl1,vl2,r); break;
+						default:
+							*r = 0; break;
+					}
+				}
+				break;
+			case O_P:
+				vl1 = 0;
+				for ( dc = DC((P)f); dc; dc = NEXT(dc) ) {
+					get_algtree((Obj)COEF(dc),&vl2);
+					mergev(ALG,vl1,vl2,&vl3);
+					vl1 = vl3;
+				}
+				*r = vl1;
+				break;
+			case O_R:
+				get_algtree((Obj)NM((R)f),&vl1);
+				get_algtree((Obj)DN((R)f),&vl2);
+				mergev(ALG,vl1,vl2,r);
+				break;
+			case O_LIST:
+				vl1 = 0;
+				for ( b = BDY((LIST)f); b; b = NEXT(b) ) {
+					get_algtree((Obj)BDY(b),&vl2);
+					mergev(ALG,vl1,vl2,&vl3);
+					vl1 = vl3;
+				}
+				*r = vl1;
+				break;
+			case O_VECT:
+				vl1 = 0;
+				l = ((VECT)f)->len;
+				a = BDY((VECT)f);
+				for ( i = 0; i < l; i++ ) {
+					get_algtree((Obj)a[i],&vl2);
+					mergev(ALG,vl1,vl2,&vl3);
+					vl1 = vl3;
+				}
+				*r = vl1;
+				break;
+			case O_MAT:
+				vl1 = 0;
+				row = ((MAT)f)->row; col = ((MAT)f)->col;
+				m = BDY((MAT)f);
+				for ( i = 0; i < row; i++ )
+					for ( j = 0; j < col; j++ ) {
+						get_algtree((Obj)m[i][j],&vl2);
+						mergev(ALG,vl1,vl2,&vl3);
+						vl1 = vl3;
+					}
+				*r = vl1;
+				break;
+			default:
+				*r = 0;
+				break;
+		}
+}
+
+void algobjtorat(Obj f,Obj *r)
+{
+	Obj t;
+	DCP dc,dcr,dcr0;
+	P p,nm,dn;
+	R rat;
+	NODE b,s,s0;
+	VECT v;
+	MAT mat;
+	LIST list;
+	pointer *a;
+	pointer **m;
+	int len,row,col,i,j,l;
+
+	if ( !f ) *r = 0;
+	else
+		switch ( OID(f) ) {
+			case O_N:
+				algtorat((Num)f,r);
+				break;
+			case O_P:
+				dcr0 = 0;
+				for ( dc = DC((P)f); dc; dc = NEXT(dc) ) {
+					NEXTDC(dcr0,dcr);
+					algobjtorat((Obj)COEF(dc),&t);
+					COEF(dcr) = (P)t;
+					DEG(dcr) = DEG(dc);
+				}
+				NEXT(dcr) = 0; MKP(VR((P)f),dcr0,p); *r = (Obj)p;
+				break;
+			case O_R:
+				algobjtorat((Obj)NM((R)f),&t); nm = (P)t;
+				algobjtorat((Obj)DN((R)f),&t); dn = (P)t;
+				MKRAT(nm,dn,0,rat); *r = (Obj)rat;
+				break;
+			case O_LIST:
+				s0 = 0;
+				for ( b = BDY((LIST)f); b; b = NEXT(b) ) {
+					NEXTNODE(s0,s);
+					algobjtorat((Obj)BDY(b),&t);
+					BDY(s) = (pointer)t;
+				}
+				NEXT(s) = 0;
+				MKLIST(list,s0);
+				*r = (Obj)list;
+				break;
+			case O_VECT:
+				l = ((VECT)f)->len;
+				a = BDY((VECT)f);
+				MKVECT(v,l);
+				for ( i = 0; i < l; i++ ) {
+					algobjtorat((Obj)a[i],&t);
+					BDY(v)[i] = (pointer)t;
+				}
+				*r = (Obj)v;
+				break;
+			case O_MAT:
+				row = ((MAT)f)->row; col = ((MAT)f)->col;
+				m = BDY((MAT)f);
+				MKMAT(mat,row,col);
+				for ( i = 0; i < row; i++ )
+					for ( j = 0; j < col; j++ ) {
+						algobjtorat((Obj)m[i][j],&t);
+						BDY(mat)[i][j] = (pointer)t;
+					}
+				*r = (Obj)mat;
+				break;
+			default:
+				*r = f;
+				break;
+		}
 }