=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/calc.c,v retrieving revision 1.2 retrieving revision 1.5 diff -u -p -r1.2 -r1.5 --- OpenXM_contrib2/asir2000/plot/calc.c 2000/08/21 08:31:50 1.2 +++ OpenXM_contrib2/asir2000/plot/calc.c 2001/10/09 01:36:27 1.5 @@ -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,20 +45,17 @@ * 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.1.1.1 1999/12/03 07:39:12 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/plot/calc.c,v 1.4 2001/08/22 09:19:21 noro Exp $ */ #include "ca.h" +#include "parse.h" #include "ifplot.h" #include #if PARI #include "genpari.h" #endif -double usubstrp(P,double); - -void calc(tab,can) -double **tab; -struct canvas *can; +void calc(double **tab,struct canvas *can,int nox) { double x,y,xmin,ymin,xstep,ystep; int ix,iy; @@ -68,7 +65,7 @@ struct canvas *can; V vx,vy; Obj t,s; - initmarker(can,"Evaluating..."); + if ( !nox ) initmarker(can,"Evaluating..."); MKReal(1.0,r); mulr(CO,(Obj)can->formula,(Obj)r,&fr); vx = can->vx; vy = can->vy; @@ -79,23 +76,23 @@ struct canvas *can; for( ix = 0, x = xmin; ix < w ; ix++, x += xstep ) { #if 0 MKReal(x,r); substp(CO,fr,vx,(P)r,&g); - marker(can,DIR_X,ix); + if ( !nox ) marker(can,DIR_X,ix); for( iy = 0, y = ymin; iy < h ; iy++, y += ystep ) tab[ix][iy] = usubstrp(g,y); #endif - BDY(rx) = x; substr(CO,0,fr,vx,x?(P)rx:0,&t); devalr(CO,t,&g); - marker(can,DIR_X,ix); + BDY(rx) = x; substr(CO,0,fr,vx,x?(Obj)rx:0,&t); + devalr(CO,t,&g); + if ( !nox ) marker(can,DIR_X,ix); for( iy = 0, y = ymin; iy < h ; iy++, y += ystep ) { BDY(ry) = y; - substr(CO,0,g,vy,y?(P)ry:0,&t); devalr(CO,t,&s); + substr(CO,0,g,vy,y?(Obj)ry:0,&t); + devalr(CO,t,&s); tab[ix][iy] = ToReal(s); } } } -double usubstrp(p,r) -P p; -double r; +double usubstrp(P p,double r) { double t; DCP dc; @@ -118,16 +115,12 @@ double r; return t; } -void qcalc(tab,can) -char **tab; -struct canvas *can; +void qcalc(char **tab,struct canvas *can) { - Q dx,dy,w,h,xstep,ystep,c,q1,q2; + Q dx,dy,w,h,xstep,ystep,c,q1; P g,g1,f1,f2,x,y,t,s; - DCP dc; int ix,iy; int *a,*pa; - char *px; VECT ss; @@ -147,7 +140,7 @@ struct canvas *can; for ( iy = 0; iy < can->height; iy++ ) tab[ix][iy] = 1; else if ( !NUM(g1) ) { - strum(CO,g1,&ss); seproot(ss,0,can->height,a); + sturmseq(CO,g1,&ss); seproot(ss,0,can->height,a); for ( iy = 0, pa = a; iy < can->height; iy++, pa++ ) if ( *pa < 0 || (*(pa+1) >= 0 && (*pa > *(pa+1))) ) tab[ix][iy] = 1; @@ -161,7 +154,7 @@ struct canvas *can; for ( ix = 0; ix < can->width; ix++ ) tab[ix][iy] = 1; else if ( !NUM(g1) ) { - strum(CO,g1,&ss); seproot(ss,0,can->width,a); + sturmseq(CO,g1,&ss); seproot(ss,0,can->width,a); for ( ix = 0, pa = a; ix < can->width; ix++, pa++ ) if ( *pa < 0 || (*(pa+1) >= 0 && (*pa > *(pa+1))) ) tab[ix][iy] = 1; @@ -169,10 +162,7 @@ struct canvas *can; } } -strum(vl,p,rp) -VL vl; -P p; -VECT *rp; +void sturmseq(VL vl,P p,VECT *rp) { P g1,g2,q,r,s; P *t; @@ -213,10 +203,7 @@ VECT *rp; *rp = ret; } -seproot(s,min,max,ar) -VECT s; -int min,max; -int *ar; +void seproot(VECT s,int min,int max,int *ar) { P f; P *ss; @@ -256,9 +243,7 @@ int *ar; seproot(s,k,j,ar); } -numch(s,n,a0) -VECT s; -Q n,a0; +int numch(VECT s,Q n,Q a0) { int len,i,c; Q a; @@ -276,10 +261,7 @@ Q n,a0; return c; } -usubstqp(p,r,v) -P p; -Q r; -Q *v; +void usubstqp(P p,Q r,Q *v) { Q d,d1,a,b,t; DCP dc; @@ -302,8 +284,7 @@ Q *v; } } -void plotcalc(can) -struct canvas *can; +void plotcalc(struct canvas *can) { double x,xmin,xstep,ymax,ymin,dy; int ix; @@ -324,7 +305,8 @@ struct canvas *can; for( ix = 0, x = xmin; ix < w ; ix++, x += xstep ) { /* full substitution */ BDY(rx) = x; - substr(CO,0,fr,can->vx,x?(P)rx:0,&s); devalr(CO,(Obj)s,&t); + substr(CO,0,fr,can->vx,x?(Obj)rx:0,&s); + devalr(CO,(Obj)s,&t); if ( t && (OID(t)!=O_N || NID((Num)t)!=N_R) ) error("plotcalc : invalid evaluation"); tab[ix] = ToReal((Num)t); @@ -360,6 +342,6 @@ struct canvas *can; else if ( t < -MAXSHORT ) YC(pa[ix]) = -MAXSHORT; else - YC(pa[ix]) = t; + YC(pa[ix]) = (long)t; } }