diff options
Diffstat (limited to 'js')
48 files changed, 48 insertions, 48 deletions
diff --git a/js/Branching/M_SWITCH.js b/js/Branching/M_SWITCH.js index c7e681d1..093f2f54 100644 --- a/js/Branching/M_SWITCH.js +++ b/js/Branching/M_SWITCH.js @@ -6,7 +6,7 @@ function M_SWITCH() { this.nin = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["mswitch"]), new ScilabDouble([4])); - this.model.in1 = in1; + this.model.in1 = new ScilabDouble(in1); this.model.out = new ScilabDouble([-1]); this.model.ipar = new ScilabDouble(ipar); this.model.blocktype = new ScilabString(["c"]); diff --git a/js/Branching/NRMSOM_f.js b/js/Branching/NRMSOM_f.js index 21cbd5ce..8414f30f 100644 --- a/js/Branching/NRMSOM_f.js +++ b/js/Branching/NRMSOM_f.js @@ -5,7 +5,7 @@ function NRMSOM_f() { this.nin = 2; this.model = scicos_model(); this.model.sim = new ScilabString(["junk"]); - this.model.in1 = in1; + this.model.in1 = new ScilabDouble(in1); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [true,false]; diff --git a/js/Branching/RELAY_f.js b/js/Branching/RELAY_f.js index 910ce11e..a6e811d7 100644 --- a/js/Branching/RELAY_f.js +++ b/js/Branching/RELAY_f.js @@ -6,7 +6,7 @@ function RELAY_f() { this.nin = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["relay"]), new ScilabDouble([2])); - this.model.in1 = in1; + this.model.in1 = new ScilabDouble(in1); this.model.out = new ScilabDouble([-1]); this.model.evtin = new ScilabDouble([ones(in1)]); this.model.dstate = new ScilabDouble([i0]); diff --git a/js/Branching/SELECT_f.js b/js/Branching/SELECT_f.js index bf3a26de..a5527aa8 100644 --- a/js/Branching/SELECT_f.js +++ b/js/Branching/SELECT_f.js @@ -6,7 +6,7 @@ function SELECT_f() { this.nin = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["selector"]), new ScilabDouble([2])); - this.model.in1 = in1; + this.model.in1 = new ScilabDouble(in1); this.model.out = new ScilabDouble([-1]); this.model.evtin = new ScilabDouble([ones(in1)]); this.model.dstate = new ScilabDouble([this.z0]); diff --git a/js/Branching/SELECT_m.js b/js/Branching/SELECT_m.js index 31529172..6f05f7ca 100644 --- a/js/Branching/SELECT_m.js +++ b/js/Branching/SELECT_m.js @@ -5,7 +5,7 @@ function SELECT_m() { this.nin = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["selector_m"]), new ScilabDouble([4])); - this.model.in1 = [[-1],[-1]]; + this.model.in1 = new ScilabDouble([-1],[-1]); this.model.in2 = new ScilabDouble([-2],[-2]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); diff --git a/js/Branching/SWITCH2.js b/js/Branching/SWITCH2.js index 8c1270d3..5b80f243 100644 --- a/js/Branching/SWITCH2.js +++ b/js/Branching/SWITCH2.js @@ -7,7 +7,7 @@ function SWITCH2() { rpar = 0; this.model = scicos_model(); this.model.sim = list(new ScilabString(["switch2"]), new ScilabDouble([4])); - this.model.in1 = in1; + this.model.in1 = new ScilabDouble(in1); this.model.out = new ScilabDouble([-1]); this.model.ipar = ipar; this.model.rpar = new ScilabDouble([rpar]); diff --git a/js/Branching/SWITCH2_m.js b/js/Branching/SWITCH2_m.js index 4f78bc26..8dbaa1e6 100644 --- a/js/Branching/SWITCH2_m.js +++ b/js/Branching/SWITCH2_m.js @@ -6,7 +6,7 @@ function SWITCH2_m() { rpar = 0; this.model = scicos_model(); this.model.sim = list(new ScilabString(["switch2_m"]), new ScilabDouble([4])); - this.model.in1 = [[-1],[1],[-1]]; + this.model.in1 = new ScilabDouble([-1],[1],[-1]); this.model.in2 = new ScilabDouble([-2],[1],[-2]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); diff --git a/js/Branching/SWITCH_f.js b/js/Branching/SWITCH_f.js index dbd37d01..1b4846f9 100644 --- a/js/Branching/SWITCH_f.js +++ b/js/Branching/SWITCH_f.js @@ -6,7 +6,7 @@ function SWITCH_f() { this.nin = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["switchn"]), new ScilabDouble([2])); - this.model.in1 = in1; + this.model.in1 = new ScilabDouble(in1); this.model.out = new ScilabDouble([-1]); this.model.ipar = new ScilabDouble([i0]); this.model.blocktype = new ScilabString(["c"]); diff --git a/js/Electrical/VVsourceAC.js b/js/Electrical/VVsourceAC.js index 04dc5e9f..3faab62a 100644 --- a/js/Electrical/VVsourceAC.js +++ b/js/Electrical/VVsourceAC.js @@ -2,7 +2,7 @@ function VVsourceAC() { VVsourceAC.prototype.define = function VVsourceAC() { this.model = scicos_model(); - this.model.in1 = [[1],[1]]; + this.model.in1 = new ScilabDouble([1],[1]); this.model.out = [1]; VA = 220; this.FR = 50; diff --git a/js/Hydraulics/VanneReglante.js b/js/Hydraulics/VanneReglante.js index 96d37553..e92145ca 100644 --- a/js/Hydraulics/VanneReglante.js +++ b/js/Hydraulics/VanneReglante.js @@ -2,7 +2,7 @@ function VanneReglante() { VanneReglante.prototype.define = function VanneReglante() { this.model = scicos_model(); - this.model.in1 = [[1],[1]]; + this.model.in1 = new ScilabDouble([1],[1]); this.model.out = [1]; this.Cvmax = 8005.42; this.p_rho = 0; diff --git a/js/IntegerOp/DFLIPFLOP.js b/js/IntegerOp/DFLIPFLOP.js index 08cf972a..e07adda8 100644 --- a/js/IntegerOp/DFLIPFLOP.js +++ b/js/IntegerOp/DFLIPFLOP.js @@ -78,7 +78,7 @@ function DFLIPFLOP() { scs_m.objs[44-1] = scicos_link(xx=[[279.98293],[279.98293],[325.53038],[325.53038]],yy=[[372.50232],[315.89455],[315.89455],[299.28749]],id="drawlink",thick=[0,0],ct=[5,-1],from=[2,2,0],to=[32,2,1]); this.model = scicos_model(); this.model.sim = new ScilabString(["csuper"]); - this.model.in1 = [[1],[1],[1]]; + this.model.in1 = new ScilabDouble([1],[1],[1]); this.model.in2 = new ScilabDouble([1],[1],[1]); this.model.out = new ScilabDouble([1],[1]); this.model.out2 = new ScilabDouble([1],[1]); diff --git a/js/IntegerOp/DLATCH.js b/js/IntegerOp/DLATCH.js index ee249fb4..ac4afc92 100644 --- a/js/IntegerOp/DLATCH.js +++ b/js/IntegerOp/DLATCH.js @@ -23,7 +23,7 @@ function DLATCH() { scs_m.objs[19-1] = scicos_link(xx=[[305.09603],[325.09603]],yy=[[280.83282],[280.83282]],id="drawlink",thick=[0,0],ct=[1,1],from=[10,2,0],to=[18,1,1]); this.model = scicos_model(); this.model.sim = new ScilabString(["csuper"]); - this.model.in1 = [[1],[1]]; + this.model.in1 = new ScilabDouble([1],[1]); this.model.in2 = new ScilabDouble([1],[1]); this.model.out = new ScilabDouble([1],[1]); this.model.out2 = new ScilabDouble([1],[1]); diff --git a/js/IntegerOp/INTMUL.js b/js/IntegerOp/INTMUL.js index ac189f0f..375723a6 100644 --- a/js/IntegerOp/INTMUL.js +++ b/js/IntegerOp/INTMUL.js @@ -4,7 +4,7 @@ function INTMUL() { sgn = 0; this.model = scicos_model(); this.model.sim = list(new ScilabString(["matmul_i32"]), new ScilabDouble([4])); - this.model.in1 = [[-1],[-2]]; + this.model.in1 = new ScilabDouble([-1],[-2]); this.model.out = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2],[-3]); this.model.out2 = new ScilabDouble([-3]); diff --git a/js/IntegerOp/JKFLIPFLOP.js b/js/IntegerOp/JKFLIPFLOP.js index 9f677d25..6fbf4a6a 100644 --- a/js/IntegerOp/JKFLIPFLOP.js +++ b/js/IntegerOp/JKFLIPFLOP.js @@ -34,7 +34,7 @@ function JKFLIPFLOP() { scs_m.objs[22-1] = scicos_link(xx=[[446.2036],[466.2036]],yy=[[179.25363],[179.25363]],id="drawlink",thick=[0,0],ct=[1,1],from=[9,1,0],to=[21,1,1]); this.model = scicos_model(); this.model.sim = new ScilabString(["csuper"]); - this.model.in1 = [[1],[1],[1]]; + this.model.in1 = new ScilabDouble([1],[1],[1]); this.model.in2 = new ScilabDouble([1],[1],[1]); this.model.out = new ScilabDouble([1],[1]); this.model.out2 = new ScilabDouble([1],[1]); diff --git a/js/IntegerOp/LOGIC.js b/js/IntegerOp/LOGIC.js index 362462ee..98689ead 100644 --- a/js/IntegerOp/LOGIC.js +++ b/js/IntegerOp/LOGIC.js @@ -4,7 +4,7 @@ function LOGIC() { this.mat = [[0],[0],[0],[1]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["logic"]), new ScilabDouble([4])); - this.model.in1 = [[1],[1]]; + this.model.in1 = new ScilabDouble([1],[1]); this.model.in2 = new ScilabDouble([1],[1]); this.model.out = new ScilabDouble([1]); this.model.out2 = new ScilabDouble([1]); diff --git a/js/IntegerOp/SRFLIPFLOP.js b/js/IntegerOp/SRFLIPFLOP.js index 4b222944..603bf152 100644 --- a/js/IntegerOp/SRFLIPFLOP.js +++ b/js/IntegerOp/SRFLIPFLOP.js @@ -18,7 +18,7 @@ function SRFLIPFLOP() { scs_m.objs[14-1] = scicos_link(xx=[[363.03733],[383.03733]],yy=[[248.584],[248.584]],id="drawlink",thick=[0,0],ct=[1,1],from=[5,2,0],to=[13,1,1]); this.model = scicos_model(); this.model.sim = new ScilabString(["csuper"]); - this.model.in1 = [[1],[1]]; + this.model.in1 = new ScilabDouble([1],[1]); this.model.in2 = new ScilabDouble([1],[1]); this.model.out = new ScilabDouble([1],[1]); this.model.out2 = new ScilabDouble([1],[1]); diff --git a/js/Linear/BIGSOM_f.js b/js/Linear/BIGSOM_f.js index 5c887738..da6a2b13 100644 --- a/js/Linear/BIGSOM_f.js +++ b/js/Linear/BIGSOM_f.js @@ -4,7 +4,7 @@ function BIGSOM_f() { this.sgn = [[1],[1]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["sum"]), new ScilabDouble([2])); - this.model.in1 = [[-1],[-1]]; + this.model.in1 = new ScilabDouble([-1],[-1]); this.model.out = new ScilabDouble([-1]); this.model.rpar = new ScilabDouble(this.sgn); this.model.blocktype = new ScilabString(["c"]); diff --git a/js/Linear/DELAYV_f.js b/js/Linear/DELAYV_f.js index cfadf33e..e8b2de09 100644 --- a/js/Linear/DELAYV_f.js +++ b/js/Linear/DELAYV_f.js @@ -7,7 +7,7 @@ function DELAYV_f() { this.T = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["delayv"]), new ScilabDouble([1])); - this.model.in1 = [[this.nin],[1]]; + this.model.in1 = new ScilabDouble([this.nin],[1]); this.model.out = new ScilabDouble([this.nin]); this.model.evtin = new ScilabDouble([1]); this.model.evtout = new ScilabDouble([1],[1]); diff --git a/js/Linear/SOM_f.js b/js/Linear/SOM_f.js index 33b8d81b..ec087b3c 100644 --- a/js/Linear/SOM_f.js +++ b/js/Linear/SOM_f.js @@ -4,7 +4,7 @@ function SOM_f() { sgn = [[1],[1],[1]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["sum"]), new ScilabDouble([2])); - this.model.in1 = [[-1],[-1],[-1]]; + this.model.in1 = new ScilabDouble([-1],[-1],[-1]); this.model.out = new ScilabDouble([-1]); this.model.rpar = new ScilabDouble(sgn); this.model.blocktype = new ScilabString(["c"]); diff --git a/js/Linear/SUMMATION.js b/js/Linear/SUMMATION.js index f6258a04..a56677db 100644 --- a/js/Linear/SUMMATION.js +++ b/js/Linear/SUMMATION.js @@ -4,7 +4,7 @@ function SUMMATION() { this.sgn = [[1],[-1]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["summation"]), new ScilabDouble([4])); - this.model.in1 = [[-1],[-1]]; + this.model.in1 = new ScilabDouble([-1],[-1]); this.model.out = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2],[-2]); this.model.out2 = new ScilabDouble([-2]); diff --git a/js/Linear/SUM_f.js b/js/Linear/SUM_f.js index 70d6662f..5557a31a 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() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["plusblk"]), new ScilabDouble([2])); - this.model.in1 = [[-1],[-1],[-1]]; + this.model.in1 = new ScilabDouble([-1],[-1],[-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [true,false]; diff --git a/js/Linear/TCLSS.js b/js/Linear/TCLSS.js index bce3ad8b..50067410 100644 --- a/js/Linear/TCLSS.js +++ b/js/Linear/TCLSS.js @@ -11,7 +11,7 @@ function TCLSS() { out = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["tcslti4"]), new ScilabDouble([4])); - this.model.in1 = [[in1],[nx]]; + this.model.in1 = new ScilabDouble([in1],[nx]); this.model.out = new ScilabDouble([out]); this.model.evtin = new ScilabDouble([1]); this.model.state = new ScilabDouble([this.x0]); diff --git a/js/Linear/TCLSS_f.js b/js/Linear/TCLSS_f.js index d74c397a..5fd45bac 100644 --- a/js/Linear/TCLSS_f.js +++ b/js/Linear/TCLSS_f.js @@ -11,7 +11,7 @@ function TCLSS_f() { out = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["tcslti"]), new ScilabDouble([1])); - this.model.in1 = [[in1],[nx]]; + this.model.in1 = new ScilabDouble([in1],[nx]); this.model.out = new ScilabDouble([out]); this.model.evtin = new ScilabDouble([1]); this.model.state = new ScilabDouble([this.x0]); diff --git a/js/Linear/VARIABLE_DELAY.js b/js/Linear/VARIABLE_DELAY.js index 52e6067c..575eafc3 100644 --- a/js/Linear/VARIABLE_DELAY.js +++ b/js/Linear/VARIABLE_DELAY.js @@ -7,7 +7,7 @@ function VARIABLE_DELAY() { this.N = 1024; this.model = scicos_model(); this.model.sim = list(new ScilabString(["variable_delay"]), new ScilabDouble([4])); - this.model.in1 = [[nin],[1]]; + this.model.in1 = new ScilabDouble([nin],[1]); this.model.out = new ScilabDouble([nin]); this.model.rpar = [this.T,this.init]; this.model.ipar = new ScilabDouble([this.N]); diff --git a/js/MatrixOp/MATBKSL.js b/js/MatrixOp/MATBKSL.js index 09ae0c16..f66c8398 100644 --- a/js/MatrixOp/MATBKSL.js +++ b/js/MatrixOp/MATBKSL.js @@ -5,7 +5,7 @@ function MATBKSL() { function_name = "mat_bksl"; funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = [[-1],[-1]]; + this.model.in1 = new ScilabDouble([-1],[-1]); this.model.in2 = new ScilabDouble([-2],[-3]); this.model.intyp = [1,1]; this.model.out = new ScilabDouble([-2]); diff --git a/js/MatrixOp/MATCATH.js b/js/MatrixOp/MATCATH.js index 6474ecca..dc1558d0 100644 --- a/js/MatrixOp/MATCATH.js +++ b/js/MatrixOp/MATCATH.js @@ -5,7 +5,7 @@ function MATCATH() { function_name = "mat_cath"; funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = [[-1],[-1]]; + this.model.in1 = new ScilabDouble([-1],[-1]); this.model.in2 = new ScilabDouble([-2],[-3]); this.model.intyp = [1,1]; this.model.out = new ScilabDouble([-1]); diff --git a/js/MatrixOp/MATCATV.js b/js/MatrixOp/MATCATV.js index 8a3c1886..c6a998f3 100644 --- a/js/MatrixOp/MATCATV.js +++ b/js/MatrixOp/MATCATV.js @@ -7,7 +7,7 @@ function MATCATV() { funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.model.in2 = new ScilabDouble([-1],[-1]); - this.model.in1 = [[-2],[-3]]; + this.model.in1 = new ScilabDouble([-2],[-3]); this.model.intyp = [-1,-1]; this.model.out = new ScilabDouble([0]); this.model.out2 = new ScilabDouble([-1]); diff --git a/js/MatrixOp/MATDIV.js b/js/MatrixOp/MATDIV.js index 7293521e..dbe451df 100644 --- a/js/MatrixOp/MATDIV.js +++ b/js/MatrixOp/MATDIV.js @@ -5,7 +5,7 @@ function MATDIV() { function_name = "mat_div"; funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = [[-1],[-2]]; + this.model.in1 = new ScilabDouble([-1],[-2]); this.model.in2 = new ScilabDouble([-3],[-3]); this.model.intyp = [1,1]; this.model.out = new ScilabDouble([-1]); diff --git a/js/MatrixOp/MATMUL.js b/js/MatrixOp/MATMUL.js index b4fbac36..2ce11fb8 100644 --- a/js/MatrixOp/MATMUL.js +++ b/js/MatrixOp/MATMUL.js @@ -3,7 +3,7 @@ function MATMUL() { MATMUL.prototype.define = function MATMUL() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["matmul_m"]), new ScilabDouble([4])); - this.model.in1 = [[-1],[-2]]; + this.model.in1 = new ScilabDouble([-1],[-2]); this.model.in2 = new ScilabDouble([-2],[-3]); this.model.out = new ScilabDouble([-1]); this.model.out2 = new ScilabDouble([-3]); diff --git a/js/MatrixOp/RICC.js b/js/MatrixOp/RICC.js index 453e2e36..482dc0d3 100644 --- a/js/MatrixOp/RICC.js +++ b/js/MatrixOp/RICC.js @@ -5,7 +5,7 @@ function RICC() { function_name = "ricc_m"; funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = [[-1],[-1],[-1]]; + this.model.in1 = new ScilabDouble([-1],[-1],[-1]); this.model.in2 = new ScilabDouble([-1],[-1],[-1]); this.model.intyp = [1,1,1]; this.model.out = new ScilabDouble([-1]); diff --git a/js/Misc/AUTOMAT.js b/js/Misc/AUTOMAT.js index bb635dcc..e34f5a85 100644 --- a/js/Misc/AUTOMAT.js +++ b/js/Misc/AUTOMAT.js @@ -13,7 +13,7 @@ function AUTOMAT() { rpar = [this.X0]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["automat"]), new ScilabDouble([10004])); - this.model.in1 = [[2*NX+1],[2*NX+1]]; + this.model.in1 = new ScilabDouble([2*NX+1],[2*NX+1]); this.model.out = new ScilabDouble([2],[2*NX]); this.model.state = new ScilabDouble([ones(2*NX,1)]); this.model.nzcross = new ScilabDouble([1]); diff --git a/js/Misc/BOUNCEXY.js b/js/Misc/BOUNCEXY.js index 6eea589c..fae911bf 100644 --- a/js/Misc/BOUNCEXY.js +++ b/js/Misc/BOUNCEXY.js @@ -11,7 +11,7 @@ function BOUNCEXY() { this.ymax = 15; this.model = scicos_model(); this.model.sim = list(new ScilabString(["bouncexy"]), new ScilabDouble([4])); - this.model.in1 = [[-1],[-1]]; + this.model.in1 = new ScilabDouble([-1],[-1]); this.model.in2 = new ScilabDouble([1],[1]); this.model.intyp = new ScilabDouble([1],[1]); this.model.evtin = new ScilabDouble([1]); diff --git a/js/Misc/BPLATFORM.js b/js/Misc/BPLATFORM.js index cfbc15a5..6ea0a30a 100644 --- a/js/Misc/BPLATFORM.js +++ b/js/Misc/BPLATFORM.js @@ -10,7 +10,7 @@ function BPLATFORM() { this.ymax = 15; this.model = scicos_model(); this.model.sim = list(new ScilabString(["bplatform2"]), new ScilabDouble([5])); - this.model.in1 = [[1],[1]]; + this.model.in1 = new ScilabDouble([1],[1]); this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([0]); this.model.rpar = new ScilabDouble([this.plen],[this.csiz],[this.phi],[this.xmin],[this.xmax],[this.ymin],[this.ymax]); diff --git a/js/Misc/LOGICAL_OP.js b/js/Misc/LOGICAL_OP.js index 61f940f3..73feb47a 100644 --- a/js/Misc/LOGICAL_OP.js +++ b/js/Misc/LOGICAL_OP.js @@ -6,7 +6,7 @@ function LOGICAL_OP() { this.nin = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["logicalop"]), new ScilabDouble([4])); - this.model.in1 = in1; + this.model.in1 = new ScilabDouble(in1); this.model.out = new ScilabDouble([-1]); this.model.ipar = ipar; this.model.blocktype = new ScilabString(["c"]); diff --git a/js/Misc/PENDULUM_ANIM.js b/js/Misc/PENDULUM_ANIM.js index b5632e21..cc56163e 100644 --- a/js/Misc/PENDULUM_ANIM.js +++ b/js/Misc/PENDULUM_ANIM.js @@ -10,7 +10,7 @@ function PENDULUM_ANIM() { this.ymax = 5; this.model = scicos_model(); this.model.sim = list(new ScilabString(["anim_pen"]), new ScilabDouble([5])); - this.model.in1 = [[1],[1]]; + this.model.in1 = new ScilabDouble([1],[1]); this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([0]); this.model.rpar = new ScilabDouble([this.plen],[this.csiz],[this.phi],[this.xmin],[this.xmax],[this.ymin],[this.ymax]); diff --git a/js/Misc/RELATIONALOP.js b/js/Misc/RELATIONALOP.js index 1575cac2..c1f3fcb9 100644 --- a/js/Misc/RELATIONALOP.js +++ b/js/Misc/RELATIONALOP.js @@ -5,7 +5,7 @@ function RELATIONALOP() { label = "<"; this.model = scicos_model(); this.model.sim = list(new ScilabString(["relationalop"]), new ScilabDouble([4])); - this.model.in1 = [[1],[1]]; + this.model.in1 = new ScilabDouble([1],[1]); this.model.out = new ScilabDouble([1]); this.model.ipar = ipar; this.model.blocktype = new ScilabString(["c"]); diff --git a/js/NonLinear/DLRADAPT_f.js b/js/NonLinear/DLRADAPT_f.js index 7abecd16..f1d5e69d 100644 --- a/js/NonLinear/DLRADAPT_f.js +++ b/js/NonLinear/DLRADAPT_f.js @@ -9,7 +9,7 @@ function DLRADAPT_f() { this.last_y = [[0],[0]]; this.model = scicos_model(); this.model.sim = new ScilabString(["dlradp"]); - this.model.in1 = [[1],[1]]; + this.model.in1 = new ScilabDouble([1],[1]); this.model.out = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([this.last_u],[this.last_y]); diff --git a/js/NonLinear/INTRP2BLK_f.js b/js/NonLinear/INTRP2BLK_f.js index fd6fa8c2..ca146ae9 100644 --- a/js/NonLinear/INTRP2BLK_f.js +++ b/js/NonLinear/INTRP2BLK_f.js @@ -6,7 +6,7 @@ function INTRP2BLK_f() { this.c = [[0,1],[1,2]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["intrp2"]), new ScilabDouble([1])); - this.model.in1 = [[1],[1]]; + this.model.in1 = new ScilabDouble([1],[1]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.a],[this.b],[this.c.slice()]); this.model.ipar = new ScilabDouble([2],[2]); diff --git a/js/NonLinear/LOOKUP2D.js b/js/NonLinear/LOOKUP2D.js index 30a3daab..8c50face 100644 --- a/js/NonLinear/LOOKUP2D.js +++ b/js/NonLinear/LOOKUP2D.js @@ -10,7 +10,7 @@ function LOOKUP2D() { Nx = length(this.xx); Ny = length(this.yy); this.model.sim = list(new ScilabString(["lookup2d"]), new ScilabDouble([4])); - this.model.in1 = [[1],[1]]; + this.model.in1 = new ScilabDouble([1],[1]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.xx.slice()],[this.yy.slice()],[this.zz.slice()]); this.model.ipar = new ScilabDouble([Nx],[Ny],[this.Method]); diff --git a/js/NonLinear/PRODUCT.js b/js/NonLinear/PRODUCT.js index 718fec80..e8f0287f 100644 --- a/js/NonLinear/PRODUCT.js +++ b/js/NonLinear/PRODUCT.js @@ -4,7 +4,7 @@ function PRODUCT() { this.sgn = [[1],[-1]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["product"]), new ScilabDouble([4])); - this.model.in1 = [[-1],[-1]]; + this.model.in1 = new ScilabDouble([-1],[-1]); this.model.out = new ScilabDouble([-1]); this.model.ipar = new ScilabDouble(this.sgn); this.model.blocktype = new ScilabString(["c"]); diff --git a/js/NonLinear/PROD_f.js b/js/NonLinear/PROD_f.js index 943af598..1f32a41a 100644 --- a/js/NonLinear/PROD_f.js +++ b/js/NonLinear/PROD_f.js @@ -3,7 +3,7 @@ function PROD_f() { PROD_f.prototype.define = function PROD_f() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["prod"]), new ScilabDouble([2])); - this.model.in1 = [[-1],[-1]]; + this.model.in1 = new ScilabDouble([-1],[-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [true,false]; diff --git a/js/PDE/PDE.js b/js/PDE/PDE.js index 3ad6f38a..9e6318d6 100644 --- a/js/PDE/PDE.js +++ b/js/PDE/PDE.js @@ -4,7 +4,7 @@ function PDE() { this.model = scicos_model(); this.model.state = new ScilabDouble([zeros(10,1)]); this.model.sim = list(new ScilabString(["PDE"]), new ScilabDouble([0])); - this.model.in1 = [[1],[1],[1],[1],[1]]; + this.model.in1 = new ScilabDouble([1],[1],[1],[1],[1]); this.model.out = new ScilabDouble([10],[0]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [false,true]; diff --git a/js/Sinks/BARXY.js b/js/Sinks/BARXY.js index e0a39a05..ab795976 100644 --- a/js/Sinks/BARXY.js +++ b/js/Sinks/BARXY.js @@ -9,7 +9,7 @@ function BARXY() { this.model.sim = list(new ScilabString(["BARXY_sim"]), new ScilabDouble([5])); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = [true,false]; - this.model.in1 = [[-1],[-1]]; + this.model.in1 = new ScilabDouble([-1],[-1]); this.model.intyp = [1]; this.model.out = []; this.model.evtin = [1]; diff --git a/js/Sinks/CANIMXY.js b/js/Sinks/CANIMXY.js index 63ca8fce..abf2ddcc 100644 --- a/js/Sinks/CANIMXY.js +++ b/js/Sinks/CANIMXY.js @@ -14,7 +14,7 @@ function CANIMXY() { this.nbr_curves = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["canimxy"]), new ScilabDouble([4])); - this.model.in1 = [[1],[1]]; + this.model.in1 = new ScilabDouble([1],[1]); this.model.in2 = new ScilabDouble([1],[1]); this.model.intyp = new ScilabDouble([1],[1]); this.model.evtin = new ScilabDouble([1]); diff --git a/js/Sinks/CANIMXY3D.js b/js/Sinks/CANIMXY3D.js index 24221ece..7b134fdb 100644 --- a/js/Sinks/CANIMXY3D.js +++ b/js/Sinks/CANIMXY3D.js @@ -14,7 +14,7 @@ function CANIMXY3D() { this.nbr_curves = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["canimxy3d"]), new ScilabDouble([4])); - this.model.in1 = [[1],[1],[1]]; + this.model.in1 = new ScilabDouble([1],[1],[1]); this.model.evtin = new ScilabDouble([1]); this.model.in2 = new ScilabDouble([1],[1],[1]); this.model.intyp = new ScilabDouble([1],[1],[1]); diff --git a/js/Sinks/CMSCOPE.js b/js/Sinks/CMSCOPE.js index e5bf0287..66b294c3 100644 --- a/js/Sinks/CMSCOPE.js +++ b/js/Sinks/CMSCOPE.js @@ -14,7 +14,7 @@ function CMSCOPE() { period = transpose(this.per.slice()); this.model = scicos_model(); this.model.sim = list(new ScilabString(["cmscope"]), new ScilabDouble([4])); - this.model.in1 = this.in1; + this.model.in1 = new ScilabDouble(this.in1); this.model.in2 = new ScilabDouble([1],[1]); this.model.intyp = new ScilabDouble([1],[1]); this.model.evtin = new ScilabDouble([1]); diff --git a/js/Sinks/CSCOPXY.js b/js/Sinks/CSCOPXY.js index 289f425e..458e7eef 100644 --- a/js/Sinks/CSCOPXY.js +++ b/js/Sinks/CSCOPXY.js @@ -14,7 +14,7 @@ function CSCOPXY() { this.nbr_curves = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["cscopxy"]), new ScilabDouble([4])); - this.model.in1 = [[1],[1]]; + this.model.in1 = new ScilabDouble([1],[1]); this.model.in2 = new ScilabDouble([1],[1]); this.model.intyp = new ScilabDouble([1],[1]); this.model.evtin = new ScilabDouble([1]); diff --git a/js/Sinks/CSCOPXY3D.js b/js/Sinks/CSCOPXY3D.js index d20d2b32..142cf4b2 100644 --- a/js/Sinks/CSCOPXY3D.js +++ b/js/Sinks/CSCOPXY3D.js @@ -14,7 +14,7 @@ function CSCOPXY3D() { this.nbr_curves = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["cscopxy3d"]), new ScilabDouble([4])); - this.model.in1 = [[1],[1],[1]]; + this.model.in1 = new ScilabDouble([1],[1],[1]); this.model.in2 = new ScilabDouble([1],[1],[1]); this.model.intyp = new ScilabDouble([1],[1],[1]); this.model.evtin = new ScilabDouble([1]); |