diff options
author | Sunil Shetye | 2018-06-18 17:30:31 +0530 |
---|---|---|
committer | Sunil Shetye | 2018-06-18 20:30:18 +0530 |
commit | cd5b0819762aa4a1cb72d29ab7b8c3ac65bbad76 (patch) | |
tree | 56407047bba37f94b7b5f00890b4385cefa502fd /js/Misc | |
parent | 0fd33c776a03e3b9ad2267e4f3fbb2c7bcbbb92a (diff) | |
download | sci2js-cd5b0819762aa4a1cb72d29ab7b8c3ac65bbad76.tar.gz sci2js-cd5b0819762aa4a1cb72d29ab7b8c3ac65bbad76.tar.bz2 sci2js-cd5b0819762aa4a1cb72d29ab7b8c3ac65bbad76.zip |
use format string
Diffstat (limited to 'js/Misc')
-rw-r--r-- | js/Misc/BACKLASH.js | 4 | ||||
-rw-r--r-- | js/Misc/BOUNCE.js | 6 | ||||
-rw-r--r-- | js/Misc/BOUNCEXY.js | 4 | ||||
-rw-r--r-- | js/Misc/BPLATFORM.js | 4 | ||||
-rw-r--r-- | js/Misc/CBLOCK.js | 10 | ||||
-rw-r--r-- | js/Misc/CBLOCK4.js | 10 | ||||
-rw-r--r-- | js/Misc/CONSTRAINT2_c.js | 6 | ||||
-rw-r--r-- | js/Misc/CONSTRAINT_c.js | 4 | ||||
-rw-r--r-- | js/Misc/DEADBAND.js | 4 | ||||
-rw-r--r-- | js/Misc/DEBUG.js | 4 | ||||
-rw-r--r-- | js/Misc/DIFF_f.js | 4 | ||||
-rw-r--r-- | js/Misc/EDGETRIGGER.js | 4 | ||||
-rw-r--r-- | js/Misc/ENDBLK.js | 2 | ||||
-rw-r--r-- | js/Misc/HYSTHERESIS.js | 4 | ||||
-rw-r--r-- | js/Misc/LOGICAL_OP.js | 4 | ||||
-rw-r--r-- | js/Misc/MEMORY_f.js | 4 | ||||
-rw-r--r-- | js/Misc/PENDULUM_ANIM.js | 4 | ||||
-rw-r--r-- | js/Misc/RATELIMITER.js | 4 | ||||
-rw-r--r-- | js/Misc/RELATIONALOP.js | 4 | ||||
-rw-r--r-- | js/Misc/TEXT_f.js | 4 | ||||
-rw-r--r-- | js/Misc/c_block.js | 8 | ||||
-rw-r--r-- | js/Misc/fortran_block.js | 8 | ||||
-rw-r--r-- | js/Misc/generic_block.js | 4 | ||||
-rw-r--r-- | js/Misc/generic_block2.js | 4 | ||||
-rw-r--r-- | js/Misc/generic_block3.js | 4 | ||||
-rw-r--r-- | js/Misc/scifunc_block_m.js | 6 |
26 files changed, 64 insertions, 64 deletions
diff --git a/js/Misc/BACKLASH.js b/js/Misc/BACKLASH.js index fe9aac19..338109ca 100644 --- a/js/Misc/BACKLASH.js +++ b/js/Misc/BACKLASH.js @@ -26,7 +26,7 @@ rpar=model.rpar; while (true) { [ok,ini,gap,zcr,exprs]=scicos_getvalue("Set backlash parameters",["initial output","gap","use zero-crossing (0:no, 1:yes)"],list("vec",1,"vec",1,"vec",1),exprs); if (!ok) { -break +break; } if (ok) { graphics.exprs=exprs; @@ -40,7 +40,7 @@ model.nzcross=0; model.rpar=rpar; x.graphics=graphics; x.model=model; -break +break; } } } diff --git a/js/Misc/BOUNCE.js b/js/Misc/BOUNCE.js index 73eaf0ab..5b4c3f8a 100644 --- a/js/Misc/BOUNCE.js +++ b/js/Misc/BOUNCE.js @@ -53,7 +53,7 @@ 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); if (!ok) { -break +break; } xt=xt.slice(); y=y.slice(); @@ -77,7 +77,7 @@ message("Mass and radius must be >0"); ok=false; } if (!ok) { -break +break; } [model,graphics,ok]=check_io(model,graphics,[],[n,n],[],[]); if (ok) { @@ -100,7 +100,7 @@ model.nzcross=n*(n-1)/2+4*n; graphics.exprs=exprs; x.graphics=graphics; x.model=model; -break +break; } } } diff --git a/js/Misc/BOUNCEXY.js b/js/Misc/BOUNCEXY.js index c7564cca..fb0f9434 100644 --- a/js/Misc/BOUNCEXY.js +++ b/js/Misc/BOUNCEXY.js @@ -47,7 +47,7 @@ dstate=model.dstate; while (true) { [ok,clrs,siz,win,imode,xmin,xmax,ymin,ymax,exprs]=scicos_getvalue("Set Scope parameters",["colors","radii","window number (-1 for automatic)","animation mode (0,1)","Xmin","Xmax","Ymin","Ymax"],list("vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs); if (!ok) { -break +break; } mess=[]; if (size(clrs,"*")!=size(siz,"*")) { @@ -86,7 +86,7 @@ model.ipar=ipar; graphics.exprs=exprs; x.graphics=graphics; x.model=model; -break +break; } } } diff --git a/js/Misc/BPLATFORM.js b/js/Misc/BPLATFORM.js index 95d25191..a5994f86 100644 --- a/js/Misc/BPLATFORM.js +++ b/js/Misc/BPLATFORM.js @@ -33,7 +33,7 @@ dstate=model.dstate; while (true) { [ok,plen,csiz,phi,xmin,xmax,ymin,ymax,exprs]=scicos_getvalue("Set Scope parameters",["pendulum length","cart size (square side)","slope","Xmin","Xmax","Ymin","Ymax"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs); if (!ok) { -break +break; } mess=[]; if (plen<=0||csiz<=0) { @@ -56,7 +56,7 @@ model.rpar=rpar; graphics.exprs=exprs; x.graphics=graphics; x.model=model; -break +break; } } } diff --git a/js/Misc/CBLOCK.js b/js/Misc/CBLOCK.js index 1b37ce68..de8a80f0 100644 --- a/js/Misc/CBLOCK.js +++ b/js/Misc/CBLOCK.js @@ -43,7 +43,7 @@ label=graphics.exprs; while (true) { [ok,function_name,impli,i,o,ci,co,xx,ng,z,rpar,ipar,auto0,depu,dept,lab]=scicos_getvalue("Set C-Block2 block parameters",["simulation function","is block implicit? (y,n)","input ports sizes","output ports sizes","input event ports sizes","output events ports sizes","initial continuous state","number of zero crossing surfaces","initial discrete state","Real parameters vector","Integer parameters vector","initial firing vector (<0 for no firing)","direct feedthrough (y or n)","time dependence (y or n)"],list("str",1,"str",1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec",-1,"vec","sum(%6)","str",1,"str",1),label(1)); if (!ok) { -break +break; } label[1-1]=lab; funam=stripblanks(function_name); @@ -85,7 +85,7 @@ dept=false; } dep_ut=[depu,dept]; if (funam==" ") { -break +break; } if (model.sim(1)!=funam||sign(size(model.state,"*"))!=sign(nx)||sign(size(model.dstate,"*"))!=sign(nz)||model.nzcross!=ng||sign(size(model.evtout,"*"))!=sign(nevout)) { tt=[]; @@ -95,7 +95,7 @@ while (true) { [ok,tt,cancel]=CFORTR2(funam,tt); if (!ok) { if (cancel) { -break +break; } } else { [model,graphics,ok]=check_io(model,graphics,i,o,ci,co); @@ -116,12 +116,12 @@ label[2-1]=tt; x.model=model; graphics.exprs=label; x.graphics=graphics; -break +break; } } } if (ok||cancel) { -break +break; } } } diff --git a/js/Misc/CBLOCK4.js b/js/Misc/CBLOCK4.js index a17f3e18..bea5ff99 100644 --- a/js/Misc/CBLOCK4.js +++ b/js/Misc/CBLOCK4.js @@ -27,7 +27,7 @@ label=graphics.exprs; while (true) { [ok,function_name,impli,in1,it,out,ot,ci,co,xx,z,oz,rpar,ipar,opar,nmode,nzcr,auto0,depu,dept,lab]=scicos_getvalue("Set C-Block4 block parameters",["Simulation function","Is block implicit? (y,n)","Input ports sizes","Input ports type","Output port sizes","Output ports type","Input event ports sizes","Output events ports sizes","Initial continuous state","Initial discrete state","Initial object state","Real parameters vector","Integer parameters vector","Object parameters list","Number of modes","Number of zero crossings","Initial firing vector (<0 for no firing)","Direct feedthrough (y or n)","Time dependence (y or n)"],list("str",1,"str",1,"mat",[-1,2],"vec",-1,"mat",[-1,2],"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"lis",-1,"vec",-1,"vec",-1,"lis",-1,"vec",1,"vec",1,"vec","sum(%8)","str",1,"str",1),label(1)); if (!ok) { -break +break; } label[1-1]=lab; funam=stripblanks(function_name); @@ -67,7 +67,7 @@ dept=false; } dep_ut=[depu,dept]; if (funam==" ") { -break +break; } if (model.sim(1)!=funam||sign(size(model.state,"*"))!=sign(nx)||sign(size(model.dstate,"*"))!=sign(nz)||model.nzcross!=nzcr||sign(size(model.evtout,"*"))!=sign(nevout)) { tt=[]; @@ -80,7 +80,7 @@ while (true) { [ok,tt,cancel]=CC4(funam,tt); if (!ok) { if (cancel) { -break +break; } } else { model.sim=list(funam,funtyp); @@ -98,11 +98,11 @@ label[2-1]=tt; x.model=model; graphics.exprs=label; x.graphics=graphics; -break +break; } } if (ok||cancel) { -break +break; } } } diff --git a/js/Misc/CONSTRAINT2_c.js b/js/Misc/CONSTRAINT2_c.js index a01c102f..a67461e1 100644 --- a/js/Misc/CONSTRAINT2_c.js +++ b/js/Misc/CONSTRAINT2_c.js @@ -29,7 +29,7 @@ while (true) { ask_again=false; [ok,x0,xd0,id,exprs]=scicos_getvalue("Set Constraint block parameters",["Initial guess values of states x","Initial guess values of derivative x\'","Id(i)=1: if x\'(i) is present in the feedback, else Id(i)=0"],list("vec",-1,"vec",-1,"vec",-1),exprs); if (!ok) { -break +break; } x0=x0.slice(); N=size(x0,"*"); @@ -50,7 +50,7 @@ for (i=1;i<=N;i+=1) { if (!((id[i-1]==0)||(id[i-1]==1))) { ask_again=true; x_message(["Id(i) must be either","0 when x\'(i) is not present in the feedback","1: when x\'(i) is present in the feedback"]); -break +break; } if ((id[i-1]==0)) { id[i-1]=-1; @@ -65,7 +65,7 @@ model.in1=N; model.ipar=id; x.graphics=graphics; x.model=model; -break +break; } } } diff --git a/js/Misc/CONSTRAINT_c.js b/js/Misc/CONSTRAINT_c.js index 1b2d953c..16568b55 100644 --- a/js/Misc/CONSTRAINT_c.js +++ b/js/Misc/CONSTRAINT_c.js @@ -26,7 +26,7 @@ model=arg1.model; while (true) { [ok,x0,exprs]=scicos_getvalue("Set solver block parameters","Initial guess values",list("vec",-1),exprs); if (!ok) { -break +break; } x0=x0.slice(); N=size(x0,"*"); @@ -42,7 +42,7 @@ model.in1=N; model.ipar=-1*ones(N,1); x.graphics=graphics; x.model=model; -break +break; } } } diff --git a/js/Misc/DEADBAND.js b/js/Misc/DEADBAND.js index ee23b752..b34ee97c 100644 --- a/js/Misc/DEADBAND.js +++ b/js/Misc/DEADBAND.js @@ -29,7 +29,7 @@ model=arg1.model; while (true) { [ok,maxp,minp,zeroc,exprs]=scicos_getvalue("Set Deadband parameters",["End of dead band","Start of dead band","zero crossing (0:no, 1:yes)"],list("vec",1,"vec",1,"vec",1),exprs); if (!ok) { -break +break; } if (maxp<=minp) { message("Upper limit must be > Lower limit"); @@ -46,7 +46,7 @@ model.nmode=0; graphics.exprs=exprs; x.graphics=graphics; x.model=model; -break +break; } } } diff --git a/js/Misc/DEBUG.js b/js/Misc/DEBUG.js index 5e84861b..3535d543 100644 --- a/js/Misc/DEBUG.js +++ b/js/Misc/DEBUG.js @@ -31,13 +31,13 @@ exprs[2-1]=txt; if ((scicos_debug()!=2&&scicos_debug()!=3)) { scicos_debug(2); } -break +break; } else { message(["Error in the instructions",lasterror()]); } } else { ok=false; -break +break; } } if (ok) { diff --git a/js/Misc/DIFF_f.js b/js/Misc/DIFF_f.js index e83d63f9..d7cb8162 100644 --- a/js/Misc/DIFF_f.js +++ b/js/Misc/DIFF_f.js @@ -25,13 +25,13 @@ model=arg1.model; while (true) { [ok,x0,xd0,exprs]=scicos_getvalue("Set continuous linear system parameters",["Initial state","Initial Derivative"],list("vec",1,"vec",1),exprs); if (!ok) { -break +break; } graphics.exprs=exprs; model.state=[x0.slice(),xd0.slice()]; x.graphics=graphics; x.model=model; -break +break; } x.model.firing=[]; } diff --git a/js/Misc/EDGETRIGGER.js b/js/Misc/EDGETRIGGER.js index 49715350..2a562620 100644 --- a/js/Misc/EDGETRIGGER.js +++ b/js/Misc/EDGETRIGGER.js @@ -27,13 +27,13 @@ model=arg1.model; while (true) { [ok,edge,exprs]=scicos_getvalue("Set edge trigger block parameters",["rising (1), falling (-1), both (0)"],list("vec",1),exprs); if (!ok) { -break +break; } model.ipar=sign(edge); graphics.exprs=exprs; x.graphics=graphics; x.model=model; -break +break; } } } diff --git a/js/Misc/ENDBLK.js b/js/Misc/ENDBLK.js index aad616ec..eb5fbc9c 100644 --- a/js/Misc/ENDBLK.js +++ b/js/Misc/ENDBLK.js @@ -17,7 +17,7 @@ for (i=1;i<=length(arg1.model.rpar.objs);i+=1) { o=arg1.model.rpar.objs(i); if (typeof(o)=="Block"&&o.gui=="END_c") { ppath=list(i); -break +break; } } newpar=list(); diff --git a/js/Misc/HYSTHERESIS.js b/js/Misc/HYSTHERESIS.js index 6965253e..04951691 100644 --- a/js/Misc/HYSTHERESIS.js +++ b/js/Misc/HYSTHERESIS.js @@ -30,7 +30,7 @@ model=arg1.model; while (true) { [ok,high_lim,low_lim,out_high,out_low,nzz,exprs]=scicos_getvalue("Set parameters",["switch on at","switch off at","output when on","output when off","use zero crossing: yes (1), no (0)"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs); if (!ok) { -break +break; } if (low_lim>high_lim) { message("switch on value must be larger than switch off value"); @@ -43,7 +43,7 @@ nzz=2; model.nzcross=nzz; x.graphics=graphics; x.model=model; -break +break; } } } diff --git a/js/Misc/LOGICAL_OP.js b/js/Misc/LOGICAL_OP.js index ea8e5ccd..b24cf6d0 100644 --- a/js/Misc/LOGICAL_OP.js +++ b/js/Misc/LOGICAL_OP.js @@ -30,7 +30,7 @@ exprs=[exprs,sci2exp(1),sci2exp(0)]; while (true) { [ok,nin,rule,Datatype,tp,exprs]=scicos_getvalue("Set parameters",["number of inputs","Operator: AND (0), OR (1), NAND (2), NOR (3), XOR (4), NOT (5)","Datatype (1=double 3=int32 ...)","Bitwise Rule(0=No 1=yes)"],list("vec",1,"vec",1,"vec",1,"vec",1),exprs); if (!ok) { -break +break; } nin=int(nin); rule=int(rule); @@ -104,7 +104,7 @@ graphics.exprs=exprs; graphics.style=["blockWithLabel;displayedLabel="+label]; x.graphics=graphics; x.model=model; -break +break; } } } diff --git a/js/Misc/MEMORY_f.js b/js/Misc/MEMORY_f.js index eaae0695..574eb74a 100644 --- a/js/Misc/MEMORY_f.js +++ b/js/Misc/MEMORY_f.js @@ -28,7 +28,7 @@ model=arg1.model; while (true) { [ok,a,inh,exprs]=scicos_getvalue("Set memory block parameters",["initial condition","Inherit (1: no, 0: yes)"],list("vec",-1,"vec",1),exprs); if (!ok) { -break +break; } if (inh==0) { inh=[]; @@ -49,7 +49,7 @@ model.in1=in1; model.out=out; x.graphics=graphics; x.model=model; -break +break; } } } diff --git a/js/Misc/PENDULUM_ANIM.js b/js/Misc/PENDULUM_ANIM.js index 0c426fa7..52c47878 100644 --- a/js/Misc/PENDULUM_ANIM.js +++ b/js/Misc/PENDULUM_ANIM.js @@ -33,7 +33,7 @@ dstate=model.dstate; while (true) { [ok,plen,csiz,phi,xmin,xmax,ymin,ymax,exprs]=scicos_getvalue("Set Scope parameters",["pendulum length","cart size (square side)","slope","Xmin","Xmax","Ymin","Ymax"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs); if (!ok) { -break +break; } mess=[]; if (plen<=0||csiz<=0) { @@ -56,7 +56,7 @@ model.rpar=rpar; graphics.exprs=exprs; x.graphics=graphics; x.model=model; -break +break; } } } diff --git a/js/Misc/RATELIMITER.js b/js/Misc/RATELIMITER.js index 8e9ac55e..3493c538 100644 --- a/js/Misc/RATELIMITER.js +++ b/js/Misc/RATELIMITER.js @@ -27,7 +27,7 @@ model=arg1.model; while (true) { [ok,maxp,minp,exprs]=scicos_getvalue("Set rate limiter parameters",["max slope","min slope"],list("vec",1,"vec",1),exprs); if (!ok) { -break +break; } if (maxp<=minp||maxp<=0||minp>=0) { message("We must have max_slope> 0 > min_slope."); @@ -37,7 +37,7 @@ model.rpar=rpar; graphics.exprs=exprs; x.graphics=graphics; x.model=model; -break +break; } } } diff --git a/js/Misc/RELATIONALOP.js b/js/Misc/RELATIONALOP.js index 4713a36e..522d4d60 100644 --- a/js/Misc/RELATIONALOP.js +++ b/js/Misc/RELATIONALOP.js @@ -30,7 +30,7 @@ exprs=[exprs,sci2exp(1)]; while (true) { [ok,rule,zcr,Datatype,exprs]=scicos_getvalue("Set parameters",["Operator: == (0), ~= (1), < (2), <= (3), > (4), >= (5)","Use zero crossing (no: 0), (yes: 1)","Datatype (1=double 3=int32 ...)"],list("vec",1,"vec",1,"vec",1),exprs); if (!ok) { -break +break; } rule=int(rule); if (zcr!=0) { @@ -86,7 +86,7 @@ model.nzcross=zcr; model.nmode=zcr; x.graphics=graphics; x.model=model; -break +break; } } } diff --git a/js/Misc/TEXT_f.js b/js/Misc/TEXT_f.js index 8307b47d..e02fd0bb 100644 --- a/js/Misc/TEXT_f.js +++ b/js/Misc/TEXT_f.js @@ -30,7 +30,7 @@ exprs=[exprs,"3","1"]; while (true) { [ok,txt,font,siz,exprs]=scicos_getvalue("Set Text block parameters",["Text","Font number","Font size"],list("str",-1,"vec",1,"vec",1),exprs); if (!ok) { -break +break; } if (font<=0||font>6) { message("Font number must be greater than 0 and less than 7"); @@ -59,7 +59,7 @@ ipar=[font,siz]; model.rpar=txt; model.ipar=ipar; x.model=model; -break +break; } } } diff --git a/js/Misc/c_block.js b/js/Misc/c_block.js index 6ef0bb71..185124a9 100644 --- a/js/Misc/c_block.js +++ b/js/Misc/c_block.js @@ -40,10 +40,10 @@ label=graphics.exprs; while (true) { [ok,i,o,rpar,funam,lab]=scicos_getvalue("Set C_block parameters",["input ports sizes","output port sizes","System parameters vector","function name"],list("vec",-1,"vec",-1,"vec",-1,"str",-1),label(1)); if (!ok) { -break +break; } if (funam==" ") { -break +break; } label[1-1]=lab; rpar=rpar.slice(); @@ -57,7 +57,7 @@ tt=[]; } [ok,tt]=CFORTR(funam,tt,i,o); if (!ok) { -break +break; } [model,graphics,ok]=check_io(model,graphics,i,o,[],[]); if (ok) { @@ -67,7 +67,7 @@ label[2-1]=tt; x.model=model; graphics.exprs=label; x.graphics=graphics; -break +break; } } } diff --git a/js/Misc/fortran_block.js b/js/Misc/fortran_block.js index ab5bc64c..e829d7ee 100644 --- a/js/Misc/fortran_block.js +++ b/js/Misc/fortran_block.js @@ -31,10 +31,10 @@ label=graphics.exprs; while (true) { [ok,i,o,rpar,funam,lab]=scicos_getvalue("Set fortran_block parameters",["input ports sizes","output port sizes","System parameters vector","function name"],list("vec",-1,"vec",-1,"vec",-1,"str",-1),label(1)); if (!ok) { -break +break; } if (funam==" ") { -break +break; } label[1-1]=lab; rpar=rpar.slice(); @@ -48,7 +48,7 @@ tt=[]; } [ok,tt]=FORTR(funam,tt,i,o); if (!ok) { -break +break; } [model,graphics,ok]=check_io(model,graphics,i,o,[],[]); if (ok) { @@ -58,7 +58,7 @@ label[2-1]=tt; x.model=model; graphics.exprs=label; x.graphics=graphics; -break +break; } } } diff --git a/js/Misc/generic_block.js b/js/Misc/generic_block.js index 5b420771..81a7aad4 100644 --- a/js/Misc/generic_block.js +++ b/js/Misc/generic_block.js @@ -35,7 +35,7 @@ label[9-1]=[]; while (true) { [ok,function_name,funtyp,i,o,ci,co,xx,z,rpar,ipar,auto0,depu,dept,lab]=scicos_getvalue("Set GENERIC block parameters",["simulation function","function type (0,1,2,..)","input ports sizes","output port sizes","input event ports sizes","output events ports sizes","initial continuous state","initial discrete state","Real parameters vector","Integer parameters vector","initial firing vector (<0 for no firing)","direct feedthrough (y or n)","time dependence (y or n)"],list("str",1,"vec",1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec","sum(%6)","str",1,"str",1),label); if (!ok) { -break +break; } label=lab; function_name=stripblanks(function_name); @@ -89,7 +89,7 @@ arg1.model=model; graphics.exprs=label; arg1.graphics=graphics; x=arg1; -break +break; } } needcompile=resume(needcompile) diff --git a/js/Misc/generic_block2.js b/js/Misc/generic_block2.js index 9d67e1cc..91da13aa 100644 --- a/js/Misc/generic_block2.js +++ b/js/Misc/generic_block2.js @@ -35,7 +35,7 @@ label[9-1]=[]; while (true) { [ok,function_name,funtyp,i,o,ci,co,xx,z,rpar,ipar,nmode,nzcr,auto0,depu,dept,lab]=scicos_getvalue("Set GENERIC block parameters",["simulation function","function type (0,1,2,..)","input ports sizes","output port sizes","input event ports sizes","output events ports sizes","initial continuous state","initial discrete state","Real parameters vector","Integer parameters vector","number of modes","number of zero_crossings","initial firing vector (<0 for no firing)","direct feedthrough (y or n)","time dependence (y or n)"],list("str",1,"vec",1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",1,"vec",1,"vec","sum(%6)","str",1,"str",1),label); if (!ok) { -break +break; } label=lab; function_name=stripblanks(function_name); @@ -91,7 +91,7 @@ arg1.model=model; graphics.exprs=label; arg1.graphics=graphics; x=arg1; -break +break; } } needcompile=resume(needcompile) diff --git a/js/Misc/generic_block3.js b/js/Misc/generic_block3.js index 2a2b71dd..d5f35a3c 100644 --- a/js/Misc/generic_block3.js +++ b/js/Misc/generic_block3.js @@ -31,7 +31,7 @@ label[9-1]=[]; while (true) { [ok,function_name,funtyp,in1,it,out,ot,ci,co,xx,z,oz,rpar,ipar,opar,nmode,nzcr,auto0,depu,dept,lab]=scicos_getvalue("Set GENERIC block parameters",["Simulation function","Function type (0,1,2,..)","Input ports sizes","Input ports type","Output port sizes","Output ports type","Input event ports sizes","Output events ports sizes","Initial continuous state","Initial discrete state","Initial object state","Real parameters vector","Integer parameters vector","Object parameters list","Number of modes","Number of zero crossings","Initial firing vector (<0 for no firing)","Direct feedthrough (y or n)","Time dependence (y or n)"],list("str",1,"vec",1,"mat",[-1,2],"vec",-1,"mat",[-1,2],"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"lis",-1,"vec",-1,"vec",-1,"lis",-1,"vec",1,"vec",1,"vec","sum(%8)","str",1,"str",1),label); if (!ok) { -break +break; } label=lab; function_name=stripblanks(function_name); @@ -95,7 +95,7 @@ arg1.model=model; graphics.exprs=label; arg1.graphics=graphics; x=arg1; -break +break; } } needcompile=resume(needcompile) diff --git a/js/Misc/scifunc_block_m.js b/js/Misc/scifunc_block_m.js index 99918658..56d148e2 100644 --- a/js/Misc/scifunc_block_m.js +++ b/js/Misc/scifunc_block_m.js @@ -46,7 +46,7 @@ exprs=graphics.exprs; while (true) { [ok,i,o,ci,co,xx,z,rpar,auto0,deptime,lab]=scicos_getvalue(["Set scifunc_block parameters","only regular blocks supported"],["input ports sizes","output port sizes","input event ports sizes","output events ports sizes","initial continuous state","initial discrete state","System parameters vector","initial firing vector (<0 for no firing)","is block always active (0:no, 1:yes)"],list("mat",[-1,2],"mat",[-2,2],"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",1),exprs[1-1]); if (!ok) { -break +break; } exprs[1-1]=lab; xx=xx.slice(); @@ -64,7 +64,7 @@ nco=size(co,1); [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 +break; } [model,graphics,ok]=set_io(model,graphics,list(i,it),list(o,ot),ci,co); if (ok) { @@ -86,7 +86,7 @@ x.model=model; exprs[2-1]=tt; graphics.exprs=exprs; x.graphics=graphics; -break +break; } } needcompile=resume(needcompile) |