From ac15cca9d5daa5e0c7e531d1454b436b6cca64dc Mon Sep 17 00:00:00 2001 From: Sunil Shetye Date: Fri, 15 Jun 2018 17:43:46 +0530 Subject: fix syntax issues --- js/Misc/BACKLASH.js | 4 ++-- js/Misc/BOUNCE.js | 12 ++++++------ js/Misc/BOUNCEXY.js | 24 ++++++++++++------------ js/Misc/CONSTRAINT2_c.js | 2 +- js/Misc/c_block.js | 8 ++++---- js/Misc/fortran_block.js | 8 ++++---- js/Misc/scifunc_block_m.js | 8 ++++---- 7 files changed, 33 insertions(+), 33 deletions(-) (limited to 'js/Misc') diff --git a/js/Misc/BACKLASH.js b/js/Misc/BACKLASH.js index ac433e91..a854b837 100644 --- a/js/Misc/BACKLASH.js +++ b/js/Misc/BACKLASH.js @@ -15,8 +15,8 @@ break } if (ok) { graphics.exprs=exprs; -rpar[1]=ini; -rpar[2]=gap; +rpar[1-1]=ini; +rpar[2-1]=gap; if (zcr!=0) { model.nzcross=2; } else { diff --git a/js/Misc/BOUNCE.js b/js/Misc/BOUNCE.js index f310eed3..b1cf7c07 100644 --- a/js/Misc/BOUNCE.js +++ b/js/Misc/BOUNCE.js @@ -8,8 +8,8 @@ graphics=arg1.graphics; exprs=graphics.exprs; model=arg1.model; if (size(exprs,"*")<9) { -exprs[8]="9.81"; -exprs[9]="0"; +exprs[8-1]="9.81"; +exprs[9-1]="0"; } while (true) { [ok,rpar1,rpar2,walls,xt,xd,y,yd,g,C,exprs]=scicos_getvalue(["Set Bounce Block"],["Mass","Radius","[xmin,xmax,ymin,ymax]","xpos","xdpos","ypos","ydpos","g (gravity)","C (aerodynamic coeff"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",1,"vec",1),exprs); @@ -46,9 +46,9 @@ k=1; ipar=[]; for(i=1;i<=n;i+=1) { for(j=i+1;j<=n;j+=1) { -ipar[k]=i; +ipar[k-1]=i; k=k+1; -ipar[k]=j; +ipar[k-1]=j; k=k+1; } } @@ -71,9 +71,9 @@ k=1; ipar=[]; for(i=1;i<=n;i+=1) { for(j=i+1;j<=n;j+=1) { -ipar[k]=i; +ipar[k-1]=i; k=k+1; -ipar[k]=j; +ipar[k-1]=j; k=k+1; } } diff --git a/js/Misc/BOUNCEXY.js b/js/Misc/BOUNCEXY.js index 278bff63..2ac6ccce 100644 --- a/js/Misc/BOUNCEXY.js +++ b/js/Misc/BOUNCEXY.js @@ -37,12 +37,12 @@ rpar=[xmin,xmax,ymin,ymax]; ipar=[win,imode,clrs.slice()]; z=[]; for(i=1;i<=size(clrs,"*");i+=1) { -z[6*(i-1)+1]=0; -z[6*(i-1)+2]=0; -z[6*(i-1)+3]=2*siz(i); -z[6*(i-1)+4]=2*siz(i); -z[6*(i-1)+5]=0.000; -z[6*(i-1)+6]=64.0*360.000; +z[6*(i-1)+1-1]=0; +z[6*(i-1)+2-1]=0; +z[6*(i-1)+3-1]=2*siz(i); +z[6*(i-1)+4-1]=2*siz(i); +z[6*(i-1)+5-1]=0.000; +z[6*(i-1)+6-1]=64.0*360.000; } model.dstate=z; model.rpar=rpar; @@ -71,12 +71,12 @@ model.intyp=[1,1]; model.evtin=1; z=[]; for(i=1;i<=size(clrs,"*");i+=1) { -z[6*(i-1)+1]=0; -z[6*(i-1)+2]=0; -z[6*(i-1)+3]=2*siz(i); -z[6*(i-1)+4]=2*siz(i); -z[6*(i-1)+5]=0.000; -z[6*(i-1)+6]=64.0*360.000; +z[6*(i-1)+1-1]=0; +z[6*(i-1)+2-1]=0; +z[6*(i-1)+3-1]=2*siz(i); +z[6*(i-1)+4-1]=2*siz(i); +z[6*(i-1)+5-1]=0.000; +z[6*(i-1)+6-1]=64.0*360.000; } model.dstate=z; model.rpar=[xmin,xmax,ymin,ymax]; diff --git a/js/Misc/CONSTRAINT2_c.js b/js/Misc/CONSTRAINT2_c.js index 704a0f8d..ee58ef12 100644 --- a/js/Misc/CONSTRAINT2_c.js +++ b/js/Misc/CONSTRAINT2_c.js @@ -35,7 +35,7 @@ x_message(["Id(i) must be either","0 when x\'(i) is not present in the feedback" break } if ((id(i)==0)) { -id[i]=-1; +id[i-1]=-1; } } } diff --git a/js/Misc/c_block.js b/js/Misc/c_block.js index a975433e..f3fe984e 100644 --- a/js/Misc/c_block.js +++ b/js/Misc/c_block.js @@ -15,13 +15,13 @@ break if (funam==" ") { break } -label[1]=lab; +label[1-1]=lab; rpar=rpar.slice(); i=int(i.slice()); ni=size(i,1); o=int(o.slice()); no=size(o,1); -tt=label.slice(2-1); +tt=label[2-1]; if (model.sim(1)!=funam||size(model.in,"*")!=size(i,"*")||size(model.out,"*")!=size(o,"*")) { tt=[]; } @@ -31,9 +31,9 @@ break } [model,graphics,ok]=check_io(model,graphics,i,o,[],[]); if (ok) { -model.sim[1]=funam; +model.sim[1-1]=funam; model.rpar=rpar; -label[2]=tt; +label[2-1]=tt; x.model=model; graphics.exprs=label; x.graphics=graphics; diff --git a/js/Misc/fortran_block.js b/js/Misc/fortran_block.js index f9949646..4bc445c8 100644 --- a/js/Misc/fortran_block.js +++ b/js/Misc/fortran_block.js @@ -15,13 +15,13 @@ break if (funam==" ") { break } -label[1]=lab; +label[1-1]=lab; rpar=rpar.slice(); i=int(i.slice()); ni=size(i,1); o=int(o.slice()); no=size(o,1); -tt=label.slice(2-1); +tt=label[2-1]; if (model.sim(1)!=funam||size(model.in,"*")!=size(i,"*")||size(model.out,"*")!=size(o,"*")) { tt=[]; } @@ -31,9 +31,9 @@ break } [model,graphics,ok]=check_io(model,graphics,i,o,[],[]); if (ok) { -model.sim[1]=funam; +model.sim[1-1]=funam; model.rpar=rpar; -label[2]=tt; +label[2-1]=tt; x.model=model; graphics.exprs=label; x.graphics=graphics; diff --git a/js/Misc/scifunc_block_m.js b/js/Misc/scifunc_block_m.js index b56691d3..7f7d543e 100644 --- a/js/Misc/scifunc_block_m.js +++ b/js/Misc/scifunc_block_m.js @@ -13,7 +13,7 @@ while (true) { if (!ok) { break } -exprs[1]=lab; +exprs[1-1]=lab; xx=xx.slice(); z=z.slice(); rpar=rpar.slice(); @@ -26,8 +26,8 @@ ci=int(ci.slice()); nci=size(ci,1); co=int(co.slice()); nco=size(co,1); -[ok,tt,dep_ut]=genfunc2(exprs.slice(2-1),i,o,nci,nco,size(xx,1),size(z,1),nrp,"c"); -dep_ut[2]=(1==deptime); +[ok,tt,dep_ut]=genfunc2(exprs[2-1],i,o,nci,nco,size(xx,1),size(z,1),nrp,"c"); +dep_ut[2-1]=(1==deptime); if (!ok) { break } @@ -48,7 +48,7 @@ model.opar=tt; model.firing=auto; model.dep_ut=dep_ut; x.model=model; -exprs[2]=tt; +exprs[2-1]=tt; graphics.exprs=exprs; x.graphics=graphics; break -- cgit