===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/puref.c,v
retrieving revision 1.2
retrieving revision 1.10
diff -u -p -r1.2 -r1.10
--- OpenXM_contrib2/asir2000/parse/puref.c	2000/08/21 08:31:47	1.2
+++ OpenXM_contrib2/asir2000/parse/puref.c	2014/09/19 01:26:00	1.10
@@ -23,7 +23,7 @@
  * shall be made on your publication or presentation in any form of the
  * results obtained by use of the SOFTWARE.
  * (4) In the event that you modify the SOFTWARE, you shall notify FLL by
- * e-mail at risa-admin@flab.fujitsu.co.jp of the detailed specification
+ * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification
  * for such modification or the source code of the modified part of the
  * SOFTWARE.
  * 
@@ -45,16 +45,14 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/parse/puref.c,v 1.1.1.1 1999/12/03 07:39:12 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/puref.c,v 1.9 2013/02/15 07:05:49 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
 
 NODE pflist;
 
-void searchpf(name,fp)
-char *name;
-FUNC *fp;
+void searchpf(char *name,FUNC *fp)
 {
 	NODE node;
 	PF pf;
@@ -65,15 +63,13 @@ FUNC *fp;
 			pf = (PF)node->body;
 			*fp = t = (FUNC)MALLOC(sizeof(struct oFUNC));
 			t->name = name; t->id = A_PURE; t->argc = pf->argc;
-			t->f.puref = pf;
+			t->f.puref = pf; t->fullname = name;
 			return;
 		}
 	*fp = 0;
 }
 
-void searchc(name,fp)
-char *name;
-FUNC *fp;
+void searchc(char *name,FUNC *fp)
 {
 	NODE node;
 	PF pf;
@@ -85,20 +81,14 @@ FUNC *fp;
 			pf = (PF)node->body;
 			*fp = t = (FUNC)MALLOC(sizeof(struct oFUNC));
 			t->name = name; t->id = A_PURE; t->argc = pf->argc;
-			t->f.puref = pf;
+			t->f.puref = pf; t->fullname = name;
 			return;
 		}
 	*fp = 0;
 }
 
