diff options
Diffstat (limited to 'js')
257 files changed, 746 insertions, 746 deletions
diff --git a/js/Branching/CLKFROM.js b/js/Branching/CLKFROM.js index b705f634..1ff250ee 100644 --- a/js/Branching/CLKFROM.js +++ b/js/Branching/CLKFROM.js @@ -7,7 +7,7 @@ function CLKFROM() { this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = "A"; this.x = standard_define([2,1],this.model,exprs," "); this.x.graphics.id = "From"; diff --git a/js/Branching/CLKGOTO.js b/js/Branching/CLKGOTO.js index 75320022..f1462d11 100644 --- a/js/Branching/CLKGOTO.js +++ b/js/Branching/CLKGOTO.js @@ -8,7 +8,7 @@ function CLKGOTO() { this.model.ipar = new ScilabDouble([int(1)]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [["A"],[sci2exp(1)]]; this.x = standard_define([2,1],this.model,exprs," "); this.x.graphics.id = "Goto"; diff --git a/js/Branching/CLKGotoTagVisibility.js b/js/Branching/CLKGotoTagVisibility.js index 6b7e5fb8..d7ea947b 100644 --- a/js/Branching/CLKGotoTagVisibility.js +++ b/js/Branching/CLKGotoTagVisibility.js @@ -3,17 +3,17 @@ function CLKGotoTagVisibility() { CLKGotoTagVisibility.prototype.define = function CLKGotoTagVisibility() { this.model = scicos_model(); this.model.sim = new ScilabString(["clkgototagvisibility"]); - this.model.in1 = []; - this.model.in2 = []; - this.model.out = []; - this.model.out2 = []; - this.model.evtin = []; + this.model.in1 = new ScilabDouble([]); + this.model.in2 = new ScilabDouble([]); + this.model.out = new ScilabDouble([]); + this.model.out2 = new ScilabDouble([]); + this.model.evtin = new ScilabDouble([]); this.model.intyp = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabBoolean([false]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = "A"; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/Branching/DEMUX.js b/js/Branching/DEMUX.js index 4d1da68d..5c1cb1be 100644 --- a/js/Branching/DEMUX.js +++ b/js/Branching/DEMUX.js @@ -5,11 +5,11 @@ function DEMUX() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["multiplex"]), new ScilabDouble([4])); this.model.in1 = new ScilabDouble([0]); - this.model.out = -transpose([1:this.out]); + this.model.out = new ScilabDouble(-transpose([1:this.out])); this.model.ipar = new ScilabDouble([this.out]); this.model.blocktype = new ScilabString(["c"]); - this.model.firing = []; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = string(this.out); var gr_i = []; this.x = standard_define([.5,2],this.model,exprs,gr_i); diff --git a/js/Branching/DEMUX_f.js b/js/Branching/DEMUX_f.js index f9ada1b0..6e04c129 100644 --- a/js/Branching/DEMUX_f.js +++ b/js/Branching/DEMUX_f.js @@ -5,11 +5,11 @@ function DEMUX_f() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["demux"]), new ScilabDouble([1])); this.model.in1 = new ScilabDouble([0]); - this.model.out = -transpose([1:this.out]); + this.model.out = new ScilabDouble(-transpose([1:this.out])); this.model.ipar = new ScilabDouble([this.out]); this.model.blocktype = new ScilabString(["c"]); - this.model.firing = []; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = string(this.out); var gr_i = []; this.x = standard_define([.5,2],this.model,exprs,gr_i); diff --git a/js/Branching/ESELECT_f.js b/js/Branching/ESELECT_f.js index 310344e5..407c795b 100644 --- a/js/Branching/ESELECT_f.js +++ b/js/Branching/ESELECT_f.js @@ -11,7 +11,7 @@ function ESELECT_f() { this.model.evtout = new ScilabDouble([ones(this.out,1)]); this.model.blocktype = new ScilabString(["l"]); this.model.firing = new ScilabDouble([-ones(this.out,1)]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); this.model.nmode = new ScilabDouble([0]); this.model.nzcross = new ScilabDouble([0]); var gr_i = []; diff --git a/js/Branching/EXTRACTOR.js b/js/Branching/EXTRACTOR.js index 8eeeb581..f08a5f15 100644 --- a/js/Branching/EXTRACTOR.js +++ b/js/Branching/EXTRACTOR.js @@ -7,7 +7,7 @@ function EXTRACTOR() { this.model.in1 = new ScilabDouble([-1]); this.model.out = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); this.model.ipar = new ScilabDouble([this.ind]); var exprs = [sci2exp(this.ind)]; var gr_i = []; @@ -41,7 +41,7 @@ function EXTRACTOR() { var graphics = tmpvar0[1] var ok = tmpvar0[2]; if (ok) { - this.model.ipar = this.ind; + this.model.ipar = new ScilabDouble(this.ind); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Branching/FROM.js b/js/Branching/FROM.js index edb2d8b7..42b351a1 100644 --- a/js/Branching/FROM.js +++ b/js/Branching/FROM.js @@ -3,16 +3,16 @@ function FROM() { FROM.prototype.define = function FROM() { this.model = scicos_model(); this.model.sim = new ScilabString(["from"]); - this.model.in1 = []; - this.model.in2 = []; + this.model.in1 = new ScilabDouble([]); + this.model.in2 = new ScilabDouble([]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); this.model.out2 = new ScilabDouble([-2]); this.model.outtyp = new ScilabDouble([-1]); - this.model.ipar = []; + this.model.ipar = new ScilabDouble([]); this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = ["A"]; var gr_i = []; this.x = standard_define([2,1],this.model,exprs,gr_i); diff --git a/js/Branching/FROMMO.js b/js/Branching/FROMMO.js index 7563b8d0..e80abb71 100644 --- a/js/Branching/FROMMO.js +++ b/js/Branching/FROMMO.js @@ -3,16 +3,16 @@ function FROMMO() { FROMMO.prototype.define = function FROMMO() { this.model = scicos_model(); this.model.sim = new ScilabString(["frommo"]); - this.model.in1 = []; - this.model.in2 = []; + this.model.in1 = new ScilabDouble([]); + this.model.in2 = new ScilabDouble([]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); this.model.out2 = new ScilabDouble([-2]); this.model.outtyp = new ScilabDouble([-1]); - this.model.ipar = []; + this.model.ipar = new ScilabDouble([]); this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var mo = modelica(); mo.model = "frommo"; mo.outputs = "n"; diff --git a/js/Branching/GOTO.js b/js/Branching/GOTO.js index 24549a07..6f561aea 100644 --- a/js/Branching/GOTO.js +++ b/js/Branching/GOTO.js @@ -6,13 +6,13 @@ function GOTO() { this.model.in1 = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([-1]); - this.model.out = []; - this.model.out2 = []; + this.model.out = new ScilabDouble([]); + this.model.out2 = new ScilabDouble([]); this.model.outtyp = new ScilabDouble([1]); this.model.ipar = new ScilabDouble([int(1)]); this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [["A"],[sci2exp(1)]]; var gr_i = []; this.x = standard_define([2,1],this.model,exprs,gr_i); diff --git a/js/Branching/GOTOMO.js b/js/Branching/GOTOMO.js index 473bfd8c..e6ea2dd2 100644 --- a/js/Branching/GOTOMO.js +++ b/js/Branching/GOTOMO.js @@ -5,14 +5,14 @@ function GOTOMO() { this.model.sim = new ScilabString(["gotomo"]); this.model.in1 = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); - this.model.intyp = []; - this.model.out = []; - this.model.out2 = []; + this.model.intyp = new ScilabDouble([]); + this.model.out = new ScilabDouble([]); + this.model.out2 = new ScilabDouble([]); this.model.outtyp = new ScilabDouble([1]); this.model.ipar = new ScilabDouble([int(1)]); this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var mo = modelica(); mo.model = "gotomo"; mo.inputs = "p"; diff --git a/js/Branching/GotoTagVisibility.js b/js/Branching/GotoTagVisibility.js index 87317add..7f10aaa2 100644 --- a/js/Branching/GotoTagVisibility.js +++ b/js/Branching/GotoTagVisibility.js @@ -3,17 +3,17 @@ function GotoTagVisibility() { GotoTagVisibility.prototype.define = function GotoTagVisibility() { this.model = scicos_model(); this.model.sim = new ScilabString(["gototagvisibility"]); - this.model.in1 = []; - this.model.in2 = []; - this.model.out = []; - this.model.out2 = []; - this.model.evtin = []; + this.model.in1 = new ScilabDouble([]); + this.model.in2 = new ScilabDouble([]); + this.model.out = new ScilabDouble([]); + this.model.out2 = new ScilabDouble([]); + this.model.evtin = new ScilabDouble([]); this.model.intyp = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabBoolean([false]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = "A"; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/Branching/GotoTagVisibilityMO.js b/js/Branching/GotoTagVisibilityMO.js index 95c5ae7b..65c93537 100644 --- a/js/Branching/GotoTagVisibilityMO.js +++ b/js/Branching/GotoTagVisibilityMO.js @@ -3,17 +3,17 @@ function GotoTagVisibilityMO() { GotoTagVisibilityMO.prototype.define = function GotoTagVisibilityMO() { this.model = scicos_model(); this.model.sim = new ScilabString(["gototagvisibilitymo"]); - this.model.in1 = []; - this.model.in2 = []; - this.model.out = []; - this.model.out2 = []; - this.model.evtin = []; + this.model.in1 = new ScilabDouble([]); + this.model.in2 = new ScilabDouble([]); + this.model.out = new ScilabDouble([]); + this.model.out2 = new ScilabDouble([]); + this.model.evtin = new ScilabDouble([]); this.model.intyp = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabBoolean([false]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = "A"; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/Branching/ISELECT_f.js b/js/Branching/ISELECT_f.js index f06d1bb5..4ae441a3 100644 --- a/js/Branching/ISELECT_f.js +++ b/js/Branching/ISELECT_f.js @@ -11,7 +11,7 @@ function ISELECT_f() { this.model.evtin = new ScilabDouble([ones(out)]); this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(this.nout)],[string(this.z0+1)]]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/Branching/ISELECT_m.js b/js/Branching/ISELECT_m.js index 6334bf7d..ed09ed94 100644 --- a/js/Branching/ISELECT_m.js +++ b/js/Branching/ISELECT_m.js @@ -11,15 +11,15 @@ function ISELECT_m() { this.model.in1 = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([1]); - this.model.evtout = []; - this.model.state = []; - this.model.rpar = []; - this.model.ipar = []; - this.model.firing = []; + this.model.evtout = new ScilabDouble([]); + this.model.state = new ScilabDouble([]); + this.model.rpar = new ScilabDouble([]); + this.model.ipar = new ScilabDouble([]); + this.model.firing = new ScilabDouble([]); this.model.evtin = new ScilabDouble([ones(this.nout,1)]); this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(1)],[sci2exp(this.nout)],[sci2exp(this.z0)]]; var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); diff --git a/js/Branching/MUX.js b/js/Branching/MUX.js index b16966b4..7d77713f 100644 --- a/js/Branching/MUX.js +++ b/js/Branching/MUX.js @@ -4,11 +4,11 @@ function MUX() { this.in1 = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["multiplex"]), new ScilabDouble([4])); - this.model.in1 = -transpose([1:this.in1]); + this.model.in1 = new ScilabDouble(-transpose([1:this.in1])); this.model.out = new ScilabDouble([0]); this.model.ipar = new ScilabDouble([this.in1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = string(this.in1); var gr_i = []; this.x = standard_define([.5,2],this.model,exprs,gr_i); diff --git a/js/Branching/MUX_f.js b/js/Branching/MUX_f.js index 65fc7db3..f3bedb89 100644 --- a/js/Branching/MUX_f.js +++ b/js/Branching/MUX_f.js @@ -4,11 +4,11 @@ function MUX_f() { this.in1 = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["mux"]), new ScilabDouble([1])); - this.model.in1 = -transpose([1:this.in1]); + this.model.in1 = new ScilabDouble(-transpose([1:this.in1])); this.model.out = new ScilabDouble([0]); this.model.ipar = new ScilabDouble([this.in1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = string(this.in1); var gr_i = []; this.x = standard_define([0.5,2],this.model,exprs,gr_i); diff --git a/js/Branching/M_SWITCH.js b/js/Branching/M_SWITCH.js index 30bbaee4..3b75f7e2 100644 --- a/js/Branching/M_SWITCH.js +++ b/js/Branching/M_SWITCH.js @@ -10,7 +10,7 @@ function M_SWITCH() { this.model.out = new ScilabDouble([-1]); this.model.ipar = new ScilabDouble(ipar); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(this.nin)],[string(ipar)]]; var gr_i = []; this.x = standard_define([2.5,2],this.model,exprs,gr_i); diff --git a/js/Branching/NRMSOM_f.js b/js/Branching/NRMSOM_f.js index c2765c61..ae1cc248 100644 --- a/js/Branching/NRMSOM_f.js +++ b/js/Branching/NRMSOM_f.js @@ -8,7 +8,7 @@ function NRMSOM_f() { this.model.in1 = new ScilabDouble(in1); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [string(this.nin)]; var gr_i = []; this.x = standard_define([.2,2],this.model,exprs,gr_i); diff --git a/js/Branching/RELAY_f.js b/js/Branching/RELAY_f.js index 69020ac6..3052e95c 100644 --- a/js/Branching/RELAY_f.js +++ b/js/Branching/RELAY_f.js @@ -11,8 +11,8 @@ function RELAY_f() { this.model.evtin = new ScilabDouble([ones(in1)]); this.model.dstate = new ScilabDouble([i0]); this.model.blocktype = new ScilabString(["c"]); - this.model.firing = []; - this.model.dep_ut = [true,true]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([true,true]); var exprs = [[string(this.nin)],[string(i0+1)]]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/Branching/SCALAR2VECTOR.js b/js/Branching/SCALAR2VECTOR.js index 004add07..a775f16e 100644 --- a/js/Branching/SCALAR2VECTOR.js +++ b/js/Branching/SCALAR2VECTOR.js @@ -7,7 +7,7 @@ function SCALAR2VECTOR() { this.model.out = new ScilabDouble([this.nout]); this.model.in1 = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [string([this.nout])]; var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); diff --git a/js/Branching/SELECT_f.js b/js/Branching/SELECT_f.js index 34b3e65d..9cca42a2 100644 --- a/js/Branching/SELECT_f.js +++ b/js/Branching/SELECT_f.js @@ -11,7 +11,7 @@ function SELECT_f() { this.model.evtin = new ScilabDouble([ones(in1)]); this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(this.nin)],[string(this.z0+1)]]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/Branching/SELECT_m.js b/js/Branching/SELECT_m.js index c59ee23f..af52a5b0 100644 --- a/js/Branching/SELECT_m.js +++ b/js/Branching/SELECT_m.js @@ -11,15 +11,15 @@ function SELECT_m() { this.model.out = new ScilabDouble([-1]); this.model.out2 = new ScilabDouble([-2]); this.model.outtyp = new ScilabDouble([1]); - this.model.evtout = []; - this.model.state = []; - this.model.rpar = []; - this.model.ipar = []; - this.model.firing = []; + this.model.evtout = new ScilabDouble([]); + this.model.state = new ScilabDouble([]); + this.model.rpar = new ScilabDouble([]); + this.model.ipar = new ScilabDouble([]); + this.model.firing = new ScilabDouble([]); this.model.evtin = new ScilabDouble([ones(this.nin,1)]); this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(1)],[sci2exp(this.nin)],[sci2exp(this.z0)]]; var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); diff --git a/js/Branching/SWITCH2.js b/js/Branching/SWITCH2.js index ad4e6b15..3667651f 100644 --- a/js/Branching/SWITCH2.js +++ b/js/Branching/SWITCH2.js @@ -9,12 +9,12 @@ function SWITCH2() { this.model.sim = list(new ScilabString(["switch2"]), new ScilabDouble([4])); this.model.in1 = new ScilabDouble(in1); this.model.out = new ScilabDouble([-1]); - this.model.ipar = ipar; + this.model.ipar = new ScilabDouble(ipar); this.model.rpar = new ScilabDouble([rpar]); this.model.nzcross = new ScilabDouble([this.nzz]); this.model.nmode = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(ipar)],[string(rpar)],[string(this.nzz)]]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/Branching/SWITCH2_m.js b/js/Branching/SWITCH2_m.js index e49aa38c..087fe226 100644 --- a/js/Branching/SWITCH2_m.js +++ b/js/Branching/SWITCH2_m.js @@ -12,12 +12,12 @@ function SWITCH2_m() { this.model.out = new ScilabDouble([-1]); this.model.out2 = new ScilabDouble([-2]); this.model.outtyp = new ScilabDouble([1]); - this.model.ipar = ipar; + this.model.ipar = new ScilabDouble(ipar); this.model.rpar = new ScilabDouble([rpar]); this.model.nzcross = new ScilabDouble([this.nzz]); this.model.nmode = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(1)],[string(ipar)],[string(rpar)],[string(this.nzz)]]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/Branching/SWITCH_f.js b/js/Branching/SWITCH_f.js index 45393eba..87d7a165 100644 --- a/js/Branching/SWITCH_f.js +++ b/js/Branching/SWITCH_f.js @@ -10,8 +10,8 @@ function SWITCH_f() { this.model.out = new ScilabDouble([-1]); this.model.ipar = new ScilabDouble([i0]); this.model.blocktype = new ScilabString(["c"]); - this.model.firing = []; - this.model.dep_ut = [true,true]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([true,true]); var exprs = [[string(this.nin)],[string(i0+1)]]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/Electrical/CCS.js b/js/Electrical/CCS.js index a1c63058..6a8c2211 100644 --- a/js/Electrical/CCS.js +++ b/js/Electrical/CCS.js @@ -34,12 +34,12 @@ function CCS() { this.model.sim = new ScilabString([ModelName]); mo.inputs = MI; mo.outputs = MO; - this.model.rpar = PrametersValue; + this.model.rpar = new ScilabDouble(PrametersValue); mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName)); var exprs = []; var gr_i = []; this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]); diff --git a/js/Electrical/CVS.js b/js/Electrical/CVS.js index 82338529..98af660e 100644 --- a/js/Electrical/CVS.js +++ b/js/Electrical/CVS.js @@ -34,12 +34,12 @@ function CVS() { this.model.sim = new ScilabString([ModelName]); mo.inputs = MI; mo.outputs = MO; - this.model.rpar = PrametersValue; + this.model.rpar = new ScilabDouble(PrametersValue); mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName)); var exprs = []; var gr_i = []; this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]); diff --git a/js/Electrical/Capacitor.js b/js/Electrical/Capacitor.js index 0bb18356..d39a9755 100644 --- a/js/Electrical/Capacitor.js +++ b/js/Electrical/Capacitor.js @@ -7,7 +7,7 @@ function Capacitor() { this.model.rpar = new ScilabDouble([this.C],[this.v]); this.model.sim = new ScilabString(["Capacitor"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var mo = modelica(); mo.model = "Capacitor"; mo.inputs = "p"; diff --git a/js/Electrical/ConstantVoltage.js b/js/Electrical/ConstantVoltage.js index 86527aec..d4693242 100644 --- a/js/Electrical/ConstantVoltage.js +++ b/js/Electrical/ConstantVoltage.js @@ -8,7 +8,7 @@ function ConstantVoltage() { this.model.out = new ScilabDouble([1]); this.model.sim = new ScilabString(["ConstantVoltage"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var mo = modelica(); mo.model = "ConstantVoltage"; mo.inputs = "p"; diff --git a/js/Electrical/CurrentSensor.js b/js/Electrical/CurrentSensor.js index a0be489a..9ca08d67 100644 --- a/js/Electrical/CurrentSensor.js +++ b/js/Electrical/CurrentSensor.js @@ -6,7 +6,7 @@ function CurrentSensor() { this.model.out = new ScilabDouble([1],[1]); this.model.sim = new ScilabString(["CurrentSensor"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var mo = modelica(); mo.model = "CurrentSensor"; mo.inputs = "p"; diff --git a/js/Electrical/Diode.js b/js/Electrical/Diode.js index df2e5f8b..d98e47e0 100644 --- a/js/Electrical/Diode.js +++ b/js/Electrical/Diode.js @@ -11,7 +11,7 @@ function Diode() { this.model.out = new ScilabDouble([1]); this.model.sim = new ScilabString(["Diode"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var mo = modelica(); mo.model = "Diode"; mo.inputs = "p"; diff --git a/js/Electrical/Ground.js b/js/Electrical/Ground.js index 9d796b5c..2c94c087 100644 --- a/js/Electrical/Ground.js +++ b/js/Electrical/Ground.js @@ -2,11 +2,11 @@ function Ground() { Ground.prototype.define = function Ground() { this.model = scicos_model(); - this.model.in1 = [1]; - this.model.out = []; + this.model.in1 = new ScilabDouble([1]); + this.model.out = new ScilabDouble([]); this.model.sim = new ScilabString(["Ground"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var mo = modelica(); mo.model = "Ground"; mo.inputs = "p"; diff --git a/js/Electrical/Gyrator.js b/js/Electrical/Gyrator.js index b048b411..aeba6720 100644 --- a/js/Electrical/Gyrator.js +++ b/js/Electrical/Gyrator.js @@ -39,7 +39,7 @@ function Gyrator() { var exprs = [["1"],["1"]]; var gr_i = []; this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]); diff --git a/js/Electrical/IdealTransformer.js b/js/Electrical/IdealTransformer.js index 3bdbff02..df8ab379 100644 --- a/js/Electrical/IdealTransformer.js +++ b/js/Electrical/IdealTransformer.js @@ -34,12 +34,12 @@ function IdealTransformer() { this.model.sim = new ScilabString([ModelName]); mo.inputs = MI; mo.outputs = MO; - this.model.rpar = PrametersValue; + this.model.rpar = new ScilabDouble(PrametersValue); mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName)); var exprs = ["1"]; var gr_i = []; this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]); diff --git a/js/Electrical/Inductor.js b/js/Electrical/Inductor.js index 46c3b201..2b9d4e20 100644 --- a/js/Electrical/Inductor.js +++ b/js/Electrical/Inductor.js @@ -2,13 +2,13 @@ function Inductor() { Inductor.prototype.define = function Inductor() { this.model = scicos_model(); - this.model.in1 = [1]; - this.model.out = [1]; + this.model.in1 = new ScilabDouble([1]); + this.model.out = new ScilabDouble([1]); this.L = 1.e-5; this.model.rpar = new ScilabDouble([this.L]); this.model.sim = new ScilabString(["Inductor"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var mo = modelica(); mo.model = "Inductor"; mo.inputs = "p"; diff --git a/js/Electrical/MOTOR.js b/js/Electrical/MOTOR.js index 0c8b03ea..7927882f 100644 --- a/js/Electrical/MOTOR.js +++ b/js/Electrical/MOTOR.js @@ -3,10 +3,10 @@ function MOTOR() { MOTOR.prototype.define = function MOTOR() { this.model = scicos_model(); this.model.out = new ScilabDouble([1],[1]); - this.model.in1 = [1]; + this.model.in1 = new ScilabDouble([1]); this.model.sim = new ScilabString(["motor"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var gr_i = []; var exprs = ""; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/Electrical/NMOS.js b/js/Electrical/NMOS.js index c80a5c08..7e4d8ae2 100644 --- a/js/Electrical/NMOS.js +++ b/js/Electrical/NMOS.js @@ -13,7 +13,7 @@ function NMOS() { this.RDS = 1.e+7; this.model.sim = new ScilabString(["NMOS"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var mo = modelica(); mo.model = "NMOS"; mo.outputs = [["D"],["B"],["S"]]; diff --git a/js/Electrical/NPN.js b/js/Electrical/NPN.js index 392f5285..1617b2f4 100644 --- a/js/Electrical/NPN.js +++ b/js/Electrical/NPN.js @@ -39,7 +39,7 @@ function NPN() { var exprs = [["50"],["0.1"],["1.e-16"],["0.02"],["0.12e-9"],["5e-9"],["1e-12"],["0.4e-12"],["0.5e-12"],["0.8"],["0.4"],["0.8"],["0.333"],["1e-15"],["1e-15"],["0.02585"],["40"]]; var gr_i = []; this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]); diff --git a/js/Electrical/OpAmp.js b/js/Electrical/OpAmp.js index 387cd7b4..a2bedf1e 100644 --- a/js/Electrical/OpAmp.js +++ b/js/Electrical/OpAmp.js @@ -6,7 +6,7 @@ function OpAmp() { this.model = scicos_model(); this.model.sim = new ScilabString(["OpAmp"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var mo = modelica(); mo.model = this.model.sim; mo.inputs = [["in_p"],["in_n"]]; @@ -15,7 +15,7 @@ function OpAmp() { this.model.equations = new ScilabDouble([mo]); this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); - this.model.rpar = Z; + this.model.rpar = new ScilabDouble(Z); var exprs = string(Z); var gr_i = []; this.x = standard_define([3,5],this.model,exprs,gr_i); diff --git a/js/Electrical/PMOS.js b/js/Electrical/PMOS.js index ade7e825..59dc456b 100644 --- a/js/Electrical/PMOS.js +++ b/js/Electrical/PMOS.js @@ -13,7 +13,7 @@ function PMOS() { this.RDS = 1.e+7; this.model.sim = new ScilabString(["PMOS"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var mo = modelica(); mo.model = "PMOS"; mo.outputs = [["D"],["B"],["S"]]; diff --git a/js/Electrical/PNP.js b/js/Electrical/PNP.js index a64de188..8cccbb43 100644 --- a/js/Electrical/PNP.js +++ b/js/Electrical/PNP.js @@ -39,7 +39,7 @@ function PNP() { var exprs = [["50"],["0.1"],["1.e-16"],["0.02"],["0.12e-9"],["5e-9"],["1e-12"],["0.4e-12"],["0.5e-12"],["0.8"],["0.4"],["0.8"],["0.333"],["1e-15"],["1e-15"],["0.02585"],["40"]]; var gr_i = []; this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]); diff --git a/js/Electrical/PotentialSensor.js b/js/Electrical/PotentialSensor.js index 46db78fb..99b180da 100644 --- a/js/Electrical/PotentialSensor.js +++ b/js/Electrical/PotentialSensor.js @@ -2,12 +2,12 @@ function PotentialSensor() { PotentialSensor.prototype.define = function PotentialSensor() { this.model = scicos_model(); - this.model.in1 = [1]; - this.model.out = [1]; - this.model.rpar = []; + this.model.in1 = new ScilabDouble([1]); + this.model.out = new ScilabDouble([1]); + this.model.rpar = new ScilabDouble([]); this.model.sim = new ScilabString(["PotentialSensor"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var mo = modelica(); mo.model = "PotentialSensor"; mo.inputs = "p"; diff --git a/js/Electrical/Resistor.js b/js/Electrical/Resistor.js index d0c91ba5..ebbfc7d4 100644 --- a/js/Electrical/Resistor.js +++ b/js/Electrical/Resistor.js @@ -6,7 +6,7 @@ function Resistor() { this.model.rpar = new ScilabDouble([this.R]); this.model.sim = new ScilabString(["resistor"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var mo = modelica(); mo.model = "Resistor"; mo.inputs = "p"; diff --git a/js/Electrical/SineVoltage.js b/js/Electrical/SineVoltage.js index 7db61627..56ac2b5c 100644 --- a/js/Electrical/SineVoltage.js +++ b/js/Electrical/SineVoltage.js @@ -2,8 +2,8 @@ function SineVoltage() { SineVoltage.prototype.define = function SineVoltage() { this.model = scicos_model(); - this.model.in1 = [1]; - this.model.out = [1]; + this.model.in1 = new ScilabDouble([1]); + this.model.out = new ScilabDouble([1]); this.V = 1; this.ph = 0; this.frq = 1; @@ -12,7 +12,7 @@ function SineVoltage() { this.model.rpar = new ScilabDouble([this.V],[this.ph],[this.frq],[this.offset],[this.start]); this.model.sim = new ScilabString(["SineVoltage"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var mo = modelica(); mo.model = "SineVoltage"; mo.inputs = "p"; diff --git a/js/Electrical/Switch.js b/js/Electrical/Switch.js index 57211e6b..e922c86e 100644 --- a/js/Electrical/Switch.js +++ b/js/Electrical/Switch.js @@ -8,7 +8,7 @@ function Switch() { var Z = eval(S); this.model.sim = new ScilabString(["Switch"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var mo = modelica(); mo.model = this.model.sim; mo.inputs = [["p"],["inp"]]; diff --git a/js/Electrical/VVsourceAC.js b/js/Electrical/VVsourceAC.js index 22a7553b..8938dc9c 100644 --- a/js/Electrical/VVsourceAC.js +++ b/js/Electrical/VVsourceAC.js @@ -3,13 +3,13 @@ function VVsourceAC() { VVsourceAC.prototype.define = function VVsourceAC() { this.model = scicos_model(); this.model.in1 = new ScilabDouble([1],[1]); - this.model.out = [1]; + this.model.out = new ScilabDouble([1]); var VA = 220; this.FR = 50; - this.model.rpar = [this.FR]; + this.model.rpar = new ScilabDouble([this.FR]); this.model.sim = new ScilabString(["VVsourceAC"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var mo = modelica(); mo.model = "VVsourceAC"; mo.inputs = ["p","VA"]; @@ -43,7 +43,7 @@ function VVsourceAC() { if (!ok) { break; } - this.model.rpar = [this.FR]; + this.model.rpar = new ScilabDouble([this.FR]); this.model.equations.parameters[2] = list(new ScilabDouble([this.FR])); graphics.exprs = exprs; this.x.graphics = graphics; diff --git a/js/Electrical/VariableResistor.js b/js/Electrical/VariableResistor.js index 608b7d95..271be235 100644 --- a/js/Electrical/VariableResistor.js +++ b/js/Electrical/VariableResistor.js @@ -4,7 +4,7 @@ function VariableResistor() { this.model = scicos_model(); this.model.sim = new ScilabString(["VariableResistor"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var mo = modelica(); mo.model = "VariableResistor"; mo.inputs = ["p","R"]; diff --git a/js/Electrical/VoltageSensor.js b/js/Electrical/VoltageSensor.js index 0c9fc13d..0a1851f3 100644 --- a/js/Electrical/VoltageSensor.js +++ b/js/Electrical/VoltageSensor.js @@ -6,7 +6,7 @@ function VoltageSensor() { this.model.out = new ScilabDouble([1],[1]); this.model.sim = new ScilabString(["VoltageSensor"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var mo = modelica(); mo.model = "VoltageSensor"; mo.inputs = "p"; diff --git a/js/Electrical/VsourceAC.js b/js/Electrical/VsourceAC.js index cde9cd20..b96151e9 100644 --- a/js/Electrical/VsourceAC.js +++ b/js/Electrical/VsourceAC.js @@ -2,14 +2,14 @@ function VsourceAC() { VsourceAC.prototype.define = function VsourceAC() { this.model = scicos_model(); - this.model.in1 = [1]; - this.model.out = [1]; + this.model.in1 = new ScilabDouble([1]); + this.model.out = new ScilabDouble([1]); this.VA = 220; this.FR = 50; this.model.rpar = new ScilabDouble([this.VA],[this.FR]); this.model.sim = new ScilabString(["VsourceAC"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var mo = modelica(); mo.model = "VsourceAC"; mo.inputs = "p"; diff --git a/js/Events/ANDLOG_f.js b/js/Events/ANDLOG_f.js index ae7ce241..c6a99734 100644 --- a/js/Events/ANDLOG_f.js +++ b/js/Events/ANDLOG_f.js @@ -6,8 +6,8 @@ function ANDLOG_f() { this.model.out = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1],[1]); this.model.blocktype = new ScilabString(["d"]); - this.model.firing = []; - this.model.dep_ut = [false,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([false,false]); var gr_i = []; this.x = standard_define([3,3],this.model,[],gr_i); return new BasicBlock(this.x); diff --git a/js/Events/CLKSOMV_f.js b/js/Events/CLKSOMV_f.js index 43665ce3..65b37b35 100644 --- a/js/Events/CLKSOMV_f.js +++ b/js/Events/CLKSOMV_f.js @@ -7,7 +7,7 @@ function CLKSOMV_f() { this.model.evtout = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var gr_i = []; this.x = standard_define([2,2],this.model,[],gr_i); return new BasicBlock(this.x); diff --git a/js/Events/CLKSOM_f.js b/js/Events/CLKSOM_f.js index 10342a16..948e5269 100644 --- a/js/Events/CLKSOM_f.js +++ b/js/Events/CLKSOM_f.js @@ -7,7 +7,7 @@ function CLKSOM_f() { this.model.evtout = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var gr_i = []; this.x = standard_define([1,1]/1.2,this.model,[],gr_i); return new BasicBlock(this.x); diff --git a/js/Events/CLKSPLIT_f.js b/js/Events/CLKSPLIT_f.js index a3f0d2f6..477c849d 100644 --- a/js/Events/CLKSPLIT_f.js +++ b/js/Events/CLKSPLIT_f.js @@ -6,8 +6,8 @@ function CLKSPLIT_f() { this.model.evtin = new ScilabDouble([1]); this.model.evtout = new ScilabDouble([1],[1]); this.model.blocktype = new ScilabString(["d"]); - this.model.firing = [false,false,false]; - this.model.dep_ut = [false,false]; + this.model.firing = new ScilabDouble([false,false,false]); + this.model.dep_ut = new ScilabDouble([false,false]); this.x = standard_define([1,1]/3,this.model,[],[]); return new BasicBlock(this.x); } diff --git a/js/Events/END_c.js b/js/Events/END_c.js index 77911212..24848fcb 100644 --- a/js/Events/END_c.js +++ b/js/Events/END_c.js @@ -8,7 +8,7 @@ function END_c() { this.model.evtout = new ScilabDouble([1]); this.model.firing = new ScilabDouble([this.tf]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = string(this.tf); var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/Events/EVTDLY_c.js b/js/Events/EVTDLY_c.js index d535d0d6..a4a6f941 100644 --- a/js/Events/EVTDLY_c.js +++ b/js/Events/EVTDLY_c.js @@ -10,7 +10,7 @@ function EVTDLY_c() { this.model.rpar = new ScilabDouble([this.dt],[this.ff]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([this.ff]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[string(this.dt)],[sci2exp(this.ff)]]; var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); diff --git a/js/Events/EVTDLY_f.js b/js/Events/EVTDLY_f.js index e7fb881b..eb531d9c 100644 --- a/js/Events/EVTDLY_f.js +++ b/js/Events/EVTDLY_f.js @@ -10,7 +10,7 @@ function EVTDLY_f() { this.model.rpar = new ScilabDouble([this.dt]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([this.ff]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[string(this.dt)],[sci2exp(this.ff)]]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/Events/EVTGEN_f.js b/js/Events/EVTGEN_f.js index e6073dbb..6d387826 100644 --- a/js/Events/EVTGEN_f.js +++ b/js/Events/EVTGEN_f.js @@ -7,7 +7,7 @@ function EVTGEN_f() { this.model.evtout = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([this.tt]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = string(this.tt); var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); diff --git a/js/Events/EVTVARDLY.js b/js/Events/EVTVARDLY.js index 36d2d1d6..2855497c 100644 --- a/js/Events/EVTVARDLY.js +++ b/js/Events/EVTVARDLY.js @@ -9,7 +9,7 @@ function EVTVARDLY() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = string(this.model.firing); var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/Events/HALT_f.js b/js/Events/HALT_f.js index ee80ba4e..f3796ca3 100644 --- a/js/Events/HALT_f.js +++ b/js/Events/HALT_f.js @@ -8,7 +8,7 @@ function HALT_f() { this.model.dstate = new ScilabDouble([0]); this.model.ipar = new ScilabDouble([0]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = string(this.n); var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/Events/IFTHEL_f.js b/js/Events/IFTHEL_f.js index 27452a38..a43df50f 100644 --- a/js/Events/IFTHEL_f.js +++ b/js/Events/IFTHEL_f.js @@ -9,8 +9,8 @@ function IFTHEL_f() { this.model.evtin = new ScilabDouble([1]); this.model.evtout = new ScilabDouble([1],[1]); this.model.blocktype = new ScilabString(["l"]); - this.model.firing = [-1,-1]; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble([-1,-1]); + this.model.dep_ut = new ScilabDouble([true,false]); this.model.nmode = new ScilabDouble([1]); this.model.nzcross = new ScilabDouble([1]); var gr_i = []; @@ -46,7 +46,7 @@ function IFTHEL_f() { if (!ok) { break; } - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); if (this.nmod!=0) { this.nmod = 1; } @@ -59,7 +59,7 @@ function IFTHEL_f() { var ok = tmpvar0[2]; if (ok) { graphics.exprs = exprs; - this.model.evtin = this.inh; + this.model.evtin = new ScilabDouble(this.inh); this.model.sim[2] = new ScilabDouble([-1]); this.model.nmode = new ScilabDouble([this.nmod]); this.model.nzcross = new ScilabDouble([this.nmod]); diff --git a/js/Events/MFCLCK_f.js b/js/Events/MFCLCK_f.js index ef618f72..65b4b868 100644 --- a/js/Events/MFCLCK_f.js +++ b/js/Events/MFCLCK_f.js @@ -11,8 +11,8 @@ function MFCLCK_f() { this.model.rpar = new ScilabDouble([this.dt]); this.model.ipar = new ScilabDouble([this.nn]); this.model.blocktype = new ScilabString(["d"]); - this.model.firing = [-1,0]; - this.model.dep_ut = [false,false]; + this.model.firing = new ScilabDouble([-1,0]); + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[string(this.dt)],[string(this.nn)]]; var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); @@ -41,7 +41,7 @@ function MFCLCK_f() { this.model.rpar = new ScilabDouble([this.dt]); var hh = this.model.firing; hh[2-1] = 0; - this.model.firing = hh; + this.model.firing = new ScilabDouble(hh); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Events/M_freq.js b/js/Events/M_freq.js index ba3dd675..b76b3d94 100644 --- a/js/Events/M_freq.js +++ b/js/Events/M_freq.js @@ -5,11 +5,11 @@ function M_freq() { this.model.sim = list(new ScilabString(["m_frequ"]), new ScilabDouble([4])); this.model.evtout = new ScilabDouble([1],[1],[1]); this.model.evtin = new ScilabDouble([1]); - this.model.rpar = []; + this.model.rpar = new ScilabDouble([]); this.model.opar = list([[1,1,0],[1,1,1],[1,3,2]], new ScilabDouble([1]), new ScilabDouble([0]), new ScilabDouble([0])); this.model.blocktype = new ScilabString(["d"]); - this.model.firing = [0,-1,-1]; - this.model.dep_ut = [false,false]; + this.model.firing = new ScilabDouble([0,-1,-1]); + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[sci2exp([[1],[2]])],[sci2exp([[0],[0]])]]; var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); diff --git a/js/Events/VirtualCLK0.js b/js/Events/VirtualCLK0.js index a4b3baed..b50db6e2 100644 --- a/js/Events/VirtualCLK0.js +++ b/js/Events/VirtualCLK0.js @@ -5,10 +5,10 @@ function VirtualCLK0() { this.model.sim = new ScilabString(["vrtclk0"]); this.model.evtin = new ScilabDouble([1]); this.model.opar = list(); - this.model.ipar = []; + this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = []; this.x = standard_define([2,2],this.model,exprs," "); return new BasicBlock(this.x); diff --git a/js/Hydraulics/Bache.js b/js/Hydraulics/Bache.js index 82ed4cb1..68683e2e 100644 --- a/js/Hydraulics/Bache.js +++ b/js/Hydraulics/Bache.js @@ -4,8 +4,8 @@ function Bache() { var in1 = 2; var out = 3; this.model = scicos_model(); - this.model.in1 = [-transpose([1:in1])]; - this.model.out = [-transpose([1:out])]; + this.model.in1 = new ScilabDouble([-transpose([1:in1])]); + this.model.out = new ScilabDouble([-transpose([1:out])]); this.Patm = 1.013e5; this.A = 1; this.ze1 = 40; @@ -18,7 +18,7 @@ function Bache() { this.model.rpar = new ScilabDouble([this.Patm],[this.A],[this.ze1],[this.ze2],[this.zs1],[this.zs2],[this.z0],[this.T0],[this.p_rho]); this.model.sim = new ScilabString(["Bache"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var mo = modelica(); mo.model = "Bache"; mo.inputs = ["Ce1","Ce2"]; diff --git a/js/Hydraulics/Flowmeter.js b/js/Hydraulics/Flowmeter.js index 540ed624..e5efb188 100644 --- a/js/Hydraulics/Flowmeter.js +++ b/js/Hydraulics/Flowmeter.js @@ -39,7 +39,7 @@ function Flowmeter() { var exprs = "1"; var gr_i = []; this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]); diff --git a/js/Hydraulics/PerteDP.js b/js/Hydraulics/PerteDP.js index f83950f2..4a57604e 100644 --- a/js/Hydraulics/PerteDP.js +++ b/js/Hydraulics/PerteDP.js @@ -2,8 +2,8 @@ function PerteDP() { PerteDP.prototype.define = function PerteDP() { this.model = scicos_model(); - this.model.in1 = [1]; - this.model.out = [1]; + this.model.in1 = new ScilabDouble([1]); + this.model.out = new ScilabDouble([1]); this.L = 10; this.D = 0.2; this.lambda = 0.03; @@ -13,7 +13,7 @@ function PerteDP() { this.model.rpar = new ScilabDouble([this.L],[this.D],[this.lambda],[this.z1],[this.z2],[this.p_rho]); this.model.sim = new ScilabString(["PerteDP"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var mo = modelica(); mo.model = "PerteDP"; mo.inputs = "C1"; diff --git a/js/Hydraulics/PuitsP.js b/js/Hydraulics/PuitsP.js index 873fb972..ab5be777 100644 --- a/js/Hydraulics/PuitsP.js +++ b/js/Hydraulics/PuitsP.js @@ -9,7 +9,7 @@ function PuitsP() { this.model.rpar = new ScilabDouble([this.P0],[this.T0],[this.H0],[this.option_temperature]); this.model.sim = new ScilabString(["Puits"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var mo = modelica(); mo.model = "Puits"; mo.inputs = ["C"]; diff --git a/js/Hydraulics/SourceP.js b/js/Hydraulics/SourceP.js index 955403fb..b622899e 100644 --- a/js/Hydraulics/SourceP.js +++ b/js/Hydraulics/SourceP.js @@ -9,7 +9,7 @@ function SourceP() { this.model.rpar = new ScilabDouble([this.P0],[this.T0],[this.H0],[this.option_temperature]); this.model.sim = new ScilabString(["Source"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var mo = modelica(); mo.model = "Source"; mo.inputs = []; diff --git a/js/Hydraulics/VanneReglante.js b/js/Hydraulics/VanneReglante.js index 7ae90b14..1810e7f5 100644 --- a/js/Hydraulics/VanneReglante.js +++ b/js/Hydraulics/VanneReglante.js @@ -3,13 +3,13 @@ function VanneReglante() { VanneReglante.prototype.define = function VanneReglante() { this.model = scicos_model(); this.model.in1 = new ScilabDouble([1],[1]); - this.model.out = [1]; + this.model.out = new ScilabDouble([1]); this.Cvmax = 8005.42; this.p_rho = 0; this.model.rpar = new ScilabDouble([this.Cvmax],[this.p_rho]); this.model.sim = new ScilabString(["VanneReglante"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var mo = modelica(); mo.model = "VanneReglante"; mo.inputs = ["C1","Ouv"]; diff --git a/js/IntegerOp/BITCLEAR.js b/js/IntegerOp/BITCLEAR.js index 9230f85e..864bfaf7 100644 --- a/js/IntegerOp/BITCLEAR.js +++ b/js/IntegerOp/BITCLEAR.js @@ -11,7 +11,7 @@ function BITCLEAR() { this.model.outtyp = new ScilabDouble([3]); this.model.opar = list(new ScilabDouble([int32(0)])); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(3)],[sci2exp(0)]]; var gr_i = []; this.x = standard_define([4,2],this.model,exprs,gr_i); diff --git a/js/IntegerOp/BITSET.js b/js/IntegerOp/BITSET.js index 6a0582fe..fd52e1bb 100644 --- a/js/IntegerOp/BITSET.js +++ b/js/IntegerOp/BITSET.js @@ -11,7 +11,7 @@ function BITSET() { this.model.outtyp = new ScilabDouble([3]); this.model.opar = list(new ScilabDouble([uint32(0)])); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(3)],[sci2exp(0)]]; var gr_i = []; this.x = standard_define([4,2],this.model,exprs,gr_i); diff --git a/js/IntegerOp/CONVERT.js b/js/IntegerOp/CONVERT.js index ddd77a7c..94be655f 100644 --- a/js/IntegerOp/CONVERT.js +++ b/js/IntegerOp/CONVERT.js @@ -10,10 +10,10 @@ function CONVERT() { this.model.out2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([3]); - this.model.rpar = []; + this.model.rpar = new ScilabDouble([]); this.model.ipar = new ScilabDouble([sgn]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(1)],[sci2exp(3)],[sci2exp(0)]]; var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); diff --git a/js/IntegerOp/DFLIPFLOP.js b/js/IntegerOp/DFLIPFLOP.js index 79215c3e..80a84dfd 100644 --- a/js/IntegerOp/DFLIPFLOP.js +++ b/js/IntegerOp/DFLIPFLOP.js @@ -82,11 +82,11 @@ function DFLIPFLOP() { this.model.in2 = new ScilabDouble([1],[1],[1]); this.model.out = new ScilabDouble([1],[1]); this.model.out2 = new ScilabDouble([1],[1]); - this.model.intyp = [5,1,1]; - this.model.outtyp = [5,5]; + this.model.intyp = new ScilabDouble([5,1,1]); + this.model.outtyp = new ScilabDouble([5,5]); this.model.blocktype = new ScilabString(["h"]); this.model.firing = new ScilabBoolean([false]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); this.model.rpar = new ScilabDouble([scs_m]); var gr_i = []; this.x = standard_define([2,3],this.model,[],gr_i); diff --git a/js/IntegerOp/DLATCH.js b/js/IntegerOp/DLATCH.js index 2b08ce0f..317254cc 100644 --- a/js/IntegerOp/DLATCH.js +++ b/js/IntegerOp/DLATCH.js @@ -27,11 +27,11 @@ function DLATCH() { this.model.in2 = new ScilabDouble([1],[1]); this.model.out = new ScilabDouble([1],[1]); this.model.out2 = new ScilabDouble([1],[1]); - this.model.intyp = [5,-1]; - this.model.outtyp = [5,5]; + this.model.intyp = new ScilabDouble([5,-1]); + this.model.outtyp = new ScilabDouble([5,5]); this.model.blocktype = new ScilabString(["h"]); this.model.firing = new ScilabBoolean([false]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); this.model.rpar = new ScilabDouble([scs_m]); var gr_i = []; this.x = standard_define([2,3],this.model,[],gr_i); diff --git a/js/IntegerOp/EXTRACTBITS.js b/js/IntegerOp/EXTRACTBITS.js index 5525a5f5..4b6510ec 100644 --- a/js/IntegerOp/EXTRACTBITS.js +++ b/js/IntegerOp/EXTRACTBITS.js @@ -10,9 +10,9 @@ function EXTRACTBITS() { this.model.out2 = new ScilabDouble([1]); this.model.intyp = new ScilabDouble([3]); this.model.outtyp = new ScilabDouble([3]); - this.model.ipar = [0,numb]; + this.model.ipar = new ScilabDouble([0,numb]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(3)],[sci2exp(1)],[sci2exp(0)],[sci2exp(0)]]; var gr_i = []; this.x = standard_define([4,2],this.model,exprs,gr_i); diff --git a/js/IntegerOp/INTMUL.js b/js/IntegerOp/INTMUL.js index 14df9421..e15748d6 100644 --- a/js/IntegerOp/INTMUL.js +++ b/js/IntegerOp/INTMUL.js @@ -8,12 +8,12 @@ function INTMUL() { this.model.out = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2],[-3]); this.model.out2 = new ScilabDouble([-3]); - this.model.intyp = [3,3]; + this.model.intyp = new ScilabDouble([3,3]); this.model.outtyp = new ScilabDouble([3]); - this.model.rpar = []; + this.model.rpar = new ScilabDouble([]); this.model.ipar = new ScilabDouble([sgn]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(3)],[sci2exp(0)]]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/IntegerOp/JKFLIPFLOP.js b/js/IntegerOp/JKFLIPFLOP.js index 79853489..752d1d85 100644 --- a/js/IntegerOp/JKFLIPFLOP.js +++ b/js/IntegerOp/JKFLIPFLOP.js @@ -38,11 +38,11 @@ function JKFLIPFLOP() { this.model.in2 = new ScilabDouble([1],[1],[1]); this.model.out = new ScilabDouble([1],[1]); this.model.out2 = new ScilabDouble([1],[1]); - this.model.intyp = [5,1,5]; - this.model.outtyp = [5,5]; + this.model.intyp = new ScilabDouble([5,1,5]); + this.model.outtyp = new ScilabDouble([5,5]); this.model.blocktype = new ScilabString(["h"]); this.model.firing = new ScilabBoolean([false]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); this.model.rpar = new ScilabDouble([scs_m]); var gr_i = []; this.x = standard_define([2,3],this.model,[],gr_i); diff --git a/js/IntegerOp/LOGIC.js b/js/IntegerOp/LOGIC.js index 5a517eb8..97898c8d 100644 --- a/js/IntegerOp/LOGIC.js +++ b/js/IntegerOp/LOGIC.js @@ -9,12 +9,12 @@ function LOGIC() { this.model.out = new ScilabDouble([1]); this.model.out2 = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); - this.model.intyp = [5,5]; + this.model.intyp = new ScilabDouble([5,5]); this.model.outtyp = new ScilabDouble([5]); this.model.opar = list(new ScilabDouble([int8(this.mat)])); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabBoolean([false]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(this.mat)],[sci2exp(0)]]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/IntegerOp/SHIFT.js b/js/IntegerOp/SHIFT.js index ab0de403..5b6a4188 100644 --- a/js/IntegerOp/SHIFT.js +++ b/js/IntegerOp/SHIFT.js @@ -11,10 +11,10 @@ function SHIFT() { this.model.out2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([3]); this.model.outtyp = new ScilabDouble([3]); - this.model.rpar = []; + this.model.rpar = new ScilabDouble([]); this.model.ipar = new ScilabDouble(sgn); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(3)],[sci2exp(0)],[sci2exp(0)]]; var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); diff --git a/js/IntegerOp/SRFLIPFLOP.js b/js/IntegerOp/SRFLIPFLOP.js index 3ed06b83..db4dc223 100644 --- a/js/IntegerOp/SRFLIPFLOP.js +++ b/js/IntegerOp/SRFLIPFLOP.js @@ -22,11 +22,11 @@ function SRFLIPFLOP() { this.model.in2 = new ScilabDouble([1],[1]); this.model.out = new ScilabDouble([1],[1]); this.model.out2 = new ScilabDouble([1],[1]); - this.model.intyp = [5,5]; - this.model.outtyp = [5,5]; + this.model.intyp = new ScilabDouble([5,5]); + this.model.outtyp = new ScilabDouble([5,5]); this.model.blocktype = new ScilabString(["h"]); this.model.firing = new ScilabBoolean([false]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); this.model.rpar = new ScilabDouble([scs_m]); var gr_i = []; this.x = standard_define([2,3],this.model,[],gr_i); diff --git a/js/Linear/BIGSOM_f.js b/js/Linear/BIGSOM_f.js index 95fe10ed..b0a75d52 100644 --- a/js/Linear/BIGSOM_f.js +++ b/js/Linear/BIGSOM_f.js @@ -8,7 +8,7 @@ function BIGSOM_f() { this.model.out = new ScilabDouble([-1]); this.model.rpar = new ScilabDouble(this.sgn); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = sci2exp(this.sgn); var gr_i = []; this.x = standard_define([2,3],this.model,exprs,gr_i); @@ -39,7 +39,7 @@ function BIGSOM_f() { var graphics = tmpvar0[1] var ok = tmpvar0[2]; if (ok) { - this.model.rpar = this.sgn.slice(); + this.model.rpar = new ScilabDouble(this.sgn.slice()); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Linear/CLINDUMMY_f.js b/js/Linear/CLINDUMMY_f.js index 047efa5f..0159348b 100644 --- a/js/Linear/CLINDUMMY_f.js +++ b/js/Linear/CLINDUMMY_f.js @@ -6,8 +6,8 @@ function CLINDUMMY_f() { this.model.sim = list(new ScilabString(["cdummy"]), new ScilabDouble([4])); this.model.state = new ScilabDouble([x0]); this.model.blocktype = new ScilabString(["c"]); - this.model.firing = []; - this.model.dep_ut = [false,true]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([false,true]); var gr_i = []; this.x = standard_define([3,2],this.model,[],gr_i); return new BasicBlock(this.x); diff --git a/js/Linear/CLR.js b/js/Linear/CLR.js index b4abd599..5edba5dd 100644 --- a/js/Linear/CLR.js +++ b/js/Linear/CLR.js @@ -14,7 +14,7 @@ function CLR() { this.model.state = new ScilabDouble([x0]); this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); @@ -70,14 +70,14 @@ function CLR() { var mmm = [false,true]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = mmm; + this.model.dep_ut = new ScilabDouble(mmm); } if (ns1<=ns) { var x0 = x0.slice(1-1,ns1); } else { x0[ns1-1][1-1] = 0; } - this.model.state = x0; + this.model.state = new ScilabDouble(x0); this.model.rpar = new ScilabDouble(rpar); this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Linear/CLR_f.js b/js/Linear/CLR_f.js index d1b8d23b..0d56c799 100644 --- a/js/Linear/CLR_f.js +++ b/js/Linear/CLR_f.js @@ -14,7 +14,7 @@ function CLR_f() { this.model.state = new ScilabDouble([x0]); this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); var gr_i = []; this.x = standard_define([2.5,2.5],this.model,exprs,gr_i); return new BasicBlock(this.x); @@ -70,14 +70,14 @@ function CLR_f() { var mmm = [false,true]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = mmm; + this.model.dep_ut = new ScilabDouble(mmm); } if (ns1<=ns) { var x0 = x0.slice(1-1,ns1); } else { x0[ns1-1][1-1] = 0; } - this.model.state = x0; + this.model.state = new ScilabDouble(x0); this.model.rpar = new ScilabDouble(rpar); this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Linear/CLSS.js b/js/Linear/CLSS.js index d5fd2d3a..3c095238 100644 --- a/js/Linear/CLSS.js +++ b/js/Linear/CLSS.js @@ -15,7 +15,7 @@ function CLSS() { this.model.state = new ScilabDouble([this.x0]); this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; var gr_i = []; this.x = standard_define([4,2],this.model,exprs,gr_i); @@ -90,12 +90,12 @@ function CLSS() { var mmm = [false,true]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = mmm; + this.model.dep_ut = new ScilabDouble(mmm); } } else { - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); } - this.model.state = this.x0.slice(); + this.model.state = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble(rpar); this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Linear/CLSS_f.js b/js/Linear/CLSS_f.js index f6afb7fb..09f6465f 100644 --- a/js/Linear/CLSS_f.js +++ b/js/Linear/CLSS_f.js @@ -15,7 +15,7 @@ function CLSS_f() { this.model.state = new ScilabDouble([this.x0]); this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; var gr_i = []; this.x = standard_define([4,2],this.model,exprs,gr_i); @@ -80,12 +80,12 @@ function CLSS_f() { var mmm = [false,true]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = mmm; + this.model.dep_ut = new ScilabDouble(mmm); } } else { - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); } - this.model.state = this.x0.slice(); + this.model.state = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble(rpar); this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Linear/DELAYV_f.js b/js/Linear/DELAYV_f.js index 0cfbfc4d..6e3ada84 100644 --- a/js/Linear/DELAYV_f.js +++ b/js/Linear/DELAYV_f.js @@ -14,8 +14,8 @@ function DELAYV_f() { this.model.dstate = new ScilabDouble([z0]); this.model.rpar = new ScilabDouble([this.T/(size(this.zz0,"*"))]); this.model.blocktype = new ScilabString(["d"]); - this.model.firing = [0,-1]; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble([0,-1]); + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(this.nin)],[strcat(string(z0.slice(1-1,$-1)),";")],[string(this.T)]]; var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); diff --git a/js/Linear/DERIV.js b/js/Linear/DERIV.js index 853643e7..01ef03d1 100644 --- a/js/Linear/DERIV.js +++ b/js/Linear/DERIV.js @@ -6,7 +6,7 @@ function DERIV() { this.model.in1 = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["x"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = []; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/Linear/DIFF_c.js b/js/Linear/DIFF_c.js index f8d77168..057264bf 100644 --- a/js/Linear/DIFF_c.js +++ b/js/Linear/DIFF_c.js @@ -8,7 +8,7 @@ function DIFF_c() { this.model.out = new ScilabDouble([1]); this.model.state = new ScilabDouble(this.x0); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); var exprs = [[strcat(sci2exp(this.x0[1-1]))],[strcat(sci2exp(this.x0[2-1]))]]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); @@ -52,7 +52,7 @@ function DIFF_c() { if (!ask_again) { graphics.exprs = exprs; this.model.state = new ScilabDouble([this.x0],[this.xd0]); - this.model.out = [N]; + this.model.out = new ScilabDouble([N]); this.model.in1 = new ScilabDouble([N]); this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Linear/DLR.js b/js/Linear/DLR.js index 8c4d3f0e..2f686ae0 100644 --- a/js/Linear/DLR.js +++ b/js/Linear/DLR.js @@ -12,10 +12,10 @@ function DLR() { this.model.in1 = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); - this.model.dstate = x0.slice(); + this.model.dstate = new ScilabDouble(x0.slice()); this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); @@ -67,7 +67,7 @@ function DLR() { x0[ns1-1][1-1] = 0; } var rpar = [[A.slice()],[B.slice()],[C.slice()],[D.slice()]]; - this.model.dstate = x0; + this.model.dstate = new ScilabDouble(x0); this.model.rpar = new ScilabDouble(rpar); if (norm(D,1)!=0) { var mmm = [true,false]; @@ -75,7 +75,7 @@ function DLR() { var mmm = [false,false]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = mmm; + this.model.dep_ut = new ScilabDouble(mmm); } this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Linear/DLR_f.js b/js/Linear/DLR_f.js index 0306a6d9..f2702d0e 100644 --- a/js/Linear/DLR_f.js +++ b/js/Linear/DLR_f.js @@ -12,10 +12,10 @@ function DLR_f() { this.model.in1 = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); - this.model.dstate = x0.slice(); + this.model.dstate = new ScilabDouble(x0.slice()); this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var gr_i = []; this.x = standard_define([2.5,2.5],this.model,exprs,gr_i); return new BasicBlock(this.x); @@ -67,7 +67,7 @@ function DLR_f() { x0[ns1-1][1-1] = 0; } var rpar = [[A.slice()],[B.slice()],[C.slice()],[D.slice()]]; - this.model.dstate = x0; + this.model.dstate = new ScilabDouble(x0); this.model.rpar = new ScilabDouble(rpar); if (norm(D,1)!=0) { var mmm = [true,false]; @@ -75,7 +75,7 @@ function DLR_f() { var mmm = [false,false]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = mmm; + this.model.dep_ut = new ScilabDouble(mmm); } this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Linear/DLSS.js b/js/Linear/DLSS.js index 69f34f7c..eb201209 100644 --- a/js/Linear/DLSS.js +++ b/js/Linear/DLSS.js @@ -11,10 +11,10 @@ function DLSS() { this.model.in1 = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); - this.model.dstate = this.x0.slice(); + this.model.dstate = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; var gr_i = []; this.x = standard_define([4,2],this.model,exprs,gr_i); @@ -89,12 +89,12 @@ function DLSS() { var mmm = [false,false]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = mmm; + this.model.dep_ut = new ScilabDouble(mmm); } } else { - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); } - this.model.dstate = this.x0.slice(); + this.model.dstate = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble(rpar); this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Linear/DLSS_f.js b/js/Linear/DLSS_f.js index 81a76895..84024be5 100644 --- a/js/Linear/DLSS_f.js +++ b/js/Linear/DLSS_f.js @@ -11,10 +11,10 @@ function DLSS_f() { this.model.in1 = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); - this.model.dstate = this.x0.slice(); + this.model.dstate = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; var gr_i = []; this.x = standard_define([4,2],this.model,exprs,gr_i); @@ -79,12 +79,12 @@ function DLSS_f() { var mmm = [false,false]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = mmm; + this.model.dep_ut = new ScilabDouble(mmm); } } else { - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); } - this.model.dstate = this.x0.slice(); + this.model.dstate = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble(rpar); this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Linear/DOLLAR.js b/js/Linear/DOLLAR.js index c92f7138..15ecd057 100644 --- a/js/Linear/DOLLAR.js +++ b/js/Linear/DOLLAR.js @@ -12,7 +12,7 @@ function DOLLAR() { this.model.evtin = new ScilabDouble([1-this.inh]); this.model.dstate = new ScilabDouble([z]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); @@ -49,14 +49,14 @@ function DOLLAR() { var in1 = out; this.model.sim = list(new ScilabString(["dollar4_m"]), new ScilabDouble([4])); this.model.odstate = list(new ScilabDouble([this.a])); - this.model.dstate = []; + this.model.dstate = new ScilabDouble([]); if (this.type[(this.a)==1-1]) { if (isreal(this.a)) { var it = 1; var ot = 1; if ((size(this.a,1)==1||size(this.a,2)==1)) { this.model.sim = list(new ScilabString(["dollar4"]), new ScilabDouble([4])); - this.model.dstate = this.a.slice(); + this.model.dstate = new ScilabDouble(this.a.slice()); this.model.odstate = list(); } } else { diff --git a/js/Linear/DOLLAR_f.js b/js/Linear/DOLLAR_f.js index 843477e9..bdc2ea92 100644 --- a/js/Linear/DOLLAR_f.js +++ b/js/Linear/DOLLAR_f.js @@ -12,7 +12,7 @@ function DOLLAR_f() { this.model.evtin = new ScilabDouble([1-this.inh]); this.model.dstate = new ScilabDouble([z]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); @@ -56,8 +56,8 @@ function DOLLAR_f() { if (ok) { graphics.exprs = exprs; this.model.dstate = new ScilabDouble([this.a]); - this.model.in1 = in1; - this.model.out = out; + this.model.in1 = new ScilabDouble(in1); + this.model.out = new ScilabDouble(out); this.x.graphics = graphics; this.x.model = this.model; break; diff --git a/js/Linear/DOLLAR_m.js b/js/Linear/DOLLAR_m.js index daaa8404..34d93154 100644 --- a/js/Linear/DOLLAR_m.js +++ b/js/Linear/DOLLAR_m.js @@ -12,7 +12,7 @@ function DOLLAR_m() { this.model.evtin = new ScilabDouble([1-this.inh]); this.model.dstate = new ScilabDouble([z]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); @@ -49,14 +49,14 @@ function DOLLAR_m() { var in1 = out; this.model.sim = list(new ScilabString(["dollar4_m"]), new ScilabDouble([4])); this.model.odstate = list(new ScilabDouble([this.a])); - this.model.dstate = []; + this.model.dstate = new ScilabDouble([]); if ((this.type[this.a-1]==1)) { if (isreal(this.a)) { var it = 1; var ot = 1; if ((size(this.a,1)==1||size(this.a,2)==1)) { this.model.sim = list(new ScilabString(["dollar4"]), new ScilabDouble([4])); - this.model.dstate = this.a.slice(); + this.model.dstate = new ScilabDouble(this.a.slice()); this.model.odstate = list(); } } else { diff --git a/js/Linear/GAINBLK.js b/js/Linear/GAINBLK.js index 8cd16680..e84f60ef 100644 --- a/js/Linear/GAINBLK.js +++ b/js/Linear/GAINBLK.js @@ -14,7 +14,7 @@ function GAINBLK() { this.model.out2 = new ScilabDouble([out2]); this.model.rpar = new ScilabDouble([this.gain]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [strcat(sci2exp(this.gain))]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); @@ -53,7 +53,7 @@ function GAINBLK() { var it = 1; var ot = 1; this.model.sim = list(new ScilabString(["gainblk"]), new ScilabDouble([4])); - this.model.rpar = this.gain.slice(); + this.model.rpar = new ScilabDouble(this.gain.slice()); this.model.opar = list(); } else { message("type is not supported"); @@ -133,7 +133,7 @@ function GAINBLK() { message("Do on Overflow must be 0,1,2"); var ok = false; } - this.model.rpar = []; + this.model.rpar = new ScilabDouble([]); this.model.opar = list(this.gain.slice()); } if (ok) { diff --git a/js/Linear/GAINBLK_f.js b/js/Linear/GAINBLK_f.js index 55cf64ea..614fc461 100644 --- a/js/Linear/GAINBLK_f.js +++ b/js/Linear/GAINBLK_f.js @@ -10,7 +10,7 @@ function GAINBLK_f() { this.model.out = new ScilabDouble([out]); this.model.rpar = new ScilabDouble([this.gain]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [strcat(sci2exp(this.gain))]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); @@ -48,7 +48,7 @@ function GAINBLK_f() { var ok = tmpvar1[2]; if (ok) { graphics.exprs = exprs; - this.model.rpar = this.gain.slice(); + this.model.rpar = new ScilabDouble(this.gain.slice()); this.x.graphics = graphics; this.x.model = this.model; break; diff --git a/js/Linear/GAIN_f.js b/js/Linear/GAIN_f.js index e987baef..25b99662 100644 --- a/js/Linear/GAIN_f.js +++ b/js/Linear/GAIN_f.js @@ -10,7 +10,7 @@ function GAIN_f() { this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.gain]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[strcat(sci2exp(this.gain))],[strcat(sci2exp(in1))],[strcat(sci2exp(out))]]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); @@ -48,7 +48,7 @@ function GAIN_f() { var ok = tmpvar1[2]; if (ok) { graphics.exprs = exprs; - this.model.rpar = this.gain.slice(); + this.model.rpar = new ScilabDouble(this.gain.slice()); this.x.graphics = graphics; this.x.model = this.model; break; diff --git a/js/Linear/INTEGRAL.js b/js/Linear/INTEGRAL.js index c70354a8..9fc1fc16 100644 --- a/js/Linear/INTEGRAL.js +++ b/js/Linear/INTEGRAL.js @@ -9,9 +9,9 @@ function INTEGRAL() { this.model.sim = list(new ScilabString(["integral_func"]), new ScilabDouble([4])); this.model.in1 = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); - this.model.rpar = rpar; + this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); var exprs = string([[0],[0],[0],[this.maxp],[minp]]); var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); @@ -80,8 +80,8 @@ function INTEGRAL() { this.model.nmode = new ScilabDouble([0]); } if (ok) { - this.model.rpar = rpar; - this.model.state = this.x0; + this.model.rpar = new ScilabDouble(rpar); + this.model.state = new ScilabDouble(this.x0); var tmpvar0 = check_io(this.model,graphics,size(this.x0,1)*[[1],[ones(this.reinit,1)]],size(this.x0,1),ones(this.reinit,1),[]) this.model = tmpvar0[0] var graphics = tmpvar0[1] diff --git a/js/Linear/INTEGRAL_f.js b/js/Linear/INTEGRAL_f.js index 53ed84e2..5c4b7197 100644 --- a/js/Linear/INTEGRAL_f.js +++ b/js/Linear/INTEGRAL_f.js @@ -8,7 +8,7 @@ function INTEGRAL_f() { this.model.out = new ScilabDouble([1]); this.model.state = new ScilabDouble([this.x0]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); var exprs = strcat(sci2exp(this.x0)); var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/Linear/INTEGRAL_m.js b/js/Linear/INTEGRAL_m.js index 667cd9e1..75ed7a6f 100644 --- a/js/Linear/INTEGRAL_m.js +++ b/js/Linear/INTEGRAL_m.js @@ -11,9 +11,9 @@ function INTEGRAL_m() { this.model.out = new ScilabDouble([1]); this.model.in2 = new ScilabDouble([1]); this.model.out2 = new ScilabDouble([1]); - this.model.rpar = rpar; + this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); var exprs = string([[0],[0],[0],[this.maxp],[minp]]); var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); @@ -106,7 +106,7 @@ function INTEGRAL_m() { this.model.nmode = new ScilabDouble([0]); } if (ok) { - this.model.rpar = rpar; + this.model.rpar = new ScilabDouble(rpar); if ((Datatype==1)) { this.model.state = new ScilabDouble([real(this.x0.slice())]); this.model.sim = list(new ScilabString(["integral_func"]), new ScilabDouble([4])); diff --git a/js/Linear/PID.js b/js/Linear/PID.js index 320f1396..659289e1 100644 --- a/js/Linear/PID.js +++ b/js/Linear/PID.js @@ -33,7 +33,7 @@ function PID() { this.model.outtyp = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["h"]); this.model.firing = new ScilabBoolean([false]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); this.model.rpar = new ScilabDouble([scs_m]); var gr_i = []; this.x = standard_define([2,2],this.model,[],gr_i); diff --git a/js/Linear/REGISTER.js b/js/Linear/REGISTER.js index 5e86e2ce..54f732f1 100644 --- a/js/Linear/REGISTER.js +++ b/js/Linear/REGISTER.js @@ -9,7 +9,7 @@ function REGISTER() { this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = strcat(string(this.z0),";"); var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); @@ -73,7 +73,7 @@ function REGISTER() { var ok = false; } this.model.odstate = list(new ScilabDouble([this.z0])); - this.model.dstate = []; + this.model.dstate = new ScilabDouble([]); } if (ok) { var in1 = [1,1]; diff --git a/js/Linear/REGISTER_f.js b/js/Linear/REGISTER_f.js index f61de699..da798aa3 100644 --- a/js/Linear/REGISTER_f.js +++ b/js/Linear/REGISTER_f.js @@ -9,7 +9,7 @@ function REGISTER_f() { this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = strcat(string(this.z0),";"); var gr_i = []; this.x = standard_define([2.5,2.5],this.model,exprs,gr_i); diff --git a/js/Linear/SAMPHOLD.js b/js/Linear/SAMPHOLD.js index a3849f9a..ebb8d78c 100644 --- a/js/Linear/SAMPHOLD.js +++ b/js/Linear/SAMPHOLD.js @@ -8,7 +8,7 @@ function SAMPHOLD() { this.model.out = new ScilabDouble([-1]); this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var gr_i = []; this.x = standard_define([2,2],this.model," ",gr_i); return new BasicBlock(this.x); diff --git a/js/Linear/SAMPHOLD_m.js b/js/Linear/SAMPHOLD_m.js index 8d4d93a5..7d183a79 100644 --- a/js/Linear/SAMPHOLD_m.js +++ b/js/Linear/SAMPHOLD_m.js @@ -11,7 +11,7 @@ function SAMPHOLD_m() { this.model.out2 = new ScilabDouble([-2]); this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; var gr_i = []; this.x = standard_define([2,2],this.model,label,gr_i); diff --git a/js/Linear/SAMPLEHOLD_f.js b/js/Linear/SAMPLEHOLD_f.js index 7421d96e..daca32c1 100644 --- a/js/Linear/SAMPLEHOLD_f.js +++ b/js/Linear/SAMPLEHOLD_f.js @@ -8,7 +8,7 @@ function SAMPLEHOLD_f() { this.model.out = new ScilabDouble([-1]); this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var gr_i = []; this.x = standard_define([2,2],this.model," ",gr_i); return new BasicBlock(this.x); diff --git a/js/Linear/SOM_f.js b/js/Linear/SOM_f.js index 40e4c2ff..d7450565 100644 --- a/js/Linear/SOM_f.js +++ b/js/Linear/SOM_f.js @@ -8,7 +8,7 @@ function SOM_f() { this.model.out = new ScilabDouble([-1]); this.model.rpar = new ScilabDouble(sgn); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(1)],[sci2exp(sgn)]]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/Linear/SUMMATION.js b/js/Linear/SUMMATION.js index d70f6699..96182040 100644 --- a/js/Linear/SUMMATION.js +++ b/js/Linear/SUMMATION.js @@ -10,7 +10,7 @@ function SUMMATION() { this.model.out2 = new ScilabDouble([-2]); this.model.ipar = new ScilabDouble(this.sgn); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = sci2exp(this.sgn); var gr_i = []; this.x = standard_define([2,3],this.model,exprs,gr_i); diff --git a/js/Linear/SUM_f.js b/js/Linear/SUM_f.js index 59abbc82..de2a8e22 100644 --- a/js/Linear/SUM_f.js +++ b/js/Linear/SUM_f.js @@ -6,7 +6,7 @@ function SUM_f() { 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]; + this.model.dep_ut = new ScilabDouble([true,false]); var gr_i = []; var exprs = []; this.x = standard_define([1,1],this.model,exprs,gr_i); diff --git a/js/Linear/TCLSS.js b/js/Linear/TCLSS.js index 51b90c89..552810c5 100644 --- a/js/Linear/TCLSS.js +++ b/js/Linear/TCLSS.js @@ -17,7 +17,7 @@ function TCLSS() { this.model.state = new ScilabDouble([this.x0]); this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); @@ -82,12 +82,12 @@ function TCLSS() { var mmm = [false,true]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = mmm; + this.model.dep_ut = new ScilabDouble(mmm); } } else { - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); } - this.model.state = this.x0.slice(); + this.model.state = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble(rpar); if (this.D!=[]) { this.model.sim = list(new ScilabString(["tcslti4"]), new ScilabDouble([4])); diff --git a/js/Linear/TCLSS_f.js b/js/Linear/TCLSS_f.js index 33f82aa0..da69f8aa 100644 --- a/js/Linear/TCLSS_f.js +++ b/js/Linear/TCLSS_f.js @@ -17,7 +17,7 @@ function TCLSS_f() { this.model.state = new ScilabDouble([this.x0]); this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); @@ -82,12 +82,12 @@ function TCLSS_f() { var mmm = [false,true]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = mmm; + this.model.dep_ut = new ScilabDouble(mmm); } } else { - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); } - this.model.state = this.x0.slice(); + this.model.state = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble(rpar); if (this.D!=[]) { this.model.sim = list(new ScilabString(["tcslti"]), new ScilabDouble([1])); diff --git a/js/Linear/TIME_DELAY.js b/js/Linear/TIME_DELAY.js index d02b26f5..a4cee6f2 100644 --- a/js/Linear/TIME_DELAY.js +++ b/js/Linear/TIME_DELAY.js @@ -7,12 +7,12 @@ function TIME_DELAY() { this.N = 1024; this.model = scicos_model(); this.model.sim = list(new ScilabString(["time_delay"]), new ScilabDouble([4])); - this.model.in1 = [nin]; + this.model.in1 = new ScilabDouble([nin]); this.model.out = new ScilabDouble([nin]); - this.model.rpar = [this.T,this.init]; + this.model.rpar = new ScilabDouble([this.T,this.init]); this.model.ipar = new ScilabDouble([this.N]); this.model.blocktype = new ScilabString(["x"]); - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); var exprs = [[string(this.T)],[string(this.init)],[string(this.N)]]; var gr_i = []; this.x = standard_define([3.5,2],this.model,exprs,gr_i); @@ -61,7 +61,7 @@ function TIME_DELAY() { graphics.exprs = exprs; this.model.rpar = new ScilabDouble([this.T],[this.init]); this.model.ipar = new ScilabDouble([this.N]); - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); this.x.graphics = graphics; this.x.model = this.model; break; diff --git a/js/Linear/VARIABLE_DELAY.js b/js/Linear/VARIABLE_DELAY.js index 3be1a51b..ef78520f 100644 --- a/js/Linear/VARIABLE_DELAY.js +++ b/js/Linear/VARIABLE_DELAY.js @@ -9,10 +9,10 @@ function VARIABLE_DELAY() { this.model.sim = list(new ScilabString(["variable_delay"]), new ScilabDouble([4])); this.model.in1 = new ScilabDouble([nin],[1]); this.model.out = new ScilabDouble([nin]); - this.model.rpar = [this.T,this.init]; + this.model.rpar = new ScilabDouble([this.T,this.init]); this.model.ipar = new ScilabDouble([this.N]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[string(this.T)],[string(this.init)],[string(this.N)]]; var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); diff --git a/js/MatrixOp/CUMSUM.js b/js/MatrixOp/CUMSUM.js index 04df6b00..08dc68c9 100644 --- a/js/MatrixOp/CUMSUM.js +++ b/js/MatrixOp/CUMSUM.js @@ -11,15 +11,15 @@ function CUMSUM() { this.model.out = new ScilabDouble([-1]); this.model.out2 = new ScilabDouble([-2]); this.model.outtyp = new ScilabDouble([1]); - this.model.evtin = []; - this.model.evtout = []; - this.model.state = []; - this.model.dstate = []; - this.model.rpar = []; - this.model.ipar = []; + this.model.evtin = new ScilabDouble([]); + this.model.evtout = new ScilabDouble([]); + this.model.state = new ScilabDouble([]); + this.model.dstate = new ScilabDouble([]); + this.model.rpar = new ScilabDouble([]); + this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); - this.model.firing = []; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(0)]]; var gr_i = []; this.x = standard_define([3,2],this.model,label,gr_i); diff --git a/js/MatrixOp/EXTRACT.js b/js/MatrixOp/EXTRACT.js index ad64ec4c..9839cb99 100644 --- a/js/MatrixOp/EXTRACT.js +++ b/js/MatrixOp/EXTRACT.js @@ -11,15 +11,15 @@ function EXTRACT() { this.model.out = new ScilabDouble([1]); this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); - this.model.evtin = []; - this.model.evtout = []; - this.model.state = []; - this.model.dstate = []; - this.model.rpar = []; - this.model.ipar = [1,1,1,1]; + this.model.evtin = new ScilabDouble([]); + this.model.evtout = new ScilabDouble([]); + this.model.state = new ScilabDouble([]); + this.model.dstate = new ScilabDouble([]); + this.model.rpar = new ScilabDouble([]); + this.model.ipar = new ScilabDouble([1,1,1,1]); this.model.blocktype = new ScilabString(["c"]); - this.model.firing = []; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp([1])],[sci2exp([1])]]; var gr_i = []; this.x = standard_define([3,2],this.model,label,gr_i); diff --git a/js/MatrixOp/EXTTRI.js b/js/MatrixOp/EXTTRI.js index 07bd5b9c..28ad3677 100644 --- a/js/MatrixOp/EXTTRI.js +++ b/js/MatrixOp/EXTTRI.js @@ -11,15 +11,15 @@ function EXTTRI() { this.model.out = new ScilabDouble([-1]); this.model.out2 = new ScilabDouble([-2]); this.model.outtyp = new ScilabDouble([1]); - this.model.evtin = []; - this.model.evtout = []; - this.model.state = []; - this.model.dstate = []; - this.model.rpar = []; - this.model.ipar = []; + this.model.evtin = new ScilabDouble([]); + this.model.evtout = new ScilabDouble([]); + this.model.state = new ScilabDouble([]); + this.model.dstate = new ScilabDouble([]); + this.model.rpar = new ScilabDouble([]); + this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); - this.model.firing = []; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; var gr_i = []; this.x = standard_define([3,2],this.model,label,gr_i); diff --git a/js/MatrixOp/MATBKSL.js b/js/MatrixOp/MATBKSL.js index 2039befb..3e5efd96 100644 --- a/js/MatrixOp/MATBKSL.js +++ b/js/MatrixOp/MATBKSL.js @@ -7,19 +7,19 @@ function MATBKSL() { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.model.in1 = new ScilabDouble([-1],[-1]); this.model.in2 = new ScilabDouble([-2],[-3]); - this.model.intyp = [1,1]; + this.model.intyp = new ScilabDouble([1,1]); this.model.out = new ScilabDouble([-2]); this.model.out2 = new ScilabDouble([-3]); this.model.outtyp = new ScilabDouble([1]); - this.model.evtin = []; - this.model.evtout = []; - this.model.state = []; - this.model.dstate = []; - this.model.rpar = []; - this.model.ipar = []; + this.model.evtin = new ScilabDouble([]); + this.model.evtout = new ScilabDouble([]); + this.model.state = new ScilabDouble([]); + this.model.dstate = new ScilabDouble([]); + this.model.rpar = new ScilabDouble([]); + this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); - this.model.firing = []; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; var gr_i = []; this.x = standard_define([2,2],this.model,label,gr_i); diff --git a/js/MatrixOp/MATCATH.js b/js/MatrixOp/MATCATH.js index d0ba82c1..7eb28d79 100644 --- a/js/MatrixOp/MATCATH.js +++ b/js/MatrixOp/MATCATH.js @@ -7,19 +7,19 @@ function MATCATH() { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.model.in1 = new ScilabDouble([-1],[-1]); this.model.in2 = new ScilabDouble([-2],[-3]); - this.model.intyp = [1,1]; + this.model.intyp = new ScilabDouble([1,1]); this.model.out = new ScilabDouble([-1]); this.model.out2 = new ScilabDouble([0]); this.model.outtyp = new ScilabDouble([-1]); - this.model.evtin = []; - this.model.evtout = []; - this.model.state = []; - this.model.dstate = []; - this.model.rpar = []; - this.model.ipar = []; + this.model.evtin = new ScilabDouble([]); + this.model.evtout = new ScilabDouble([]); + this.model.state = new ScilabDouble([]); + this.model.dstate = new ScilabDouble([]); + this.model.rpar = new ScilabDouble([]); + this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); - this.model.firing = []; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(2)]; var gr_i = []; this.x = standard_define([2,3],this.model,label,gr_i); diff --git a/js/MatrixOp/MATCATV.js b/js/MatrixOp/MATCATV.js index a54a2a05..dfe4cfcd 100644 --- a/js/MatrixOp/MATCATV.js +++ b/js/MatrixOp/MATCATV.js @@ -8,19 +8,19 @@ function MATCATV() { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.model.in2 = new ScilabDouble([-1],[-1]); this.model.in1 = new ScilabDouble([-2],[-3]); - this.model.intyp = [-1,-1]; + this.model.intyp = new ScilabDouble([-1,-1]); this.model.out = new ScilabDouble([0]); this.model.out2 = new ScilabDouble([-1]); this.model.outtyp = new ScilabDouble([-1]); - this.model.evtin = []; - this.model.evtout = []; - this.model.state = []; - this.model.dstate = []; - this.model.rpar = []; - this.model.ipar = []; + this.model.evtin = new ScilabDouble([]); + this.model.evtout = new ScilabDouble([]); + this.model.state = new ScilabDouble([]); + this.model.dstate = new ScilabDouble([]); + this.model.rpar = new ScilabDouble([]); + this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); - this.model.firing = []; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(2)]; var gr_i = []; this.x = standard_define([2,3],this.model,label,gr_i); diff --git a/js/MatrixOp/MATDET.js b/js/MatrixOp/MATDET.js index ea37a5d3..f3a4fa9d 100644 --- a/js/MatrixOp/MATDET.js +++ b/js/MatrixOp/MATDET.js @@ -11,15 +11,15 @@ function MATDET() { this.model.out = new ScilabDouble([1]); this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); - this.model.evtin = []; - this.model.evtout = []; - this.model.state = []; - this.model.dstate = []; - this.model.rpar = []; - this.model.ipar = []; + this.model.evtin = new ScilabDouble([]); + this.model.evtout = new ScilabDouble([]); + this.model.state = new ScilabDouble([]); + this.model.dstate = new ScilabDouble([]); + this.model.rpar = new ScilabDouble([]); + this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); - this.model.firing = []; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; var gr_i = []; this.x = standard_define([2,2],this.model,label,gr_i); diff --git a/js/MatrixOp/MATDIAG.js b/js/MatrixOp/MATDIAG.js index 1871efa6..a9775a91 100644 --- a/js/MatrixOp/MATDIAG.js +++ b/js/MatrixOp/MATDIAG.js @@ -11,15 +11,15 @@ function MATDIAG() { this.model.out = new ScilabDouble([-1]); this.model.out2 = new ScilabDouble([-1]); this.model.outtyp = new ScilabDouble([1]); - this.model.evtin = []; - this.model.evtout = []; - this.model.state = []; - this.model.dstate = []; - this.model.rpar = []; - this.model.ipar = []; + this.model.evtin = new ScilabDouble([]); + this.model.evtout = new ScilabDouble([]); + this.model.state = new ScilabDouble([]); + this.model.dstate = new ScilabDouble([]); + this.model.rpar = new ScilabDouble([]); + this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); - this.model.firing = []; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; var gr_i = []; this.x = standard_define([2,2],this.model,label,gr_i); diff --git a/js/MatrixOp/MATDIV.js b/js/MatrixOp/MATDIV.js index d295365d..c43b1e89 100644 --- a/js/MatrixOp/MATDIV.js +++ b/js/MatrixOp/MATDIV.js @@ -7,19 +7,19 @@ function MATDIV() { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.model.in1 = new ScilabDouble([-1],[-2]); this.model.in2 = new ScilabDouble([-3],[-3]); - this.model.intyp = [1,1]; + this.model.intyp = new ScilabDouble([1,1]); this.model.out = new ScilabDouble([-1]); this.model.out2 = new ScilabDouble([-2]); this.model.outtyp = new ScilabDouble([1]); - this.model.evtin = []; - this.model.evtout = []; - this.model.state = []; - this.model.dstate = []; - this.model.rpar = []; - this.model.ipar = []; + this.model.evtin = new ScilabDouble([]); + this.model.evtout = new ScilabDouble([]); + this.model.state = new ScilabDouble([]); + this.model.dstate = new ScilabDouble([]); + this.model.rpar = new ScilabDouble([]); + this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); - this.model.firing = []; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; var gr_i = []; this.x = standard_define([2,2],this.model,label,gr_i); diff --git a/js/MatrixOp/MATEIG.js b/js/MatrixOp/MATEIG.js index 53c4e86d..1e605fd8 100644 --- a/js/MatrixOp/MATEIG.js +++ b/js/MatrixOp/MATEIG.js @@ -11,15 +11,15 @@ function MATEIG() { this.model.out = new ScilabDouble([-1]); this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([2]); - this.model.evtin = []; - this.model.evtout = []; - this.model.state = []; - this.model.dstate = []; - this.model.rpar = []; - this.model.ipar = []; + this.model.evtin = new ScilabDouble([]); + this.model.evtout = new ScilabDouble([]); + this.model.state = new ScilabDouble([]); + this.model.dstate = new ScilabDouble([]); + this.model.rpar = new ScilabDouble([]); + this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); - this.model.firing = []; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; var gr_i = []; this.x = standard_define([2,2],this.model,label,gr_i); diff --git a/js/MatrixOp/MATEXPM.js b/js/MatrixOp/MATEXPM.js index 08d383ad..a01ec75a 100644 --- a/js/MatrixOp/MATEXPM.js +++ b/js/MatrixOp/MATEXPM.js @@ -11,15 +11,15 @@ function MATEXPM() { this.model.out = new ScilabDouble([-1]); this.model.out2 = new ScilabDouble([-1]); this.model.outtyp = new ScilabDouble([1]); - this.model.evtin = []; - this.model.evtout = []; - this.model.state = []; - this.model.dstate = []; - this.model.rpar = []; - this.model.ipar = []; + this.model.evtin = new ScilabDouble([]); + this.model.evtout = new ScilabDouble([]); + this.model.state = new ScilabDouble([]); + this.model.dstate = new ScilabDouble([]); + this.model.rpar = new ScilabDouble([]); + this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); - this.model.firing = []; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; var gr_i = []; this.x = standard_define([2,2],this.model,label,gr_i); diff --git a/js/MatrixOp/MATINV.js b/js/MatrixOp/MATINV.js index 9ad78085..3986609c 100644 --- a/js/MatrixOp/MATINV.js +++ b/js/MatrixOp/MATINV.js @@ -11,15 +11,15 @@ function MATINV() { this.model.out = new ScilabDouble([-1]); this.model.out2 = new ScilabDouble([-1]); this.model.outtyp = new ScilabDouble([1]); - this.model.evtin = []; - this.model.evtout = []; - this.model.state = []; - this.model.dstate = []; - this.model.rpar = []; - this.model.ipar = []; + this.model.evtin = new ScilabDouble([]); + this.model.evtout = new ScilabDouble([]); + this.model.state = new ScilabDouble([]); + this.model.dstate = new ScilabDouble([]); + this.model.rpar = new ScilabDouble([]); + this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); - this.model.firing = []; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; var gr_i = []; this.x = standard_define([2,2],this.model,label,gr_i); diff --git a/js/MatrixOp/MATLU.js b/js/MatrixOp/MATLU.js index c1c29c69..63965b50 100644 --- a/js/MatrixOp/MATLU.js +++ b/js/MatrixOp/MATLU.js @@ -10,16 +10,16 @@ function MATLU() { this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1],[-1]); this.model.out2 = new ScilabDouble([-1],[-1]); - this.model.outtyp = [1,1]; - this.model.evtin = []; - this.model.evtout = []; - this.model.state = []; - this.model.dstate = []; - this.model.rpar = []; - this.model.ipar = []; + this.model.outtyp = new ScilabDouble([1,1]); + this.model.evtin = new ScilabDouble([]); + this.model.evtout = new ScilabDouble([]); + this.model.state = new ScilabDouble([]); + this.model.dstate = new ScilabDouble([]); + this.model.rpar = new ScilabDouble([]); + this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); - this.model.firing = []; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([true,false]); var label = sci2exp(1); var gr_i = []; this.x = standard_define([2,2],this.model,label,gr_i); diff --git a/js/MatrixOp/MATMAGPHI.js b/js/MatrixOp/MATMAGPHI.js index bbe2d7d9..93992460 100644 --- a/js/MatrixOp/MATMAGPHI.js +++ b/js/MatrixOp/MATMAGPHI.js @@ -10,16 +10,16 @@ function MATMAGPHI() { this.model.intyp = new ScilabDouble([2]); this.model.out = new ScilabDouble([-1],[-1]); this.model.out2 = new ScilabDouble([-2],[-2]); - this.model.outtyp = [1,1]; - this.model.evtin = []; - this.model.evtout = []; - this.model.state = []; - this.model.dstate = []; - this.model.rpar = []; - this.model.ipar = []; + this.model.outtyp = new ScilabDouble([1,1]); + this.model.evtin = new ScilabDouble([]); + this.model.evtout = new ScilabDouble([]); + this.model.state = new ScilabDouble([]); + this.model.dstate = new ScilabDouble([]); + this.model.rpar = new ScilabDouble([]); + this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); - this.model.firing = []; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; var gr_i = []; this.x = standard_define([3,2],this.model,label,gr_i); diff --git a/js/MatrixOp/MATMUL.js b/js/MatrixOp/MATMUL.js index 81217de2..fac108ea 100644 --- a/js/MatrixOp/MATMUL.js +++ b/js/MatrixOp/MATMUL.js @@ -7,7 +7,7 @@ function MATMUL() { this.model.in2 = new ScilabDouble([-2],[-3]); this.model.out = new ScilabDouble([-1]); this.model.out2 = new ScilabDouble([-3]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); this.model.ipar = new ScilabDouble([1]); var label = [sci2exp(this.model.ipar)]; var gr_i = []; diff --git a/js/MatrixOp/MATPINV.js b/js/MatrixOp/MATPINV.js index ca0b3185..41dcdc64 100644 --- a/js/MatrixOp/MATPINV.js +++ b/js/MatrixOp/MATPINV.js @@ -11,15 +11,15 @@ function MATPINV() { this.model.out = new ScilabDouble([-2]); this.model.out2 = new ScilabDouble([-1]); this.model.outtyp = new ScilabDouble([1]); - this.model.evtin = []; - this.model.evtout = []; - this.model.state = []; - this.model.dstate = []; - this.model.rpar = []; - this.model.ipar = []; + this.model.evtin = new ScilabDouble([]); + this.model.evtout = new ScilabDouble([]); + this.model.state = new ScilabDouble([]); + this.model.dstate = new ScilabDouble([]); + this.model.rpar = new ScilabDouble([]); + this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); - this.model.firing = []; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; var gr_i = []; this.x = standard_define([2,2],this.model,label,gr_i); diff --git a/js/MatrixOp/MATRESH.js b/js/MatrixOp/MATRESH.js index 6de8b8bc..a369ebfe 100644 --- a/js/MatrixOp/MATRESH.js +++ b/js/MatrixOp/MATRESH.js @@ -11,15 +11,15 @@ function MATRESH() { this.model.out = new ScilabDouble([-1]); this.model.out2 = new ScilabDouble([-2]); this.model.outtyp = new ScilabDouble([1]); - this.model.evtin = []; - this.model.evtout = []; - this.model.state = []; - this.model.dstate = []; - this.model.rpar = []; - this.model.ipar = []; + this.model.evtin = new ScilabDouble([]); + this.model.evtout = new ScilabDouble([]); + this.model.state = new ScilabDouble([]); + this.model.dstate = new ScilabDouble([]); + this.model.rpar = new ScilabDouble([]); + this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); - this.model.firing = []; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp([1,1])],[sci2exp([1,1])]]; var gr_i = []; this.x = standard_define([3,2],this.model,label,gr_i); diff --git a/js/MatrixOp/MATSING.js b/js/MatrixOp/MATSING.js index 66956d3f..217bfa44 100644 --- a/js/MatrixOp/MATSING.js +++ b/js/MatrixOp/MATSING.js @@ -11,15 +11,15 @@ function MATSING() { this.model.out = new ScilabDouble([-1]); this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); - this.model.evtin = []; - this.model.evtout = []; - this.model.state = []; - this.model.dstate = []; - this.model.rpar = []; - this.model.ipar = []; + this.model.evtin = new ScilabDouble([]); + this.model.evtout = new ScilabDouble([]); + this.model.state = new ScilabDouble([]); + this.model.dstate = new ScilabDouble([]); + this.model.rpar = new ScilabDouble([]); + this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); - this.model.firing = []; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; var gr_i = []; this.x = standard_define([2,2],this.model,label,gr_i); diff --git a/js/MatrixOp/MATSUM.js b/js/MatrixOp/MATSUM.js index f4348aa7..41531c10 100644 --- a/js/MatrixOp/MATSUM.js +++ b/js/MatrixOp/MATSUM.js @@ -11,15 +11,15 @@ function MATSUM() { this.model.out = new ScilabDouble([1]); this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); - this.model.evtin = []; - this.model.evtout = []; - this.model.state = []; - this.model.dstate = []; - this.model.rpar = []; - this.model.ipar = []; + this.model.evtin = new ScilabDouble([]); + this.model.evtout = new ScilabDouble([]); + this.model.state = new ScilabDouble([]); + this.model.dstate = new ScilabDouble([]); + this.model.rpar = new ScilabDouble([]); + this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); - this.model.firing = []; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(0)]]; var gr_i = []; this.x = standard_define([3,2],this.model,label,gr_i); diff --git a/js/MatrixOp/MATTRAN.js b/js/MatrixOp/MATTRAN.js index 5189898a..c731d6ba 100644 --- a/js/MatrixOp/MATTRAN.js +++ b/js/MatrixOp/MATTRAN.js @@ -7,7 +7,7 @@ function MATTRAN() { this.model.in2 = new ScilabDouble([-2]); this.model.out = new ScilabDouble([-2]); this.model.out2 = new ScilabDouble([-1]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; var gr_i = []; this.x = standard_define([3,2],this.model,label,gr_i); diff --git a/js/MatrixOp/MATZCONJ.js b/js/MatrixOp/MATZCONJ.js index 43dab206..4a5dd180 100644 --- a/js/MatrixOp/MATZCONJ.js +++ b/js/MatrixOp/MATZCONJ.js @@ -11,15 +11,15 @@ function MATZCONJ() { this.model.out = new ScilabDouble([-1]); this.model.out2 = new ScilabDouble([-2]); this.model.outtyp = new ScilabDouble([2]); - this.model.evtin = []; - this.model.evtout = []; - this.model.state = []; - this.model.dstate = []; - this.model.rpar = []; - this.model.ipar = []; + this.model.evtin = new ScilabDouble([]); + this.model.evtout = new ScilabDouble([]); + this.model.state = new ScilabDouble([]); + this.model.dstate = new ScilabDouble([]); + this.model.rpar = new ScilabDouble([]); + this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); - this.model.firing = []; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([true,false]); var label = []; var gr_i = []; this.x = standard_define([2,2],this.model,label,gr_i); diff --git a/js/MatrixOp/MATZREIM.js b/js/MatrixOp/MATZREIM.js index b36f0466..9aa71803 100644 --- a/js/MatrixOp/MATZREIM.js +++ b/js/MatrixOp/MATZREIM.js @@ -10,16 +10,16 @@ function MATZREIM() { this.model.intyp = new ScilabDouble([2]); this.model.out = new ScilabDouble([-1],[-1]); this.model.out2 = new ScilabDouble([-2],[-2]); - this.model.outtyp = [1,1]; - this.model.evtin = []; - this.model.evtout = []; - this.model.state = []; - this.model.dstate = []; - this.model.rpar = []; - this.model.ipar = []; + this.model.outtyp = new ScilabDouble([1,1]); + this.model.evtin = new ScilabDouble([]); + this.model.evtout = new ScilabDouble([]); + this.model.state = new ScilabDouble([]); + this.model.dstate = new ScilabDouble([]); + this.model.rpar = new ScilabDouble([]); + this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); - this.model.firing = []; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([true,false]); var label = sci2exp(1); var gr_i = []; this.x = standard_define([3,2],this.model,label,gr_i); diff --git a/js/MatrixOp/RICC.js b/js/MatrixOp/RICC.js index 6cdfff18..8ab320ba 100644 --- a/js/MatrixOp/RICC.js +++ b/js/MatrixOp/RICC.js @@ -7,19 +7,19 @@ function RICC() { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.model.in1 = new ScilabDouble([-1],[-1],[-1]); this.model.in2 = new ScilabDouble([-1],[-1],[-1]); - this.model.intyp = [1,1,1]; + this.model.intyp = new ScilabDouble([1,1,1]); this.model.out = new ScilabDouble([-1]); this.model.out2 = new ScilabDouble([-1]); this.model.outtyp = new ScilabDouble([1]); - this.model.evtin = []; - this.model.evtout = []; - this.model.state = []; - this.model.dstate = []; - this.model.rpar = []; + this.model.evtin = new ScilabDouble([]); + this.model.evtout = new ScilabDouble([]); + this.model.state = new ScilabDouble([]); + this.model.dstate = new ScilabDouble([]); + this.model.rpar = new ScilabDouble([]); this.model.ipar = new ScilabDouble([1],[1]); this.model.blocktype = new ScilabString(["c"]); - this.model.firing = []; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; var gr_i = []; this.x = standard_define([2,2],this.model,label,gr_i); diff --git a/js/MatrixOp/ROOTCOEF.js b/js/MatrixOp/ROOTCOEF.js index a468a2ba..661b496d 100644 --- a/js/MatrixOp/ROOTCOEF.js +++ b/js/MatrixOp/ROOTCOEF.js @@ -11,15 +11,15 @@ function ROOTCOEF() { this.model.out = new ScilabDouble([-2]); this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); - this.model.evtin = []; - this.model.evtout = []; - this.model.state = []; - this.model.dstate = []; - this.model.rpar = []; - this.model.ipar = []; + this.model.evtin = new ScilabDouble([]); + this.model.evtout = new ScilabDouble([]); + this.model.state = new ScilabDouble([]); + this.model.dstate = new ScilabDouble([]); + this.model.rpar = new ScilabDouble([]); + this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); - this.model.firing = []; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; var gr_i = []; this.x = standard_define([3,2],this.model,label,gr_i); diff --git a/js/MatrixOp/SQRT.js b/js/MatrixOp/SQRT.js index b109ab09..3f6acb79 100644 --- a/js/MatrixOp/SQRT.js +++ b/js/MatrixOp/SQRT.js @@ -9,7 +9,7 @@ function SQRT() { this.model.outtyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); this.model.out2 = new ScilabDouble([-2]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; var gr_i = []; this.x = standard_define([2,2],this.model,label,gr_i); diff --git a/js/MatrixOp/SUBMAT.js b/js/MatrixOp/SUBMAT.js index 9e039c9b..ce83e0f3 100644 --- a/js/MatrixOp/SUBMAT.js +++ b/js/MatrixOp/SUBMAT.js @@ -11,15 +11,15 @@ function SUBMAT() { this.model.out = new ScilabDouble([-1]); this.model.out2 = new ScilabDouble([-2]); this.model.outtyp = new ScilabDouble([1]); - this.model.evtin = []; - this.model.evtout = []; - this.model.state = []; - this.model.dstate = []; - this.model.rpar = []; + this.model.evtin = new ScilabDouble([]); + this.model.evtout = new ScilabDouble([]); + this.model.state = new ScilabDouble([]); + this.model.dstate = new ScilabDouble([]); + this.model.rpar = new ScilabDouble([]); this.model.ipar = new ScilabDouble([1],[1],[1],[1]); this.model.blocktype = new ScilabString(["c"]); - this.model.firing = []; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(1)],[sci2exp(1)],[sci2exp(1)],[sci2exp(1)]]; var gr_i = []; this.x = standard_define([2.5,2],this.model,label,gr_i); diff --git a/js/Misc/AUTOMAT.js b/js/Misc/AUTOMAT.js index 654543e9..8d6bbe78 100644 --- a/js/Misc/AUTOMAT.js +++ b/js/Misc/AUTOMAT.js @@ -20,9 +20,9 @@ function AUTOMAT() { this.model.blocktype = new ScilabString(["c"]); this.model.evtout = new ScilabDouble([1]); this.model.firing = new ScilabDouble([-1]); - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); this.model.ipar = new ScilabDouble(ipar); - this.model.rpar = rpar; + this.model.rpar = new ScilabDouble(rpar); var gr_i = []; this.x = standard_define([4,2],this.model,exprs,gr_i); return new BasicBlock(this.x); diff --git a/js/Misc/BACKLASH.js b/js/Misc/BACKLASH.js index ffc9f0d7..e28d371d 100644 --- a/js/Misc/BACKLASH.js +++ b/js/Misc/BACKLASH.js @@ -9,7 +9,7 @@ function BACKLASH() { this.model.rpar = new ScilabDouble([0],[1]); this.model.nzcross = new ScilabDouble([2]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); diff --git a/js/Misc/BOUNCE.js b/js/Misc/BOUNCE.js index 1cddf4f2..ab517e1f 100644 --- a/js/Misc/BOUNCE.js +++ b/js/Misc/BOUNCE.js @@ -25,14 +25,14 @@ function BOUNCE() { var state = transpose(state); this.model = scicos_model(); this.model.sim = list(new ScilabString(["bounce_ball"]), new ScilabDouble([4])); - this.model.in1 = []; + this.model.in1 = new ScilabDouble([]); this.model.out = new ScilabDouble([n],[n]); - this.model.state = state.slice(); + this.model.state = new ScilabDouble(state.slice()); this.model.rpar = new ScilabDouble([this.rpar1],[this.rpar2],[this.walls],[this.g],[this.C]); - this.model.ipar = ipar; + this.model.ipar = new ScilabDouble(ipar); this.model.nzcross = new ScilabDouble([n*(n-1)/2+4*n]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); var exprs = [[strcat(sci2exp(this.rpar1))],[strcat(sci2exp(this.rpar2))],[strcat(sci2exp(this.walls))],[strcat(sci2exp(this.x))],[strcat(sci2exp(this.xd))],[strcat(sci2exp(this.y))],[strcat(sci2exp(this.yd))]]; var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); @@ -118,10 +118,10 @@ function BOUNCE() { } } this.model.rpar = new ScilabDouble([this.rpar1],[this.rpar2],[this.walls],[this.g],[this.C]); - this.model.ipar = ipar; + this.model.ipar = new ScilabDouble(ipar); var state = [this.xt,this.xd,this.y,this.yd]; var state = transpose(state); - this.model.state = state.slice(); + this.model.state = new ScilabDouble(state.slice()); this.model.nzcross = new ScilabDouble([n*(n-1)/2+4*n]); graphics.exprs = exprs; this.x.graphics = graphics; diff --git a/js/Misc/BOUNCEXY.js b/js/Misc/BOUNCEXY.js index 1295acf6..826790d9 100644 --- a/js/Misc/BOUNCEXY.js +++ b/js/Misc/BOUNCEXY.js @@ -24,12 +24,12 @@ function BOUNCEXY() { z[6*(i-1)+5-1] = 0.000; z[6*(i-1)+6-1] = 64.0*360.000; } - this.model.dstate = z; + this.model.dstate = new ScilabDouble(z); this.model.rpar = new ScilabDouble([this.xmin],[this.xmax],[this.ymin],[this.ymax]); this.model.ipar = new ScilabDouble([this.win],[this.imode],[this.clrs.slice()]); this.model.blocktype = new ScilabString(["d"]); - this.model.firing = []; - this.model.dep_ut = [false,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[strcat(sci2exp(this.clrs))],[strcat(sci2exp(this.siz))],[strcat(sci2exp(this.win))],[strcat(sci2exp(1))],[strcat(sci2exp(this.xmin))],[strcat(sci2exp(this.xmax))],[strcat(sci2exp(this.ymin))],[strcat(sci2exp(this.ymax))]]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); @@ -101,7 +101,7 @@ function BOUNCEXY() { z[6*(i-1)+5-1] = 0.000; z[6*(i-1)+6-1] = 64.0*360.000; } - this.model.dstate = z; + this.model.dstate = new ScilabDouble(z); this.model.rpar = new ScilabDouble(rpar); this.model.ipar = new ScilabDouble(ipar); graphics.exprs = exprs; diff --git a/js/Misc/BPLATFORM.js b/js/Misc/BPLATFORM.js index 02a231db..f708c217 100644 --- a/js/Misc/BPLATFORM.js +++ b/js/Misc/BPLATFORM.js @@ -15,7 +15,7 @@ function BPLATFORM() { 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]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = string(this.model.rpar); var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/Misc/CBLOCK.js b/js/Misc/CBLOCK.js index faf7b1e3..b8371ec1 100644 --- a/js/Misc/CBLOCK.js +++ b/js/Misc/CBLOCK.js @@ -17,15 +17,15 @@ function CBLOCK() { this.model.sim = list(new ScilabString([" "]), new ScilabDouble([2004])); this.model.in1 = new ScilabDouble([in1]); this.model.out = new ScilabDouble([out]); - this.model.evtin = clkin; - this.model.evtout = clkout; - this.model.state = x0; - this.model.dstate = z0; - this.model.rpar = this.rpar; - this.model.ipar = this.ipar; + this.model.evtin = new ScilabDouble(clkin); + this.model.evtout = new ScilabDouble(clkout); + this.model.state = new ScilabDouble(x0); + this.model.dstate = new ScilabDouble(z0); + this.model.rpar = new ScilabDouble(this.rpar); + this.model.ipar = new ScilabDouble(this.ipar); this.model.blocktype = new ScilabString([typ]); - this.model.firing = auto; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble(auto); + this.model.dep_ut = new ScilabDouble([true,false]); this.model.nzcross = new ScilabDouble([this.ng]); var label = list(transpose([funam,"n",sci2exp(in1),sci2exp(out),sci2exp(clkin),sci2exp(clkout),sci2exp(x0),sci2exp(0),sci2exp(z0),sci2exp(this.rpar),sci2exp(this.ipar),sci2exp(auto),"y","n"]),[]); var gr_i = []; @@ -145,12 +145,12 @@ function CBLOCK() { this.model.out = new ScilabDouble([this.o]); this.model.evtin = new ScilabDouble([this.ci]); this.model.evtout = new ScilabDouble([this.co]); - this.model.state = this.xx; - this.model.dstate = this.z; - this.model.rpar = this.rpar; + this.model.state = new ScilabDouble(this.xx); + this.model.dstate = new ScilabDouble(this.z); + this.model.rpar = new ScilabDouble(this.rpar); this.model.ipar = new ScilabDouble([this.ipar]); this.model.firing = new ScilabDouble([this.auto0]); - this.model.dep_ut = dep_ut; + this.model.dep_ut = new ScilabDouble(dep_ut); this.model.nzcross = new ScilabDouble([this.ng]); label[2-1] = tt; this.x.model = this.model; diff --git a/js/Misc/CBLOCK4.js b/js/Misc/CBLOCK4.js index 15889859..5858a1a8 100644 --- a/js/Misc/CBLOCK4.js +++ b/js/Misc/CBLOCK4.js @@ -10,7 +10,7 @@ function CBLOCK4() { this.model.out = new ScilabDouble([1]); this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var label = list([[funam],["n"],[sci2exp([this.model.in1,this.model.in2])],[sci2exp(this.model.intyp)],[sci2exp([this.model.out,this.model.out2])],[sci2exp(this.model.outtyp)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.odstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.opar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]],[]); var gr_i = []; this.x = standard_define([4,2],this.model,label,gr_i); @@ -134,16 +134,16 @@ function CBLOCK4() { } } else { this.model.sim = list(new ScilabDouble([funam]), new ScilabDouble([funtyp])); - this.model.state = this.xx; - this.model.dstate = this.z; + this.model.state = new ScilabDouble(this.xx); + this.model.dstate = new ScilabDouble(this.z); this.model.odstate = new ScilabDouble([this.oz]); - this.model.rpar = this.rpar; + this.model.rpar = new ScilabDouble(this.rpar); this.model.ipar = new ScilabDouble([this.ipar]); this.model.opar = new ScilabDouble([this.opar]); this.model.firing = new ScilabDouble([this.auto0]); this.model.nzcross = new ScilabDouble([this.nzcr]); this.model.nmode = new ScilabDouble([this.nmode]); - this.model.dep_ut = dep_ut; + this.model.dep_ut = new ScilabDouble(dep_ut); label[2-1] = tt; this.x.model = this.model; graphics.exprs = label; diff --git a/js/Misc/CONSTRAINT2_c.js b/js/Misc/CONSTRAINT2_c.js index 012099d4..7c2b0af5 100644 --- a/js/Misc/CONSTRAINT2_c.js +++ b/js/Misc/CONSTRAINT2_c.js @@ -9,9 +9,9 @@ function CONSTRAINT2_c() { this.model.in1 = new ScilabDouble([1]); this.model.out = new ScilabDouble([1],[1]); this.model.state = new ScilabDouble([this.x0],[this.xd0]); - this.model.ipar = this.id; + this.model.ipar = new ScilabDouble(this.id); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); var exprs = list(strcat(sci2exp(this.x0)),strcat(sci2exp(this.xd0)),strcat(sci2exp(this.id))); var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); @@ -73,7 +73,7 @@ function CONSTRAINT2_c() { this.model.state = new ScilabDouble([this.x0],[this.xd0]); this.model.out = new ScilabDouble([N],[N]); this.model.in1 = new ScilabDouble([N]); - this.model.ipar = this.id; + this.model.ipar = new ScilabDouble(this.id); this.x.graphics = graphics; this.x.model = this.model; break; diff --git a/js/Misc/CONSTRAINT_c.js b/js/Misc/CONSTRAINT_c.js index b25271e6..52113803 100644 --- a/js/Misc/CONSTRAINT_c.js +++ b/js/Misc/CONSTRAINT_c.js @@ -9,7 +9,7 @@ function CONSTRAINT_c() { this.model.ipar = new ScilabDouble([0]); this.model.state = new ScilabDouble(this.x0); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); var exprs = "0"; var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); diff --git a/js/Misc/DEADBAND.js b/js/Misc/DEADBAND.js index 6bf8c08d..b4bab67a 100644 --- a/js/Misc/DEADBAND.js +++ b/js/Misc/DEADBAND.js @@ -12,7 +12,7 @@ function DEADBAND() { this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(this.maxp)],[string(this.minp)],[string(this.model.nmode)]]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/Misc/DIFF_f.js b/js/Misc/DIFF_f.js index b68a32d1..9edcc7fb 100644 --- a/js/Misc/DIFF_f.js +++ b/js/Misc/DIFF_f.js @@ -8,7 +8,7 @@ function DIFF_f() { this.model.out = new ScilabDouble([1]); this.model.state = new ScilabDouble(this.x0); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); var exprs = [[strcat(sci2exp(this.x0[1-1]))],[strcat(sci2exp(this.x0[2-1]))]]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/Misc/EDGETRIGGER.js b/js/Misc/EDGETRIGGER.js index f694714f..36e4f317 100644 --- a/js/Misc/EDGETRIGGER.js +++ b/js/Misc/EDGETRIGGER.js @@ -10,7 +10,7 @@ function EDGETRIGGER() { this.model.nzcross = new ScilabDouble([1]); this.model.ipar = new ScilabDouble([sign(this.edge)]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [string(this.edge)]; var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); diff --git a/js/Misc/EDGE_TRIGGER.js b/js/Misc/EDGE_TRIGGER.js index 4349ce08..24c39990 100644 --- a/js/Misc/EDGE_TRIGGER.js +++ b/js/Misc/EDGE_TRIGGER.js @@ -27,7 +27,7 @@ function EDGE_TRIGGER() { graphics.orig = [160,0]; graphics.sz = [60,40]; graphics.exprs = [["0"],["0"]]; - this.model.evtin = []; + this.model.evtin = new ScilabDouble([]); this.model.nzcross = new ScilabDouble([0]); this.model.nmode = new ScilabDouble([0]); graphics.pin = 6; diff --git a/js/Misc/Extract_Activation.js b/js/Misc/Extract_Activation.js index 1497b6a1..16e98353 100644 --- a/js/Misc/Extract_Activation.js +++ b/js/Misc/Extract_Activation.js @@ -16,7 +16,7 @@ function Extract_Activation() { graphics.orig = [80,0]; graphics.sz = [60,40]; graphics.exprs = [["0"],["0"]]; - this.model.evtin = []; + this.model.evtin = new ScilabDouble([]); this.model.nzcross = new ScilabDouble([0]); this.model.nmode = new ScilabDouble([0]); graphics.pin = 7; diff --git a/js/Misc/HYSTHERESIS.js b/js/Misc/HYSTHERESIS.js index 3146e712..981bbdfe 100644 --- a/js/Misc/HYSTHERESIS.js +++ b/js/Misc/HYSTHERESIS.js @@ -13,7 +13,7 @@ function HYSTHERESIS() { this.model.nzcross = new ScilabDouble([this.nzz]); this.model.nmode = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(rpar)],[string(sign(this.nzz))]]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); @@ -51,7 +51,7 @@ function HYSTHERESIS() { message("switch on value must be larger than switch off value"); } else { graphics.exprs = exprs; - this.model.rpar = transpose([this.high_lim,this.low_lim,this.out_high,this.out_low]); + this.model.rpar = new ScilabDouble(transpose([this.high_lim,this.low_lim,this.out_high,this.out_low])); if (this.nzz>0) { this.nzz = 2; } diff --git a/js/Misc/LOGICAL_OP.js b/js/Misc/LOGICAL_OP.js index 83de46aa..4664dae5 100644 --- a/js/Misc/LOGICAL_OP.js +++ b/js/Misc/LOGICAL_OP.js @@ -8,9 +8,9 @@ function LOGICAL_OP() { this.model.sim = list(new ScilabString(["logicalop"]), new ScilabDouble([4])); this.model.in1 = new ScilabDouble(in1); this.model.out = new ScilabDouble([-1]); - this.model.ipar = ipar; + this.model.ipar = new ScilabDouble(ipar); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(this.nin)],[string(ipar)]]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); @@ -67,7 +67,7 @@ function LOGICAL_OP() { } if (this.Datatype==1) { this.model.sim = list(new ScilabString(["logicalop"]), new ScilabDouble([4])); - this.model.ipar = [this.rule]; + this.model.ipar = new ScilabDouble([this.rule]); } else { if (this.Datatype==3) { this.model.sim = list(new ScilabString(["logicalop_i32"]), new ScilabDouble([4])); diff --git a/js/Misc/MBLOCK.js b/js/Misc/MBLOCK.js index dde93d71..b0ceb11f 100644 --- a/js/Misc/MBLOCK.js +++ b/js/Misc/MBLOCK.js @@ -12,8 +12,8 @@ function MBLOCK() { var exprs = tlist(["MBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],sci2exp(this.in1.slice()),sci2exp(this.intype.slice()),sci2exp(this.out.slice()),sci2exp(this.outtype.slice()),sci2exp(param.slice()),list(string(0.1),string(.0001)),sci2exp(this.pprop.slice()),nameF,[]); this.model = scicos_model(); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,true]; - this.model.rpar = []; + this.model.dep_ut = new ScilabDouble([false,true]); + this.model.rpar = new ScilabDouble([]); for (i=1;i<=lstsize(paramv);i+=1) { this.model.rpar = new ScilabDouble([this.model.rpar],[paramv[i-1].slice()]); } @@ -263,7 +263,7 @@ function MBLOCK() { mo.parameters = list(transpose(param),paramv); } this.model.equations = new ScilabDouble([mo]); - this.model.rpar = []; + this.model.rpar = new ScilabDouble([]); for (i=1;i<=lstsize(paramv);i+=1) { this.model.rpar = new ScilabDouble([this.model.rpar],[paramv[i-1].slice()]); } diff --git a/js/Misc/MEMORY_f.js b/js/Misc/MEMORY_f.js index d975cc56..43faface 100644 --- a/js/Misc/MEMORY_f.js +++ b/js/Misc/MEMORY_f.js @@ -12,7 +12,7 @@ function MEMORY_f() { this.model.dstate = new ScilabDouble([0]); this.model.rpar = new ScilabDouble([z]); this.model.blocktype = new ScilabString(["m"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); diff --git a/js/Misc/MPBLOCK.js b/js/Misc/MPBLOCK.js index 0c2ce112..01cecbc4 100644 --- a/js/Misc/MPBLOCK.js +++ b/js/Misc/MPBLOCK.js @@ -12,8 +12,8 @@ function MPBLOCK() { var exprs = tlist(["MPBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],sci2exp(this.in1.slice()),sci2exp(this.intype.slice()),sci2exp(this.out.slice()),sci2exp(this.outtype.slice()),sci2exp(param.slice()),list(string(0.1),string(.0001)),sci2exp(pprop.slice()),nameF,[]); this.model = scicos_model(); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,true]; - this.model.rpar = []; + this.model.dep_ut = new ScilabDouble([true,true]); + this.model.rpar = new ScilabDouble([]); for (i=1;i<=lstsize(paramv);i+=1) { this.model.rpar = new ScilabDouble([this.model.rpar],[paramv[i-1].slice()]); } @@ -247,7 +247,7 @@ function MPBLOCK() { } } this.model.equations = new ScilabDouble([mo]); - this.model.rpar = []; + this.model.rpar = new ScilabDouble([]); for (i=1;i<=lstsize(paramv);i+=1) { this.model.rpar = new ScilabDouble([this.model.rpar],[double(paramv[i-1].slice())]); } diff --git a/js/Misc/PAL_f.js b/js/Misc/PAL_f.js index 7b64b6c3..5a70057c 100644 --- a/js/Misc/PAL_f.js +++ b/js/Misc/PAL_f.js @@ -5,11 +5,11 @@ function PAL_f() { scs.props.title = "Palette"; this.model = scicos_model(); this.model.sim = new ScilabString(["palette"]); - this.model.in1 = []; - this.model.out = []; + this.model.in1 = new ScilabDouble([]); + this.model.out = new ScilabDouble([]); this.model.rpar = new ScilabDouble([scs]); this.model.blocktype = new ScilabString(["h"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var gr_i = []; this.x = standard_define([2,2],this.model,[],gr_i); this.x.graphics.id = scs.props.title[1-1]; diff --git a/js/Misc/PENDULUM_ANIM.js b/js/Misc/PENDULUM_ANIM.js index bf3d386a..05758ed8 100644 --- a/js/Misc/PENDULUM_ANIM.js +++ b/js/Misc/PENDULUM_ANIM.js @@ -15,7 +15,7 @@ function PENDULUM_ANIM() { 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]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = string(this.model.rpar); var gr_i = []; this.x = standard_define([3,3],this.model,exprs,gr_i); diff --git a/js/Misc/RATELIMITER.js b/js/Misc/RATELIMITER.js index aa206268..d7f88eff 100644 --- a/js/Misc/RATELIMITER.js +++ b/js/Misc/RATELIMITER.js @@ -10,7 +10,7 @@ function RATELIMITER() { this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(this.maxp)],[string(this.minp)]]; var gr_i = []; this.x = standard_define([3.5,2],this.model,exprs,gr_i); diff --git a/js/Misc/RELATIONALOP.js b/js/Misc/RELATIONALOP.js index 34d9bb78..bd7da970 100644 --- a/js/Misc/RELATIONALOP.js +++ b/js/Misc/RELATIONALOP.js @@ -7,9 +7,9 @@ function RELATIONALOP() { this.model.sim = list(new ScilabString(["relationalop"]), new ScilabDouble([4])); this.model.in1 = new ScilabDouble([1],[1]); this.model.out = new ScilabDouble([1]); - this.model.ipar = ipar; + this.model.ipar = new ScilabDouble(ipar); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(ipar)],[string(0)]]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); @@ -95,7 +95,7 @@ function RELATIONALOP() { } graphics.exprs = exprs; graphics.style = ["fontSize=13;fontStyle=1;displayedLabel="+label]; - this.model.ipar = [this.rule]; + this.model.ipar = new ScilabDouble([this.rule]); this.model.nzcross = new ScilabDouble([this.zcr]); this.model.nmode = new ScilabDouble([this.zcr]); this.x.graphics = graphics; diff --git a/js/Misc/SPLIT_f.js b/js/Misc/SPLIT_f.js index 50681b70..cd072345 100644 --- a/js/Misc/SPLIT_f.js +++ b/js/Misc/SPLIT_f.js @@ -6,7 +6,7 @@ function SPLIT_f() { this.model.in1 = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1],[-1],[-1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); this.x = standard_define([1,1]/3,this.model,[],[]); return new BasicBlock(this.x); } diff --git a/js/Misc/SUPER_f.js b/js/Misc/SUPER_f.js index 5cf0195b..986ce265 100644 --- a/js/Misc/SUPER_f.js +++ b/js/Misc/SUPER_f.js @@ -17,7 +17,7 @@ function SUPER_f() { this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([scs]); this.model.blocktype = new ScilabString(["h"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var gr_i = []; this.x = standard_define([2,2],this.model,[],gr_i); return new SuperBlock(this.x); diff --git a/js/Misc/c_block.js b/js/Misc/c_block.js index 1499b7e8..fd3573df 100644 --- a/js/Misc/c_block.js +++ b/js/Misc/c_block.js @@ -15,15 +15,15 @@ function c_block() { this.model.sim = list(new ScilabString([" "]), new ScilabDouble([2001])); this.model.in1 = new ScilabDouble([in1]); this.model.out = new ScilabDouble([out]); - this.model.evtin = clkin; - this.model.evtout = clkout; - this.model.state = x0; - this.model.dstate = z0; - this.model.rpar = this.rpar; + this.model.evtin = new ScilabDouble(clkin); + this.model.evtout = new ScilabDouble(clkout); + this.model.state = new ScilabDouble(x0); + this.model.dstate = new ScilabDouble(z0); + this.model.rpar = new ScilabDouble(this.rpar); this.model.ipar = new ScilabDouble([0]); this.model.blocktype = new ScilabString([typ]); - this.model.firing = auto; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble(auto); + this.model.dep_ut = new ScilabDouble([true,false]); var label = list([[sci2exp(in1)],[sci2exp(out)],[strcat(sci2exp(this.rpar))],[this.funam]],list([])); var gr_i = []; this.x = standard_define([3,2],this.model,label,gr_i); @@ -81,7 +81,7 @@ function c_block() { var ok = tmpvar1[2]; if (ok) { this.model.sim[1] = new ScilabString([this.funam]); - this.model.rpar = this.rpar; + this.model.rpar = new ScilabDouble(this.rpar); label[2-1] = tt; this.x.model = this.model; graphics.exprs = label; diff --git a/js/Misc/fortran_block.js b/js/Misc/fortran_block.js index bd4d11c7..f04ff321 100644 --- a/js/Misc/fortran_block.js +++ b/js/Misc/fortran_block.js @@ -5,15 +5,15 @@ function fortran_block() { this.model.sim = list(new ScilabString([" "]), new ScilabDouble([1001])); this.model.in1 = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); - this.model.evtin = []; - this.model.evtout = []; - this.model.state = []; - this.model.dstate = []; - this.model.rpar = []; + this.model.evtin = new ScilabDouble([]); + this.model.evtout = new ScilabDouble([]); + this.model.state = new ScilabDouble([]); + this.model.dstate = new ScilabDouble([]); + this.model.rpar = new ScilabDouble([]); this.model.ipar = new ScilabDouble([0]); this.model.blocktype = new ScilabString(["c"]); - this.model.firing = []; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([true,false]); this.funam = "forty"; var label = list([[sci2exp(this.model.in1)],[sci2exp(this.model.out)],[strcat(sci2exp(this.model.rpar))],[this.funam]],list([])); var gr_i = []; @@ -72,7 +72,7 @@ function fortran_block() { var ok = tmpvar1[2]; if (ok) { this.model.sim[1] = new ScilabString([this.funam]); - this.model.rpar = this.rpar; + this.model.rpar = new ScilabDouble(this.rpar); label[2-1] = tt; this.x.model = this.model; graphics.exprs = label; diff --git a/js/Misc/func_block.js b/js/Misc/func_block.js index 2579f2c7..ef6dffca 100644 --- a/js/Misc/func_block.js +++ b/js/Misc/func_block.js @@ -6,7 +6,7 @@ function func_block() { this.model.in1 = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = "v=sin(u);y=u*v"; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/Misc/generic_block.js b/js/Misc/generic_block.js index 93cefd86..e3a2ae82 100644 --- a/js/Misc/generic_block.js +++ b/js/Misc/generic_block.js @@ -7,15 +7,15 @@ function generic_block() { this.model.sim = list(new ScilabString([this.function_name]), new ScilabDouble([this.funtyp])); this.model.in1 = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); - this.model.evtin = []; - this.model.evtout = []; - this.model.state = []; - this.model.dstate = []; - this.model.rpar = []; - this.model.ipar = []; + this.model.evtin = new ScilabDouble([]); + this.model.evtout = new ScilabDouble([]); + this.model.state = new ScilabDouble([]); + this.model.dstate = new ScilabDouble([]); + this.model.rpar = new ScilabDouble([]); + this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); - this.model.firing = []; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([true,false]); var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp(this.model.in1)],[sci2exp(this.model.out)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.firing)],["y"],["n"]]; var gr_i = []; this.x = standard_define([2,2],this.model,label,gr_i); @@ -114,12 +114,12 @@ function generic_block() { var needcompile = 4; } this.model.sim = list(new ScilabDouble([this.function_name]), new ScilabDouble([this.funtyp])); - this.model.state = this.xx; - this.model.dstate = this.z; - this.model.rpar = this.rpar; + this.model.state = new ScilabDouble(this.xx); + this.model.dstate = new ScilabDouble(this.z); + this.model.rpar = new ScilabDouble(this.rpar); this.model.ipar = new ScilabDouble([this.ipar]); this.model.firing = new ScilabDouble([this.auto0]); - this.model.dep_ut = dep_ut; + this.model.dep_ut = new ScilabDouble(dep_ut); arg1.model = this.model; graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/Misc/generic_block2.js b/js/Misc/generic_block2.js index d276b49a..2e4880cc 100644 --- a/js/Misc/generic_block2.js +++ b/js/Misc/generic_block2.js @@ -7,15 +7,15 @@ function generic_block2() { this.model.sim = list(new ScilabString([this.function_name]), new ScilabDouble([this.funtyp])); this.model.in1 = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); - this.model.evtin = []; - this.model.evtout = []; - this.model.state = []; - this.model.dstate = []; - this.model.rpar = []; - this.model.ipar = []; + this.model.evtin = new ScilabDouble([]); + this.model.evtout = new ScilabDouble([]); + this.model.state = new ScilabDouble([]); + this.model.dstate = new ScilabDouble([]); + this.model.rpar = new ScilabDouble([]); + this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); - this.model.firing = []; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([true,false]); var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp(this.model.in1)],[sci2exp(this.model.out)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]]; var gr_i = []; this.x = standard_define([2,2],this.model,label,gr_i); @@ -118,14 +118,14 @@ function generic_block2() { var needcompile = 4; } this.model.sim = list(new ScilabDouble([this.function_name]), new ScilabDouble([this.funtyp])); - this.model.state = this.xx; - this.model.dstate = this.z; - this.model.rpar = this.rpar; + this.model.state = new ScilabDouble(this.xx); + this.model.dstate = new ScilabDouble(this.z); + this.model.rpar = new ScilabDouble(this.rpar); this.model.ipar = new ScilabDouble([this.ipar]); this.model.firing = new ScilabDouble([this.auto0]); this.model.nzcross = new ScilabDouble([this.nzcr]); this.model.nmode = new ScilabDouble([this.nmode]); - this.model.dep_ut = dep_ut; + this.model.dep_ut = new ScilabDouble(dep_ut); arg1.model = this.model; graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/Misc/generic_block3.js b/js/Misc/generic_block3.js index e5bb8697..24888cb8 100644 --- a/js/Misc/generic_block3.js +++ b/js/Misc/generic_block3.js @@ -11,7 +11,7 @@ function generic_block3() { this.model.out = new ScilabDouble([1]); this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp([this.model.in1,this.model.in2])],[sci2exp(this.model.intyp)],[sci2exp([this.model.out,this.model.out2]),sci2exp(this.model.outtyp)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.odstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.opar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]]; var gr_i = []; this.x = standard_define([4,2],this.model,label,gr_i); @@ -128,16 +128,16 @@ function generic_block3() { var needcompile = 4; } this.model.sim = list(new ScilabDouble([this.function_name]), new ScilabDouble([this.funtyp])); - this.model.state = this.xx; - this.model.dstate = this.z; + this.model.state = new ScilabDouble(this.xx); + this.model.dstate = new ScilabDouble(this.z); this.model.odstate = new ScilabDouble([this.oz]); - this.model.rpar = this.rpar; + this.model.rpar = new ScilabDouble(this.rpar); this.model.ipar = new ScilabDouble([this.ipar]); this.model.opar = new ScilabDouble([this.opar]); this.model.firing = new ScilabDouble([this.auto0]); this.model.nzcross = new ScilabDouble([this.nzcr]); this.model.nmode = new ScilabDouble([this.nmode]); - this.model.dep_ut = dep_ut; + this.model.dep_ut = new ScilabDouble(dep_ut); arg1.model = this.model; graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/Misc/scifunc_block.js b/js/Misc/scifunc_block.js index 80f6abb0..96ddc1f3 100644 --- a/js/Misc/scifunc_block.js +++ b/js/Misc/scifunc_block.js @@ -14,16 +14,16 @@ function scifunc_block() { this.model.sim = list(new ScilabString(["scifunc"]), new ScilabDouble([3])); this.model.in1 = new ScilabDouble([in1]); this.model.out = new ScilabDouble([out]); - this.model.evtin = clkin; - this.model.evtout = clkout; - this.model.state = x0; - this.model.dstate = z0; - this.model.rpar = this.rpar; + this.model.evtin = new ScilabDouble(clkin); + this.model.evtout = new ScilabDouble(clkout); + this.model.state = new ScilabDouble(x0); + this.model.dstate = new ScilabDouble(z0); + this.model.rpar = new ScilabDouble(this.rpar); this.model.ipar = new ScilabDouble([0]); this.model.opar = list(); this.model.blocktype = new ScilabString([typ]); - this.model.firing = auto; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble(auto); + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = list([[sci2exp(in1)],[sci2exp(out)],[sci2exp(clkin)],[sci2exp(clkout)],[strcat(sci2exp(x0))],[strcat(sci2exp(z0))],[strcat(sci2exp(this.rpar))],[sci2exp(auto)]],list("y1=sin(u1)"," "," ","y1=sin(u1)"," "," "," ")); var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); @@ -97,9 +97,9 @@ function scifunc_block() { var ok = tmpvar1[2]; if (ok) { var auto = this.auto0; - this.model.state = this.xx; - this.model.dstate = this.z; - this.model.rpar = this.rpar; + this.model.state = new ScilabDouble(this.xx); + this.model.dstate = new ScilabDouble(this.z); + this.model.rpar = new ScilabDouble(this.rpar); if (this.model.ipar!=0) { this.model.opar = new ScilabDouble([this.model.ipar]); this.model.ipar = new ScilabDouble([0]); diff --git a/js/Misc/scifunc_block_m.js b/js/Misc/scifunc_block_m.js index 494f6450..3b54ace1 100644 --- a/js/Misc/scifunc_block_m.js +++ b/js/Misc/scifunc_block_m.js @@ -19,16 +19,16 @@ function scifunc_block_m() { this.model.out = new ScilabDouble([out]); this.model.out2 = new ScilabDouble([out]); this.model.outtyp = new ScilabDouble([it]); - this.model.evtin = clkin; - this.model.evtout = clkout; - this.model.state = x0; - this.model.dstate = z0; - this.model.rpar = this.rpar; + this.model.evtin = new ScilabDouble(clkin); + this.model.evtout = new ScilabDouble(clkout); + this.model.state = new ScilabDouble(x0); + this.model.dstate = new ScilabDouble(z0); + this.model.rpar = new ScilabDouble(this.rpar); this.model.ipar = new ScilabDouble([0]); this.model.opar = list(); this.model.blocktype = new ScilabString([typ]); - this.model.firing = auto; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble(auto); + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = list([[sci2exp([in1,in1])],[sci2exp([out,out])],[sci2exp(clkin)],[sci2exp(clkout)],[strcat(sci2exp(x0))],[strcat(sci2exp(z0))],[strcat(sci2exp(this.rpar))],[sci2exp(auto)],[sci2exp(0)]],list("y1=sin(u1)"," "," ","y1=sin(u1)"," "," "," ")); var gr_i = []; this.x = standard_define([4,2],this.model,exprs,gr_i); @@ -99,9 +99,9 @@ function scifunc_block_m() { var ok = tmpvar1[2]; if (ok) { var auto = this.auto0; - this.model.state = this.xx; - this.model.dstate = this.z; - this.model.rpar = this.rpar; + this.model.state = new ScilabDouble(this.xx); + this.model.dstate = new ScilabDouble(this.z); + this.model.rpar = new ScilabDouble(this.rpar); if (this.model.ipar!=0) { this.model.opar = new ScilabDouble([this.model.ipar]); this.model.ipar = new ScilabDouble([0]); diff --git a/js/NonLinear/ABSBLK_f.js b/js/NonLinear/ABSBLK_f.js index dccca3e7..99864ff5 100644 --- a/js/NonLinear/ABSBLK_f.js +++ b/js/NonLinear/ABSBLK_f.js @@ -6,7 +6,7 @@ function ABSBLK_f() { this.model.in1 = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var gr_i = []; this.x = standard_define([2,2],this.model,[],gr_i); return new BasicBlock(this.x); diff --git a/js/NonLinear/ABS_VALUE.js b/js/NonLinear/ABS_VALUE.js index d1440877..3b4b3aff 100644 --- a/js/NonLinear/ABS_VALUE.js +++ b/js/NonLinear/ABS_VALUE.js @@ -9,7 +9,7 @@ function ABS_VALUE() { this.model.nzcross = new ScilabDouble([nu]); this.model.nmode = new ScilabDouble([nu]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [string([1])]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/NonLinear/COSBLK_f.js b/js/NonLinear/COSBLK_f.js index 5fc89b30..a27929db 100644 --- a/js/NonLinear/COSBLK_f.js +++ b/js/NonLinear/COSBLK_f.js @@ -7,7 +7,7 @@ function COSBLK_f() { this.model.in1 = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var gr_i = []; this.x = standard_define([2,2],this.model,[],gr_i); return new BasicBlock(this.x); diff --git a/js/NonLinear/DLRADAPT_f.js b/js/NonLinear/DLRADAPT_f.js index bbbcc0b1..a5e1aa61 100644 --- a/js/NonLinear/DLRADAPT_f.js +++ b/js/NonLinear/DLRADAPT_f.js @@ -16,8 +16,8 @@ function DLRADAPT_f() { this.model.rpar = new ScilabDouble([this.p.slice()],[real(this.rn.slice())],[imag(this.rn.slice())],[real(this.rd.slice())],[imag(this.rd.slice())],[this.g.slice()]); this.model.ipar = new ScilabDouble([0],[2],[2]); this.model.blocktype = new ScilabString(["d"]); - this.model.firing = []; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(this.p)],[sci2exp(this.rn)],[sci2exp(this.rd,0)],[sci2exp(this.g)],[sci2exp(this.last_u)],[sci2exp(this.last_y)]]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/NonLinear/EXPBLK_f.js b/js/NonLinear/EXPBLK_f.js index a1ec6e7f..8b273fb9 100644 --- a/js/NonLinear/EXPBLK_f.js +++ b/js/NonLinear/EXPBLK_f.js @@ -9,7 +9,7 @@ function EXPBLK_f() { this.model.out = new ScilabDouble([-1]); this.model.rpar = new ScilabDouble([this.a]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = ["%e"]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/NonLinear/EXPBLK_m.js b/js/NonLinear/EXPBLK_m.js index 61ae91d7..f10f3ad9 100644 --- a/js/NonLinear/EXPBLK_m.js +++ b/js/NonLinear/EXPBLK_m.js @@ -13,7 +13,7 @@ function EXPBLK_m() { this.model.outtyp = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.a]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = ["%e"]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/NonLinear/FSV_f.js b/js/NonLinear/FSV_f.js index 37dc3224..0a1b1914 100644 --- a/js/NonLinear/FSV_f.js +++ b/js/NonLinear/FSV_f.js @@ -7,7 +7,7 @@ function FSV_f() { this.model.in1 = new ScilabDouble([in1]); this.model.out = new ScilabDouble([in1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = " "; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/NonLinear/INTRP2BLK_f.js b/js/NonLinear/INTRP2BLK_f.js index db41305d..9c4c0f6f 100644 --- a/js/NonLinear/INTRP2BLK_f.js +++ b/js/NonLinear/INTRP2BLK_f.js @@ -11,7 +11,7 @@ function INTRP2BLK_f() { this.model.rpar = new ScilabDouble([this.a],[this.b],[this.c.slice()]); this.model.ipar = new ScilabDouble([2],[2]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[strcat(sci2exp(this.a))],[strcat(sci2exp(this.b))],[strcat(sci2exp(this.c,0))]]; var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); diff --git a/js/NonLinear/INTRPLBLK_f.js b/js/NonLinear/INTRPLBLK_f.js index d2cdf8fa..1583e329 100644 --- a/js/NonLinear/INTRPLBLK_f.js +++ b/js/NonLinear/INTRPLBLK_f.js @@ -9,7 +9,7 @@ function INTRPLBLK_f() { this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.a],[this.b]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[strcat(sci2exp(this.a))],[strcat(sci2exp(this.b))]]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/NonLinear/INVBLK.js b/js/NonLinear/INVBLK.js index 4d9721cd..a777a4f3 100644 --- a/js/NonLinear/INVBLK.js +++ b/js/NonLinear/INVBLK.js @@ -7,7 +7,7 @@ function INVBLK() { this.model.in1 = new ScilabDouble([in1]); this.model.out = new ScilabDouble([in1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = " "; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/NonLinear/INVBLK_f.js b/js/NonLinear/INVBLK_f.js index 219dc37b..af9b25a4 100644 --- a/js/NonLinear/INVBLK_f.js +++ b/js/NonLinear/INVBLK_f.js @@ -7,7 +7,7 @@ function INVBLK_f() { this.model.in1 = new ScilabDouble([in1]); this.model.out = new ScilabDouble([in1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = " "; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/NonLinear/LOGBLK_f.js b/js/NonLinear/LOGBLK_f.js index 5b725fea..87f7b64f 100644 --- a/js/NonLinear/LOGBLK_f.js +++ b/js/NonLinear/LOGBLK_f.js @@ -9,7 +9,7 @@ function LOGBLK_f() { this.model.out = new ScilabDouble([-1]); this.model.rpar = new ScilabDouble([this.a]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = "%e"; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/NonLinear/LOOKUP2D.js b/js/NonLinear/LOOKUP2D.js index 1e615526..86705715 100644 --- a/js/NonLinear/LOOKUP2D.js +++ b/js/NonLinear/LOOKUP2D.js @@ -15,7 +15,7 @@ function LOOKUP2D() { this.model.rpar = new ScilabDouble([this.xx.slice()],[this.yy.slice()],[this.zz.slice()]); this.model.ipar = new ScilabDouble([Nx],[Ny],[this.Method]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = list(strcat(sci2exp(this.xx)),strcat(sci2exp(this.yy)),strcat(sci2exp(this.zz)),sci2exp(this.Method),Graf); var gr_i = []; this.x = standard_define([2.5,2],this.model,exprs,gr_i); diff --git a/js/NonLinear/LOOKUP_c.js b/js/NonLinear/LOOKUP_c.js index 29655d2e..c569f4d7 100644 --- a/js/NonLinear/LOOKUP_c.js +++ b/js/NonLinear/LOOKUP_c.js @@ -17,9 +17,9 @@ function LOOKUP_c() { this.model.rpar = new ScilabDouble([this.xx.slice()],[this.yy.slice()]); this.model.ipar = new ScilabDouble([N],[this.Method],[0],[0]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; - this.model.evtin = []; - this.model.evtout = []; + this.model.dep_ut = new ScilabDouble([true,false]); + this.model.evtin = new ScilabDouble([]); + this.model.evtout = new ScilabDouble([]); this.model.firing = new ScilabDouble([0]); var exprs = [[sci2exp(this.Method)],[sci2exp(this.xx)],[sci2exp(this.yy)],[sci2exp(0)],[Graf]]; var gr_i = []; diff --git a/js/NonLinear/LOOKUP_f.js b/js/NonLinear/LOOKUP_f.js index 9724bd70..81a00e6c 100644 --- a/js/NonLinear/LOOKUP_f.js +++ b/js/NonLinear/LOOKUP_f.js @@ -7,7 +7,7 @@ function LOOKUP_f() { this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([-2],[-1],[1],[2],[-1],[1],[-1],[1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var gr_i = []; this.x = standard_define([2,2],this.model,[],gr_i); return new BasicBlock(this.x); diff --git a/js/NonLinear/MAXMIN.js b/js/NonLinear/MAXMIN.js index c973c2c3..53de8ae6 100644 --- a/js/NonLinear/MAXMIN.js +++ b/js/NonLinear/MAXMIN.js @@ -6,7 +6,7 @@ function MAXMIN() { this.model.out = new ScilabDouble([1]); this.model.in1 = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); this.model.ipar = new ScilabDouble([0]); var exprs = [string(transpose([2,1,1]))]; var gr_i = []; diff --git a/js/NonLinear/MAX_f.js b/js/NonLinear/MAX_f.js index 7bbbd11b..96122900 100644 --- a/js/NonLinear/MAX_f.js +++ b/js/NonLinear/MAX_f.js @@ -8,7 +8,7 @@ function MAX_f() { this.model.out = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([0],[0]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = " "; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/NonLinear/MIN_f.js b/js/NonLinear/MIN_f.js index ff7b5cc0..f571e358 100644 --- a/js/NonLinear/MIN_f.js +++ b/js/NonLinear/MIN_f.js @@ -8,7 +8,7 @@ function MIN_f() { this.model.out = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([0],[0]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = sci2exp(in1); var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/NonLinear/POWBLK_f.js b/js/NonLinear/POWBLK_f.js index aa5793da..39c01eeb 100644 --- a/js/NonLinear/POWBLK_f.js +++ b/js/NonLinear/POWBLK_f.js @@ -9,7 +9,7 @@ function POWBLK_f() { this.model.out = new ScilabDouble([-1]); this.model.rpar = new ScilabDouble([this.a]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = string(this.a); var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); @@ -40,12 +40,12 @@ function POWBLK_f() { graphics.exprs = exprs; if (this.a==int(this.a)) { this.model.ipar = new ScilabDouble([this.a]); - this.model.rpar = []; + this.model.rpar = new ScilabDouble([]); } else { this.model.rpar = new ScilabDouble([this.a]); - this.model.ipar = []; + this.model.ipar = new ScilabDouble([]); } - this.model.firing = []; + this.model.firing = new ScilabDouble([]); this.x.graphics = graphics; this.x.model = this.model; break; diff --git a/js/NonLinear/PRODUCT.js b/js/NonLinear/PRODUCT.js index 4ff4f86f..0b180388 100644 --- a/js/NonLinear/PRODUCT.js +++ b/js/NonLinear/PRODUCT.js @@ -8,7 +8,7 @@ function PRODUCT() { this.model.out = new ScilabDouble([-1]); this.model.ipar = new ScilabDouble(this.sgn); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = sci2exp(this.sgn); var gr_i = []; this.x = standard_define([2,3],this.model,exprs,gr_i); diff --git a/js/NonLinear/PROD_f.js b/js/NonLinear/PROD_f.js index 1f32a41a..5090deb5 100644 --- a/js/NonLinear/PROD_f.js +++ b/js/NonLinear/PROD_f.js @@ -6,7 +6,7 @@ function PROD_f() { 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]; + this.model.dep_ut = new ScilabDouble([true,false]); this.x = standard_define([1,1],this.model,[],[]); return new BasicBlock(this.x); } diff --git a/js/NonLinear/QUANT_f.js b/js/NonLinear/QUANT_f.js index 083c1e22..557cb3fa 100644 --- a/js/NonLinear/QUANT_f.js +++ b/js/NonLinear/QUANT_f.js @@ -10,7 +10,7 @@ function QUANT_f() { this.model.rpar = new ScilabDouble([this.pas]); this.model.ipar = new ScilabDouble([this.meth]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(this.pas)],[string(this.meth)]]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/NonLinear/SATURATION.js b/js/NonLinear/SATURATION.js index 76577e72..f89b0fb7 100644 --- a/js/NonLinear/SATURATION.js +++ b/js/NonLinear/SATURATION.js @@ -12,7 +12,7 @@ function SATURATION() { this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(this.maxp)],[string(this.minp)],[string(this.model.nmode)]]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/NonLinear/SAT_f.js b/js/NonLinear/SAT_f.js index b3c1cb21..52c4bef4 100644 --- a/js/NonLinear/SAT_f.js +++ b/js/NonLinear/SAT_f.js @@ -12,7 +12,7 @@ function SAT_f() { this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.minp],[this.maxp],[slope]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(this.minp)],[string(this.maxp)],[string(slope)]]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); @@ -49,7 +49,7 @@ function SAT_f() { } else { var rpar = [[this.minp/this.pente],[this.maxp/this.pente],[this.pente]]; this.model.rpar = new ScilabDouble(rpar); - this.model.firing = []; + this.model.firing = new ScilabDouble([]); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/NonLinear/SIGNUM.js b/js/NonLinear/SIGNUM.js index e62644ab..41c6823f 100644 --- a/js/NonLinear/SIGNUM.js +++ b/js/NonLinear/SIGNUM.js @@ -9,7 +9,7 @@ function SIGNUM() { this.model.nzcross = new ScilabDouble([nu]); this.model.nmode = new ScilabDouble([nu]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [string([1])]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/NonLinear/SINBLK_f.js b/js/NonLinear/SINBLK_f.js index 0484cf15..f3411c27 100644 --- a/js/NonLinear/SINBLK_f.js +++ b/js/NonLinear/SINBLK_f.js @@ -6,7 +6,7 @@ function SINBLK_f() { this.model.in1 = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = " "; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/NonLinear/TANBLK_f.js b/js/NonLinear/TANBLK_f.js index 1650e8f0..29012ddf 100644 --- a/js/NonLinear/TANBLK_f.js +++ b/js/NonLinear/TANBLK_f.js @@ -7,7 +7,7 @@ function TANBLK_f() { this.model.in1 = new ScilabDouble([in1]); this.model.out = new ScilabDouble([in1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = sci2exp(in1); var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/NonLinear/TrigFun.js b/js/NonLinear/TrigFun.js index d7168800..ea1e576c 100644 --- a/js/NonLinear/TrigFun.js +++ b/js/NonLinear/TrigFun.js @@ -6,7 +6,7 @@ function TrigFun() { this.model.in1 = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = "sin"; var gr_i = []; this.x = standard_define([4,2],this.model,exprs,gr_i); diff --git a/js/PDE/PDE.js b/js/PDE/PDE.js index 222faab2..91816b22 100644 --- a/js/PDE/PDE.js +++ b/js/PDE/PDE.js @@ -7,7 +7,7 @@ function PDE() { 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]; + this.model.dep_ut = new ScilabDouble([false,true]); var params_pde = tlist([["paramspde"],["a"],["b"],["txt_exp"],["check_op1"],["a1"],["b1"],["check_op2"],["a2"],["b2"],["check_op3"],["a3"],["b3"],["check_op4"],["a4"],["b4"],["check_op5"],["a5"],["b5"],["check_op6"],["a6"],["b6"],["check_op7"],["a7"],["b7"],["discr_cst"],["discr_non_cst"],["signe"],["rad_automatique"],["rad_manuel"],["methode"],["ord1"],["ord2"],["ord3"],["degre"],["nnode"],["txt_pas"],["CI"],["dCI"],["CLa"],["CLa_exp"],["CLb"],["CLb_exp"],["points"]],"","","","0","","IN_EDP1(t)","0","","IN_EDP2(t)","0","","IN_EDP3(t)","0","","IN_EDP4(t)","0","","IN_EDP5(t)","0","","IN_EDP6(t)","0","","IN_EDP7(t)","0","0","0","0","0","0","","","","","","","","","0","IN_CL1(t)","0","IN_CL2(t)",""); var label = list(params_pde,[],""); var gr_i = []; diff --git a/js/Sinks/AFFICH_m.js b/js/Sinks/AFFICH_m.js index 015e00f8..ad6b0537 100644 --- a/js/Sinks/AFFICH_m.js +++ b/js/Sinks/AFFICH_m.js @@ -15,8 +15,8 @@ function AFFICH_m() { this.model.dstate = new ScilabDouble([-1],[0],[0],[1],[1],[0],[zeros(this.in1[1-1][1-1]*this.in1[1-1][2-1],1)]); this.model.ipar = new ScilabDouble([this.font],[this.fontsize],[this.colr],[1000],[this.nt],[this.nd],[this.in1[1-1][1-1]]); this.model.blocktype = new ScilabString(["c"]); - this.model.firing = []; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([true,false]); this.model.label = new ScilabString([""]); var exprs = [[sci2exp([this.model.in1,this.model.in2])],[string(this.font)],[string(this.fontsize)],[string(this.colr)],[string(this.nt)],[string(this.nd)],[string(0)]]; var gr_i = []; diff --git a/js/Sinks/BARXY.js b/js/Sinks/BARXY.js index e4d9be7c..6dba5c05 100644 --- a/js/Sinks/BARXY.js +++ b/js/Sinks/BARXY.js @@ -8,11 +8,11 @@ function BARXY() { this.ymax = 15; 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.dep_ut = new ScilabDouble([true,false]); this.model.in1 = new ScilabDouble([-1],[-1]); - this.model.intyp = [1]; - this.model.out = []; - this.model.evtin = [1]; + this.model.intyp = new ScilabDouble([1]); + this.model.out = new ScilabDouble([]); + this.model.evtin = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.xmin],[this.xmax],[this.ymin],[this.ymax]); this.model.ipar = new ScilabDouble([1]); this.x = standard_define([2,2],this.model,[],[]); diff --git a/js/Sinks/CANIMXY.js b/js/Sinks/CANIMXY.js index 9e16f480..063eb79a 100644 --- a/js/Sinks/CANIMXY.js +++ b/js/Sinks/CANIMXY.js @@ -21,8 +21,8 @@ function CANIMXY() { this.model.rpar = new ScilabDouble([this.xmin],[this.xmax],[this.ymin],[this.ymax]); this.model.ipar = new ScilabDouble([this.win],[1],[this.N],[this.clrs],[this.siz],[0],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]); this.model.blocktype = new ScilabString(["d"]); - this.model.firing = []; - this.model.dep_ut = [false,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[string(this.nbr_curves)],[string(this.clrs)],[string(this.siz)],[string(this.win)],["[]"],["[]"],[string(this.xmin)],[string(this.xmax)],[string(this.ymin)],[string(this.ymax)],[string(this.N)]]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/Sinks/CANIMXY3D.js b/js/Sinks/CANIMXY3D.js index 88ddb6db..87669164 100644 --- a/js/Sinks/CANIMXY3D.js +++ b/js/Sinks/CANIMXY3D.js @@ -21,8 +21,8 @@ function CANIMXY3D() { this.model.rpar = new ScilabDouble([this.vec_x.slice()],[this.vec_y.slice()],[this.vec_z.slice()],[this.param3ds.slice()]); this.model.ipar = new ScilabDouble([this.win],[8],[this.N],[this.clrs.slice()],[this.siz.slice()],[8],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]); this.model.blocktype = new ScilabString(["d"]); - this.model.firing = []; - this.model.dep_ut = [false,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[string(this.nbr_curves)],[strcat(string(this.clrs)," ")],[strcat(string(this.siz)," ")],[string(this.win)],["[]"],["[]"],[strcat(string(this.vec_x)," ")],[strcat(string(this.vec_y)," ")],[strcat(string(this.vec_z)," ")],[strcat(string(this.param3ds)," ")],[string(this.N)]]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/Sinks/CEVENTSCOPE.js b/js/Sinks/CEVENTSCOPE.js index 204e1ce0..c46f6e3c 100644 --- a/js/Sinks/CEVENTSCOPE.js +++ b/js/Sinks/CEVENTSCOPE.js @@ -13,7 +13,7 @@ function CEVENTSCOPE() { this.model.rpar = new ScilabDouble([this.per]); this.model.ipar = new ScilabDouble([this.win],[1],[this.clrs[this.nclock-1]],[this.wpos.slice()],[this.wdim.slice()]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[sci2exp(this.nclock)],[strcat(sci2exp(this.clrs[this.nclock-1])," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.per)]]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/Sinks/CFSCOPE.js b/js/Sinks/CFSCOPE.js index c01a6804..81823bcb 100644 --- a/js/Sinks/CFSCOPE.js +++ b/js/Sinks/CFSCOPE.js @@ -15,7 +15,7 @@ function CFSCOPE() { this.model.rpar = new ScilabDouble([0],[this.ymin],[this.ymax],[this.per]); this.model.ipar = new ScilabDouble([this.win],[1],[this.N],[this.clrs],[this.wpos],[this.wdim],[1],[1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[strcat(string(this.clrs)," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.ymin)],[string(this.ymax)],[string(this.per)],[string(this.N)],[string([1])]]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); @@ -106,8 +106,8 @@ function CFSCOPE() { var ipar = [[this.win],[1],[this.N],[this.clrs.slice()],[this.wpos.slice()],[this.wdim.slice()],[size(this.wu,"*")],[this.wu.slice()]]; this.model.rpar = new ScilabDouble(rpar); this.model.ipar = new ScilabDouble(ipar); - this.model.firing = []; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([true,false]); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Sinks/CLKOUTV_f.js b/js/Sinks/CLKOUTV_f.js index fc2b84f4..03b1ce07 100644 --- a/js/Sinks/CLKOUTV_f.js +++ b/js/Sinks/CLKOUTV_f.js @@ -7,8 +7,8 @@ function CLKOUTV_f() { this.model.evtin = new ScilabDouble([1]); this.model.ipar = new ScilabDouble([this.prt]); this.model.blocktype = new ScilabString(["d"]); - this.model.firing = []; - this.model.dep_ut = [false,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = string(this.prt); this.x = standard_define([1,1],this.model,exprs," "); return new EventOutBlock(this.x); diff --git a/js/Sinks/CLKOUT_f.js b/js/Sinks/CLKOUT_f.js index 4698544d..0aecca3f 100644 --- a/js/Sinks/CLKOUT_f.js +++ b/js/Sinks/CLKOUT_f.js @@ -7,8 +7,8 @@ function CLKOUT_f() { this.model.evtin = new ScilabDouble([1]); this.model.ipar = new ScilabDouble([this.prt]); this.model.blocktype = new ScilabString(["d"]); - this.model.firing = []; - this.model.dep_ut = [false,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = string(this.prt); this.x = standard_define([1,1],this.model,exprs," "); return new BasicBlock(this.x); @@ -39,7 +39,7 @@ function CLKOUT_f() { } else { this.model.ipar = new ScilabDouble([this.prt]); this.model.evtin = new ScilabDouble([1]); - this.model.firing = []; + this.model.firing = new ScilabDouble([]); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Sinks/CMAT3D.js b/js/Sinks/CMAT3D.js index d42b45dc..5ea42142 100644 --- a/js/Sinks/CMAT3D.js +++ b/js/Sinks/CMAT3D.js @@ -18,7 +18,7 @@ function CMAT3D() { this.model.ipar = new ScilabDouble([this.cmin],[this.cmax],[size_c],[size_x],[size_y]); this.model.rpar = new ScilabDouble([this.colormap.slice()],[this.x],[y]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[strcat(string(this.x)," ")],[strcat(string(y)," ")],[string("jetcolormap(25)")],[string(this.cmin)],[string(this.cmax)]]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/Sinks/CMATVIEW.js b/js/Sinks/CMATVIEW.js index cc79f1f3..efc67f99 100644 --- a/js/Sinks/CMATVIEW.js +++ b/js/Sinks/CMATVIEW.js @@ -16,7 +16,7 @@ function CMATVIEW() { this.model.ipar = new ScilabDouble([this.cmin],[this.cmax],[size_c]); this.model.rpar = new ScilabDouble([alpha_c],[beta_c],[this.colormap.slice()]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string("jetcolormap(25)")],[string(this.cmin)],[string(this.cmax)]]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/Sinks/CMSCOPE.js b/js/Sinks/CMSCOPE.js index 5827d49a..14377533 100644 --- a/js/Sinks/CMSCOPE.js +++ b/js/Sinks/CMSCOPE.js @@ -21,7 +21,7 @@ function CMSCOPE() { this.model.rpar = new ScilabDouble([0],[period.slice()],[yy.slice()]); this.model.ipar = new ScilabDouble([this.win],[size(this.in1,"*")],[this.N],[this.wpos.slice()],[this.wdim.slice()],[this.in1.slice()],[this.clrs.slice(1-1,sum(this.in1))]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[strcat(string(this.in1)," ")],[strcat(string(this.clrs)," ")],[string(this.win)],[sci2exp([])],[sci2exp([])],[strcat(string(this.ymin)," ")],[strcat(string(this.ymax)," ")],[strcat(string(this.per)," ")],[string(this.N)],[string(0)],[emptystr()]]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); @@ -140,7 +140,7 @@ function CMSCOPE() { this.clrs = this.clrs.slice(1-1,sum(this.in1)); var ipar = [[this.win],[size(this.in1,"*")],[this.N],[this.wpos.slice()],[this.wdim.slice()],[this.in1.slice()],[this.clrs.slice()],[this.heritance]]; this.model.evtin = new ScilabDouble([ones(1-this.heritance,1)]); - this.model.dstate = []; + this.model.dstate = new ScilabDouble([]); this.model.rpar = new ScilabDouble(rpar); this.model.ipar = new ScilabDouble(ipar); this.model.label = new ScilabDouble([this.nom]); diff --git a/js/Sinks/CSCOPE.js b/js/Sinks/CSCOPE.js index f5886c93..17b7c53a 100644 --- a/js/Sinks/CSCOPE.js +++ b/js/Sinks/CSCOPE.js @@ -17,7 +17,7 @@ function CSCOPE() { this.model.rpar = new ScilabDouble([0],[this.ymin],[this.ymax],[this.per]); this.model.ipar = new ScilabDouble([this.win],[1],[this.N],[this.clrs],[this.wpos],[this.wdim]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[strcat(string(this.clrs)," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.ymin)],[string(this.ymax)],[string(this.per)],[string(this.N)],[transpose(string(0))],[emptystr()]]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/Sinks/CSCOPXY.js b/js/Sinks/CSCOPXY.js index 3b6078d3..1f2e5dc0 100644 --- a/js/Sinks/CSCOPXY.js +++ b/js/Sinks/CSCOPXY.js @@ -21,7 +21,7 @@ function CSCOPXY() { this.model.rpar = new ScilabDouble([this.xmin],[this.xmax],[this.ymin],[this.ymax]); this.model.ipar = new ScilabDouble([this.win],[1],[this.N],[this.clrs],[this.siz],[1],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[string(this.nbr_curves)],[sci2exp(this.clrs)],[sci2exp(this.siz)],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.xmin)],[string(this.xmax)],[string(this.ymin)],[string(this.ymax)],[string(this.N)]]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/Sinks/CSCOPXY3D.js b/js/Sinks/CSCOPXY3D.js index 80f313d2..a0bca1af 100644 --- a/js/Sinks/CSCOPXY3D.js +++ b/js/Sinks/CSCOPXY3D.js @@ -21,7 +21,7 @@ function CSCOPXY3D() { this.model.rpar = new ScilabDouble([this.vec_x.slice()],[this.vec_y.slice()],[this.vec_z.slice()],[this.param3ds.slice()]); this.model.ipar = new ScilabDouble([this.win],[8],[this.N],[this.clrs.slice()],[this.siz.slice()],[8],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[string(this.nbr_curves)],[strcat(string(this.clrs)," ")],[strcat(string(this.siz)," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[strcat(string(this.vec_x)," ")],[strcat(string(this.vec_y)," ")],[strcat(string(this.vec_z)," ")],[strcat(string(this.param3ds)," ")],[string(this.N)]]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/Sinks/OUTIMPL_f.js b/js/Sinks/OUTIMPL_f.js index f7688fea..6201233a 100644 --- a/js/Sinks/OUTIMPL_f.js +++ b/js/Sinks/OUTIMPL_f.js @@ -2,13 +2,13 @@ function OUTIMPL_f() { OUTIMPL_f.prototype.define = function OUTIMPL_f() { this.model = scicos_model(); - this.model.in1 = [-1]; - this.model.in2 = [1]; + this.model.in1 = new ScilabDouble([-1]); + this.model.in2 = new ScilabDouble([1]); this.prt = 1; this.model.sim = new ScilabString(["outimpl"]); - this.model.ipar = [1]; + this.model.ipar = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var mo = modelica(); mo.model = "PORT"; mo.inputs = "n"; diff --git a/js/Sinks/OUT_f.js b/js/Sinks/OUT_f.js index ee146a61..271dc87e 100644 --- a/js/Sinks/OUT_f.js +++ b/js/Sinks/OUT_f.js @@ -10,7 +10,7 @@ function OUT_f() { this.model.intyp = new ScilabDouble([-1]); this.model.ipar = new ScilabDouble([this.prt]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = string(this.prt); var gr_i = []; this.x = standard_define([1,1],this.model,exprs,gr_i); diff --git a/js/Sinks/TOWS_c.js b/js/Sinks/TOWS_c.js index f7aa7b54..78d4a853 100644 --- a/js/Sinks/TOWS_c.js +++ b/js/Sinks/TOWS_c.js @@ -7,17 +7,17 @@ function TOWS_c() { this.herit = 0; this.model = scicos_model(); this.model.sim = list(new ScilabString(["tows_c"]), new ScilabDouble([4])); - this.model.in1 = [nu]; + this.model.in1 = new ScilabDouble([nu]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([-1]); - this.model.out = []; - this.model.evtin = [1]; - this.model.evtout = []; - this.model.rpar = []; + this.model.out = new ScilabDouble([]); + this.model.evtin = new ScilabDouble([1]); + this.model.evtout = new ScilabDouble([]); + this.model.rpar = new ScilabDouble([]); this.model.ipar = new ScilabDouble([this.nz],[length(this.varnam)],[transpose(this.ascii[this.varnam-1])]); this.model.blocktype = new ScilabString(["d"]); - this.model.firing = []; - this.model.dep_ut = [false,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([false,false]); var gr_i = []; var exprs = [[string(this.nz)],[string(this.varnam)],[string(this.herit)]]; this.x = standard_define([4,2],this.model,exprs,gr_i); diff --git a/js/Sinks/TRASH_f.js b/js/Sinks/TRASH_f.js index e36cee9d..b14fd735 100644 --- a/js/Sinks/TRASH_f.js +++ b/js/Sinks/TRASH_f.js @@ -7,7 +7,7 @@ function TRASH_f() { this.model.in1 = new ScilabDouble([in1]); this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = " "; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/Sinks/WFILE_f.js b/js/Sinks/WFILE_f.js index b6a2a5ec..f3a26efb 100644 --- a/js/Sinks/WFILE_f.js +++ b/js/Sinks/WFILE_f.js @@ -14,7 +14,7 @@ function WFILE_f() { this.model.dstate = new ScilabDouble([-1],[lunit],[zeros((nin+1)*this.N,1)]); this.model.ipar = new ScilabDouble([length(fname)],[length(frmt)],[0],[this.N],[this._str2code[fname-1]],[this._str2code[frmt-1]]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(this.in1)],[fname],[frmt],[string(this.N)]]; var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); @@ -95,7 +95,7 @@ function WFILE_f() { this.model.in1 = new ScilabDouble([nin]); this.model.dstate = new ScilabDouble(dstate); this.model.ipar = new ScilabDouble(ipar); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Sinks/WRITEAU_f.js b/js/Sinks/WRITEAU_f.js index 29f756ba..090fe131 100644 --- a/js/Sinks/WRITEAU_f.js +++ b/js/Sinks/WRITEAU_f.js @@ -15,7 +15,7 @@ function WRITEAU_f() { this.model.dstate = new ScilabDouble([-1],[lunit],[zeros((nin+1)*this.N,1)]); this.model.ipar = new ScilabDouble([length(fname)],[this._str2code[frmt-1]],[this.N],[this.swap],[this._str2code[fname-1]]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [string(this.N),string(this.swap)]; var gr_i = []; this.x = standard_define([4,2],this.model,exprs,gr_i); diff --git a/js/Sinks/WRITEC_f.js b/js/Sinks/WRITEC_f.js index 34ec1758..49986ca7 100644 --- a/js/Sinks/WRITEC_f.js +++ b/js/Sinks/WRITEC_f.js @@ -15,7 +15,7 @@ function WRITEC_f() { this.model.dstate = new ScilabDouble([-1],[lunit],[zeros((nin+1)*this.N,1)]); this.model.ipar = new ScilabDouble([length(fname)],[this._str2code[frmt-1]],[this.N],[this.swap],[this._str2code[fname-1]]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(this.in1)],[fname],[frmt],[string(this.N),string(this.swap)]]; var gr_i = []; this.x = standard_define([4,2],this.model,exprs,gr_i); diff --git a/js/Sources/CLKINV_f.js b/js/Sources/CLKINV_f.js index fe23a42a..649c7258 100644 --- a/js/Sources/CLKINV_f.js +++ b/js/Sources/CLKINV_f.js @@ -8,7 +8,7 @@ function CLKINV_f() { this.model.ipar = new ScilabDouble([this.prt]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = string(this.prt); var gr_i = []; this.x = standard_define([1,1],this.model,exprs,gr_i); diff --git a/js/Sources/CLKIN_f.js b/js/Sources/CLKIN_f.js index a4b5c636..8dec6a6a 100644 --- a/js/Sources/CLKIN_f.js +++ b/js/Sources/CLKIN_f.js @@ -8,7 +8,7 @@ function CLKIN_f() { this.model.ipar = new ScilabDouble([this.prt]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = string(this.prt); this.x = standard_define([1,1],this.model,exprs," "); return new BasicBlock(this.x); diff --git a/js/Sources/CONST.js b/js/Sources/CONST.js index 82b1795b..c6b97f93 100644 --- a/js/Sources/CONST.js +++ b/js/Sources/CONST.js @@ -4,11 +4,11 @@ function CONST() { this.C = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["cstblk4"]), new ScilabDouble([4])); - this.model.in1 = []; + this.model.in1 = new ScilabDouble([]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.C]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = strcat(sci2exp(this.C)); var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); @@ -40,7 +40,7 @@ function CONST() { } else if (and(sz>1)) { message("C matrix is not supported, use CONST_m instead"); } else { - this.model.rpar = this.C.slice(); + this.model.rpar = new ScilabDouble(this.C.slice()); this.model.out = new ScilabDouble([nout]); graphics.exprs = exprs; this.x.graphics = graphics; diff --git a/js/Sources/CONST_f.js b/js/Sources/CONST_f.js index cb76e0fb..5f7bd3f7 100644 --- a/js/Sources/CONST_f.js +++ b/js/Sources/CONST_f.js @@ -4,11 +4,11 @@ function CONST_f() { this.C = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["cstblk"]), new ScilabDouble([1])); - this.model.in1 = []; + this.model.in1 = new ScilabDouble([]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.C]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = strcat(sci2exp(this.C)); var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); @@ -37,7 +37,7 @@ function CONST_f() { if (nout==0) { message("C must have at least one element"); } else { - this.model.rpar = this.C.slice(); + this.model.rpar = new ScilabDouble(this.C.slice()); this.model.out = new ScilabDouble([nout]); graphics.exprs = exprs; this.x.graphics = graphics; diff --git a/js/Sources/CONST_m.js b/js/Sources/CONST_m.js index c2357e68..3305fcd1 100644 --- a/js/Sources/CONST_m.js +++ b/js/Sources/CONST_m.js @@ -4,14 +4,14 @@ function CONST_m() { this.C = [1]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["cstblk4"]), new ScilabDouble([4])); - this.model.in1 = []; + this.model.in1 = new ScilabDouble([]); this.model.out = new ScilabDouble([size(this.C,1)]); - this.model.in2 = []; + this.model.in2 = new ScilabDouble([]); this.model.out2 = new ScilabDouble([size(this.C,2)]); - this.model.rpar = this.C; + this.model.rpar = new ScilabDouble(this.C); this.model.opar = list(); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = sci2exp(this.C); var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); @@ -65,7 +65,7 @@ function CONST_m() { var ok = false; } if (ok) { - this.model.rpar = []; + this.model.rpar = new ScilabDouble([]); var tmpvar0 = set_io(this.model,graphics,list(),list(nout,ot),[],[]) this.model = tmpvar0[0] var graphics = tmpvar0[1] diff --git a/js/Sources/CURVE_c.js b/js/Sources/CURVE_c.js index 0076b715..7b67863e 100644 --- a/js/Sources/CURVE_c.js +++ b/js/Sources/CURVE_c.js @@ -9,12 +9,12 @@ function CURVE_c() { this.PeriodicOption = "y"; var Graf = "n"; this.model.sim = list(new ScilabString(["curve_c"]), new ScilabDouble([4])); - this.model.in1 = []; + this.model.in1 = new ScilabDouble([]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.xx.slice()],[this.yy.slice()]); this.model.ipar = new ScilabDouble([N],[this.Method],[1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); this.model.evtin = new ScilabDouble([1]); this.model.evtout = new ScilabDouble([1]); this.model.firing = new ScilabDouble([0]); diff --git a/js/Sources/CURV_f.js b/js/Sources/CURV_f.js index 7a64af1d..17889b60 100644 --- a/js/Sources/CURV_f.js +++ b/js/Sources/CURV_f.js @@ -9,12 +9,12 @@ function CURV_f() { var rpar = [[xx],[yy],[rect.slice()]]; this.model = scicos_model(); this.model.sim = new ScilabString(["intplt"]); - this.model.in1 = []; + this.model.in1 = new ScilabDouble([]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([xx],[yy],[rect.slice()]); this.model.ipar = new ScilabDouble([size(xx,1)],[axisdata.slice()]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); var gr_i = []; this.x = standard_define([2,2],this.model,[],gr_i); return new BasicBlock(this.x); @@ -58,7 +58,7 @@ function CURV_f() { } if (ok) { this.model.sim = new ScilabString(["intplt"]); - this.model.firing = []; + this.model.firing = new ScilabDouble([]); var rect = gc[1-1]; this.model.rpar = new ScilabDouble([xx.slice()],[yy.slice()],[rect.slice()]); var axisdata = gc[2-1]; diff --git a/js/Sources/Counter.js b/js/Sources/Counter.js index f159e9f9..d9461533 100644 --- a/js/Sources/Counter.js +++ b/js/Sources/Counter.js @@ -12,7 +12,7 @@ function Counter() { this.model.dstate = new ScilabDouble([0]); this.model.ipar = new ScilabDouble([this.rule],[this.maxim],[this.minim]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[string(this.minim)],[string(this.maxim)],[string(this.rule)]]; var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); diff --git a/js/Sources/FROMWS_c.js b/js/Sources/FROMWS_c.js index 24babc3c..5cf355cb 100644 --- a/js/Sources/FROMWS_c.js +++ b/js/Sources/FROMWS_c.js @@ -11,11 +11,11 @@ function FROMWS_c() { this.model.out2 = new ScilabDouble([-2]); this.model.outtyp = new ScilabDouble([-1]); this.model.ipar = new ScilabDouble([length(this.varnam)],[this._str2code[this.varnam-1]],[this.Method],[this.ZC],[this.OutEnd]); - this.model.evtin = [1]; - this.model.evtout = [1]; - this.model.firing = [0]; + this.model.evtin = new ScilabDouble([1]); + this.model.evtout = new ScilabDouble([1]); + this.model.firing = new ScilabDouble([0]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); var gr_i = []; var exprs = [[string(this.varnam)],[string(this.Method)],[string(this.ZC)],[string(this.OutEnd)]]; this.x = standard_define([3.5,2],this.model,exprs,gr_i); diff --git a/js/Sources/GENSIN_f.js b/js/Sources/GENSIN_f.js index ceece8f2..ed9ffb75 100644 --- a/js/Sources/GENSIN_f.js +++ b/js/Sources/GENSIN_f.js @@ -4,13 +4,13 @@ function GENSIN_f() { var rpar = [[1],[1],[0]]; this.model = scicos_model(); this.model.sim = new ScilabString(["gensin"]); - this.model.in1 = []; + this.model.in1 = new ScilabDouble([]); this.model.out = new ScilabDouble([1]); this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([1],[1],[0]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); var exprs = [[string(rpar[1-1])],[string(rpar[2-1])],[string(rpar[3-1])]]; var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); diff --git a/js/Sources/GENSQR_f.js b/js/Sources/GENSQR_f.js index 4c7bc406..83d9d48c 100644 --- a/js/Sources/GENSQR_f.js +++ b/js/Sources/GENSQR_f.js @@ -10,7 +10,7 @@ function GENSQR_f() { this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([this.Amplitude]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = string(this.Amplitude); var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); diff --git a/js/Sources/GEN_SQR.js b/js/Sources/GEN_SQR.js index 29b8af91..17d47993 100644 --- a/js/Sources/GEN_SQR.js +++ b/js/Sources/GEN_SQR.js @@ -20,23 +20,23 @@ function GEN_SQR() { scs_m_1.objs[16-1] = scicos_link(xx=[[48.313686],[48.229901]],yy=[[403.57431],[385.21998]],id="drawlink",thick=[0,0],ct=[5,-1],from=[15,1,0],to=[1,1,1]); this.model = scicos_model(); this.model.sim = new ScilabString(["csuper"]); - this.model.in1 = []; - this.model.in2 = []; + this.model.in1 = new ScilabDouble([]); + this.model.in2 = new ScilabDouble([]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); this.model.out2 = new ScilabDouble([-2]); this.model.outtyp = new ScilabDouble([-1]); - this.model.evtin = []; - this.model.evtout = []; - this.model.state = []; - this.model.dstate = []; + this.model.evtin = new ScilabDouble([]); + this.model.evtout = new ScilabDouble([]); + this.model.state = new ScilabDouble([]); + this.model.dstate = new ScilabDouble([]); this.model.odstate = list(); this.model.rpar = new ScilabDouble([scs_m_1]); this.model.ipar = new ScilabDouble([1]); this.model.opar = list(); this.model.blocktype = new ScilabString(["h"]); - this.model.firing = []; - this.model.dep_ut = [false,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([false,false]); this.model.label = new ScilabString([""]); this.model.nzcross = new ScilabDouble([0]); this.model.nmode = new ScilabDouble([0]); diff --git a/js/Sources/Ground_g.js b/js/Sources/Ground_g.js index 726a9fd1..98dfe03e 100644 --- a/js/Sources/Ground_g.js +++ b/js/Sources/Ground_g.js @@ -4,15 +4,15 @@ function Ground_g() { var C = [0]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["cstblk4_m"]), new ScilabDouble([4])); - this.model.in1 = []; + this.model.in1 = new ScilabDouble([]); this.model.out = new ScilabDouble([1]); - this.model.in2 = []; + this.model.in2 = new ScilabDouble([]); this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([-1]); - this.model.rpar = []; + this.model.rpar = new ScilabDouble([]); this.model.opar = list(C); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = []; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/Sources/INIMPL_f.js b/js/Sources/INIMPL_f.js index 5a5ce339..a74a358e 100644 --- a/js/Sources/INIMPL_f.js +++ b/js/Sources/INIMPL_f.js @@ -3,10 +3,10 @@ function INIMPL_f() { INIMPL_f.prototype.define = function INIMPL_f() { this.model = scicos_model(); this.model.sim = new ScilabString(["inimpl"]); - this.model.out = [-1]; - this.model.out2 = [1]; - this.model.ipar = [1]; - this.model.dep_ut = [false,false]; + this.model.out = new ScilabDouble([-1]); + this.model.out2 = new ScilabDouble([1]); + this.model.ipar = new ScilabDouble([1]); + this.model.dep_ut = new ScilabDouble([false,false]); this.model.blocktype = new ScilabString(["c"]); var mo = modelica(); mo.model = "PORT"; diff --git a/js/Sources/IN_f.js b/js/Sources/IN_f.js index d3779e21..35db0c40 100644 --- a/js/Sources/IN_f.js +++ b/js/Sources/IN_f.js @@ -9,7 +9,7 @@ function IN_f() { this.model.outtyp = new ScilabDouble([-1]); this.model.ipar = new ScilabDouble([prt]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = sci2exp(prt); var gr_i = []; this.x = standard_define([1,1],this.model,exprs,gr_i); @@ -57,7 +57,7 @@ function IN_f() { var y = needcompile; } this.model.ipar = new ScilabDouble([prt]); - this.model.firing = []; + this.model.firing = new ScilabDouble([]); this.model.out = new ScilabDouble([otsz[1-1]]); this.model.out2 = new ScilabDouble([otsz[2-1]]); this.model.outtyp = new ScilabDouble([ot]); diff --git a/js/Sources/Modulo_Count.js b/js/Sources/Modulo_Count.js index 258f4f04..fd47a64a 100644 --- a/js/Sources/Modulo_Count.js +++ b/js/Sources/Modulo_Count.js @@ -10,7 +10,7 @@ function Modulo_Count() { this.model.dstate = new ScilabDouble([this.ini_c]); this.model.ipar = new ScilabDouble([this.base]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[string(this.ini_c)],[string(this.base)]]; var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); diff --git a/js/Sources/PULSE_SC.js b/js/Sources/PULSE_SC.js index f0320ae3..5d571066 100644 --- a/js/Sources/PULSE_SC.js +++ b/js/Sources/PULSE_SC.js @@ -15,23 +15,23 @@ function PULSE_SC() { scs_m_1.objs[11-1] = scicos_link(xx=[[154.57795],[174.57795]],yy=[[206.09381],[206.09381]],id="drawlink",thick=[0,0],ct=[1,1],from=[3,1,0],to=[10,1,1]); this.model = scicos_model(); this.model.sim = new ScilabString(["csuper"]); - this.model.in1 = []; - this.model.in2 = []; + this.model.in1 = new ScilabDouble([]); + this.model.in2 = new ScilabDouble([]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); this.model.out2 = new ScilabDouble([-2]); this.model.outtyp = new ScilabDouble([-1]); - this.model.evtin = []; - this.model.evtout = []; - this.model.state = []; - this.model.dstate = []; + this.model.evtin = new ScilabDouble([]); + this.model.evtout = new ScilabDouble([]); + this.model.state = new ScilabDouble([]); + this.model.dstate = new ScilabDouble([]); this.model.odstate = list(); this.model.rpar = new ScilabDouble([scs_m_1]); this.model.ipar = new ScilabDouble([1]); this.model.opar = list(); this.model.blocktype = new ScilabString(["h"]); - this.model.firing = []; - this.model.dep_ut = [false,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([false,false]); this.model.label = new ScilabString([""]); this.model.nzcross = new ScilabDouble([0]); this.model.nmode = new ScilabDouble([0]); diff --git a/js/Sources/RAMP.js b/js/Sources/RAMP.js index 625556b1..25aa112e 100644 --- a/js/Sources/RAMP.js +++ b/js/Sources/RAMP.js @@ -7,13 +7,13 @@ function RAMP() { var rpar = [[this.slope],[this.stt],[this.iout]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["ramp"]), new ScilabDouble([4])); - this.model.in1 = []; + this.model.in1 = new ScilabDouble([]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); this.model.nmode = new ScilabDouble([1]); this.model.nzcross = new ScilabDouble([1]); - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); var exprs = [string(rpar)]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/Sources/RAND_f.js b/js/Sources/RAND_f.js index 0d01c76d..ec4d7b4c 100644 --- a/js/Sources/RAND_f.js +++ b/js/Sources/RAND_f.js @@ -14,7 +14,7 @@ function RAND_f() { this.model.rpar = new ScilabDouble([this.a.slice()],[this.b.slice()]); this.model.ipar = new ScilabDouble([this.flag]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[string(this.flag)],[sci2exp(this.a.slice())],[sci2exp(this.b.slice())],[string(this.model.dstate[1-1])]]; var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); diff --git a/js/Sources/RAND_m.js b/js/Sources/RAND_m.js index a874bdda..f25eacce 100644 --- a/js/Sources/RAND_m.js +++ b/js/Sources/RAND_m.js @@ -9,21 +9,21 @@ function RAND_m() { var funtyp = 4; this.model = scicos_model(); this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); - this.model.in1 = []; - this.model.in2 = []; - this.model.intyp = []; + this.model.in1 = new ScilabDouble([]); + this.model.in2 = new ScilabDouble([]); + this.model.intyp = new ScilabDouble([]); this.model.out = new ScilabDouble([1]); this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); - this.model.evtout = []; - this.model.state = []; + this.model.evtout = new ScilabDouble([]); + this.model.state = new ScilabDouble([]); this.model.dstate = new ScilabDouble([int(rand()*(10^7-1))],[0*this.a.slice()]); - this.model.rpar = [this.a.slice(),this.b.slice()]; + this.model.rpar = new ScilabDouble([this.a.slice(),this.b.slice()]); this.model.ipar = new ScilabDouble([this.flag]); this.model.blocktype = new ScilabString(["d"]); - this.model.firing = []; - this.model.dep_ut = [false,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[sci2exp(1)],[string(this.flag)],[sci2exp([this.a])],[sci2exp([this.b])],[sci2exp([this.model.dstate[1-1],int(rand()*(10^7-1))])]]; var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); diff --git a/js/Sources/READAU_f.js b/js/Sources/READAU_f.js index c8dc3476..efd42ea1 100644 --- a/js/Sources/READAU_f.js +++ b/js/Sources/READAU_f.js @@ -19,7 +19,7 @@ function READAU_f() { this.model.dstate = new ScilabDouble([1],[1],[lunit],[zeros(this.N*M,1)]); this.model.ipar = new ScilabDouble([length(fname)],[this._str2code[frmt-1]],[ievt],[this.N],[M],[this.swap],[offset],[this._str2code[fname-1]],[tmask],[outmask]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[fname],[string(this.N)],[string(this.swap)]]; var gr_i = []; this.x = standard_define([5,2],this.model,exprs,gr_i); diff --git a/js/Sources/READC_f.js b/js/Sources/READC_f.js index b7d8b64f..9dc47d51 100644 --- a/js/Sources/READC_f.js +++ b/js/Sources/READC_f.js @@ -18,12 +18,12 @@ function READC_f() { this.model.sim = list(new ScilabString(["readc"]), new ScilabDouble([2])); this.model.out = new ScilabDouble([nout]); this.model.evtin = new ScilabDouble([1]); - this.model.evtout = []; + this.model.evtout = new ScilabDouble([]); this.model.dstate = new ScilabDouble([1],[1],[lunit],[zeros(this.N*this.M,1)]); this.model.ipar = new ScilabDouble([length(fname)],[this._str2code[frmt-1]],[ievt],[this.N],[this.M],[this.swap],[this.offset],[this._str2code[fname-1]],[tmask],[this.outmask]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [["[]"],[sci2exp(this.outmask)],[fname],[frmt],[string(this.M)],[string(this.N)],[string(this.offset)],[string(this.swap)]]; var gr_i = []; this.x = standard_define([4,2],this.model,exprs,gr_i); diff --git a/js/Sources/RFILE_f.js b/js/Sources/RFILE_f.js index d16da3a0..5f94def6 100644 --- a/js/Sources/RFILE_f.js +++ b/js/Sources/RFILE_f.js @@ -19,7 +19,7 @@ function RFILE_f() { this.model.dstate = new ScilabDouble(dstate); this.model.ipar = new ScilabDouble([length(fname)],[length(frmt)],[0],[this.N],[this._str2code[fname-1]],[this._str2code[frmt-1]],[tmask],[this.outmask]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[sci2exp([])],[sci2exp(this.outmask)],[fname],[frmt],[string(this.N)],[sci2exp(out)]]; var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); @@ -103,7 +103,7 @@ function RFILE_f() { var ok = tmpvar0[2]; if (ok) { if (ievt==0) { - this.model.firing = []; + this.model.firing = new ScilabDouble([]); } else { this.model.firing = new ScilabDouble([0]); } diff --git a/js/Sources/SAWTOOTH_f.js b/js/Sources/SAWTOOTH_f.js index 97108a8c..4ba5e01c 100644 --- a/js/Sources/SAWTOOTH_f.js +++ b/js/Sources/SAWTOOTH_f.js @@ -7,7 +7,7 @@ function SAWTOOTH_f() { this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([0]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); var exprs = " "; var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); diff --git a/js/Sources/STEP.js b/js/Sources/STEP.js index a22157bc..0ff3980a 100644 --- a/js/Sources/STEP.js +++ b/js/Sources/STEP.js @@ -12,7 +12,7 @@ function STEP() { this.model.firing = new ScilabDouble([1]); this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[string(1)],[string(rpar)]]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/Sources/SampleCLK.js b/js/Sources/SampleCLK.js index d77bac58..f066d4b2 100644 --- a/js/Sources/SampleCLK.js +++ b/js/Sources/SampleCLK.js @@ -4,10 +4,10 @@ function SampleCLK() { this.model = scicos_model(); this.model.sim = new ScilabString(["sampleclk"]); this.model.evtout = new ScilabDouble([1]); - this.model.rpar = [1,0]; + this.model.rpar = new ScilabDouble([1,0]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[sci2exp(1)],[sci2exp(0)]]; this.x = standard_define([2,2],this.model,exprs," "); return new BasicBlock(this.x); diff --git a/js/Sources/TIME_f.js b/js/Sources/TIME_f.js index de546604..4c56f9aa 100644 --- a/js/Sources/TIME_f.js +++ b/js/Sources/TIME_f.js @@ -5,7 +5,7 @@ function TIME_f() { this.model.sim = new ScilabString(["timblk"]); this.model.out = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); var gr_i = []; this.x = standard_define([2,2],this.model,[],gr_i); return new BasicBlock(this.x); diff --git a/js/Sources/TKSCALE.js b/js/Sources/TKSCALE.js index c91d07a2..c5909fd1 100644 --- a/js/Sources/TKSCALE.js +++ b/js/Sources/TKSCALE.js @@ -10,7 +10,7 @@ function TKSCALE() { this.model.evtin = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.a],[this.b],[this.f]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[sci2exp(this.a)],[sci2exp(this.b)],[sci2exp(this.f)]]; var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); diff --git a/js/Threshold/GENERAL_f.js b/js/Threshold/GENERAL_f.js index 70e6177c..19d58b0f 100644 --- a/js/Threshold/GENERAL_f.js +++ b/js/Threshold/GENERAL_f.js @@ -12,7 +12,7 @@ function GENERAL_f() { this.model.rpar = new ScilabDouble([0],[0],[0],[0]); this.model.blocktype = new ScilabString(["z"]); this.model.firing = new ScilabDouble([-ones(this.out,1)]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[strcat(sci2exp(this.in1))],[strcat(sci2exp(this.out))]]; var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); @@ -59,7 +59,7 @@ function GENERAL_f() { if (result!=[]) { rp.slice(1-1,nout1).slice(1-1,2*n) = evstr(result); this.model.nzcross = new ScilabDouble([this.in1]); - this.model.rpar = rp.slice(); + this.model.rpar = new ScilabDouble(rp.slice()); this.model.firing = new ScilabDouble([-ones(this.out,1)]); graphics.exprs = exprs; this.x.graphics = graphics; diff --git a/js/Threshold/NEGTOPOS_f.js b/js/Threshold/NEGTOPOS_f.js index beea2612..50e5cdc3 100644 --- a/js/Threshold/NEGTOPOS_f.js +++ b/js/Threshold/NEGTOPOS_f.js @@ -9,7 +9,7 @@ function NEGTOPOS_f() { this.model.rpar = new ScilabDouble([-1],[-1],[0],[-1]); this.model.blocktype = new ScilabString(["z"]); this.model.firing = new ScilabDouble([-1]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var gr_i = []; this.x = standard_define([2,2],this.model,[],gr_i); return new BasicBlock(this.x); diff --git a/js/Threshold/POSTONEG_f.js b/js/Threshold/POSTONEG_f.js index c2cf96d8..ce173fac 100644 --- a/js/Threshold/POSTONEG_f.js +++ b/js/Threshold/POSTONEG_f.js @@ -9,8 +9,8 @@ function POSTONEG_f() { this.model.evtout = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([-1],[-1],[-1],[0]); this.model.blocktype = new ScilabString(["z"]); - this.model.dep_ut = [true,false]; - this.model.firing = [-1]; + this.model.dep_ut = new ScilabDouble([true,false]); + this.model.firing = new ScilabDouble([-1]); var gr_i = []; this.x = standard_define([2,2],this.model,[],gr_i); return new BasicBlock(this.x); diff --git a/js/Threshold/ZCROSS_f.js b/js/Threshold/ZCROSS_f.js index f31d3e0a..6879424a 100644 --- a/js/Threshold/ZCROSS_f.js +++ b/js/Threshold/ZCROSS_f.js @@ -11,7 +11,7 @@ function ZCROSS_f() { this.model.rpar = new ScilabDouble([-1],[-1],[0],[0]); this.model.blocktype = new ScilabString(["z"]); this.model.firing = new ScilabDouble([-1]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = strcat(sci2exp(this.in1)); var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); |