From 0047c3bea1d86b12a08544f6f0833c63e77f6eac Mon Sep 17 00:00:00 2001 From: Sunil Shetye Date: Wed, 11 Jul 2018 15:19:38 +0530 Subject: support vector also --- js/Branching/CLKFROM.js | 2 +- js/Branching/CLKGOTO.js | 2 +- js/Branching/CLKGotoTagVisibility.js | 12 ++++++------ js/Branching/DEMUX.js | 6 +++--- js/Branching/DEMUX_f.js | 6 +++--- js/Branching/ESELECT_f.js | 2 +- js/Branching/EXTRACTOR.js | 4 ++-- js/Branching/FROM.js | 8 ++++---- js/Branching/FROMMO.js | 8 ++++---- js/Branching/GOTO.js | 6 +++--- js/Branching/GOTOMO.js | 8 ++++---- js/Branching/GotoTagVisibility.js | 12 ++++++------ js/Branching/GotoTagVisibilityMO.js | 12 ++++++------ js/Branching/ISELECT_f.js | 2 +- js/Branching/ISELECT_m.js | 12 ++++++------ js/Branching/MUX.js | 4 ++-- js/Branching/MUX_f.js | 4 ++-- js/Branching/M_SWITCH.js | 2 +- js/Branching/NRMSOM_f.js | 2 +- js/Branching/RELAY_f.js | 4 ++-- js/Branching/SCALAR2VECTOR.js | 2 +- js/Branching/SELECT_f.js | 2 +- js/Branching/SELECT_m.js | 12 ++++++------ js/Branching/SWITCH2.js | 4 ++-- js/Branching/SWITCH2_m.js | 4 ++-- js/Branching/SWITCH_f.js | 4 ++-- 26 files changed, 73 insertions(+), 73 deletions(-) (limited to 'js/Branching') 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); -- cgit