diff options
author | Sunil Shetye | 2018-06-18 23:41:23 +0530 |
---|---|---|
committer | Sunil Shetye | 2018-06-19 10:31:46 +0530 |
commit | 1170404c7650cb531534b308f103c9b6abd50d14 (patch) | |
tree | a6a61ae2a9a3592440483906ce6c7254b3243553 /js/Linear | |
parent | cd5b0819762aa4a1cb72d29ab7b8c3ac65bbad76 (diff) | |
download | sci2js-1170404c7650cb531534b308f103c9b6abd50d14.tar.gz sci2js-1170404c7650cb531534b308f103c9b6abd50d14.tar.bz2 sci2js-1170404c7650cb531534b308f103c9b6abd50d14.zip |
handle multiple rows
Diffstat (limited to 'js/Linear')
-rw-r--r-- | js/Linear/BIGSOM_f.js | 4 | ||||
-rw-r--r-- | js/Linear/CLSS.js | 8 | ||||
-rw-r--r-- | js/Linear/CLSS_f.js | 8 | ||||
-rw-r--r-- | js/Linear/DELAYV_f.js | 12 | ||||
-rw-r--r-- | js/Linear/DELAY_f.js | 28 | ||||
-rw-r--r-- | js/Linear/DIFF_c.js | 8 | ||||
-rw-r--r-- | js/Linear/DLSS.js | 8 | ||||
-rw-r--r-- | js/Linear/DLSS_f.js | 8 | ||||
-rw-r--r-- | js/Linear/DOLLAR.js | 4 | ||||
-rw-r--r-- | js/Linear/DOLLAR_f.js | 4 | ||||
-rw-r--r-- | js/Linear/DOLLAR_m.js | 4 | ||||
-rw-r--r-- | js/Linear/GAINBLK.js | 4 | ||||
-rw-r--r-- | js/Linear/GAIN_f.js | 2 | ||||
-rw-r--r-- | js/Linear/INTEGRAL.js | 8 | ||||
-rw-r--r-- | js/Linear/INTEGRAL_m.js | 16 | ||||
-rw-r--r-- | js/Linear/PID.js | 32 | ||||
-rw-r--r-- | js/Linear/REGISTER.js | 4 | ||||
-rw-r--r-- | js/Linear/SOM_f.js | 10 | ||||
-rw-r--r-- | js/Linear/SUMMATION.js | 12 | ||||
-rw-r--r-- | js/Linear/SUM_f.js | 2 | ||||
-rw-r--r-- | js/Linear/TCLSS.js | 12 | ||||
-rw-r--r-- | js/Linear/TCLSS_f.js | 12 | ||||
-rw-r--r-- | js/Linear/TIME_DELAY.js | 6 | ||||
-rw-r--r-- | js/Linear/VARIABLE_DELAY.js | 10 |
24 files changed, 113 insertions, 113 deletions
diff --git a/js/Linear/BIGSOM_f.js b/js/Linear/BIGSOM_f.js index 98c7469e..8fbd341d 100644 --- a/js/Linear/BIGSOM_f.js +++ b/js/Linear/BIGSOM_f.js @@ -1,10 +1,10 @@ /* autogenerated from "macros/Linear/BIGSOM_f.sci" */ function BIGSOM_f() { BIGSOM_f.prototype.define = function BIGSOM_f() { -sgn=[1,1]; +sgn=[[1],[1]]; model=scicos_model(); model.sim=list("sum",2); -model.in1=[-1,-1]; +model.in1=[[-1],[-1]]; model.out=-1; model.rpar=sgn; model.blocktype="c"; diff --git a/js/Linear/CLSS.js b/js/Linear/CLSS.js index 4db8b5da..d4465f5e 100644 --- a/js/Linear/CLSS.js +++ b/js/Linear/CLSS.js @@ -13,10 +13,10 @@ model.sim=list("csslti4",4); model.in1=in1; model.out=out; model.state=x0; -model.rpar=[A.slice(),B.slice(),C.slice(),D.slice()]; +model.rpar=[[A.slice()],[B.slice()],[C.slice()],[D.slice()]]; model.blocktype="c"; model.dep_ut=[false,true]; -exprs=[strcat(sci2exp(A)),strcat(sci2exp(B)),strcat(sci2exp(C)),strcat(sci2exp(D)),strcat(sci2exp(x0))]; +exprs=[[strcat(sci2exp(A))],[strcat(sci2exp(B))],[strcat(sci2exp(C))],[strcat(sci2exp(D))],[strcat(sci2exp(x0))]]; gr_i=[]; x=standard_define([4,2],model,exprs,gr_i); } @@ -33,7 +33,7 @@ exprs=exprs[[1:4,7]-1]; } model=arg1.model; while (true) { -[ok,A,B,C,D,x0,exprs]=scicos_getvalue("Set continuous linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),exprs); +[ok,A,B,C,D,x0,exprs]=scicos_getvalue("Set continuous linear system parameters",[["A matrix"],["B matrix"],["C matrix"],["D matrix"],["Initial state"]],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),exprs); if (!ok) { break; } @@ -62,7 +62,7 @@ message(_("Matrix A is not square or D has wrong dimension")); [model,graphics,ok]=check_io(model,graphics,in1,out,[],[]); if (ok) { graphics.exprs=exprs; -rpar=[A.slice(),B.slice(),C.slice(),D.slice()]; +rpar=[[A.slice()],[B.slice()],[C.slice()],[D.slice()]]; if (D!=[]) { if (norm(D,1)!=0) { mmm=[true,true]; diff --git a/js/Linear/CLSS_f.js b/js/Linear/CLSS_f.js index c924074f..a3af3879 100644 --- a/js/Linear/CLSS_f.js +++ b/js/Linear/CLSS_f.js @@ -13,10 +13,10 @@ model.sim=list("csslti",1); model.in1=in1; model.out=out; model.state=x0; -model.rpar=[A.slice(),B.slice(),C.slice(),D.slice()]; +model.rpar=[[A.slice()],[B.slice()],[C.slice()],[D.slice()]]; model.blocktype="c"; model.dep_ut=[false,true]; -exprs=[strcat(sci2exp(A)),strcat(sci2exp(B)),strcat(sci2exp(C)),strcat(sci2exp(D)),strcat(sci2exp(x0))]; +exprs=[[strcat(sci2exp(A))],[strcat(sci2exp(B))],[strcat(sci2exp(C))],[strcat(sci2exp(D))],[strcat(sci2exp(x0))]]; gr_i=[]; x=standard_define([4,2],model,exprs,gr_i); } @@ -33,7 +33,7 @@ exprs=exprs[[1:4,7]-1]; } model=arg1.model; while (true) { -[ok,A,B,C,D,x0,exprs]=scicos_getvalue("Set continuous linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),exprs); +[ok,A,B,C,D,x0,exprs]=scicos_getvalue("Set continuous linear system parameters",[["A matrix"],["B matrix"],["C matrix"],["D matrix"],["Initial state"]],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),exprs); if (!ok) { break; } @@ -52,7 +52,7 @@ message("A matrix must be square"); [model,graphics,ok]=check_io(model,graphics,in1,out,[],[]); if (ok) { graphics.exprs=exprs; -rpar=[A.slice(),B.slice(),C.slice(),D.slice()]; +rpar=[[A.slice()],[B.slice()],[C.slice()],[D.slice()]]; if (D!=[]) { if (norm(D,1)!=0) { mmm=[true,true]; diff --git a/js/Linear/DELAYV_f.js b/js/Linear/DELAYV_f.js index 3a1687b8..8ecb2401 100644 --- a/js/Linear/DELAYV_f.js +++ b/js/Linear/DELAYV_f.js @@ -7,16 +7,16 @@ zz0=z0.slice(1-1,$-1); T=1; model=scicos_model(); model.sim=list("delayv",1); -model.in1=[nin,1]; +model.in1=[[nin],[1]]; model.out=nin; model.evtin=1; -model.evtout=[1,1]; +model.evtout=[[1],[1]]; model.dstate=z0; model.rpar=T/(size(zz0,"*")); model.blocktype="d"; model.firing=[0,-1]; model.dep_ut=[true,false]; -exprs=[string(nin),strcat(string(z0.slice(1-1,$-1)),";"),string(T)]; +exprs=[[string(nin)],[strcat(string(z0.slice(1-1,$-1)),";")],[string(T)]]; gr_i=[]; x=standard_define([3,2],model,exprs,gr_i); } @@ -34,7 +34,7 @@ z0=model.dstate; zz0=z0.slice(1-1,$-1); told=z0[$-1]; while (true) { -[ok,nin,zz0,T,exprs]=scicos_getvalue("Set delay parameters",["Number of inputs","Register initial condition","Max delay"],list("vec",1,"vec",-1,"vec",1),exprs); +[ok,nin,zz0,T,exprs]=scicos_getvalue("Set delay parameters",[["Number of inputs"],["Register initial condition"],["Max delay"]],list("vec",1,"vec",-1,"vec",1),exprs); if (!ok) { break; } @@ -47,11 +47,11 @@ message("Delay must be positive"); ok=false; } if (ok) { -[model,graphics,ok]=check_io(model,graphics,[nin,1],nin,1,[1,1]); +[model,graphics,ok]=check_io(model,graphics,[[nin],[1]],nin,1,[[1],[1]]); } if (ok) { graphics.exprs=exprs; -model.dstate=[zz0.slice(),told]; +model.dstate=[[zz0.slice()],[told]]; model.rpar=T/(size(zz0,"*")); x.graphics=graphics; x.model=model; diff --git a/js/Linear/DELAY_f.js b/js/Linear/DELAY_f.js index c891093b..05949aa7 100644 --- a/js/Linear/DELAY_f.js +++ b/js/Linear/DELAY_f.js @@ -5,7 +5,7 @@ evtdly=EVTDLY_f("define"); evtdly.graphics.orig=[243,296]; evtdly.graphics.sz=[40,40]; evtdly.graphics.flip=true; -evtdly.graphics.exprs=["0.1","0"]; +evtdly.graphics.exprs=[["0.1"],["0"]]; evtdly.graphics.pein=10; evtdly.graphics.peout=7; evtdly.model.rpar=0.1; @@ -22,31 +22,31 @@ input_port=IN_f("define"); input_port.graphics.orig=[92,210]; input_port.graphics.sz=[20,20]; input_port.graphics.flip=true; -input_port.graphics.exprs=["1","1"]; +input_port.graphics.exprs=[["1"],["1"]]; input_port.graphics.pout=6; input_port.model.ipar=1; output_port=OUT_f("define"); output_port.graphics.orig=[440,210]; output_port.graphics.sz=[20,20]; output_port.graphics.flip=true; -output_port.graphics.exprs=["1","1"]; +output_port.graphics.exprs=[["1"],["1"]]; output_port.graphics.pin=5; output_port.model.ipar=1; split=CLKSPLIT_f("define"); -split.graphics.orig=[263,271.2]; +split.graphics.orig=[[263],[271.2]]; split.graphics.pein=7; -split.graphics.peout=[9,10]; +split.graphics.peout=[[9],[10]]; diagram=scicos_diagram(); diagram.objs[1-1]=input_port; diagram.objs[2-1]=output_port; diagram.objs[3-1]=register; diagram.objs[4-1]=evtdly; -diagram.objs[5-1]=scicos_link(xx=[296.6,440],yy=[220,220],from=[3,1],to=[2,1]); -diagram.objs[6-1]=scicos_link(xx=[112,229.4],yy=[220,220],from=[1,1],to=[3,1]); -diagram.objs[7-1]=scicos_link(xx=[263,263],yy=[290.3,271.2],ct=[5,-1],from=[4,1],to=[8,1]); +diagram.objs[5-1]=scicos_link(xx=[[296.6],[440]],yy=[[220],[220]],from=[3,1],to=[2,1]); +diagram.objs[6-1]=scicos_link(xx=[[112],[229.4]],yy=[[220],[220]],from=[1,1],to=[3,1]); +diagram.objs[7-1]=scicos_link(xx=[[263],[263]],yy=[[290.3],[271.2]],ct=[5,-1],from=[4,1],to=[8,1]); diagram.objs[8-1]=split; -diagram.objs[9-1]=scicos_link(xx=[263,263],yy=[271.2,250.7],ct=[5,-1],from=[8,1],to=[3,1]); -diagram.objs[10-1]=scicos_link(xx=[263,308.6,308.6,263,263],yy=[271.2,271.2,367,367,341.7],ct=[5,-1],from=[8,2],to=[4,1]); +diagram.objs[9-1]=scicos_link(xx=[[263],[263]],yy=[[271.2],[250.7]],ct=[5,-1],from=[8,1],to=[3,1]); +diagram.objs[10-1]=scicos_link(xx=[[263],[308.6],[308.6],[263],[263]],yy=[[271.2],[271.2],[367],[367],[341.7]],ct=[5,-1],from=[8,2],to=[4,1]); x=scicos_block(); x.gui="DELAY_f"; x.graphics.sz=[2,2]; @@ -88,19 +88,19 @@ register=x.model.rpar.objs(ppath[1-1]); evtdly=x.model.rpar.objs(ppath[2-1]); register_exprs=register.graphics.exprs; evtdly_exprs=evtdly.graphics.exprs; -exprs=[evtdly_exprs(1),register_exprs]; +exprs=[[evtdly_exprs(1)],[register_exprs]]; while (true) { -[ok,dt,z0,exprs]=scicos_getvalue(["This block implements as a discretized delay","it is consist of a shift register and a clock","value of the delay is given by;","the discretization time step multiplied by the","number-1 of state of the register"],["Discretization time step","Register initial state"],list("vec",1,"vec",-1),exprs); +[ok,dt,z0,exprs]=scicos_getvalue([["This block implements as a discretized delay"],["it is consist of a shift register and a clock"],["value of the delay is given by;","the discretization time step multiplied by the"],["number-1 of state of the register"]],[["Discretization time step"],["Register initial state"]],list("vec",1,"vec",-1),exprs); if (!ok) { break; } mess=[]; if (prod(size(z0))<1) { -mess=[mess,"Register length must be at least 1"," "]; +mess=[[mess],["Register length must be at least 1"],[" "]]; ok=false; } if (dt<=0) { -mess=[mess,"Discretization time step must be positive"," "]; +mess=[[mess],["Discretization time step must be positive"],[" "]]; ok=false; } if (!ok) { diff --git a/js/Linear/DIFF_c.js b/js/Linear/DIFF_c.js index e0025a4d..7f5905ab 100644 --- a/js/Linear/DIFF_c.js +++ b/js/Linear/DIFF_c.js @@ -1,7 +1,7 @@ /* autogenerated from "macros/Linear/DIFF_c.sci" */ function DIFF_c() { DIFF_c.prototype.define = function DIFF_c() { -x0=[0,0]; +x0=[[0],[0]]; model=scicos_model(); model.sim=list("diffblk_c",10004); model.in1=1; @@ -9,7 +9,7 @@ model.out=1; model.state=x0; model.blocktype="c"; model.dep_ut=[false,true]; -exprs=[strcat(sci2exp(x0[1-1])),strcat(sci2exp(x0[2-1]))]; +exprs=[[strcat(sci2exp(x0[1-1]))],[strcat(sci2exp(x0[2-1]))]]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); } @@ -24,7 +24,7 @@ exprs=graphics.exprs; model=arg1.model; while (true) { ask_again=false; -[ok,x0,xd0,exprs]=scicos_getvalue("Set continuous linear system parameters",["Initial state","Initial Derivative"],list("vec",-1,"vec",-1),exprs); +[ok,x0,xd0,exprs]=scicos_getvalue("Set continuous linear system parameters",[["Initial state"],["Initial Derivative"]],list("vec",-1,"vec",-1),exprs); if (!ok) { break; } @@ -42,7 +42,7 @@ ask_again=true; } if (!ask_again) { graphics.exprs=exprs; -model.state=[x0,xd0]; +model.state=[[x0],[xd0]]; model.out=[N]; model.in1=N; x.graphics=graphics; diff --git a/js/Linear/DLSS.js b/js/Linear/DLSS.js index 79ef159f..48f4069a 100644 --- a/js/Linear/DLSS.js +++ b/js/Linear/DLSS.js @@ -12,10 +12,10 @@ model.in1=1; model.out=1; model.evtin=1; model.dstate=x0.slice(); -model.rpar=[A.slice(),B.slice(),C.slice(),D.slice()]; +model.rpar=[[A.slice()],[B.slice()],[C.slice()],[D.slice()]]; model.blocktype="d"; model.dep_ut=[false,false]; -exprs=[strcat(sci2exp(A)),strcat(sci2exp(B)),strcat(sci2exp(C)),strcat(sci2exp(D)),strcat(sci2exp(x0))]; +exprs=[[strcat(sci2exp(A))],[strcat(sci2exp(B))],[strcat(sci2exp(C))],[strcat(sci2exp(D))],[strcat(sci2exp(x0))]]; gr_i=[]; x=standard_define([4,2],model,exprs,gr_i); } @@ -32,7 +32,7 @@ exprs=exprs[[1:4,7]-1]; } model=arg1.model; while (true) { -[ok,A,B,C,D,x0,exprs]=scicos_getvalue("Set discrete linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),exprs); +[ok,A,B,C,D,x0,exprs]=scicos_getvalue("Set discrete linear system parameters",[["A matrix"],["B matrix"],["C matrix"],["D matrix"],["Initial state"]],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),exprs); if (!ok) { break; } @@ -61,7 +61,7 @@ message(_("Matrix A is not square or D has wrong dimension")); [model,graphics,ok]=check_io(model,graphics,in1,out,1,[]); if (ok) { graphics.exprs=exprs; -rpar=[A.slice(),B.slice(),C.slice(),D.slice()]; +rpar=[[A.slice()],[B.slice()],[C.slice()],[D.slice()]]; if (D!=[]) { if (norm(D,1)!=0) { mmm=[true,false]; diff --git a/js/Linear/DLSS_f.js b/js/Linear/DLSS_f.js index d7d4f2f5..3eeb691a 100644 --- a/js/Linear/DLSS_f.js +++ b/js/Linear/DLSS_f.js @@ -12,10 +12,10 @@ model.in1=1; model.out=1; model.evtin=1; model.dstate=x0.slice(); -model.rpar=[A.slice(),B.slice(),C.slice(),D.slice()]; +model.rpar=[[A.slice()],[B.slice()],[C.slice()],[D.slice()]]; model.blocktype="d"; model.dep_ut=[false,false]; -exprs=[strcat(sci2exp(A)),strcat(sci2exp(B)),strcat(sci2exp(C)),strcat(sci2exp(D)),strcat(sci2exp(x0))]; +exprs=[[strcat(sci2exp(A))],[strcat(sci2exp(B))],[strcat(sci2exp(C))],[strcat(sci2exp(D))],[strcat(sci2exp(x0))]]; gr_i=[]; x=standard_define([4,2],model,exprs,gr_i); } @@ -32,7 +32,7 @@ exprs=exprs[[1:4,7]-1]; } model=arg1.model; while (true) { -[ok,A,B,C,D,x0,exprs]=scicos_getvalue("Set discrete linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),exprs); +[ok,A,B,C,D,x0,exprs]=scicos_getvalue("Set discrete linear system parameters",[["A matrix"],["B matrix"],["C matrix"],["D matrix"],["Initial state"]],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),exprs); if (!ok) { break; } @@ -51,7 +51,7 @@ message("A matrix must be square"); [model,graphics,ok]=check_io(model,graphics,in1,out,1,[]); if (ok) { graphics.exprs=exprs; -rpar=[A.slice(),B.slice(),C.slice(),D.slice()]; +rpar=[[A.slice()],[B.slice()],[C.slice()],[D.slice()]]; if (D!=[]) { if (norm(D,1)!=0) { mmm=[true,false]; diff --git a/js/Linear/DOLLAR.js b/js/Linear/DOLLAR.js index 88405a1d..abcad365 100644 --- a/js/Linear/DOLLAR.js +++ b/js/Linear/DOLLAR.js @@ -4,7 +4,7 @@ DOLLAR.prototype.define = function DOLLAR() { z=0; inh=0; in1=1; -exprs=string([z,inh]); +exprs=string([[z],[inh]]); model=scicos_model(); model.sim=list("dollar4",4); model.in1=in1; @@ -29,7 +29,7 @@ if (size(exprs,"*")<2) { exprs[2-1]="0"; } while (true) { -[ok,a,inh,exprs]=scicos_getvalue("Set 1/z block parameters",["initial condition","Inherit (no:0, yes:1)"],list("mat",[-1,-2],"vec",-1),exprs); +[ok,a,inh,exprs]=scicos_getvalue("Set 1/z block parameters",[["initial condition"],["Inherit (no:0, yes:1)"]],list("mat",[-1,-2],"vec",-1),exprs); if (!ok) { break; } diff --git a/js/Linear/DOLLAR_f.js b/js/Linear/DOLLAR_f.js index c08d6216..203d8dad 100644 --- a/js/Linear/DOLLAR_f.js +++ b/js/Linear/DOLLAR_f.js @@ -4,7 +4,7 @@ DOLLAR_f.prototype.define = function DOLLAR_f() { z=0; inh=0; in1=1; -exprs=string([z,inh]); +exprs=string([[z],[inh]]); model=scicos_model(); model.sim="dollar"; model.in1=in1; @@ -29,7 +29,7 @@ if (size(exprs,"*")<2) { exprs[2-1]="0"; } while (true) { -[ok,a,inh,exprs]=scicos_getvalue("Set 1/z block parameters",["initial condition","Inherit (no:0, yes:1)"],list("vec",-1,"vec",-1),exprs); +[ok,a,inh,exprs]=scicos_getvalue("Set 1/z block parameters",[["initial condition"],["Inherit (no:0, yes:1)"]],list("vec",-1,"vec",-1),exprs); if (!ok) { break; } diff --git a/js/Linear/DOLLAR_m.js b/js/Linear/DOLLAR_m.js index b25fa881..d7ce7a98 100644 --- a/js/Linear/DOLLAR_m.js +++ b/js/Linear/DOLLAR_m.js @@ -4,7 +4,7 @@ DOLLAR_m.prototype.define = function DOLLAR_m() { z=0; inh=0; in1=1; -exprs=string([z,inh]); +exprs=string([[z],[inh]]); model=scicos_model(); model.sim=list("dollar4",4); model.in1=in1; @@ -29,7 +29,7 @@ if (size(exprs,"*")<2) { exprs[2-1]="0"; } while (true) { -[ok,a,inh,exprs]=scicos_getvalue("Set 1/z block parameters",["initial condition","Inherit (no:0, yes:1)"],list("mat",[-1,-2],"vec",-1),exprs); +[ok,a,inh,exprs]=scicos_getvalue("Set 1/z block parameters",[["initial condition"],["Inherit (no:0, yes:1)"]],list("mat",[-1,-2],"vec",-1),exprs); if (!ok) { break; } diff --git a/js/Linear/GAINBLK.js b/js/Linear/GAINBLK.js index c5113bc0..83aad919 100644 --- a/js/Linear/GAINBLK.js +++ b/js/Linear/GAINBLK.js @@ -29,10 +29,10 @@ graphics=arg1.graphics; exprs=graphics.exprs; model=arg1.model; if (size(exprs,"*")==1) { -exprs=[exprs,sci2exp(0)]; +exprs=[[exprs],[sci2exp(0)]]; } while (true) { -[ok,gain,over,exprs]=scicos_getvalue("Set gain block parameters",["Gain","Do On Overflow(0=Nothing 1=Saturate 2=Error)"],list("mat",[-1,-1],"vec",1),exprs); +[ok,gain,over,exprs]=scicos_getvalue("Set gain block parameters",[["Gain"],["Do On Overflow(0=Nothing 1=Saturate 2=Error)"]],list("mat",[-1,-1],"vec",1),exprs); if (!ok) { break; } diff --git a/js/Linear/GAIN_f.js b/js/Linear/GAIN_f.js index 4996bc20..6e8f10bc 100644 --- a/js/Linear/GAIN_f.js +++ b/js/Linear/GAIN_f.js @@ -11,7 +11,7 @@ model.out=1; model.rpar=gain; model.blocktype="c"; model.dep_ut=[true,false]; -exprs=[strcat(sci2exp(gain)),strcat(sci2exp(in1)),strcat(sci2exp(out))]; +exprs=[[strcat(sci2exp(gain))],[strcat(sci2exp(in1))],[strcat(sci2exp(out))]]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); } diff --git a/js/Linear/INTEGRAL.js b/js/Linear/INTEGRAL.js index d2eb1397..04e3bca9 100644 --- a/js/Linear/INTEGRAL.js +++ b/js/Linear/INTEGRAL.js @@ -12,7 +12,7 @@ model.out=1; model.rpar=rpar; model.blocktype="c"; model.dep_ut=[false,true]; -exprs=string([0,0,0,maxp,minp]); +exprs=string([[0],[0],[0],[maxp],[minp]]); gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); x.graphics.id="1/s"; @@ -27,7 +27,7 @@ graphics=arg1.graphics; exprs=graphics.exprs; model=arg1.model; while (true) { -[ok,x0,reinit,satur,maxp,lowp,exprs]=scicos_getvalue("Set Integral block parameters",["Initial Condition","With re-intialization (1:yes, 0:no)","With saturation (1:yes, 0:no)","Upper limit","Lower limit"],list("vec",-1,"vec",1,"vec",1,"vec",-1,"vec",-1),exprs); +[ok,x0,reinit,satur,maxp,lowp,exprs]=scicos_getvalue("Set Integral block parameters",[["Initial Condition"],["With re-intialization (1:yes, 0:no)"],["With saturation (1:yes, 0:no)"],["Upper limit"],["Lower limit"]],list("vec",-1,"vec",1,"vec",1,"vec",-1,"vec",-1),exprs); if (!ok) { break; } @@ -55,7 +55,7 @@ ok=false; message("Initial condition x0 should be inside the limits"); ok=false; } else { -rpar=[maxp,lowp]; +rpar=[[maxp],[lowp]]; model.nzcross=size(x0,1); model.nmode=size(x0,1); } @@ -67,7 +67,7 @@ model.nmode=0; if (ok) { model.rpar=rpar; model.state=x0; -[model,graphics,ok]=check_io(model,graphics,size(x0,1)*[1,ones(reinit,1)],size(x0,1),ones(reinit,1),[]); +[model,graphics,ok]=check_io(model,graphics,size(x0,1)*[[1],[ones(reinit,1)]],size(x0,1),ones(reinit,1),[]); } if (ok) { graphics.exprs=exprs; diff --git a/js/Linear/INTEGRAL_m.js b/js/Linear/INTEGRAL_m.js index 07d0343a..d1497320 100644 --- a/js/Linear/INTEGRAL_m.js +++ b/js/Linear/INTEGRAL_m.js @@ -14,7 +14,7 @@ model.out2=1; model.rpar=rpar; model.blocktype="c"; model.dep_ut=[false,true]; -exprs=string([0,0,0,maxp,minp]); +exprs=string([[0],[0],[0],[maxp],[minp]]); gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); } @@ -28,7 +28,7 @@ graphics=arg1.graphics; exprs=graphics.exprs; model=arg1.model; while (true) { -[ok,x0,reinit,satur,maxp,lowp,exprs]=scicos_getvalue("Set Integral block parameters",["Initial Condition","With re-intialization (1:yes, 0:no)","With saturation (1:yes, 0:no)","Upper limit","Lower limit"],list("mat",[-1,-1],"vec",1,"vec",1,"mat",[-1,-1],"mat",[-1,-1]),exprs); +[ok,x0,reinit,satur,maxp,lowp,exprs]=scicos_getvalue("Set Integral block parameters",[["Initial Condition"],["With re-intialization (1:yes, 0:no)"],["With saturation (1:yes, 0:no)"],["Upper limit"],["Lower limit"]],list("mat",[-1,-1],"vec",1,"vec",1,"mat",[-1,-1],"mat",[-1,-1]),exprs); if (!ok) { break; } @@ -59,7 +59,7 @@ ok=false; message("Initial condition x0 should be inside the limits"); ok=false; } else { -rpar=[real(maxp.slice()),real(lowp.slice())]; +rpar=[[real(maxp.slice())],[real(lowp.slice())]]; model.nzcross=size(x0,"*"); model.nmode=size(x0,"*"); } @@ -80,7 +80,7 @@ ok=false; message("Initial condition x0 should be inside the limits"); ok=false; } else { -rpar=[real(maxp.slice()),real(lowp.slice()),imag(maxp.slice()),imag(lowp.slice())]; +rpar=[[real(maxp.slice())],[real(lowp.slice())],[imag(maxp.slice())],[imag(lowp.slice())]]; model.nzcross=2*size(x0,"*"); model.nmode=2*size(x0,"*"); } @@ -95,19 +95,19 @@ model.rpar=rpar; if ((Datatype==1)) { model.state=real(x0.slice()); model.sim=list("integral_func",4); -it=[1,ones(reinit,1)]; +it=[[1],[ones(reinit,1)]]; ot=1; } else if ((Datatype==2)) { -model.state=[real(x0.slice()),imag(x0.slice())]; +model.state=[[real(x0.slice())],[imag(x0.slice())]]; model.sim=list("integralz_func",4); -it=[2,2*ones(reinit,1)]; +it=[[2],[2*ones(reinit,1)]]; ot=2; } else { message("Datatype is not supported"); ok=false; } if (ok) { -in1=[size(x0,1)*[1,ones(reinit,1)],size(x0,2)*[1,ones(reinit,1)]]; +in1=[size(x0,1)*[[1],[ones(reinit,1)]],size(x0,2)*[[1],[ones(reinit,1)]]]; out=size(x0); [model,graphics,ok]=set_io(model,graphics,list(in1,it),list(out,ot),ones(reinit,1),[]); } diff --git a/js/Linear/PID.js b/js/Linear/PID.js index f4822015..34d08bd4 100644 --- a/js/Linear/PID.js +++ b/js/Linear/PID.js @@ -2,27 +2,27 @@ function PID() { PID.prototype.define = function PID() { scs_m=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["PID"],tol=[0.0001,0.000001,1.000e-10,100001,0,0],tf=100000,context=" ",void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(true,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list())); -scs_m.objs[1-1]=scicos_block(gui="INTEGRAL_m",graphics=scicos_graphics(orig=[318.304,183.11733],sz=[40,40],flip=true,theta=0,exprs=["0","0","0","1","-1"],pin=7,pout=9,pein=[],peout=[],gr_i=[],id="1/s",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("integral_func",4),in1=1,in2=1,intyp=1,out=1,out2=1,outtyp=1,evtin=[],evtout=[],state=0,dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[false,true],label="",nzcross=0,nmode=0,equations=list()),doc=list()); -scs_m.objs[2-1]=scicos_block(gui="SUMMATION",graphics=scicos_graphics(orig=[387.97067,172.85067],sz=[40,60],flip=true,theta=0,exprs=["1","[1;1;1]"],pin=[10,9,11],pout=19,pein=[],peout=[],gr_i=[],id="",in_implicit=["E","E","E"],out_implicit="E"),model=scicos_model(sim=list("summation",4),in1=[-1,-1,-1],in2=[-2,-2,-2],intyp=[1,1,1],out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[1,1,1],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[1-1]=scicos_block(gui="INTEGRAL_m",graphics=scicos_graphics(orig=[318.304,183.11733],sz=[40,40],flip=true,theta=0,exprs=[["0"],["0"],["0"],["1"],["-1"]],pin=7,pout=9,pein=[],peout=[],gr_i=[],id="1/s",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("integral_func",4),in1=1,in2=1,intyp=1,out=1,out2=1,outtyp=1,evtin=[],evtout=[],state=0,dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[false,true],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[2-1]=scicos_block(gui="SUMMATION",graphics=scicos_graphics(orig=[387.97067,172.85067],sz=[40,60],flip=true,theta=0,exprs=[["1"],["[1;1;1]"]],pin=[[10],[9],[11]],pout=19,pein=[],peout=[],gr_i=[],id="",in_implicit=[["E"],["E"],["E"]],out_implicit="E"),model=scicos_model(sim=list("summation",4),in1=[[-1],[-1],[-1]],in2=[[-2],[-2],[-2]],intyp=[[1],[1],[1]],out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[[1],[1],[1]],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[3-1]=scicos_block(gui="GAINBLK",graphics=scicos_graphics(orig=[321.23733,235.91733],sz=[40,40],flip=true,theta=0,exprs="1",pin=17,pout=10,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("gainblk",4),in1=-1,in2=-2,intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=1,ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[4-1]=scicos_block(gui="DERIV",graphics=scicos_graphics(orig=[319.03733,135.45067],sz=[40,40],flip=true,theta=0,exprs=[],pin=8,pout=11,pein=[],peout=[],gr_i=[],id="s",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("deriv",4),in1=-1,in2=-2,intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="x",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[5-1]=scicos_block(gui="GAINBLK",graphics=scicos_graphics(orig=[255.23733,183.11733],sz=[40,40],flip=true,theta=0,exprs="1",pin=13,pout=7,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("gainblk",4),in1=-1,in2=-2,intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=1,ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[6-1]=scicos_block(gui="GAINBLK",graphics=scicos_graphics(orig=[255.23733,135.45067],sz=[40,40],flip=true,theta=0,exprs="1",pin=14,pout=8,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("gainblk",4),in1=-1,in2=-2,intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=1,ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); -scs_m.objs[7-1]=scicos_link(xx=[303.80876,309.73257],yy=[203.11733,203.11733],id="drawlink",thick=[0,0],ct=[1,1],from=[5,1,0],to=[1,1,1]); -scs_m.objs[8-1]=scicos_link(xx=[303.80876,310.4659],yy=[155.45067,155.45067],id="drawlink",thick=[0,0],ct=[1,1],from=[6,1,0],to=[4,1,1]); -scs_m.objs[9-1]=scicos_link(xx=[366.87543,379.39924],yy=[203.11733,202.85067],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[2,2,1]); -scs_m.objs[10-1]=scicos_link(xx=[369.80876,379.39924,379.39924],yy=[255.91733,255.91733,217.85067],id="drawlink",thick=[0,0],ct=[1,1],from=[3,1,0],to=[2,1,1]); -scs_m.objs[11-1]=scicos_link(xx=[367.60876,379.39924,379.39924],yy=[155.45067,155.45067,187.85067],id="drawlink",thick=[0,0],ct=[1,1],from=[4,1,0],to=[2,3,1]); -scs_m.objs[12-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[234.704,203.11733],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=16,pout=[13,14],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); -scs_m.objs[13-1]=scicos_link(xx=[234.704,246.6659],yy=[203.11733,203.11733],id="drawlink",thick=[0,0],ct=[1,1],from=[12,1,0],to=[5,1,1]); -scs_m.objs[14-1]=scicos_link(xx=[234.704,234.704,246.6659],yy=[203.11733,155.45067,155.45067],id="drawlink",thick=[0,0],ct=[1,1],from=[12,2,0],to=[6,1,1]); -scs_m.objs[15-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[233.97067,203.11733],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=21,pout=[16,17],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); -scs_m.objs[16-1]=scicos_link(xx=[233.97067,234.704],yy=[203.11733,203.11733],id="drawlink",thick=[0,0],ct=[1,1],from=[15,1,0],to=[12,1,1]); -scs_m.objs[17-1]=scicos_link(xx=[233.97067,233.97067,312.6659],yy=[203.11733,255.91733,255.91733],id="drawlink",thick=[0,0],ct=[1,1],from=[15,2,0],to=[3,1,1]); +scs_m.objs[7-1]=scicos_link(xx=[[303.80876],[309.73257]],yy=[[203.11733],[203.11733]],id="drawlink",thick=[0,0],ct=[1,1],from=[5,1,0],to=[1,1,1]); +scs_m.objs[8-1]=scicos_link(xx=[[303.80876],[310.4659]],yy=[[155.45067],[155.45067]],id="drawlink",thick=[0,0],ct=[1,1],from=[6,1,0],to=[4,1,1]); +scs_m.objs[9-1]=scicos_link(xx=[[366.87543],[379.39924]],yy=[[203.11733],[202.85067]],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[2,2,1]); +scs_m.objs[10-1]=scicos_link(xx=[[369.80876],[379.39924],[379.39924]],yy=[[255.91733],[255.91733],[217.85067]],id="drawlink",thick=[0,0],ct=[1,1],from=[3,1,0],to=[2,1,1]); +scs_m.objs[11-1]=scicos_link(xx=[[367.60876],[379.39924],[379.39924]],yy=[[155.45067],[155.45067],[187.85067]],id="drawlink",thick=[0,0],ct=[1,1],from=[4,1,0],to=[2,3,1]); +scs_m.objs[12-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[[234.704],[203.11733]],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=16,pout=[[13],[14]],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[["E"],["E"],["E"]]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[[-1],[-1],[-1]],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[13-1]=scicos_link(xx=[[234.704],[246.6659]],yy=[[203.11733],[203.11733]],id="drawlink",thick=[0,0],ct=[1,1],from=[12,1,0],to=[5,1,1]); +scs_m.objs[14-1]=scicos_link(xx=[[234.704],[234.704],[246.6659]],yy=[[203.11733],[155.45067],[155.45067]],id="drawlink",thick=[0,0],ct=[1,1],from=[12,2,0],to=[6,1,1]); +scs_m.objs[15-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[[233.97067],[203.11733]],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=21,pout=[[16],[17]],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[["E"],["E"],["E"]]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[[-1],[-1],[-1]],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[16-1]=scicos_link(xx=[[233.97067],[234.704]],yy=[[203.11733],[203.11733]],id="drawlink",thick=[0,0],ct=[1,1],from=[15,1,0],to=[12,1,1]); +scs_m.objs[17-1]=scicos_link(xx=[[233.97067],[233.97067],[312.6659]],yy=[[203.11733],[255.91733],[255.91733]],id="drawlink",thick=[0,0],ct=[1,1],from=[15,2,0],to=[3,1,1]); scs_m.objs[18-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[456.5421,192.85067],sz=[20,20],flip=true,theta=0,exprs="1",pin=19,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); -scs_m.objs[19-1]=scicos_link(xx=[436.5421,456.5421],yy=[202.85067,202.85067],id="drawlink",thick=[0,0],ct=[1,1],from=[2,1,0],to=[18,1,1]); +scs_m.objs[19-1]=scicos_link(xx=[[436.5421],[456.5421]],yy=[[202.85067],[202.85067]],id="drawlink",thick=[0,0],ct=[1,1],from=[2,1,0],to=[18,1,1]); scs_m.objs[20-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[193.97067,193.11733],sz=[20,20],flip=true,theta=0,exprs="1",pin=[],pout=21,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); -scs_m.objs[21-1]=scicos_link(xx=[213.97067,233.97067],yy=[203.11733,203.11733],id="drawlink",thick=[0,0],ct=[1,1],from=[20,1,0],to=[15,1,1]); +scs_m.objs[21-1]=scicos_link(xx=[[213.97067],[233.97067]],yy=[[203.11733],[203.11733]],id="drawlink",thick=[0,0],ct=[1,1],from=[20,1,0],to=[15,1,1]); model=scicos_model(); model.sim="csuper"; model.in1=-1; @@ -85,7 +85,7 @@ exprs[3-1]=xx3.graphics.exprs(1); d_old=xx3.model.rpar; y=0; while (true) { -[ok,p,i,d,exprs0]=scicos_getvalue("Set PID parameters",["Proportional","Integral","Derivation"],list("vec",-1,"vec",-1,"vec",-1),exprs); +[ok,p,i,d,exprs0]=scicos_getvalue("Set PID parameters",[["Proportional"],["Integral"],["Derivation"]],list("vec",-1,"vec",-1,"vec",-1),exprs); if (!ok) { break; } diff --git a/js/Linear/REGISTER.js b/js/Linear/REGISTER.js index a7822b9a..b716157a 100644 --- a/js/Linear/REGISTER.js +++ b/js/Linear/REGISTER.js @@ -24,10 +24,10 @@ graphics=arg1.graphics; exprs=graphics.exprs; model=arg1.model; if (size(exprs,1)==1) { -exprs=[exprs,sci2exp(1)]; +exprs=[[exprs],[sci2exp(1)]]; } while (true) { -[ok,z0,it,exprs]=scicos_getvalue("Set delay parameters",["Register initial condition","Datatype (1=double 3=int32 ...)"],list("vec",-1,"vec",1),exprs); +[ok,z0,it,exprs]=scicos_getvalue("Set delay parameters",[["Register initial condition"],["Datatype (1=double 3=int32 ...)"]],list("vec",-1,"vec",1),exprs); if (!ok) { break; } diff --git a/js/Linear/SOM_f.js b/js/Linear/SOM_f.js index 57198085..2f948a32 100644 --- a/js/Linear/SOM_f.js +++ b/js/Linear/SOM_f.js @@ -1,15 +1,15 @@ /* autogenerated from "macros/Linear/SOM_f.sci" */ function SOM_f() { SOM_f.prototype.define = function SOM_f() { -sgn=[1,1,1]; +sgn=[[1],[1],[1]]; model=scicos_model(); model.sim=list("sum",2); -model.in1=[-1,-1,-1]; +model.in1=[[-1],[-1],[-1]]; model.out=-1; model.rpar=sgn; model.blocktype="c"; model.dep_ut=[true,false]; -exprs=[sci2exp(1),sci2exp(sgn)]; +exprs=[[sci2exp(1)],[sci2exp(sgn)]]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); } @@ -33,8 +33,8 @@ labs=["down","left","up"]; } else { labs=["down","right","up"]; } -str=["This sum block is obsolete","parameters cannot be modified. Please replace it with new sum block","and gain blocks in the linear palette"," ","Input ports are located at up, side and down positions.","Current gains are:"]; -str=[str,(part(labs.slice(),1,7)+exprs.slice())]; +str=[["This sum block is obsolete","parameters cannot be modified. Please replace it with new sum block"],["and gain blocks in the linear palette"," ","Input ports are located at up, side and down positions.","Current gains are:"]]; +str=[[str],[(part(labs.slice(),1,7)+exprs.slice())]]; message(str); } } diff --git a/js/Linear/SUMMATION.js b/js/Linear/SUMMATION.js index a1ada670..4b54dda9 100644 --- a/js/Linear/SUMMATION.js +++ b/js/Linear/SUMMATION.js @@ -1,12 +1,12 @@ /* autogenerated from "macros/Linear/SUMMATION.sci" */ function SUMMATION() { SUMMATION.prototype.define = function SUMMATION() { -sgn=[1,-1]; +sgn=[[1],[-1]]; model=scicos_model(); model.sim=list("summation",4); -model.in1=[-1,-1]; +model.in1=[[-1],[-1]]; model.out=-1; -model.in2=[-2,-2]; +model.in2=[[-2],[-2]]; model.out2=-2; model.ipar=sgn; model.blocktype="c"; @@ -25,12 +25,12 @@ graphics=arg1.graphics; model=arg1.model; exprs=graphics.exprs; if (size(exprs,1)==1) { -exprs=[sci2exp(1),exprs,sci2exp(0)]; +exprs=[[sci2exp(1)],[exprs],[sci2exp(0)]]; } else if (size(exprs,1)==2) { -exprs=[exprs,sci2exp(0)]; +exprs=[[exprs],[sci2exp(0)]]; } while (true) { -[ok,Datatype,sgn,satur,exprs]=scicos_getvalue("Set sum block parameters",["Datatype (1=real double 2=complex 3=int32 ...)","Number of inputs or sign vector (of +1, -1)","Do on Overflow(0=Nothing 1=Saturate 2=Error)"],list("vec",1,"vec",-1,"vec",1),exprs); +[ok,Datatype,sgn,satur,exprs]=scicos_getvalue("Set sum block parameters",[["Datatype (1=real double 2=complex 3=int32 ...)"],["Number of inputs or sign vector (of +1, -1)"],["Do on Overflow(0=Nothing 1=Saturate 2=Error)"]],list("vec",1,"vec",-1,"vec",1),exprs); if (!ok) { break; } diff --git a/js/Linear/SUM_f.js b/js/Linear/SUM_f.js index 087295b7..2fae7a87 100644 --- a/js/Linear/SUM_f.js +++ b/js/Linear/SUM_f.js @@ -3,7 +3,7 @@ function SUM_f() { SUM_f.prototype.define = function SUM_f() { model=scicos_model(); model.sim=list("plusblk",2); -model.in1=[-1,-1,-1]; +model.in1=[[-1],[-1],[-1]]; model.out=-1; model.blocktype="c"; model.dep_ut=[true,false]; diff --git a/js/Linear/TCLSS.js b/js/Linear/TCLSS.js index a680df19..d26c9112 100644 --- a/js/Linear/TCLSS.js +++ b/js/Linear/TCLSS.js @@ -11,14 +11,14 @@ nx=size(x0,"*"); out=1; model=scicos_model(); model.sim=list("tcslti4",4); -model.in1=[in1,nx]; +model.in1=[[in1],[nx]]; model.out=out; model.evtin=1; model.state=x0; -model.rpar=[A.slice(),B.slice(),C.slice(),D.slice()]; +model.rpar=[[A.slice()],[B.slice()],[C.slice()],[D.slice()]]; model.blocktype="c"; model.dep_ut=[false,true]; -exprs=[strcat(sci2exp(A)),strcat(sci2exp(B)),strcat(sci2exp(C)),strcat(sci2exp(D)),strcat(sci2exp(x0))]; +exprs=[[strcat(sci2exp(A))],[strcat(sci2exp(B))],[strcat(sci2exp(C))],[strcat(sci2exp(D))],[strcat(sci2exp(x0))]]; gr_i=[]; x=standard_define([3,2],model,exprs,gr_i); } @@ -35,7 +35,7 @@ if (size(exprs,"*")==7) { exprs=exprs[[1:4,7]-1]; } while (true) { -[ok,A,B,C,D,x0,exprs]=scicos_getvalue("Set continuous linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),exprs); +[ok,A,B,C,D,x0,exprs]=scicos_getvalue("Set continuous linear system parameters",[["A matrix"],["B matrix"],["C matrix"],["D matrix"],["Initial state"]],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),exprs); if (!ok) { break; } @@ -51,10 +51,10 @@ in1=[]; if (ms!=ns) { message("A matrix must be square"); } else { -[model,graphics,ok]=check_io(model,graphics,[in1,ms],out,1,[]); +[model,graphics,ok]=check_io(model,graphics,[[in1],[ms]],out,1,[]); if (ok) { graphics.exprs=exprs; -rpar=[A.slice(),B.slice(),C.slice(),D.slice()]; +rpar=[[A.slice()],[B.slice()],[C.slice()],[D.slice()]]; if (D!=[]) { if (norm(D,1)!=0) { mmm=[true,true]; diff --git a/js/Linear/TCLSS_f.js b/js/Linear/TCLSS_f.js index 503e2963..838267e2 100644 --- a/js/Linear/TCLSS_f.js +++ b/js/Linear/TCLSS_f.js @@ -11,14 +11,14 @@ nx=size(x0,"*"); out=1; model=scicos_model(); model.sim=list("tcslti",1); -model.in1=[in1,nx]; +model.in1=[[in1],[nx]]; model.out=out; model.evtin=1; model.state=x0; -model.rpar=[A.slice(),B.slice(),C.slice(),D.slice()]; +model.rpar=[[A.slice()],[B.slice()],[C.slice()],[D.slice()]]; model.blocktype="c"; model.dep_ut=[false,true]; -exprs=[strcat(sci2exp(A)),strcat(sci2exp(B)),strcat(sci2exp(C)),strcat(sci2exp(D)),strcat(sci2exp(x0))]; +exprs=[[strcat(sci2exp(A))],[strcat(sci2exp(B))],[strcat(sci2exp(C))],[strcat(sci2exp(D))],[strcat(sci2exp(x0))]]; gr_i=[]; x=standard_define([3,2],model,exprs,gr_i); } @@ -35,7 +35,7 @@ if (size(exprs,"*")==7) { exprs=exprs[[1:4,7]-1]; } while (true) { -[ok,A,B,C,D,x0,exprs]=scicos_getvalue("Set continuous linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),exprs); +[ok,A,B,C,D,x0,exprs]=scicos_getvalue("Set continuous linear system parameters",[["A matrix"],["B matrix"],["C matrix"],["D matrix"],["Initial state"]],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),exprs); if (!ok) { break; } @@ -51,10 +51,10 @@ in1=[]; if (ms!=ns) { message("A matrix must be square"); } else { -[model,graphics,ok]=check_io(model,graphics,[in1,ms],out,1,[]); +[model,graphics,ok]=check_io(model,graphics,[[in1],[ms]],out,1,[]); if (ok) { graphics.exprs=exprs; -rpar=[A.slice(),B.slice(),C.slice(),D.slice()]; +rpar=[[A.slice()],[B.slice()],[C.slice()],[D.slice()]]; if (D!=[]) { if (norm(D,1)!=0) { mmm=[true,true]; diff --git a/js/Linear/TIME_DELAY.js b/js/Linear/TIME_DELAY.js index 86b22984..94678dec 100644 --- a/js/Linear/TIME_DELAY.js +++ b/js/Linear/TIME_DELAY.js @@ -13,7 +13,7 @@ model.rpar=[T,init]; model.ipar=N; model.blocktype="x"; model.dep_ut=[false,true]; -exprs=[string(T),string(init),string(N)]; +exprs=[[string(T)],[string(init)],[string(N)]]; gr_i=[]; x=standard_define([3.5,2],model,exprs,gr_i); } @@ -28,7 +28,7 @@ exprs=graphics.exprs; model=arg1.model; nin=model.in1(1); while (true) { -[ok,T,init,N,exprs]=scicos_getvalue("Set delay parameters",["Delay","initial input","Buffer size"],list("vec",1,"vec",1,"vec",1),exprs); +[ok,T,init,N,exprs]=scicos_getvalue("Set delay parameters",[["Delay"],["initial input"],["Buffer size"]],list("vec",1,"vec",1,"vec",1),exprs); if (!ok) { break; } @@ -45,7 +45,7 @@ if (ok) { } if (ok) { graphics.exprs=exprs; -model.rpar=[T,init]; +model.rpar=[[T],[init]]; model.ipar=N; model.dep_ut=[false,true]; x.graphics=graphics; diff --git a/js/Linear/VARIABLE_DELAY.js b/js/Linear/VARIABLE_DELAY.js index 2f74eab3..d66b25fa 100644 --- a/js/Linear/VARIABLE_DELAY.js +++ b/js/Linear/VARIABLE_DELAY.js @@ -7,13 +7,13 @@ init=0; N=1024; model=scicos_model(); model.sim=list("variable_delay",4); -model.in1=[nin,1]; +model.in1=[[nin],[1]]; model.out=nin; model.rpar=[T,init]; model.ipar=N; model.blocktype="d"; model.dep_ut=[false,false]; -exprs=[string(T),string(init),string(N)]; +exprs=[[string(T)],[string(init)],[string(N)]]; gr_i=[]; x=standard_define([3,2],model,exprs,gr_i); } @@ -28,7 +28,7 @@ exprs=graphics.exprs; model=arg1.model; nin=model.in1(1); while (true) { -[ok,T,init,N,exprs]=scicos_getvalue("Set delay parameters",["Max delay","initial input","Buffer size"],list("vec",1,"vec",1,"vec",1),exprs); +[ok,T,init,N,exprs]=scicos_getvalue("Set delay parameters",[["Max delay"],["initial input"],["Buffer size"]],list("vec",1,"vec",1,"vec",1),exprs); if (!ok) { break; } @@ -41,11 +41,11 @@ message("Delay must be positive"); ok=false; } if (ok) { -[model,graphics,ok]=check_io(model,graphics,[-1,1],-1,[],[]); +[model,graphics,ok]=check_io(model,graphics,[[-1],[1]],-1,[],[]); } if (ok) { graphics.exprs=exprs; -model.rpar=[T,init]; +model.rpar=[[T],[init]]; model.ipar=N; x.graphics=graphics; x.model=model; |