=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/plotf.c,v retrieving revision 1.14 retrieving revision 1.23 diff -u -p -r1.14 -r1.23 --- OpenXM_contrib2/asir2000/plot/plotf.c 2002/08/02 05:39:22 1.14 +++ OpenXM_contrib2/asir2000/plot/plotf.c 2012/10/04 04:56:39 1.23 @@ -45,37 +45,68 @@ * 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.13 2002/08/02 02:28:29 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/plot/plotf.c,v 1.22 2011/08/10 04:51:58 saito Exp $ */ #include "ca.h" #include "parse.h" #include "ox.h" #include "ifplot.h" -void Pifplot(), Pconplot(), Pplotover(), Pplot(), Parrayplot(), Pdrawcircle(); -void Pmemory_ifplot(); -void Popen_canvas(), Pclear_canvas(), Pdraw_obj(), Pdraw_string(); -void Pox_rpc(); -void Pox_cmo_rpc(); +void Pifplot(NODE, Obj *), Pconplot(NODE, Obj *), Pplotover(NODE, Q *); +void Pplot(NODE, Obj *), Parrayplot(NODE, Q *), Pdrawcircle(NODE, Q *); +#if defined(INTERVAL) +void Pitvplot1(NODE, Obj *), itvplot_main1(NODE, Obj *); //NORMAL +void Pitvplot2(NODE, Obj *), itvplot_main2(NODE, Obj *); //TRANSFER +void Pitvplot3(NODE, Obj *), itvplot_main3(NODE, Obj *); //RECURSION +void Pitvplot4(NODE, Obj *), itvplot_main4(NODE, Obj *); //RECURSION+TRANSFER +void Pitvplot(NODE, Obj *), itvplot_main(NODE, Obj *); //NEWTYPE +void Pobj_cp(NODE, Obj *); +void Pineqn(NODE, Obj *), Pineqnor(NODE, Obj *), Pineqnand(NODE, Obj *); +void Pineqnxor(NODE, Obj *), Pmemory_ineqn(NODE, Obj *); +void ineqn_main(NODE, int, Obj *); +void ineqn_main_op(NODE, int, int, Obj *); +#endif +void Ppolarplot(NODE, Q *); +void Pmemory_ifplot(NODE, Obj *), Pmemory_conplot(NODE, Obj *); +void Pmemory_plot(NODE, Obj *); +void Popen_canvas(NODE, Q *), Pclear_canvas(NODE, Q *), Pdraw_obj(NODE, Q *); +void Pdraw_string(NODE, Q *); +void Pox_rpc(), Pox_cmo_rpc(); +void ifplot_main(NODE, int, Obj *); +void conplot_main(NODE, int, Obj *); +void plot_main(NODE, int, Obj *); struct ftab plot_tab[] = { {"ifplot",Pifplot,-7}, - {"memory_ifplot",Pmemory_ifplot,-7}, + {"memory_ifplot",Pmemory_ifplot,-6}, +#if defined(INTERVAL) + {"itvplot1",Pitvplot1,-7}, + {"itvplot2",Pitvplot2,-7}, + {"itvplot3",Pitvplot3,-7}, + {"itvplot4",Pitvplot4,-7}, + {"itvplot",Pitvplot,-7}, + {"ineqn",Pineqn,-8}, + {"ineqnor",Pineqnor,-7}, + {"ineqnand",Pineqnand,-7}, + {"ineqnxor",Pineqnxor,-7}, + {"memory_ineqn",Pmemory_ineqn,-6}, + {"obj_cp",Pobj_cp,4}, +#endif {"conplot",Pconplot,-8}, + {"memory_conplot",Pmemory_conplot,-7}, {"plot",Pplot,-6}, - {"plotover",Pplotover,3}, - {"drawcircle",Pdrawcircle,5}, + {"memory_plot",Pmemory_plot,-5}, + {"polarplot",Ppolarplot,-6}, + {"plotover",Pplotover,-4}, + {"drawcircle",Pdrawcircle,6}, {"open_canvas",Popen_canvas,-3}, {"clear_canvas",Pclear_canvas,2}, {"draw_obj",Pdraw_obj,-4}, {"draw_string",Pdraw_string,-5}, -/* - {"arrayplot",Parrayplot,2}, -*/ {0,0,0}, }; -void Popen_canvas(NODE arg,Obj *rp) +void Popen_canvas(NODE arg,Q *rp) { Q w300,s_id; LIST geom; @@ -89,41 +120,357 @@ void Popen_canvas(NODE arg,Obj *rp) stream = 0; else switch ( OID(BDY(arg)) ) { - case O_LIST: - geom = (LIST)BDY(arg); - break; - case O_N: - stream = QTOS((Q)BDY(arg)); break; - case O_STR: - wname = (STRING)BDY(arg); break; - default: - error("open_canvas : invalid argument"); break; + case O_LIST: + geom = (LIST)BDY(arg); + break; + case O_N: + stream = QTOS((Q)BDY(arg)); break; + case O_STR: + wname = (STRING)BDY(arg); break; + default: + error("open_canvas : invalid argument"); break; } - /* open_canvas in ox_plot requires + stream = validate_ox_plot_stream(stream); + STOQ(stream,s_id); + if ( !geom ) { + STOQ(300,w300); + MKNODE(n0,w300,0); MKNODE(n,w300,n0); MKLIST(geom,n); + } + MKSTR(fname,"open_canvas"); + arg = mknode(4,s_id,fname,geom,wname); + Pox_cmo_rpc(arg,rp); + *rp = s_id; +} + +void Pifplot(NODE arg,Obj *rp) +{ + ifplot_main(arg,0,rp); +} + +void Pmemory_ifplot(NODE arg,Obj *rp) +{ + ifplot_main(arg,1,rp); +} + +void ifplot_main(NODE arg,int is_memory, 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,sign; + P poly; + P var; + NODE n,n0; + STRING fname,wname; + Obj t; + + STOQ(-2,m2); STOQ(2,p2); + MKNODE(n,p2,0); MKNODE(defrange,m2,n); + poly = 0; vl = 0; geom = 0; wname = 0; stream = -1; ri = 0; + v[0] = v[1] = 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; + case O_STR: + wname = (STRING)BDY(arg); break; + default: + error("ifplot : invalid argument"); break; + } + if ( !poly ) error("ifplot : invalid argument"); + switch ( ri ) { + case 0: + if ( !v[1] ) error("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("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("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("ifplot : invalid argument"); + break; + default: + error("ifplot : cannot happen"); break; + } + /* 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), + wname=name (STRING)] + */ + + stream = validate_ox_plot_stream(stream); + STOQ(stream,s_id); + if ( !geom ) { + STOQ(300,w300); + MKNODE(n0,w300,0); MKNODE(n,w300,n0); MKLIST(geom,n); + } + if ( is_memory ) { + MKSTR(fname,"memory_plot"); + arg = mknode(8,s_id,fname,poly,xrange,yrange,0,geom); + Pox_rpc(arg,&t); + arg = mknode(1,s_id); + Pox_pop_cmo(arg,rp); + } else { + MKSTR(fname,"plot"); + arg = mknode(8,s_id,fname,poly,xrange,yrange,0,geom,wname); + Pox_rpc(arg,&t); + *rp = (Obj)s_id; + } +} + +#if defined(INTERVAL) +void Pitvplot(NODE arg, Obj *rp) +{ + itvplot_main(arg, rp); +} + +void itvplot_main(NODE arg, Obj *rp) +{ + Q m2,p2,w300,s_id, itvsize; + NODE defrange; + LIST xrange,yrange,range[2],list,geom; + VL vl,vl0; + V v[2],av[2]; + int stream,ri,i,sign; + P poly; + P var; + NODE n,n0; + STRING fname,wname; + Obj t; + + STOQ(-2,m2); STOQ(2,p2); + MKNODE(n,p2,0); MKNODE(defrange,m2,n); + poly = 0; vl = 0; geom = 0; wname = 0; stream = -1; ri = 0; + v[0] = v[1] = 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("itvplot : 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("itvplot : invalid argument"); + else range[ri++] = list; + else geom = list; + break; + case O_N: + stream = QTOS((Q)BDY(arg)); break; + case O_STR: + wname = (STRING)BDY(arg); break; + default: + error("itvplot : invalid argument"); break; + } + if ( !poly ) error("itvplot : invalid argument"); + switch ( ri ) { + case 0: + if ( !v[1] ) error("itvplot : 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("itvplot : 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("itvplot : 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("itvplot : invalid argument"); + break; + default: + error("itvplot : cannot happen"); break; + } + /* itvplot 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), wname=name (STRING)] */ + stream = validate_ox_plot_stream(stream); + STOQ(stream,s_id); + if ( !geom ) { + STOQ(300,w300); + MKNODE(n0,w300,0); MKNODE(n,w300,n0); MKLIST(geom,n); + } + MKSTR(fname,"itvifplot"); + STOQ(Itvplot, itvsize); + arg = mknode(9,s_id,fname,poly,xrange,yrange,0,geom,wname,itvsize); + Pox_rpc(arg,&t); + *rp = (Obj)s_id; +} +void Pitvplot1(NODE arg, Obj *rp) +{ + itvplot_main1(arg, rp); +} + +void Pitvplot2(NODE arg, Obj *rp) +{ + itvplot_main2(arg, rp); +} + +void Pitvplot3(NODE arg, Obj *rp) +{ + itvplot_main3(arg, rp); +} + +void Pitvplot4(NODE arg, Obj *rp) +{ + itvplot_main4(arg, rp); +} + +// NORMAL type +void itvplot_main1(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,sign; + P poly; + P var; + NODE n,n0; + STRING fname,wname; + Obj t; + + STOQ(-2,m2); STOQ(2,p2); + MKNODE(n,p2,0); MKNODE(defrange,m2,n); + poly = 0; vl = 0; geom = 0; wname = 0; stream = -1; ri = 0; + v[0] = v[1] = 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("itvplot : 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("itvplot : invalid argument"); + else range[ri++] = list; + else geom = list; + break; + case O_N: + stream = QTOS((Q)BDY(arg)); break; + case O_STR: + wname = (STRING)BDY(arg); break; + default: + error("itvplot : invalid argument"); break; + } + if ( !poly ) error("itvplot : invalid argument"); + switch ( ri ) { + case 0: + if ( !v[1] ) error("itvplot : 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("itvplot : 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("itvplot : 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("itvplot : invalid argument"); + break; + default: + error("itvplot : cannot happen"); break; + } stream = validate_ox_plot_stream(stream); STOQ(stream,s_id); if ( !geom ) { STOQ(300,w300); MKNODE(n0,w300,0); MKNODE(n,w300,n0); MKLIST(geom,n); } - MKSTR(fname,"open_canvas"); - arg = mknode(4,s_id,fname,geom,wname); - Pox_cmo_rpc(arg,rp); + MKSTR(fname,"itvplot1"); + arg = mknode(8,s_id,fname,poly,xrange,yrange,0,geom,wname); + Pox_rpc(arg,&t); + *rp = (Obj)s_id; } -void Pifplot(NODE arg,Q *rp) +// TRANSFER TYPE +void itvplot_main2(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; + int stream,ri,i,sign; P poly; P var; NODE n,n0; @@ -145,7 +492,7 @@ void Pifplot(NODE arg,Q *rp) for ( vl0 = vl, i = 0; vl0; vl0 = NEXT(vl0) ) if ( vl0->v->attr == (pointer)V_IND ) if ( i >= 2 ) - error("ifplot : invalid argument"); + error("itvplot : invalid argument"); else v[i++] = vl0->v; break; @@ -153,7 +500,7 @@ void Pifplot(NODE arg,Q *rp) list = (LIST)BDY(arg); if ( OID(BDY(BDY(list))) == O_P ) if ( ri > 1 ) - error("ifplot : invalid argument"); + error("itvplot : invalid argument"); else range[ri++] = list; else @@ -164,20 +511,20 @@ void Pifplot(NODE arg,Q *rp) case O_STR: wname = (STRING)BDY(arg); break; default: - error("ifplot : invalid argument"); break; + error("itvplot : invalid argument"); break; } if ( !poly ) - error("ifplot : invalid argument"); + error("itvplot : invalid argument"); switch ( ri ) { case 0: if ( !v[1] ) - error("ifplot : please specify all variables"); + error("itvplot : 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("ifplot : please specify all variables"); + error("itvplot : please specify all variables"); av[0] = VR((P)BDY(BDY(range[0]))); if ( v[0] == av[0] ) { xrange = range[0]; @@ -186,7 +533,7 @@ void Pifplot(NODE arg,Q *rp) MKV(v[0],var); MKNODE(n,var,defrange); MKLIST(xrange,n); yrange = range[0]; } else - error("ifplot : invalid argument"); + error("itvplot : invalid argument"); break; case 2: av[0] = VR((P)BDY(BDY(range[0]))); @@ -195,50 +542,138 @@ void Pifplot(NODE arg,Q *rp) ((v[0] == av[1]) && (!v[1] || v[1] == av[0])) ) { xrange = range[0]; yrange = range[1]; } else - error("ifplot : invalid argument"); + error("itvplot : invalid argument"); break; default: - error("ifplot : cannot happen"); break; + error("itvplot : cannot happen"); break; } - /* 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), - wname=name (STRING)] - */ - stream = validate_ox_plot_stream(stream); STOQ(stream,s_id); if ( !geom ) { STOQ(300,w300); MKNODE(n0,w300,0); MKNODE(n,w300,n0); MKLIST(geom,n); } - MKSTR(fname,"plot"); + MKSTR(fname,"itvplot2"); arg = mknode(8,s_id,fname,poly,xrange,yrange,0,geom,wname); Pox_rpc(arg,&t); - *rp = s_id; + *rp = (Obj)s_id; } +// RECURSION TYPE +void itvplot_main3(NODE arg, Obj *rp) +{ + Q m2,p2,w300,s_id, itvsize; + NODE defrange; + LIST xrange,yrange,range[2],list,geom; + VL vl,vl0; + V v[2],av[2]; + int stream,ri,i,sign; + P poly; + P var; + NODE n,n0; + STRING fname,wname; + Obj t; -void Pmemory_ifplot(NODE arg,Q *rp) + STOQ(-2,m2); STOQ(2,p2); + MKNODE(n,p2,0); MKNODE(defrange,m2,n); + poly = 0; vl = 0; geom = 0; wname = 0; stream = -1; ri = 0; + v[0] = v[1] = 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("itvplot : 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("itvplot : invalid argument"); + else + range[ri++] = list; + else + geom = list; + break; + case O_N: + stream = QTOS((Q)BDY(arg)); break; + case O_STR: + wname = (STRING)BDY(arg); break; + default: + error("itvplot : invalid argument"); break; + } + if ( !poly ) + error("itvplot : invalid argument"); + switch ( ri ) { + case 0: + if ( !v[1] ) + error("itvplot : 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("itvplot : 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("itvplot : 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("itvplot : invalid argument"); + break; + default: + error("itvplot : cannot happen"); break; + } + stream = validate_ox_plot_stream(stream); + STOQ(stream,s_id); + if ( !geom ) { + STOQ(300,w300); + MKNODE(n0,w300,0); MKNODE(n,w300,n0); MKLIST(geom,n); + } + MKSTR(fname,"itvplot3"); + STOQ(Itvplot, itvsize); + arg = mknode(9,s_id,fname,poly,xrange,yrange,0,geom,wname,itvsize); + Pox_rpc(arg,&t); + *rp = (Obj)s_id; +} +// RECURSION and TRANSFER TYPE +void itvplot_main4(NODE arg, Obj *rp) { - Q m2,p2,w300,s_id; + Q m2,p2,w300,s_id,itvsize; NODE defrange; LIST xrange,yrange,range[2],list,geom; VL vl,vl0; V v[2],av[2]; - int stream,ri,i; + int stream,ri,i,sign; P poly; P var; NODE n,n0; - STRING fname; + STRING fname,wname; Obj t; STOQ(-2,m2); STOQ(2,p2); MKNODE(n,p2,0); MKNODE(defrange,m2,n); - poly = 0; vl = 0; geom = 0; stream = -1; ri = 0; + poly = 0; vl = 0; geom = 0; wname = 0; stream = -1; ri = 0; + v[0] = v[1] = 0; for ( ; arg; arg = NEXT(arg) ) if ( !BDY(arg) ) stream = 0; @@ -250,7 +685,7 @@ void Pmemory_ifplot(NODE arg,Q *rp) for ( vl0 = vl, i = 0; vl0; vl0 = NEXT(vl0) ) if ( vl0->v->attr == (pointer)V_IND ) if ( i >= 2 ) - error("ifplot : invalid argument"); + error("itvplot : invalid argument"); else v[i++] = vl0->v; break; @@ -258,7 +693,7 @@ void Pmemory_ifplot(NODE arg,Q *rp) list = (LIST)BDY(arg); if ( OID(BDY(BDY(list))) == O_P ) if ( ri > 1 ) - error("ifplot : invalid argument"); + error("itvplot : invalid argument"); else range[ri++] = list; else @@ -266,21 +701,23 @@ void Pmemory_ifplot(NODE arg,Q *rp) break; case O_N: stream = QTOS((Q)BDY(arg)); break; + case O_STR: + wname = (STRING)BDY(arg); break; default: - error("memory_ifplot : invalid argument"); break; + error("itvplot : invalid argument"); break; } if ( !poly ) - error("memory_ifplot : invalid argument"); + error("itvplot : invalid argument"); switch ( ri ) { case 0: if ( !v[1] ) - error("memory_ifplot : please specify all variables"); + error("itvplot : 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"); + error("itvplot : please specify all variables"); av[0] = VR((P)BDY(BDY(range[0]))); if ( v[0] == av[0] ) { xrange = range[0]; @@ -289,7 +726,7 @@ void Pmemory_ifplot(NODE arg,Q *rp) MKV(v[0],var); MKNODE(n,var,defrange); MKLIST(xrange,n); yrange = range[0]; } else - error("memory_ifplot : invalid argument"); + error("itvplot : invalid argument"); break; case 2: av[0] = VR((P)BDY(BDY(range[0]))); @@ -298,18 +735,19 @@ void Pmemory_ifplot(NODE arg,Q *rp) ((v[0] == av[1]) && (!v[1] || v[1] == av[0])) ) { xrange = range[0]; yrange = range[1]; } else - error("memory_ifplot : invalid argument"); + error("itvplot : invalid argument"); break; default: - error("memory_ifplot : cannot happen"); break; + error("itvplot : cannot happen"); break; } - /* memory_ifplot in ox_plot requires + /* itvplot 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)] + geom=[xsize,ysize] (LIST), + wname=name (STRING)] */ stream = validate_ox_plot_stream(stream); @@ -318,14 +756,186 @@ void Pmemory_ifplot(NODE arg,Q *rp) 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); + MKSTR(fname,"itvplot4"); + STOQ(Itvplot, itvsize); + arg = mknode(9,s_id,fname,poly,xrange,yrange,0,geom,wname,itvsize); Pox_rpc(arg,&t); - *rp = s_id; + *rp = (Obj)s_id; } -void Pconplot(NODE arg,Q *rp) +void Pineqn(NODE arg, Obj *rp) { + ineqn_main(arg, 1, rp); +} + +void ineqn_main(NODE arg,int is_memory, Obj *rp) +{ + Q s_id, m2, p2, w300, color; + NODE defrange, n, n0; + P poly, var; + VL vl, vl0; + V v[2], av[2]; + LIST xrange, yrange, range[2], list, geom; + int stream, ri, i,sign; + STRING fname,wname; + + STOQ(-2,m2); STOQ(2,p2); + MKNODE(n,p2,0); MKNODE(defrange,m2,n); + poly = 0; vl = 0; geom = 0; wname = 0; stream = -1; ri = 0; + v[0] = v[1] = 0; + /* get polynomial */ + if ( !(OID(BDY(arg)) == O_P || (OID(BDY(arg)) ==O_R)) ) + error("ineqn : first argument must be a polynormial"); + else { + poly = (P)BDY(arg); + /* get vars */ + 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( + "ineqn : first argument must be a univariate or bivariate polynormial"); + else + v[i++] = vl0->v; + } + /* get color */ + arg = NEXT(arg); + if ( OID(BDY(arg)) != O_N ) + error("ineqn : second argument must be color code"); + else + color = (Q)BDY(arg); + /* other argument is optional */ + arg = NEXT(arg); + for ( ; arg; arg = NEXT(arg) ) + if ( !BDY(arg) ) + stream = 0; + else + switch ( OID(BDY(arg)) ) { + case O_LIST: + list = (LIST)BDY(arg); + if ( OID(BDY(BDY(list))) == O_P ) + if ( ri > 1 ) + error("ineqn : invalid list argument"); + else + range[ri++] = list; + else + geom = list; + break; + case O_N: + stream = QTOS((Q)BDY(arg)); break; + case O_STR: + wname = (STRING)BDY(arg); break; + default: + error("ineqn : invalid argument"); break; + } + switch ( ri ) { + case 0: + if ( !v[1] ) error("ineqn : 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("ineqn : 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("ineqn : 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("ineqn : invalid argument"); + break; + default: + error("ineqn : cannot happen"); break; + } + + stream = validate_ox_plot_stream(stream); + STOQ(stream,s_id); + if ( !geom ) { + STOQ(300,w300); + MKNODE(n0,w300,0); MKNODE(n,w300,n0); MKLIST(geom,n); + } + MKSTR(fname, "ineqn"); + arg = mknode(8, s_id, fname, poly, color, xrange, yrange, geom, wname); + Pox_cmo_rpc(arg,rp); + *rp = (Obj)s_id; +} + +void Pineqnor(NODE arg, Obj *rp) +{ + ineqn_main_op(arg, 7, 0, rp); +} + +void Pineqnand(NODE arg, Obj *rp) +{ + ineqn_main_op(arg, 1, 0, rp); +} + +void Pineqnxor(NODE arg, Obj *rp) +{ + ineqn_main_op(arg, 6, 0, rp); +} + +void Pmemory_ineqn(NODE arg, Obj *rp) +{ + ineqn_main(arg, 1, rp); +} + +void ineqn_main_op(NODE arg, int op, int is_memory, Obj *rp) +{ + Q s_id, index, color, op_code; + P poly; + STRING fname; + Obj t; + + poly = (P)ARG0(arg); + color = (Q)ARG1(arg); + s_id = (Q)ARG2(arg); + index = (Q)ARG3(arg); + STOQ( op, op_code); + MKSTR(fname, "ineqnover"); + arg = mknode(6, s_id, fname, index, poly, color, op_code); + Pox_rpc(arg, &t); + *rp = (Obj)s_id; +} + +void Pobj_cp(NODE arg, Obj *rp) +{ + Q sysid, index_A, index_B, op_code; + STRING fname; + Obj t; + + sysid = (Q)ARG0(arg); + index_A = (Q)ARG1(arg); + index_B = (Q)ARG2(arg); + op_code = (Q)ARG3(arg); + MKSTR(fname, "objcp"); + arg = mknode(5, sysid, fname, index_A, index_B, op_code); + Pox_rpc(arg, &t); + *rp = (Obj)sysid; +} +#endif + +void Pconplot(NODE arg,Obj *rp) +{ + conplot_main(arg, 0, rp); +} + +void Pmemory_conplot(NODE arg,Obj *rp) +{ + conplot_main(arg,1,rp); +} + +void conplot_main(NODE arg,int is_memory,Obj *rp) +{ Q m2,p2,w300,s_id; NODE defrange; LIST xrange,yrange,zrange,range[3],list,geom; @@ -435,14 +1045,32 @@ void Pconplot(NODE arg,Q *rp) STOQ(300,w300); MKNODE(n0,w300,0); MKNODE(n,w300,n0); MKLIST(geom,n); } - MKSTR(fname,"plot"); - arg = mknode(8,s_id,fname,poly,xrange,yrange,zrange,geom,wname); - Pox_rpc(arg,&t); - *rp = s_id; + if ( is_memory ) { + MKSTR(fname,"memory_plot"); + arg = mknode(7,s_id,fname,poly,xrange,yrange,zrange,geom); + Pox_rpc(arg,&t); + arg = mknode(1,s_id); + Pox_pop_cmo(arg,rp); + } else { + MKSTR(fname,"plot"); + arg = mknode(8,s_id,fname,poly,xrange,yrange,zrange,geom,wname); + Pox_rpc(arg,&t); + *rp = (Obj)s_id; + } } -void Pplot(NODE arg,Q *rp) +void Pplot(NODE arg,Obj *rp) { + plot_main(arg,0,rp); +} + +void Pmemory_plot(NODE arg,Obj *rp) +{ + plot_main(arg,1,rp); +} + +void plot_main(NODE arg,int is_memory,Obj *rp) +{ Q m2,p2,w300,s_id; NODE defrange; LIST xrange,range[1],list,geom; @@ -524,8 +1152,99 @@ void Pplot(NODE arg,Q *rp) STOQ(300,w300); MKNODE(n0,w300,0); MKNODE(n,w300,n0); MKLIST(geom,n); } + if ( is_memory ) { + MKSTR(fname,"memory_plot"); + arg = mknode(7,s_id,fname,poly,xrange,NULLP,NULLP,geom); + Pox_rpc(arg,&t); + arg = mknode(1,s_id); + Pox_pop_cmo(arg,rp); + } else { + MKSTR(fname,"plot"); + arg = mknode(8,s_id,fname,poly,xrange,NULLP,NULLP,geom,wname); + Pox_rpc(arg,&t); + *rp = (Obj)s_id; + } +} + +#define Pi 3.14159265358979323846264 + +void Ppolarplot(NODE arg,Q *rp) +{ + Q m2,p2,w300,s_id; + NODE defrange; + LIST zrange,range[1],list,geom; + VL vl,vl0; + V v[1],av[1]; + int stream,ri,i; + P poly; + P var; + NODE n,n0; + STRING fname,wname; + Real pi2; + Obj t; + + MKReal(2*Pi,pi2); + MKNODE(n,pi2,0); MKNODE(defrange,0,n); + poly = 0; vl = 0; geom = 0; wname = 0; stream = -1; ri = 0; + v[0] = 0; + for ( ; arg; arg = NEXT(arg) ) + if ( !BDY(arg) ) + stream = 0; + else + switch ( OID(BDY(arg)) ) { + case O_P: case O_R: + 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 >= 1 ) + error("polarplot : invalid argument"); + else + v[i++] = vl0->v; + if ( i != 1 ) + error("polarplot : invalid argument"); + break; + case O_LIST: + list = (LIST)BDY(arg); + if ( OID(BDY(BDY(list))) == O_P ) + if ( ri > 0 ) + error("polarplot : invalid argument"); + else + range[ri++] = list; + else + geom = list; + break; + case O_N: + stream = QTOS((Q)BDY(arg)); break; + case O_STR: + wname = (STRING)BDY(arg); break; + default: + error("polarplot : invalid argument"); break; + } + if ( !poly ) + error("polarplot : invalid argument"); + switch ( ri ) { + case 0: + MKV(v[0],var); MKNODE(n,var,defrange); MKLIST(zrange,n); + break; + case 1: + av[0] = VR((P)BDY(BDY(range[0]))); + if ( v[0] == av[0] ) + zrange = range[0]; + else + error("polarplot : invalid argument"); + break; + default: + error("polarplot : cannot happen"); break; + } + stream = validate_ox_plot_stream(stream); + STOQ(stream,s_id); + if ( !geom ) { + STOQ(300,w300); + MKNODE(n0,w300,0); MKNODE(n,w300,n0); MKLIST(geom,n); + } MKSTR(fname,"plot"); - arg = mknode(8,s_id,fname,poly,xrange,0,0,geom,wname); + arg = mknode(8,s_id,fname,poly,NULLP,NULLP,zrange,geom,wname); Pox_rpc(arg,&t); *rp = s_id; } @@ -541,7 +1260,10 @@ void Pplotover(NODE arg,Q *rp) s_id = (Q)ARG1(arg); index = (Q)ARG2(arg); MKSTR(fname,"plotover"); - arg = mknode(4,s_id,fname,index,poly); + if ( argc(arg) == 4 ) + arg = mknode(5,s_id,fname,index,poly,(Q)ARG3(arg)); + else + arg = mknode(4,s_id,fname,index,poly); Pox_rpc(arg,&t); *rp = s_id; } @@ -551,7 +1273,7 @@ void Pplotover(NODE arg,Q *rp) void Pdrawcircle(NODE arg,Q *rp) { Q s_id,index; - Obj x,y,r; + Obj x,y,r,c; STRING fname; NODE n; LIST pos; @@ -560,11 +1282,12 @@ void Pdrawcircle(NODE arg,Q *rp) x = (Obj)ARG0(arg); y = (Obj)ARG1(arg); r = (Obj)ARG2(arg); - s_id = (Q)ARG3(arg); - index = (Q)ARG4(arg); + c = (Obj)ARG3(arg); + s_id = (Q)ARG4(arg); + index = (Q)ARG5(arg); MKSTR(fname,"drawcircle"); - n = mknode(3,x,y,r); MKLIST(pos,n); - arg = mknode(4,s_id,fname,index,pos); + n = mknode(3,x,y,r,c); MKLIST(pos,n); + arg = mknode(5,s_id,fname,index,pos,c); Pox_rpc(arg,&t); *rp = s_id; }