-void mkpf(name,body,argc,args,parif,libmf,simp,pfp)
-char *name;
-Obj body;
-int argc;
-V *args;
-int (*parif)(),(*simp)();
-double (*libmf)();
-PF *pfp;
+void mkpf(char *name,Obj body,int argc,V *args,
+	int (*parif)(),double (*libmf)(), int (*simp)(),PF *pfp)
 {
 	PF pf;
 	NODE node;
@@ -123,10 +113,7 @@ PF *pfp;
    each arg.
  */
 
-void mkpfins(pf,args,vp)
-PF pf;
-V *args;
-V *vp;
+void mkpfins(PF pf,V *args,V *vp)
 {
 	V v;
 	PFINS ins;
@@ -147,10 +134,7 @@ V *vp;
 
 /* the same as above. Argements are given as an array of Obj */
 
-void _mkpfins(pf,args,vp)
-PF pf;
-Obj *args;
-V *vp;
+void _mkpfins(PF pf,Obj *args,V *vp)
 {
 	V v;
 	PFINS ins;
@@ -170,11 +154,7 @@ V *vp;
 
 /* the same as above. darray is also given */
 
-void _mkpfins_with_darray(pf,args,darray,vp)
-PF pf;
-Obj *args;
-int *darray;
-V *vp;
+void _mkpfins_with_darray(PF pf,Obj *args,int *darray,V *vp)
 {
 	V v;
 	PFINS ins;
@@ -192,9 +172,7 @@ V *vp;
 	appendpfins(v,vp);
 }
 
-void appendpfins(v,vp)
-V v;
-V *vp;
+void appendpfins(V v,V *vp)
 {
 	PF fdef;
 	PFAD ad,tad;
@@ -205,7 +183,7 @@ V *vp;
 	for ( node = fdef->ins; node; node = NEXT(node) ) {
 		for ( i = 0, tad = ((PFINS)((V)node->body)->priv)->ad; 
 			i < fdef->argc; i++ )
-			if ( (ad[i].d != tad[i].d) || compr(CO,ad[i].arg,tad[i].arg) )
+			if ( (ad[i].d != tad[i].d) || !equalr(CO,ad[i].arg,tad[i].arg) )
 				break;
 		if ( i == fdef->argc ) {
 			*vp = (V)node->body;
@@ -216,9 +194,7 @@ V *vp;
 	fdef->ins = node; appendvar(CO,v); *vp = v;
 }
 
-void duppfins(v,vp)
-V v;
-V *vp;
+void duppfins(V v,V *vp)
 {
 	V tv;
 	PFINS tins;
@@ -231,10 +207,7 @@ V *vp;
 	*vp = tv;
 }
 
-void derivvar(vl,pf,v,a)
-VL vl;
-V pf,v;
-Obj *a;
+void derivvar(VL vl,V pf,V v,Obj *a)
 {
 	Obj t,s,u,w,u1;
 	P p;
@@ -264,10 +237,7 @@ Obj *a;
 	}
 }
 
-void derivr(vl,a,v,b)
-VL vl;
-V v;
-Obj a,*b;
+void derivr(VL vl,Obj a,V v,Obj *b)
 {
 	VL tvl,svl;
 	Obj r,s,t,u,nm,dn,dnm,ddn,m;
@@ -314,14 +284,61 @@ Obj a,*b;
 	}
 }
 
-void substr(vl,partial,a,v,b,c)
-VL vl;
-int partial;
-Obj a;
-V v;
-Obj b;
-Obj *c;
+void simple_derivr(VL vl,Obj a,V v,Obj *b)
 {
+	Obj r,s,t,u,nm,dn;
+
+	if ( !a || NUM(a) ) 
+		*b = 0;
+	else
+		switch ( OID(a) ) {
+			case O_P:
+				pderivr(vl,a,v,b); break;
+			case O_R:
+				nm = (Obj)NM((R)a); dn = (Obj)DN((R)a);
+				/* (nm/dn)' = nm'/dn - dn'/dn*nm/dn */
+				pderivr(vl,nm,v,&s); divr(vl,s,dn,&u); reductr(vl,u,&t);
+				pderivr(vl,dn,v,&s); divr(vl,s,dn,&u); reductr(vl,u,&s); mulr(vl,s,a,&u);
+				subr(vl,t,u,&s); reductr(vl,s,b);
+				break;
+			default:
+				error("simple_derivr : invalid argument");
+	}
+}
+
+int obj_is_dependent(Obj a,V v)
+{
+	if ( !a || OID(a) <= O_N ) return 0;
+	else if ( OID(a) == O_P ) return poly_is_dependent((P)a,v);
+	else if ( OID(a) == O_R ) return poly_is_dependent(NM((R)a),v) 
+		|| poly_is_dependent(DN((R)a),v);
+	else
+		error("obj_is_dependent : not implemented");
+}
+
+int poly_is_dependent(P p,V v)
+{
+	DCP dc;
+
+	if ( !p || OID(p) <= O_N ) return 0;
+	else if ( v == VR(p) ) return 1;
+	else {
+		for ( dc = DC(p); dc; dc = NEXT(dc) )
+			if ( poly_is_dependent(COEF(dc),v) ) return 1;
+		return 0;
+	}
+}
+
+void gen_pwrr(VL vl,Obj a,Obj d,Obj *r)
+{
+	if ( INT(d) )
+		pwrr(vl,a,d,r);
+	else
+		mkpow(vl,a,d,r);
+}
+
+void substr(VL vl,int partial,Obj a,V v,Obj b,Obj *c)
+{
 	Obj nm,dn,t;
 
 	if ( !a )
@@ -343,13 +360,7 @@ Obj *c;
 	}
 }
 
-void substpr(vl,partial,p,v0,p0,pr)
-VL vl;
-int partial;
-V v0;
-Obj p;
-Obj p0;
-Obj *pr;
+void substpr(VL vl,int partial,Obj p,V v0,Obj p0,Obj *pr)
 {
 	P x;
 	Obj t,m,c,s,a;
@@ -380,7 +391,8 @@ Obj *pr;
 		for ( c = 0, dc = DC((P)p); dc; dc = NEXT(dc) ) {
 			substpr(vl,partial,(Obj)COEF(dc),v0,p0,&t);
 			if ( DEG(dc) ) {
-				pwrp(vl,x,DEG(dc),(P *)&s); mulr(vl,s,t,&m); 
+				gen_pwrr(vl,(Obj)x,(Obj)DEG(dc),&s);
+				mulr(vl,s,t,&m); 
 				addr(vl,m,c,&a); c = a;
 			} else {
 				addr(vl,t,c,&a); c = a;
@@ -394,7 +406,8 @@ Obj *pr;
 		else
 			c = (Obj)COEF(dc);
 		for ( d = DEG(dc), dc = NEXT(dc); dc; d = DEG(dc), dc = NEXT(dc) ) {
-				subq(d,DEG(dc),(Q *)&t); pwrr(vl,p0,t,&s); mulr(vl,s,c,&m); 
+				subq(d,DEG(dc),(Q *)&t);
+				gen_pwrr(vl,p0,t,&s); mulr(vl,s,c,&m); 
 				if ( !partial )
 					substpr(vl,partial,(Obj)COEF(dc),v0,p0,&t); 
 				else
@@ -402,18 +415,15 @@ Obj *pr;
 				addr(vl,m,t,&c); 
 		}
 		if ( d ) {
-			pwrr(vl,p0,(Obj)d,&t); mulr(vl,t,c,&m); 
+			gen_pwrr(vl,p0,(Obj)d,&t);
+			mulr(vl,t,c,&m); 
 			c = m;
 		}
 		*pr = c;
 	}
 }
 
-void evalr(vl,a,prec,c)
-VL vl;
-Obj a;
-int prec;
-Obj *c;
+void evalr(VL vl,Obj a,int prec,Obj *c)
 {
 	Obj nm,dn;
 
@@ -435,11 +445,7 @@ Obj *c;
 	}
 }
 
-void evalp(vl,p,prec,pr)
-VL vl;
-P p;
-int prec;
-P *pr;
+void evalp(VL vl,P p,int prec,P *pr)
 {
 	P t;
 	DCP dc,dcr0,dcr;
@@ -467,11 +473,7 @@ P *pr;
 	}
 }
 
-void evalv(vl,v,prec,rp)
-VL vl;
-V v;
-int prec;
-Obj *rp;
+void evalv(VL vl,V v,int prec,Obj *rp)
 {
 	PFINS ins,tins;
 	PFAD ad,tad;
@@ -492,10 +494,7 @@ Obj *rp;
 	}
 }
 
