===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/puref.c,v
retrieving revision 1.7
retrieving revision 1.12
diff -u -p -r1.7 -r1.12
--- OpenXM_contrib2/asir2000/parse/puref.c	2004/08/18 00:50:37	1.7
+++ OpenXM_contrib2/asir2000/parse/puref.c	2015/08/14 13:51:56	1.12
@@ -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/parse/puref.c,v 1.6 2004/03/11 09:52:56 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/puref.c,v 1.11 2015/08/08 14:19:42 fujimoto Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -284,6 +284,51 @@ void derivr(VL vl,Obj a,V v,Obj *b)
 	}
 }
 
+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) )
@@ -605,6 +650,20 @@ void devalins(PFINS ins,Obj *rp)
 		}
 		MKReal(d,r); *rp = (Obj)r;
 	}
+}
+
+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)