===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/plotf.c,v
retrieving revision 1.9
retrieving revision 1.11
diff -u -p -r1.9 -r1.11
--- OpenXM_contrib2/asir2000/plot/plotf.c	2001/06/04 02:49:49	1.9
+++ OpenXM_contrib2/asir2000/plot/plotf.c	2001/10/09 01:36:27	1.11
@@ -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/plot/plotf.c,v 1.8 2000/11/22 04:03:11 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/plot/plotf.c,v 1.10 2001/08/22 09:19:21 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -53,10 +53,14 @@
 #include "ifplot.h"
 
 void Pifplot(), Pconplot(), Pplotover(), Pplot(), Parrayplot(), Pdrawcircle();
+void Pmemory_ifplot();
 void Popen_canvas(), Pclear_canvas(), Pdraw_obj();
+void Pox_rpc();
+void Pox_cmo_rpc();
 
 struct ftab plot_tab[] = {
 	{"ifplot",Pifplot,-7},
+	{"memory_ifplot",Pmemory_ifplot,-7},
 	{"conplot",Pconplot,-8},
 	{"plot",Pplot,-6},
 	{"plotover",Pplotover,3},
@@ -72,13 +76,11 @@ struct ftab plot_tab[] = {
 
 int current_s;
 
-void Popen_canvas(arg,rp)
-NODE arg;
-Obj *rp;
+void Popen_canvas(NODE arg,Obj *rp)
 {
 	Q w300,s_id;
 	LIST geom;
-	int stream,id,i;
+	int stream;
 	NODE n,n0;
 	STRING fname,wname;
 
@@ -118,16 +120,14 @@ Obj *rp;
 	Pox_cmo_rpc(arg,rp);
 }
 
-void Pifplot(arg,rp)
-NODE arg;
-Obj *rp;
+void Pifplot(NODE arg,Obj *rp)
 {
 	Q m2,p2,w300,s_id;
 	NODE defrange;
 	LIST xrange,yrange,range[2],list,geom;
 	VL vl,vl0;
 	V v[2],av[2];
-	int stream,ri,id,i;
+	int stream,ri,i;
 	P poly;
 	P var;
 	NODE n,n0;
@@ -143,9 +143,9 @@ Obj *rp;
 		switch ( OID(BDY(arg)) ) {
 			case O_P:
 				poly = (P)BDY(arg); 
-				get_vars_recursive(poly,&vl);
+				get_vars_recursive((Obj)poly,&vl);
 				for ( vl0 = vl, i = 0; vl0; vl0 = NEXT(vl0) )
-					if ( vl0->v->attr == V_IND )
+					if ( vl0->v->attr == (pointer)V_IND )
 						if ( i >= 2 )
 							error("ifplot : invalid argument");
 						else
@@ -226,16 +226,117 @@ Obj *rp;
 	Pox_rpc(arg,rp);
 }
 
-void Pconplot(arg,rp)
-NODE arg;
-Obj *rp;
+void Pmemory_ifplot(NODE arg,Obj *rp)
 {
 	Q m2,p2,w300,s_id;
 	NODE defrange;
+	LIST xrange,yrange,range[2],list,geom;
+	VL vl,vl0;
+	V v[2],av[2];
+	int stream,ri,i;
+	P poly;
+	P var;
+	NODE n,n0;
+	STRING fname;
+
+	STOQ(-2,m2); STOQ(2,p2);
+	MKNODE(n,p2,0); MKNODE(defrange,m2,n); 
+	poly = 0; vl = 0; geom = 0; stream = -1; ri = 0;
+	for ( ; arg; arg = NEXT(arg) )
+		if ( !BDY(arg) )
+			stream = 0;
+		else
+		switch ( OID(BDY(arg)) ) {
+			case O_P:
+				poly = (P)BDY(arg); 
+				get_vars_recursive((Obj)poly,&vl);
+				for ( vl0 = vl, i = 0; vl0; vl0 = NEXT(vl0) )
+					if ( vl0->v->attr == (pointer)V_IND )
+						if ( i >= 2 )
+							error("ifplot : invalid argument");
+						else
+							v[i++] = vl0->v;
+				break;
+			case O_LIST:
+				list = (LIST)BDY(arg);
+				if ( OID(BDY(BDY(list))) == O_P )
+					if ( ri > 1 )
+						error("ifplot : invalid argument");
+					else
+						range[ri++] = list;
+				else
+					geom = list;
+				break;
+			case O_N:
+				stream = QTOS((Q)BDY(arg)); break;
+			default:
+				error("memory_ifplot : invalid argument"); break;
+		}
+	if ( !poly )
+		error("memory_ifplot : invalid argument");
+	switch ( ri ) {
+		case 0:
+			if ( !v[1] )
+				error("memory_ifplot : please specify all variables");
+			MKV(v[0],var); MKNODE(n,var,defrange); MKLIST(xrange,n);
+			MKV(v[1],var); MKNODE(n,var,defrange); MKLIST(yrange,n);
+			break;
+		case 1:
+			if ( !v[1] )
+				error("memory_ifplot : please specify all variables");
+			av[0] = VR((P)BDY(BDY(range[0])));
+			if ( v[0] == av[0] ) {
+				xrange = range[0];
+				MKV(v[1],var); MKNODE(n,var,defrange); MKLIST(yrange,n);
+			} else if ( v[1] == av[0] ) {
+				MKV(v[0],var); MKNODE(n,var,defrange); MKLIST(xrange,n);
+				yrange = range[0];
+			} else
+				error("memory_ifplot : invalid argument");
+			break;
+		case 2:
+			av[0] = VR((P)BDY(BDY(range[0])));
+			av[1] = VR((P)BDY(BDY(range[1])));
+			if ( ((v[0] == av[0]) && (!v[1] || v[1] == av[1])) ||
+				 ((v[0] == av[1]) && (!v[1] || v[1] == av[0])) ) {
+					xrange = range[0]; yrange = range[1];
+			} else
+					error("memory_ifplot : invalid argument");
+			break;
+		default:
+			error("memory_ifplot : cannot happen"); break;
+	}
+	/* memory_ifplot in ox_plot requires 
+	   [s_id (Q),
+	   	formula (Obj),
+	   	xrange=[x,xmin,xmax] (LIST),
+	   	yrange=[y,ymin,ymax] (LIST),
+	   	zrange=0,
+	   	geom=[xsize,ysize] (LIST)]
+	*/
+
+	if ( stream < 0 )
+		stream = current_s;
+	else
+		current_s = stream;
+	STOQ(stream,s_id);
+	if ( !geom ) {
+		STOQ(300,w300);
+		MKNODE(n0,w300,0); MKNODE(n,w300,n0); MKLIST(geom,n);
+	}
+	MKSTR(fname,"memory_plot");
+	arg = mknode(7,s_id,fname,poly,xrange,yrange,0,geom);
+	Pox_rpc(arg,rp);
+}
+
+void Pconplot(NODE arg,Obj *rp)
+{
+	Q m2,p2,w300,s_id;
+	NODE defrange;
 	LIST xrange,yrange,zrange,range[3],list,geom;
 	VL vl,vl0;
 	V v[2],av[2];
-	int stream,ri,id,i;
+	int stream,ri,i;
 	P poly;
 	P var;
 	NODE n,n0;
@@ -251,9 +352,9 @@ Obj *rp;
 		switch ( OID(BDY(arg)) ) {
 			case O_P:
 				poly = (P)BDY(arg);
-				get_vars_recursive(poly,&vl);
+				get_vars_recursive((Obj)poly,&vl);
 				for ( vl0 = vl, i = 0; vl0; vl0 = NEXT(vl0) )
-					if ( vl0->v->attr == V_IND )
+					if ( vl0->v->attr == (pointer)V_IND )
 						if ( i >= 2 )
 							error("ifplot : invalid argument");
 						else
@@ -350,16 +451,14 @@ Obj *rp;
 	Pox_rpc(arg,rp);
 }
 
-void Pplot(arg,rp)
-NODE arg;
-Obj *rp;
+void Pplot(NODE arg,Obj *rp)
 {
 	Q m2,p2,w300,s_id;
 	NODE defrange;
 	LIST xrange,range[1],list,geom;
 	VL vl,vl0;
 	V v[1],av[1];
-	int stream,ri,id,i;
+	int stream,ri,i;
 	P poly;
 	P var;
 	NODE n,n0;
@@ -375,9 +474,9 @@ Obj *rp;
 		switch ( OID(BDY(arg)) ) {
 			case O_P: case O_R:
 				poly = (P)BDY(arg);
-				get_vars_recursive(poly,&vl);
+				get_vars_recursive((Obj)poly,&vl);
 				for ( vl0 = vl, i = 0; vl0; vl0 = NEXT(vl0) )
-					if ( vl0->v->attr == V_IND )
+					if ( vl0->v->attr == (pointer)V_IND )
 						if ( i >= 1 )
 							error("ifplot : invalid argument");
 						else
@@ -441,9 +540,7 @@ Obj *rp;
 	Pox_rpc(arg,rp);
 }
 
-void Pplotover(arg,rp)
-NODE arg;
-Obj *rp;
+void Pplotover(NODE arg,Obj *rp)
 {
 	Q s_id,index;
 	P poly;
@@ -459,9 +556,7 @@ Obj *rp;
 
 /* arg = [x,y,r,s_id,index] */
 
-void Pdrawcircle(arg,rp)
-NODE arg;
-Obj *rp;
+void Pdrawcircle(NODE arg,Obj *rp)
 {
 	Q s_id,index;
 	Obj x,y,r;
@@ -481,9 +576,7 @@ Obj *rp;
 }
 
 /* draw_obj(s_id,cindex,point|line); point = [x,y], line = [xa,ya,xb,yb] */
-void Pdraw_obj(arg,rp)
-NODE arg;
-Obj *rp;
+void Pdraw_obj(NODE arg,Obj *rp)
 {
 	static STRING fname;
 	Q s_id,index;
@@ -503,13 +596,10 @@ Obj *rp;
 	Pox_cmo_rpc(arg,rp);
 }
 
-void Pclear_canvas(arg,rp)
-NODE arg;
-Obj *rp;
+void Pclear_canvas(NODE arg,Obj *rp)
 {
 	static STRING fname;
 	Q s_id,index;
-	LIST obj;
 
 	if ( !fname ) {
 		MKSTR(fname,"clear_canvas");
@@ -521,9 +611,7 @@ Obj *rp;
 }
 
 #if 0
-void Parrayplot(arg,rp)
-NODE arg;
-Obj *rp;
+void Parrayplot(NODE arg,Obj *rp)
 {
 	int s;
 	int id;