-void evalins(ins,prec,rp)
-PFINS ins;
-int prec;
-Obj *rp;
+void evalins(PFINS ins,int prec,Obj *rp)
 {
 	PF pf;
 	PFAD ad;
@@ -524,15 +523,7 @@ Obj *rp;
 	}
 }
 
-void devalins(PFINS,Obj *);
-void devalv(VL,V,Obj *);
-void devalp(VL,P,P *);
-void devalr(VL,Obj,Obj *);
-
-void devalr(vl,a,c)
-VL vl;
-Obj a;
-Obj *c;
+void devalr(VL vl,Obj a,Obj *c)
 {
 	Obj nm,dn;
 	double d;
@@ -560,10 +551,7 @@ Obj *c;
 	}
 }
 
-void devalp(vl,p,pr)
-VL vl;
-P p;
-P *pr;
+void devalp(VL vl,P p,P *pr)
 {
 	P t;
 	DCP dc,dcr0,dcr;
@@ -606,16 +594,12 @@ P *pr;
 	}
 }
 
-void devalv(vl,v,rp)
-VL vl;
-V v;
-Obj *rp;
+void devalv(VL vl,V v,Obj *rp)
 {
 	PFINS ins,tins;
 	PFAD ad,tad;
 	PF pf;
 	P t;
-	Obj s;
 	int i;
 
 	if ( (vid)v->attr != V_PF ) {
@@ -631,16 +615,13 @@ Obj *rp;
 	}
 }
 
