===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/calc.c,v
retrieving revision 1.10
retrieving revision 1.12
diff -u -p -r1.10 -r1.12
--- OpenXM_contrib2/asir2000/plot/calc.c	2014/05/12 16:54:40	1.10
+++ OpenXM_contrib2/asir2000/plot/calc.c	2017/08/31 04:21:48	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/plot/calc.c,v 1.9 2013/12/19 06:04:09 saito Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/plot/calc.c,v 1.11 2014/06/27 07:58:29 saito Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -68,7 +68,7 @@ void calc(double **tab,struct canvas *can,int nox){
 	Obj fr,g,t,s;
 
 	if(!nox)initmarker(can,"Evaluating...");
-	MKReal(1.0,r); mulr(CO,(Obj)can->formula,(Obj)r,&fr);
+  todouble((Obj)can->formula,&fr);
 	xstep=(can->xmax-can->xmin)/can->width;
 	ystep=(can->ymax-can->ymin)/can->height;
 	MKReal(1.0,rx); MKReal(1.0,ry); // dummy real
@@ -101,7 +101,7 @@ void calcq(double **tab,struct canvas *can,int nox){
 	Obj fr,gm,t,s;
 	Real r,rx,ry;
 
-	MKReal(1.0,r); mulr(CO,(Obj)can->formula,(Obj)r,&fr);
+  todouble((Obj)can->formula,&fr);
 	MKReal(1.0,rx); MKReal(1.0,ry); // dummy real
 	BDY(rx)=can->xmin;
 	substr(CO,0,fr,can->vx,can->xmin?(Obj)rx:0,&t); devalr(CO,t,&gm);
@@ -139,7 +139,7 @@ void calcb(double **tab,struct canvas *can,int nox){
 	Obj fr,gm,tm,sm;
 	Real r,rx,ry;
 
-	MKReal(1.0,r); mulr(CO,(Obj)can->formula,(Obj)r,&fr);
+  todouble((Obj)can->formula,&fr);
 	MKReal(1.0,rx); MKReal(1.0,ry); // dummy real
 	BDY(rx)=can->xmin;
 	substr(CO,0,fr,can->vx,can->xmin?(Obj)rx:0,&tm); devalr(CO,tm,&gm);
@@ -381,7 +381,7 @@ void plotcalc(struct canvas *can){
 	Obj fr,t,s;
 	POINT *pa;
 
-	MKReal(1.0,r); mulr(CO,(Obj)can->formula,(Obj)r,&fr); 
+  todouble((Obj)can->formula,&fr);
 	w=can->width;h=can->height;
 	xmin=can->xmin;xstep=(can->xmax-can->xmin)/w;
 	tab=(double *)ALLOCA(w*sizeof(double));
@@ -419,6 +419,53 @@ void plotcalc(struct canvas *can){
 }
 
 void polarcalc(struct canvas *can){
+	double xmax,xmin,ymax,ymin,dx,dy,pmin,pstep,tr,p,*tabx,*taby;
+	double usubstrp();
+	int i,nstep,w,h;
+	POINT *pa;
+	Real r;
+	Obj fr,t,s;
+
+  todouble((Obj)can->formula,&fr);
+	w=can->width; h=can->height; nstep=can->nzstep;
+	pmin=can->zmin; pstep=(can->zmax-can->zmin)/nstep;
+	tabx=(double *)ALLOCA(nstep*sizeof(double));
+	taby=(double *)ALLOCA(nstep*sizeof(double));
+	MKReal(1,r); // dummy real number
+
+	for(i=0,p=pmin;i<nstep;i++,p+= pstep){
+		// full substitution
+		BDY(r)=p;
+		substr(CO,0,fr,can->vx,p?(Obj)r:0,&s);
+		devalr(CO,(Obj)s,&t);
+		if(t&&(OID(t)!=O_N||NID((Num)t)!=N_R))
+			error("polarcalc : invalid evaluation");
+		tr=ToReal((Num)t);	
+		tabx[i]=tr*cos(p);
+		taby[i]=tr*sin(p);
+	}
+	xmax=xmin=tabx[0];
+	ymax=ymin=taby[0];
+	for(i=1;i<nstep;i++){
+		if(tabx[i]>xmax)xmax=tabx[i];
+		if(tabx[i]<xmin)xmin=tabx[i];
+		if(taby[i]>ymax)ymax=taby[i];
+		if(taby[i]<ymin)ymin=taby[i];
+	}
+	can->xmax=xmax;can->xmin=xmin;
+	can->ymax=ymax;can->ymin=ymin;
+	dx=xmax-xmin;
+	dy=ymax-ymin;
+	can->pa=(struct pa *)MALLOC(sizeof(struct pa));
+	can->pa[0].length=nstep;
+	can->pa[0].pos=pa=(POINT *)MALLOC(w*sizeof(POINT));
+	for(i=0;i<nstep;i++){
+		XC(pa[i])=(w-1)*(tabx[i]-xmin)/dx; 
+		YC(pa[i])=(h-1)*(ymax-taby[i])/dy; 
+	}
+}
+
+void polarcalcNG(struct canvas *can){
 	//polarplotNG
 	double xmax,xmin,ymax,ymin,dx,dy,pmin,pstep,tr,p, *tabx,*taby;
 	double usubstrp();
@@ -427,7 +474,7 @@ void polarcalc(struct canvas *can){
 	Real r;
 	Obj fr,t,s;
 
-	MKReal(1.0,r); mulr(CO,(Obj)can->formula,(Obj)r,&fr); 
+  todouble((Obj)can->formula,&fr);
 	w=can->width; h=can->height; nstep=can->nzstep;
 	pmin=can->zmin; pstep=(can->zmax-can->zmin)/nstep;
 	tabx=(double *)ALLOCA(nstep*sizeof(double));
@@ -476,7 +523,7 @@ void ineqncalc(double **tab,struct canvas *can,int nox
 	V vx,vy;
 
 	if(!nox) initmarker(can,"Evaluating...");
-	MKReal(1.0,r); mulr(CO,(Obj)can->formula,(Obj)r,&fr);
+  todouble((Obj)can->formula,&fr);
 	vx=can->vx;vy=can->vy;
 	w=can->width;h=can->height; 
 	xmin=can->xmin;xstep=(can->xmax-can->xmin)/w;
@@ -508,7 +555,7 @@ void itvcalc(double **mask, struct canvas *can, int no
 	Obj fr,g,t,s;
 
 	idv=can->division;
-	MKReal(1.0,r); mulr(CO,(Obj)can->formula,(Obj)r,&fr);
+  todouble((Obj)can->formula,&fr);
 	vx=can->vx; vy=can->vy;
 	xstep=(can->xmax-can->xmin)/can->width;
 	ystep=(can->ymax-can->ymin)/can->height;