-void devalins(ins,rp)
-PFINS ins;
-Obj *rp;
+void devalins(PFINS ins,Obj *rp)
 {
 	PF pf;
 	PFAD ad;
 	int i;
 	Real r;
 	double d;
-	Q q;
 	V v;
 	P x;
 
@@ -671,13 +652,25 @@ Obj *rp;
 	}
 }
 
-void simplify_ins(ins,rp)
-PFINS ins;
-Obj *rp;
+extern int evalef;
+
+void simplify_elemfunc_ins(PFINS ins,Obj *rp)
 {
 	V v;
 	P t;
 
+  if ( evalef )
+    evalins(ins,0,rp); 
+  else {
+	  instov(ins,&v); MKV(v,t); *rp = (Obj)t;
+  }
+}
+
+void simplify_ins(PFINS ins,Obj *rp)
+{
+	V v;
+	P t;
+
 	if ( ins->pf->simplify )
 		(*ins->pf->simplify)(ins,rp);
 	else {
@@ -685,9 +678,7 @@ Obj *rp;
 	}
 }
 
-void instov(ins,vp)
-PFINS ins;
-V *vp;
+void instov(PFINS ins,V *vp)
 {
 	V v;
 
@@ -696,11 +687,7 @@ V *vp;
 	appendpfins(v,vp);
 }
 
-void substfr(vl,a,u,f,c)
-VL vl;
-Obj a;
-PF u,f;
-Obj *c;
+void substfr(VL vl,Obj a,PF u,PF f,Obj *c)
 {
 	Obj nm,dn;
 
@@ -722,11 +709,7 @@ Obj *c;
 	}
 }
 
-void substfp(vl,p,u,f,pr)
-VL vl;
-Obj p;
-PF u,f;
-Obj *pr;
+void substfp(VL vl,Obj p,PF u,PF f,Obj *pr)
 {
 	V v;
 	DCP dc;
@@ -745,7 +728,8 @@ Obj *pr;
 			for ( c = 0; dc; dc = NEXT(dc) ) {
 				substfp(vl,(Obj)COEF(dc),u,f,&t);
 				if ( DEG(dc) ) {
-					pwrp(vl,x,DEG(dc),(P *)&s); mulr(vl,s,t,&m); 
+					gen_pwrr(vl,(Obj)x,(Obj)DEG(dc),&s);
+					mulr(vl,s,t,&m); 
 					addr(vl,m,c,&a); c = a;
 				} else {
 					addr(vl,t,c,&a); c = a;
@@ -755,11 +739,12 @@ Obj *pr;
 			substfv(vl,v,u,f,&p0);
 			substfp(vl,(Obj)COEF(dc),u,f,&c); 
 			for ( d = DEG(dc), dc = NEXT(dc); dc; d = DEG(dc), dc = NEXT(dc) ) {
-					subq(d,DEG(dc),(Q *)&t); pwrr(vl,p0,t,&s); mulr(vl,s,c,&m); 
+					subq(d,DEG(dc),(Q *)&t); 
+					gen_pwrr(vl,p0,t,&s); mulr(vl,s,c,&m); 
 					substfp(vl,(Obj)COEF(dc),u,f,&t); addr(vl,m,t,&c); 
 			}
 			if ( d ) {
-				pwrr(vl,p0,(Obj)d,&t); mulr(vl,t,c,&m); 
+				gen_pwrr(vl,p0,(Obj)d,&t); mulr(vl,t,c,&m); 
 				c = m;
 			}
 		}
@@ -767,11 +752,7 @@ Obj *pr;
 	}
 }
 
-void substfv(vl,v,u,f,c)
-VL vl;
-V v;
-PF u,f;
-Obj *c;
+void substfv(VL vl,V v,PF u,PF f,Obj *c)
 {
 	P t;
 	Obj r,s,w;