diff options
Diffstat (limited to 'js')
205 files changed, 1002 insertions, 1002 deletions
diff --git a/js/Branching/CLKFROM.js b/js/Branching/CLKFROM.js index d94d654d..2b4ed4be 100644 --- a/js/Branching/CLKFROM.js +++ b/js/Branching/CLKFROM.js @@ -4,7 +4,7 @@ function CLKFROM() { this.model = scicos_model(); this.model.sim = new ScilabString("clkfrom"); this.model.evtout = new ScilabDouble(1); - this.model.opar = list("A"); + 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]; @@ -36,7 +36,7 @@ function CLKFROM() { needcompile = 4; y = needcompile; } - this.model.opar = list(this.tag); + this.model.opar = list(new ScilabDouble(this.tag)); this.model.evtout = new ScilabDouble(1); this.model.firing = new ScilabDouble(-1); graphics.exprs = exprs; diff --git a/js/Branching/CLKGOTO.js b/js/Branching/CLKGOTO.js index 481d8644..4fd32282 100644 --- a/js/Branching/CLKGOTO.js +++ b/js/Branching/CLKGOTO.js @@ -4,7 +4,7 @@ function CLKGOTO() { this.model = scicos_model(); this.model.sim = new ScilabString("clkgoto"); this.model.evtin = new ScilabDouble(1); - this.model.opar = list("A"); + this.model.opar = list(new ScilabString("A")); this.model.ipar = new ScilabDouble(int(1)); this.model.blocktype = new ScilabString("d"); this.model.firing = new ScilabDouble(-1); @@ -46,7 +46,7 @@ function CLKGOTO() { needcompile = 4; y = needcompile; } - this.model.opar = list(this.tag); + this.model.opar = list(new ScilabDouble(this.tag)); this.model.ipar = new ScilabDouble(this.tagvis); this.model.evtin = new ScilabDouble(1); this.model.firing = new ScilabDouble(-1); diff --git a/js/Branching/CLKGotoTagVisibility.js b/js/Branching/CLKGotoTagVisibility.js index 9b0f0b3a..620e53ef 100644 --- a/js/Branching/CLKGotoTagVisibility.js +++ b/js/Branching/CLKGotoTagVisibility.js @@ -10,7 +10,7 @@ function CLKGotoTagVisibility() { this.model.evtin = []; this.model.intyp = new ScilabDouble(1); this.model.outtyp = new ScilabDouble(1); - this.model.opar = list("A"); + 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]; @@ -45,7 +45,7 @@ function CLKGotoTagVisibility() { y = needcompile; } graphics.exprs = exprs; - this.model.opar = list(this.tag); + this.model.opar = list(new ScilabDouble(this.tag)); this.x.graphics = graphics; this.x.model = this.model; break; diff --git a/js/Branching/DEMUX.js b/js/Branching/DEMUX.js index ae6fcdd1..863ae9cf 100644 --- a/js/Branching/DEMUX.js +++ b/js/Branching/DEMUX.js @@ -3,7 +3,7 @@ function DEMUX() { DEMUX.prototype.define = function DEMUX() { this.out = 2; this.model = scicos_model(); - this.model.sim = list("multiplex",4); + 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.ipar = new ScilabDouble(this.out); diff --git a/js/Branching/DEMUX_f.js b/js/Branching/DEMUX_f.js index 425e2f90..526d0e0b 100644 --- a/js/Branching/DEMUX_f.js +++ b/js/Branching/DEMUX_f.js @@ -3,7 +3,7 @@ function DEMUX_f() { DEMUX_f.prototype.define = function DEMUX_f() { this.out = 2; this.model = scicos_model(); - this.model.sim = list("demux",1); + 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.ipar = new ScilabDouble(this.out); diff --git a/js/Branching/ESELECT_f.js b/js/Branching/ESELECT_f.js index 9f72fae2..c36e74b8 100644 --- a/js/Branching/ESELECT_f.js +++ b/js/Branching/ESELECT_f.js @@ -3,7 +3,7 @@ function ESELECT_f() { ESELECT_f.prototype.define = function ESELECT_f() { this.out = 2; this.model = scicos_model(); - this.model.sim = list("eselect",-2); + this.model.sim = list(new ScilabString("eselect"),new ScilabDouble(-2)); this.model.in1 = new ScilabDouble(1); this.model.in2 = new ScilabDouble(1); this.model.intyp = new ScilabDouble(-1); diff --git a/js/Branching/EXTRACTOR.js b/js/Branching/EXTRACTOR.js index c288817c..a5da89a1 100644 --- a/js/Branching/EXTRACTOR.js +++ b/js/Branching/EXTRACTOR.js @@ -3,7 +3,7 @@ function EXTRACTOR() { EXTRACTOR.prototype.define = function EXTRACTOR() { this.ind = 1; this.model = scicos_model(); - this.model.sim = list("extractor",4); + this.model.sim = list(new ScilabString("extractor"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(-1); this.model.out = new ScilabDouble(1); this.model.blocktype = new ScilabString("c"); diff --git a/js/Branching/FROM.js b/js/Branching/FROM.js index 0fd7db4b..d1781046 100644 --- a/js/Branching/FROM.js +++ b/js/Branching/FROM.js @@ -10,7 +10,7 @@ function FROM() { this.model.out2 = new ScilabDouble(-2); this.model.outtyp = new ScilabDouble(-1); this.model.ipar = []; - this.model.opar = list("A"); + this.model.opar = list(new ScilabString("A")); this.model.blocktype = new ScilabString("c"); this.model.dep_ut = [false,false]; exprs = ["A"]; @@ -45,7 +45,7 @@ function FROM() { y = needcompile; } graphics.exprs = exprs; - this.model.opar = list(this.tag); + this.model.opar = list(new ScilabDouble(this.tag)); this.x.model = this.model; this.x.graphics = graphics; break; diff --git a/js/Branching/FROMMO.js b/js/Branching/FROMMO.js index 0995e5cc..afb0b62d 100644 --- a/js/Branching/FROMMO.js +++ b/js/Branching/FROMMO.js @@ -10,7 +10,7 @@ function FROMMO() { this.model.out2 = new ScilabDouble(-2); this.model.outtyp = new ScilabDouble(-1); this.model.ipar = []; - this.model.opar = list("A"); + this.model.opar = list(new ScilabString("A")); this.model.blocktype = new ScilabString("c"); this.model.dep_ut = [false,false]; mo = modelica(); @@ -48,7 +48,7 @@ function FROMMO() { y = needcompile; } graphics.exprs = exprs; - this.model.opar = list(this.tag); + this.model.opar = list(new ScilabDouble(this.tag)); this.x.model = this.model; this.x.graphics = graphics; break; diff --git a/js/Branching/GOTO.js b/js/Branching/GOTO.js index 9c9bca66..bc5c0245 100644 --- a/js/Branching/GOTO.js +++ b/js/Branching/GOTO.js @@ -10,7 +10,7 @@ function GOTO() { this.model.out2 = []; this.model.outtyp = new ScilabDouble(1); this.model.ipar = new ScilabDouble(int(1)); - this.model.opar = list("A"); + this.model.opar = list(new ScilabString("A")); this.model.blocktype = new ScilabString("c"); this.model.dep_ut = [false,false]; exprs = [["A"],[sci2exp(1)]]; @@ -52,7 +52,7 @@ function GOTO() { y = needcompile; } graphics.exprs = exprs; - this.model.opar = list(this.tag); + this.model.opar = list(new ScilabDouble(this.tag)); this.model.ipar = new ScilabDouble(this.tagvis); this.x.model = this.model; this.x.graphics = graphics; diff --git a/js/Branching/GOTOMO.js b/js/Branching/GOTOMO.js index 922112c4..bd12f72e 100644 --- a/js/Branching/GOTOMO.js +++ b/js/Branching/GOTOMO.js @@ -10,7 +10,7 @@ function GOTOMO() { this.model.out2 = []; this.model.outtyp = new ScilabDouble(1); this.model.ipar = new ScilabDouble(int(1)); - this.model.opar = list("A"); + this.model.opar = list(new ScilabString("A")); this.model.blocktype = new ScilabString("c"); this.model.dep_ut = [false,false]; mo = modelica(); @@ -55,7 +55,7 @@ function GOTOMO() { y = needcompile; } graphics.exprs = exprs; - this.model.opar = list(this.tag); + this.model.opar = list(new ScilabDouble(this.tag)); this.model.ipar = new ScilabDouble(this.tagvis); this.x.model = this.model; this.x.graphics = graphics; diff --git a/js/Branching/GotoTagVisibility.js b/js/Branching/GotoTagVisibility.js index 491bec8d..d568b4b6 100644 --- a/js/Branching/GotoTagVisibility.js +++ b/js/Branching/GotoTagVisibility.js @@ -10,7 +10,7 @@ function GotoTagVisibility() { this.model.evtin = []; this.model.intyp = new ScilabDouble(1); this.model.outtyp = new ScilabDouble(1); - this.model.opar = list("A"); + 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]; @@ -45,7 +45,7 @@ function GotoTagVisibility() { y = needcompile; } graphics.exprs = exprs; - this.model.opar = list(this.tag); + this.model.opar = list(new ScilabDouble(this.tag)); this.x.graphics = graphics; this.x.model = this.model; break; diff --git a/js/Branching/GotoTagVisibilityMO.js b/js/Branching/GotoTagVisibilityMO.js index bd510468..942512e3 100644 --- a/js/Branching/GotoTagVisibilityMO.js +++ b/js/Branching/GotoTagVisibilityMO.js @@ -10,7 +10,7 @@ function GotoTagVisibilityMO() { this.model.evtin = []; this.model.intyp = new ScilabDouble(1); this.model.outtyp = new ScilabDouble(1); - this.model.opar = list("A"); + 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]; @@ -45,7 +45,7 @@ function GotoTagVisibilityMO() { y = needcompile; } graphics.exprs = exprs; - this.model.opar = list(this.tag); + this.model.opar = list(new ScilabDouble(this.tag)); this.x.graphics = graphics; this.x.model = this.model; break; diff --git a/js/Branching/ISELECT_f.js b/js/Branching/ISELECT_f.js index 1d953eed..df715ba5 100644 --- a/js/Branching/ISELECT_f.js +++ b/js/Branching/ISELECT_f.js @@ -5,7 +5,7 @@ function ISELECT_f() { out = [[-1],[-1]]; this.nout = 2; this.model = scicos_model(); - this.model.sim = list("selector",2); + this.model.sim = list(new ScilabString("selector"),new ScilabDouble(2)); this.model.in1 = new ScilabDouble(-1); this.model.out = out; this.model.evtin = new ScilabDouble(ones(out)); diff --git a/js/Branching/ISELECT_m.js b/js/Branching/ISELECT_m.js index 4a7a7852..fbdac6f1 100644 --- a/js/Branching/ISELECT_m.js +++ b/js/Branching/ISELECT_m.js @@ -4,7 +4,7 @@ function ISELECT_m() { this.z0 = 1; this.nout = 2; this.model = scicos_model(); - this.model.sim = list("selector_m",4); + this.model.sim = list(new ScilabString("selector_m"),new ScilabDouble(4)); this.model.out = [[-1],[-1]]; this.model.out2 = [[-2],[-2]]; this.model.outtyp = new ScilabDouble(1); diff --git a/js/Branching/MUX.js b/js/Branching/MUX.js index 9c2fe761..72b2a620 100644 --- a/js/Branching/MUX.js +++ b/js/Branching/MUX.js @@ -3,7 +3,7 @@ function MUX() { MUX.prototype.define = function MUX() { this.in1 = 2; this.model = scicos_model(); - this.model.sim = list("multiplex",4); + this.model.sim = list(new ScilabString("multiplex"),new ScilabDouble(4)); this.model.in1 = -transpose([1:this.in1]); this.model.out = new ScilabDouble(0); this.model.ipar = new ScilabDouble(this.in1); diff --git a/js/Branching/MUX_f.js b/js/Branching/MUX_f.js index 389b6e64..c157b922 100644 --- a/js/Branching/MUX_f.js +++ b/js/Branching/MUX_f.js @@ -3,7 +3,7 @@ function MUX_f() { MUX_f.prototype.define = function MUX_f() { this.in1 = 2; this.model = scicos_model(); - this.model.sim = list("mux",1); + this.model.sim = list(new ScilabString("mux"),new ScilabDouble(1)); this.model.in1 = -transpose([1:this.in1]); this.model.out = new ScilabDouble(0); this.model.ipar = new ScilabDouble(this.in1); diff --git a/js/Branching/M_SWITCH.js b/js/Branching/M_SWITCH.js index dc5690e8..2bd2cec7 100644 --- a/js/Branching/M_SWITCH.js +++ b/js/Branching/M_SWITCH.js @@ -5,7 +5,7 @@ function M_SWITCH() { ipar = [[1],[3]]; this.nin = 2; this.model = scicos_model(); - this.model.sim = list("mswitch",4); + this.model.sim = list(new ScilabString("mswitch"),new ScilabDouble(4)); this.model.in1 = in1; this.model.out = new ScilabDouble(-1); this.model.ipar = ipar; diff --git a/js/Branching/RELAY_f.js b/js/Branching/RELAY_f.js index f6e7f407..8dbc9e77 100644 --- a/js/Branching/RELAY_f.js +++ b/js/Branching/RELAY_f.js @@ -5,7 +5,7 @@ function RELAY_f() { in1 = [[-1],[-1]]; this.nin = 2; this.model = scicos_model(); - this.model.sim = list("relay",2); + this.model.sim = list(new ScilabString("relay"),new ScilabDouble(2)); this.model.in1 = in1; this.model.out = new ScilabDouble(-1); this.model.evtin = new ScilabDouble(ones(in1)); diff --git a/js/Branching/SCALAR2VECTOR.js b/js/Branching/SCALAR2VECTOR.js index 60ef0c64..6c2bcecf 100644 --- a/js/Branching/SCALAR2VECTOR.js +++ b/js/Branching/SCALAR2VECTOR.js @@ -3,7 +3,7 @@ function SCALAR2VECTOR() { SCALAR2VECTOR.prototype.define = function SCALAR2VECTOR() { this.nout = -1; this.model = scicos_model(); - this.model.sim = list("scalar2vector",4); + this.model.sim = list(new ScilabString("scalar2vector"),new ScilabDouble(4)); this.model.out = new ScilabDouble(this.nout); this.model.in1 = new ScilabDouble(1); this.model.blocktype = new ScilabString("c"); diff --git a/js/Branching/SELECT_f.js b/js/Branching/SELECT_f.js index 9ccb7401..1881f9e8 100644 --- a/js/Branching/SELECT_f.js +++ b/js/Branching/SELECT_f.js @@ -5,7 +5,7 @@ function SELECT_f() { in1 = [[-1],[-1]]; this.nin = 2; this.model = scicos_model(); - this.model.sim = list("selector",2); + this.model.sim = list(new ScilabString("selector"),new ScilabDouble(2)); this.model.in1 = in1; this.model.out = new ScilabDouble(-1); this.model.evtin = new ScilabDouble(ones(in1)); diff --git a/js/Branching/SELECT_m.js b/js/Branching/SELECT_m.js index df5efac0..80cfda5f 100644 --- a/js/Branching/SELECT_m.js +++ b/js/Branching/SELECT_m.js @@ -4,7 +4,7 @@ function SELECT_m() { this.z0 = 1; this.nin = 2; this.model = scicos_model(); - this.model.sim = list("selector_m",4); + this.model.sim = list(new ScilabString("selector_m"),new ScilabDouble(4)); this.model.in1 = [[-1],[-1]]; this.model.in2 = [[-2],[-2]]; this.model.intyp = new ScilabDouble(1); diff --git a/js/Branching/SWITCH2.js b/js/Branching/SWITCH2.js index d493aba9..5029e43f 100644 --- a/js/Branching/SWITCH2.js +++ b/js/Branching/SWITCH2.js @@ -6,7 +6,7 @@ function SWITCH2() { this.nzz = 1; rpar = 0; this.model = scicos_model(); - this.model.sim = list("switch2",4); + this.model.sim = list(new ScilabString("switch2"),new ScilabDouble(4)); this.model.in1 = in1; this.model.out = new ScilabDouble(-1); this.model.ipar = ipar; diff --git a/js/Branching/SWITCH2_m.js b/js/Branching/SWITCH2_m.js index b43d42fd..080c3d90 100644 --- a/js/Branching/SWITCH2_m.js +++ b/js/Branching/SWITCH2_m.js @@ -5,7 +5,7 @@ function SWITCH2_m() { this.nzz = 1; rpar = 0; this.model = scicos_model(); - this.model.sim = list("switch2_m",4); + this.model.sim = list(new ScilabString("switch2_m"),new ScilabDouble(4)); this.model.in1 = [[-1],[1],[-1]]; this.model.in2 = [[-2],[1],[-2]]; this.model.intyp = new ScilabDouble(1); diff --git a/js/Branching/SWITCH_f.js b/js/Branching/SWITCH_f.js index 3e3a58c5..d139589b 100644 --- a/js/Branching/SWITCH_f.js +++ b/js/Branching/SWITCH_f.js @@ -5,7 +5,7 @@ function SWITCH_f() { in1 = [[-1],[-1]]; this.nin = 2; this.model = scicos_model(); - this.model.sim = list("switchn",2); + this.model.sim = list(new ScilabString("switchn"),new ScilabDouble(2)); this.model.in1 = in1; this.model.out = new ScilabDouble(-1); this.model.ipar = new ScilabDouble(i0); diff --git a/js/Electrical/Capacitor.js b/js/Electrical/Capacitor.js index 50314eeb..8096f50d 100644 --- a/js/Electrical/Capacitor.js +++ b/js/Electrical/Capacitor.js @@ -46,7 +46,7 @@ function Capacitor() { break; } this.model.rpar = new ScilabDouble(this.C); - this.model.equations.parameters[('2', 'double')] = list(this.C,this.v); + this.model.equations.parameters[2] = list(new ScilabDouble(this.C),new ScilabDouble(this.v)); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Electrical/Capacitor.pickle b/js/Electrical/Capacitor.pickle index 2696f9fb..7c4bbd09 100644 --- a/js/Electrical/Capacitor.pickle +++ b/js/Electrical/Capacitor.pickle @@ -33,9 +33,9 @@ p8 sS'model.in1' p9 g8 -sS'exprs' +sS'x.graphics' p10 -g5 +g2 sS'mo.inputs' p11 g5 @@ -56,36 +56,36 @@ g8 sS'model.equations' p18 g8 -sS'mo.outputs' +sS'model.equations.parameters[2]' p19 +g15 +sS'mo.outputs' +p20 g5 sS'x.graphics.out_implicit' -p20 +p21 g13 sS'model.rpar' -p21 -S'matrix' p22 -sS'graphics.exprs' +S'matrix' p23 -NsS'typ' +sS'graphics.exprs' p24 +NsS'typ' +p25 g13 sS'model.blocktype' -p25 +p26 g5 sS'mo' -p26 -g2 -sS'x.graphics' p27 g2 sS'model.dep_ut' p28 g13 -sS"model.equations.parameters[('2', 'double')]" +sS'exprs' p29 -g15 +g5 sS'gr_i' p30 g13 diff --git a/js/Electrical/ConstantVoltage.js b/js/Electrical/ConstantVoltage.js index cd1c4d24..ab61e88f 100644 --- a/js/Electrical/ConstantVoltage.js +++ b/js/Electrical/ConstantVoltage.js @@ -42,7 +42,7 @@ function ConstantVoltage() { break; } this.model.rpar = new ScilabDouble(this.V); - this.model.equations.parameters[('2', 'double')] = list(this.V); + this.model.equations.parameters[2] = list(new ScilabDouble(this.V)); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Electrical/ConstantVoltage.pickle b/js/Electrical/ConstantVoltage.pickle index 7e8e6a7b..61da6484 100644 --- a/js/Electrical/ConstantVoltage.pickle +++ b/js/Electrical/ConstantVoltage.pickle @@ -30,9 +30,9 @@ p8 sS'model.in1' p9 g8 -sS'exprs' +sS'x.graphics' p10 -g5 +g2 sS'mo.inputs' p11 g5 @@ -50,39 +50,39 @@ g5 sS'model.equations' p17 g8 -sS'mo.outputs' +sS'model.equations.parameters[2]' p18 +g15 +sS'mo.outputs' +p19 g5 sS'x.graphics.out_implicit' -p19 +p20 g13 sS'model.rpar' -p20 +p21 g8 sS'V' -p21 +p22 g8 sS'typ' -p22 +p23 g13 sS'graphics' -p23 +p24 g2 sS'model.blocktype' -p24 +p25 g5 sS'mo' -p25 -g8 -sS'x.graphics' p26 -g2 +g8 sS'model.dep_ut' p27 g13 -sS"model.equations.parameters[('2', 'double')]" +sS'exprs' p28 -g15 +g5 sS'gr_i' p29 g13 diff --git a/js/Electrical/Inductor.js b/js/Electrical/Inductor.js index 545ff3b0..86ad7fbb 100644 --- a/js/Electrical/Inductor.js +++ b/js/Electrical/Inductor.js @@ -42,7 +42,7 @@ function Inductor() { break; } this.model.rpar = new ScilabDouble(this.L); - this.model.equations.parameters[('2', 'double')] = list(this.L); + this.model.equations.parameters[2] = list(new ScilabDouble(this.L)); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Electrical/Inductor.pickle b/js/Electrical/Inductor.pickle index 4e548cd4..7ae983ab 100644 --- a/js/Electrical/Inductor.pickle +++ b/js/Electrical/Inductor.pickle @@ -31,9 +31,9 @@ p8 sS'model.in1' p9 g8 -sS'exprs' +sS'x.graphics' p10 -g5 +g2 sS'mo.inputs' p11 g5 @@ -51,38 +51,38 @@ sS'model.equations' p16 S'double' p17 -sS'mo.outputs' +sS'model.equations.parameters[2]' p18 +g14 +sS'mo.outputs' +p19 g5 sS'x.graphics.out_implicit' -p19 +p20 g8 sS'L' -p20 +p21 g17 sS'model.rpar' -p21 +p22 g17 sS'graphics.exprs' -p22 -NsS'typ' p23 +NsS'typ' +p24 g8 sS'model.blocktype' -p24 +p25 g5 sS'mo' -p25 -g17 -sS'x.graphics' p26 -g2 +g17 sS'model.dep_ut' p27 g8 -sS"model.equations.parameters[('2', 'double')]" +sS'exprs' p28 -g14 +g5 sS'gr_i' p29 g8 diff --git a/js/Electrical/NMOS.js b/js/Electrical/NMOS.js index a85923f3..1ed6e464 100644 --- a/js/Electrical/NMOS.js +++ b/js/Electrical/NMOS.js @@ -65,7 +65,7 @@ function NMOS() { if (!ok) { break; } - this.model.equations.parameters[('2', 'double')] = list(this.W,this.L,this.Beta,this.Vt,this.K2,this.K5,this.dW,this.dL,this.RDS); + this.model.equations.parameters[2] = list(new ScilabDouble(this.W),new ScilabDouble(this.L),new ScilabDouble(this.Beta),new ScilabDouble(this.Vt),new ScilabDouble(this.K2),new ScilabDouble(this.K5),new ScilabDouble(this.dW),new ScilabDouble(this.dL),new ScilabDouble(this.RDS)); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Electrical/NMOS.pickle b/js/Electrical/NMOS.pickle index af7c5f1a..92dc0817 100644 --- a/js/Electrical/NMOS.pickle +++ b/js/Electrical/NMOS.pickle @@ -53,80 +53,80 @@ g7 sS'model.in1' p11 g7 -sS'exprs' +sS'x.graphics' p12 -S'matrix' -p13 +g2 sS'mo.inputs' -p14 +p13 g5 sS'Beta' -p15 +p14 g7 sS'x.graphics.in_implicit' -p16 +p15 S'vector' -p17 +p16 sS'mo.parameters' -p18 +p17 S'list' -p19 +p18 sS'model.sim' -p20 +p19 g5 sS'model.equations' -p21 +p20 g7 sS'RDS' -p22 +p21 g7 +sS'model.equations.parameters[2]' +p22 +g18 sS'mo.outputs' p23 -g13 -sS'x.graphics.out_implicit' +S'matrix' p24 -g13 -sS'L' +sS'x.graphics.out_implicit' p25 +g24 +sS'L' +p26 g7 sS'W' -p26 +p27 g7 sS'graphics.exprs' -p27 -NsS'typ' p28 -g17 -sS'dW' +NsS'typ' p29 +g16 +sS'dW' +p30 g7 sS'dL' -p30 +p31 g7 sS'model.blocktype' -p31 +p32 g5 sS'mo' -p32 -g2 -sS'x.graphics' p33 g2 sS'model.dep_ut' p34 -g17 -sS"model.equations.parameters[('2', 'double')]" +g16 +sS'exprs' p35 -g19 +g24 sS'gr_i' p36 -g17 +g16 sS'Vt' p37 g7 sS'y' p38 -g17 +g16 sS'x' p39 g7 diff --git a/js/Electrical/OpAmp.js b/js/Electrical/OpAmp.js index 00935c08..630e5f77 100644 --- a/js/Electrical/OpAmp.js +++ b/js/Electrical/OpAmp.js @@ -47,7 +47,7 @@ function OpAmp() { if (!ok) { break; } - this.model.equations.parameters[('2', 'double')] = list(this.OLGain,this.SatH,this.SatL); + this.model.equations.parameters[2] = list(new ScilabDouble(this.OLGain),new ScilabDouble(this.SatH),new ScilabDouble(this.SatL)); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Electrical/OpAmp.pickle b/js/Electrical/OpAmp.pickle index f88b9204..32c77948 100644 --- a/js/Electrical/OpAmp.pickle +++ b/js/Electrical/OpAmp.pickle @@ -35,9 +35,9 @@ p8 sS'model.in1' p9 g8 -sS'exprs' +sS'x.graphics' p10 -g5 +g2 sS'mo.inputs' p11 S'matrix' @@ -55,48 +55,48 @@ g5 sS'model.equations' p17 g8 -sS'mo.outputs' +sS'model.equations.parameters[2]' p18 -S'vector' +g15 +sS'mo.outputs' p19 -sS'x.graphics.out_implicit' +S'vector' p20 -g19 -sS'model.rpar' +sS'x.graphics.out_implicit' p21 -g19 -sS'S' +g20 +sS'model.rpar' p22 -g19 -sS'graphics.exprs' +g20 +sS'S' p23 -NsS'Z' +g20 +sS'graphics.exprs' p24 -g19 -sS'typ' +NsS'Z' p25 -g19 -sS'model.blocktype' +g20 +sS'typ' p26 +g20 +sS'model.blocktype' +p27 g5 sS'mo' -p27 -g2 -sS'x.graphics' p28 g2 sS'model.dep_ut' p29 -g19 -sS"model.equations.parameters[('2', 'double')]" +g20 +sS'exprs' p30 -g15 +g5 sS'gr_i' p31 -g19 +g20 sS'y' p32 -g19 +g20 sS'x' p33 g8 diff --git a/js/Electrical/PMOS.js b/js/Electrical/PMOS.js index 077514cd..551367d6 100644 --- a/js/Electrical/PMOS.js +++ b/js/Electrical/PMOS.js @@ -65,7 +65,7 @@ function PMOS() { if (!ok) { break; } - this.model.equations.parameters[('2', 'double')] = list(this.W,this.L,this.Beta,this.Vt,this.K2,this.K5,this.dW,this.dL,this.RDS); + this.model.equations.parameters[2] = list(new ScilabDouble(this.W),new ScilabDouble(this.L),new ScilabDouble(this.Beta),new ScilabDouble(this.Vt),new ScilabDouble(this.K2),new ScilabDouble(this.K5),new ScilabDouble(this.dW),new ScilabDouble(this.dL),new ScilabDouble(this.RDS)); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Electrical/PMOS.pickle b/js/Electrical/PMOS.pickle index af7c5f1a..92dc0817 100644 --- a/js/Electrical/PMOS.pickle +++ b/js/Electrical/PMOS.pickle @@ -53,80 +53,80 @@ g7 sS'model.in1' p11 g7 -sS'exprs' +sS'x.graphics' p12 -S'matrix' -p13 +g2 sS'mo.inputs' -p14 +p13 g5 sS'Beta' -p15 +p14 g7 sS'x.graphics.in_implicit' -p16 +p15 S'vector' -p17 +p16 sS'mo.parameters' -p18 +p17 S'list' -p19 +p18 sS'model.sim' -p20 +p19 g5 sS'model.equations' -p21 +p20 g7 sS'RDS' -p22 +p21 g7 +sS'model.equations.parameters[2]' +p22 +g18 sS'mo.outputs' p23 -g13 -sS'x.graphics.out_implicit' +S'matrix' p24 -g13 -sS'L' +sS'x.graphics.out_implicit' p25 +g24 +sS'L' +p26 g7 sS'W' -p26 +p27 g7 sS'graphics.exprs' -p27 -NsS'typ' p28 -g17 -sS'dW' +NsS'typ' p29 +g16 +sS'dW' +p30 g7 sS'dL' -p30 +p31 g7 sS'model.blocktype' -p31 +p32 g5 sS'mo' -p32 -g2 -sS'x.graphics' p33 g2 sS'model.dep_ut' p34 -g17 -sS"model.equations.parameters[('2', 'double')]" +g16 +sS'exprs' p35 -g19 +g24 sS'gr_i' p36 -g17 +g16 sS'Vt' p37 g7 sS'y' p38 -g17 +g16 sS'x' p39 g7 diff --git a/js/Electrical/Resistor.js b/js/Electrical/Resistor.js index b1e2354c..3cdf9f1f 100644 --- a/js/Electrical/Resistor.js +++ b/js/Electrical/Resistor.js @@ -42,7 +42,7 @@ function Resistor() { break; } this.model.rpar = new ScilabDouble(this.R); - this.model.equations.parameters[('2', 'double')] = list(this.R); + this.model.equations.parameters[2] = list(new ScilabDouble(this.R)); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Electrical/Resistor.pickle b/js/Electrical/Resistor.pickle index fffa69db..6b547a6b 100644 --- a/js/Electrical/Resistor.pickle +++ b/js/Electrical/Resistor.pickle @@ -31,9 +31,9 @@ p8 sS'model.in1' p9 g8 -sS'exprs' +sS'x.graphics' p10 -g5 +g2 sS'mo.inputs' p11 g5 @@ -51,38 +51,38 @@ g5 sS'model.equations' p17 g8 -sS'mo.outputs' +sS'model.equations.parameters[2]' p18 +g15 +sS'mo.outputs' +p19 g5 sS'x.graphics.out_implicit' -p19 +p20 g13 sS'model.rpar' -p20 +p21 g8 sS'R' -p21 +p22 g8 sS'graphics.exprs' -p22 -NsS'typ' p23 +NsS'typ' +p24 g13 sS'model.blocktype' -p24 +p25 g5 sS'mo' -p25 -g2 -sS'x.graphics' p26 g2 sS'model.dep_ut' p27 g13 -sS"model.equations.parameters[('2', 'double')]" +sS'exprs' p28 -g15 +g5 sS'gr_i' p29 g13 diff --git a/js/Electrical/SineVoltage.js b/js/Electrical/SineVoltage.js index 4b6f5c2b..acf54cb3 100644 --- a/js/Electrical/SineVoltage.js +++ b/js/Electrical/SineVoltage.js @@ -55,7 +55,7 @@ function SineVoltage() { break; } this.model.rpar = [[this.V],[this.ph],[this.frq],[this.offset],[this.start]]; - this.model.equations.parameters[('2', 'double')] = list(this.V,this.ph,this.frq,this.offset,this.start); + this.model.equations.parameters[2] = list(new ScilabDouble(this.V),new ScilabDouble(this.ph),new ScilabDouble(this.frq),new ScilabDouble(this.offset),new ScilabDouble(this.start)); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Electrical/SineVoltage.pickle b/js/Electrical/SineVoltage.pickle index 4024e82e..43dfea75 100644 --- a/js/Electrical/SineVoltage.pickle +++ b/js/Electrical/SineVoltage.pickle @@ -40,38 +40,40 @@ p9 sS'model.in1' p10 g9 -sS'exprs' +sS'x.graphics' p11 -S'matrix' -p12 +g2 sS'mo.inputs' -p13 +p12 g6 sS'start' -p14 +p13 g4 sS'frq' -p15 +p14 g4 sS'x.graphics.in_implicit' -p16 +p15 g9 sS'ph' -p17 +p16 g4 sS'mo.parameters' -p18 +p17 S'list' -p19 +p18 sS'model.sim' -p20 +p19 g6 sS'V' -p21 +p20 g4 sS'model.equations' -p22 +p21 g4 +sS'model.equations.parameters[2]' +p22 +g18 sS'mo.outputs' p23 g6 @@ -80,27 +82,25 @@ p24 g9 sS'model.rpar' p25 -g12 -sS'graphics.exprs' +S'matrix' p26 -NsS'typ' +sS'graphics.exprs' p27 +NsS'typ' +p28 g9 sS'model.blocktype' -p28 +p29 g6 sS'graphics' -p29 -g2 -sS'x.graphics' p30 g2 sS'model.dep_ut' p31 g9 -sS"model.equations.parameters[('2', 'double')]" +sS'exprs' p32 -g19 +g26 sS'gr_i' p33 g9 diff --git a/js/Electrical/Switch.js b/js/Electrical/Switch.js index 3eafb101..524b91d6 100644 --- a/js/Electrical/Switch.js +++ b/js/Electrical/Switch.js @@ -47,7 +47,7 @@ function Switch() { if (!ok) { break; } - this.model.equations.parameters[('2', 'double')] = list(this.Ron,this.Roff); + this.model.equations.parameters[2] = list(new ScilabDouble(this.Ron),new ScilabDouble(this.Roff)); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Electrical/Switch.pickle b/js/Electrical/Switch.pickle index d9d650a9..c5cb0a1a 100644 --- a/js/Electrical/Switch.pickle +++ b/js/Electrical/Switch.pickle @@ -33,9 +33,9 @@ p8 sS'model.in1' p9 g8 -sS'exprs' +sS'x.graphics' p10 -g5 +g2 sS'mo.inputs' p11 S'matrix' @@ -53,54 +53,54 @@ g5 sS'model.equations' p17 g8 -sS'mo.outputs' +sS'model.equations.parameters[2]' p18 +g15 +sS'mo.outputs' +p19 g5 sS'x.graphics.out_implicit' -p19 -S'vector' p20 -sS'model.rpar' +S'vector' p21 +sS'model.rpar' +p22 g8 sS'S' -p22 +p23 g12 sS'graphics.exprs' -p23 -NsS'Z' p24 +NsS'Z' +p25 g8 sS'typ' -p25 -g20 -sS'model.blocktype' p26 +g21 +sS'model.blocktype' +p27 g5 sS'Roff' -p27 +p28 g8 sS'Ron' -p28 +p29 g8 sS'mo' -p29 -g2 -sS'x.graphics' p30 g2 sS'model.dep_ut' p31 -g20 -sS"model.equations.parameters[('2', 'double')]" +g21 +sS'exprs' p32 -g15 +g5 sS'gr_i' p33 -g20 +g21 sS'y' p34 -g20 +g21 sS'x' p35 g8 diff --git a/js/Electrical/VVsourceAC.js b/js/Electrical/VVsourceAC.js index d693c9e1..bbe4a54e 100644 --- a/js/Electrical/VVsourceAC.js +++ b/js/Electrical/VVsourceAC.js @@ -44,7 +44,7 @@ function VVsourceAC() { break; } this.model.rpar = [this.FR]; - this.model.equations.parameters[('2', 'double')] = list(this.FR); + this.model.equations.parameters[2] = list(new ScilabDouble(this.FR)); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Electrical/VVsourceAC.pickle b/js/Electrical/VVsourceAC.pickle index 6894b5be..37940c47 100644 --- a/js/Electrical/VVsourceAC.pickle +++ b/js/Electrical/VVsourceAC.pickle @@ -39,9 +39,9 @@ sS'model.in1' p12 S'matrix' p13 -sS'exprs' +sS'x.graphics' p14 -g11 +g6 sS'mo.inputs' p15 g11 @@ -58,35 +58,35 @@ g2 sS'model.equations' p20 g2 -sS'mo.outputs' +sS'model.equations.parameters[2]' p21 +g18 +sS'mo.outputs' +p22 g4 sS'x.graphics.out_implicit' -p22 +p23 g11 sS'model.rpar' -p23 +p24 g11 sS'graphics.exprs' -p24 -NsS'typ' p25 +NsS'typ' +p26 g11 sS'model.blocktype' -p26 +p27 g4 sS'mo' -p27 -g2 -sS'x.graphics' p28 -g6 +g2 sS'model.dep_ut' p29 g11 -sS"model.equations.parameters[('2', 'double')]" +sS'exprs' p30 -g18 +g11 sS'gr_i' p31 g11 diff --git a/js/Electrical/VsourceAC.js b/js/Electrical/VsourceAC.js index c1cf8acc..cda321e2 100644 --- a/js/Electrical/VsourceAC.js +++ b/js/Electrical/VsourceAC.js @@ -46,7 +46,7 @@ function VsourceAC() { break; } this.model.rpar = [[this.VA],[this.FR]]; - this.model.equations.parameters[('2', 'double')] = list(this.VA,this.FR); + this.model.equations.parameters[2] = list(new ScilabDouble(this.VA),new ScilabDouble(this.FR)); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Electrical/VsourceAC.pickle b/js/Electrical/VsourceAC.pickle index 7941df3c..20868c5c 100644 --- a/js/Electrical/VsourceAC.pickle +++ b/js/Electrical/VsourceAC.pickle @@ -40,26 +40,28 @@ p11 sS'model.in1' p12 g11 -sS'exprs' +sS'x.graphics' p13 -S'matrix' -p14 +g6 sS'mo.inputs' -p15 +p14 g4 sS'x.graphics.in_implicit' -p16 +p15 g11 sS'mo.parameters' -p17 +p16 S'list' -p18 +p17 sS'VA' -p19 +p18 g2 sS'model.equations' -p20 +p19 g2 +sS'model.equations.parameters[2]' +p20 +g17 sS'mo.outputs' p21 g4 @@ -68,27 +70,25 @@ p22 g11 sS'model.rpar' p23 -g14 -sS'graphics.exprs' +S'matrix' p24 -NsS'typ' +sS'graphics.exprs' p25 +NsS'typ' +p26 g11 sS'model.blocktype' -p26 +p27 g4 sS'mo' -p27 -g2 -sS'x.graphics' p28 -g6 +g2 sS'model.dep_ut' p29 g11 -sS"model.equations.parameters[('2', 'double')]" +sS'exprs' p30 -g18 +g24 sS'gr_i' p31 g11 diff --git a/js/Events/END_c.js b/js/Events/END_c.js index ec7627e1..ec27739d 100644 --- a/js/Events/END_c.js +++ b/js/Events/END_c.js @@ -3,7 +3,7 @@ function END_c() { END_c.prototype.define = function END_c() { this.tf = 100000000; this.model = scicos_model(); - this.model.sim = list("scicosexit",4); + this.model.sim = list(new ScilabString("scicosexit"),new ScilabDouble(4)); this.model.evtin = new ScilabDouble(1); this.model.evtout = new ScilabDouble(1); this.model.firing = new ScilabDouble(this.tf); diff --git a/js/Events/EVTDLY_c.js b/js/Events/EVTDLY_c.js index 8d659cdc..54fca32e 100644 --- a/js/Events/EVTDLY_c.js +++ b/js/Events/EVTDLY_c.js @@ -4,7 +4,7 @@ function EVTDLY_c() { this.dt = 0.1; this.ff = 0.0; this.model = scicos_model(); - this.model.sim = list("evtdly4",4); + this.model.sim = list(new ScilabString("evtdly4"),new ScilabDouble(4)); this.model.evtin = new ScilabDouble(1); this.model.evtout = new ScilabDouble(1); this.model.rpar = [[this.dt],[this.ff]]; diff --git a/js/Events/EVTVARDLY.js b/js/Events/EVTVARDLY.js index 5d66c02e..941f0a28 100644 --- a/js/Events/EVTVARDLY.js +++ b/js/Events/EVTVARDLY.js @@ -2,7 +2,7 @@ function EVTVARDLY() { EVTVARDLY.prototype.define = function EVTVARDLY() { this.model = scicos_model(); - this.model.sim = list("evtvardly",4); + this.model.sim = list(new ScilabString("evtvardly"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(1); this.model.evtin = new ScilabDouble(1); this.model.evtout = new ScilabDouble(1); diff --git a/js/Events/IFTHEL_f.js b/js/Events/IFTHEL_f.js index ad55f013..73cba2af 100644 --- a/js/Events/IFTHEL_f.js +++ b/js/Events/IFTHEL_f.js @@ -2,7 +2,7 @@ function IFTHEL_f() { IFTHEL_f.prototype.define = function IFTHEL_f() { this.model = scicos_model(); - this.model.sim = list("ifthel",-1); + this.model.sim = list(new ScilabString("ifthel"),new ScilabDouble(-1)); this.model.in1 = new ScilabDouble(1); this.model.in2 = new ScilabDouble(1); this.model.intyp = new ScilabDouble(-1); @@ -57,7 +57,7 @@ function IFTHEL_f() { if (ok) { graphics.exprs = exprs; this.model.evtin = this.inh; - this.model.sim[('2', 'double')] = new ScilabDouble(-1); + this.model.sim[2] = new ScilabDouble(-1); this.model.nmode = new ScilabDouble(this.nmod); this.model.nzcross = new ScilabDouble(this.nmod); this.x.graphics = graphics; diff --git a/js/Events/IFTHEL_f.pickle b/js/Events/IFTHEL_f.pickle index 8588196e..b2df8700 100644 --- a/js/Events/IFTHEL_f.pickle +++ b/js/Events/IFTHEL_f.pickle @@ -63,16 +63,16 @@ sS'model.evtout' p20 S'matrix' p21 -sS"model.sim[('2', 'double')]" -p22 -g6 sS'model.nmode' -p23 +p22 g6 sS'graphics.exprs' -p24 +p23 g16 sS'model.nzcross' +p24 +g6 +sS'model.sim[2]' p25 g6 sS'[model,graphics,ok]' diff --git a/js/Events/M_freq.js b/js/Events/M_freq.js index 56413dab..afbb7a55 100644 --- a/js/Events/M_freq.js +++ b/js/Events/M_freq.js @@ -2,11 +2,11 @@ function M_freq() { M_freq.prototype.define = function M_freq() { this.model = scicos_model(); - this.model.sim = list("m_frequ",4); + this.model.sim = list(new ScilabString("m_frequ"),new ScilabDouble(4)); this.model.evtout = [[1],[1],[1]]; this.model.evtin = new ScilabDouble(1); this.model.rpar = []; - this.model.opar = list([[1,1,0],[1,1,1],[1,3,2]],1,0,0); + 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]; @@ -53,7 +53,7 @@ function M_freq() { [m,den,off,count,m1,fir,this.frequ,this.offset,ok] = mfrequ_clk(this.frequ,this.offset); } if (ok) { - this.model.opar = list(m,double(den),off,count); + this.model.opar = list(m,new ScilabDouble(double(den)),new ScilabDouble(off),new ScilabDouble(count)); mn = (2^size(m1,"*"))-1; [model,graphics,ok] = set_io(this.model,graphics,list(),list(),1,ones(mn,1)); if (mn>3) { diff --git a/js/Hydraulics/Bache.js b/js/Hydraulics/Bache.js index fb253e57..ecaf2f0c 100644 --- a/js/Hydraulics/Bache.js +++ b/js/Hydraulics/Bache.js @@ -71,7 +71,7 @@ function Bache() { break; } this.model.rpar = [[this.Patm],[this.A],[this.ze1],[this.ze2],[this.zs1],[this.zs2],[this.z0],[this.T0],[this.p_rho]]; - this.model.equations.parameters[('2', 'double')] = list(this.Patm,this.A,this.ze1,this.ze2,this.zs1,this.zs2,this.z0,this.T0,this.p_rho); + this.model.equations.parameters[2] = list(new ScilabDouble(this.Patm),new ScilabDouble(this.A),new ScilabDouble(this.ze1),new ScilabDouble(this.ze2),new ScilabDouble(this.zs1),new ScilabDouble(this.zs2),new ScilabDouble(this.z0),new ScilabDouble(this.T0),new ScilabDouble(this.p_rho)); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Hydraulics/Bache.pickle b/js/Hydraulics/Bache.pickle index cfa14eb5..e0877648 100644 --- a/js/Hydraulics/Bache.pickle +++ b/js/Hydraulics/Bache.pickle @@ -56,20 +56,20 @@ g8 sS'zs2' p12 g8 -sS'exprs' +sS'x.graphics' p13 -S'matrix' -p14 +g2 sS'z0' -p15 +p14 g8 sS'mo.inputs' -p16 +p15 S'vector' -p17 +p16 sS'x.graphics.in_implicit' +p17 +S'matrix' p18 -g14 sS'mo.parameters' p19 S'list' @@ -86,56 +86,56 @@ g5 sS'model.equations' p24 g8 -sS'mo.outputs' +sS'model.equations.parameters[2]' p25 -g17 -sS'x.graphics.out_implicit' +g20 +sS'mo.outputs' p26 -g14 -sS'in1' +g16 +sS'x.graphics.out_implicit' p27 +g18 +sS'in1' +p28 g8 sS'model.rpar' -p28 -g14 -sS'ze2' p29 +g18 +sS'ze2' +p30 g8 sS'ze1' -p30 +p31 g8 sS'T0' -p31 +p32 g8 sS'graphics.exprs' -p32 -NsS'typ' p33 -g17 -sS'model.blocktype' +NsS'typ' p34 +g16 +sS'model.blocktype' +p35 g5 sS'mo' -p35 -g2 -sS'x.graphics' p36 g2 sS'model.dep_ut' p37 -g17 -sS"model.equations.parameters[('2', 'double')]" +g16 +sS'exprs' p38 -g20 +g18 sS'gr_i' p39 -g17 +g16 sS'p_rho' p40 g8 sS'y' p41 -g17 +g16 sS'x' p42 g8 diff --git a/js/Hydraulics/PerteDP.js b/js/Hydraulics/PerteDP.js index de0ebb69..23dfe5ff 100644 --- a/js/Hydraulics/PerteDP.js +++ b/js/Hydraulics/PerteDP.js @@ -60,7 +60,7 @@ function PerteDP() { break; } this.model.rpar = [[this.L],[this.D],[this.lambda],[this.z1],[this.z2],[this.p_rho]]; - this.model.equations.parameters[('2', 'double')] = list(this.L,this.D,this.lambda,this.z1,this.z2,this.p_rho); + this.model.equations.parameters[2] = list(new ScilabDouble(this.L),new ScilabDouble(this.D),new ScilabDouble(this.lambda),new ScilabDouble(this.z1),new ScilabDouble(this.z2),new ScilabDouble(this.p_rho)); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Hydraulics/PerteDP.pickle b/js/Hydraulics/PerteDP.pickle index 7a620de4..000a85a3 100644 --- a/js/Hydraulics/PerteDP.pickle +++ b/js/Hydraulics/PerteDP.pickle @@ -41,77 +41,77 @@ p8 sS'model.in1' p9 g8 -sS'exprs' +sS'x.graphics' p10 -S'matrix' -p11 +g2 sS'mo.inputs' -p12 +p11 g5 sS'x.graphics.in_implicit' -p13 +p12 S'vector' -p14 +p13 sS'mo.parameters' -p15 +p14 S'list' -p16 +p15 sS'model.sim' -p17 +p16 g5 sS'model.equations' -p18 +p17 g8 sS'D' -p19 +p18 g8 +sS'model.equations.parameters[2]' +p19 +g15 sS'mo.outputs' p20 g5 sS'x.graphics.out_implicit' p21 -g14 +g13 sS'L' p22 g8 sS'model.rpar' p23 -g11 -sS'graphics.exprs' +S'matrix' p24 -NsS'typ' +sS'graphics.exprs' p25 -g14 -sS'z1' +NsS'typ' p26 +g13 +sS'z1' +p27 g8 sS'z2' -p27 +p28 g8 sS'model.blocktype' -p28 +p29 g5 sS'mo' -p29 -g2 -sS'x.graphics' p30 g2 sS'model.dep_ut' p31 -g14 -sS"model.equations.parameters[('2', 'double')]" +g13 +sS'exprs' p32 -g16 +g24 sS'gr_i' p33 -g14 +g13 sS'p_rho' p34 g8 sS'y' p35 -g14 +g13 sS'x' p36 g8 diff --git a/js/Hydraulics/PuitsP.js b/js/Hydraulics/PuitsP.js index 34c11d39..807a7c34 100644 --- a/js/Hydraulics/PuitsP.js +++ b/js/Hydraulics/PuitsP.js @@ -49,7 +49,7 @@ function PuitsP() { break; } this.model.rpar = [[this.P0],[this.T0],[this.H0],[this.option_temperature]]; - this.model.equations.parameters[('2', 'double')] = list(this.P0,this.T0,this.H0,this.option_temperature); + this.model.equations.parameters[2] = list(new ScilabDouble(this.P0),new ScilabDouble(this.T0),new ScilabDouble(this.H0),new ScilabDouble(this.option_temperature)); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Hydraulics/PuitsP.pickle b/js/Hydraulics/PuitsP.pickle index f52361be..6a1af8f4 100644 --- a/js/Hydraulics/PuitsP.pickle +++ b/js/Hydraulics/PuitsP.pickle @@ -34,65 +34,65 @@ NsS'model.in1' p7 S'double' p8 -sS'exprs' +sS'x.graphics' p9 -S'matrix' -p10 +g2 sS'mo.inputs' -p11 +p10 S'vector' -p12 +p11 sS'x.graphics.in_implicit' -p13 -g12 +p12 +g11 sS'option_temperature' -p14 +p13 g8 sS'mo.parameters' -p15 +p14 S'list' -p16 +p15 sS'model.sim' -p17 +p16 g5 sS'P0' -p18 +p17 g8 sS'model.equations' -p19 +p18 g8 +sS'model.equations.parameters[2]' +p19 +g15 sS'model.rpar' p20 -g10 -sS'T0' +S'matrix' p21 +sS'T0' +p22 g8 sS'graphics.exprs' -p22 -NsS'typ' p23 -g12 -sS'model.blocktype' +NsS'typ' p24 +g11 +sS'model.blocktype' +p25 g5 sS'mo' -p25 -g2 -sS'x.graphics' p26 g2 sS'model.dep_ut' p27 -g12 -sS"model.equations.parameters[('2', 'double')]" +g11 +sS'exprs' p28 -g16 +g21 sS'gr_i' p29 -g12 +g11 sS'y' p30 -g12 +g11 sS'x' p31 g8 diff --git a/js/Hydraulics/SourceP.js b/js/Hydraulics/SourceP.js index 2ed928b6..0a726fc5 100644 --- a/js/Hydraulics/SourceP.js +++ b/js/Hydraulics/SourceP.js @@ -51,7 +51,7 @@ function SourceP() { break; } this.model.rpar = [[this.P0],[this.T0],[this.H0],[this.option_temperature]]; - this.model.equations.parameters[('2', 'double')] = list(this.P0,this.T0,this.H0,this.option_temperature); + this.model.equations.parameters[2] = list(new ScilabDouble(this.P0),new ScilabDouble(this.T0),new ScilabDouble(this.H0),new ScilabDouble(this.option_temperature)); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Hydraulics/SourceP.pickle b/js/Hydraulics/SourceP.pickle index 9d807fc7..b4fa048c 100644 --- a/js/Hydraulics/SourceP.pickle +++ b/js/Hydraulics/SourceP.pickle @@ -37,68 +37,68 @@ p8 sS'model.in1' p9 g8 -sS'exprs' +sS'x.graphics' p10 -S'matrix' -p11 +g2 sS'mo.inputs' -p12 +p11 S'vector' -p13 +p12 sS'option_temperature' -p14 +p13 g8 sS'mo.parameters' -p15 +p14 S'list' -p16 +p15 sS'model.sim' -p17 +p16 g5 sS'P0' -p18 +p17 g8 sS'model.equations' -p19 +p18 g8 +sS'model.equations.parameters[2]' +p19 +g15 sS'mo.outputs' p20 -g13 +g12 sS'x.graphics.out_implicit' p21 -g13 +g12 sS'model.rpar' p22 -g11 -sS'T0' +S'matrix' p23 +sS'T0' +p24 g8 sS'graphics.exprs' -p24 -NsS'typ' p25 -g13 -sS'model.blocktype' +NsS'typ' p26 +g12 +sS'model.blocktype' +p27 g5 sS'mo' -p27 -g2 -sS'x.graphics' p28 g2 sS'model.dep_ut' p29 -g13 -sS"model.equations.parameters[('2', 'double')]" +g12 +sS'exprs' p30 -g16 +g23 sS'gr_i' p31 -g13 +g12 sS'y' p32 -g13 +g12 sS'x' p33 g8 diff --git a/js/Hydraulics/VanneReglante.js b/js/Hydraulics/VanneReglante.js index c36ad94e..d2fffc6d 100644 --- a/js/Hydraulics/VanneReglante.js +++ b/js/Hydraulics/VanneReglante.js @@ -48,7 +48,7 @@ function VanneReglante() { break; } this.model.rpar = [[this.Cvmax],[this.p_rho]]; - this.model.equations.parameters[('2', 'double')] = list(this.Cvmax,this.p_rho); + this.model.equations.parameters[2] = list(new ScilabDouble(this.Cvmax),new ScilabDouble(this.p_rho)); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Hydraulics/VanneReglante.pickle b/js/Hydraulics/VanneReglante.pickle index f77690a5..6e112bf2 100644 --- a/js/Hydraulics/VanneReglante.pickle +++ b/js/Hydraulics/VanneReglante.pickle @@ -36,17 +36,17 @@ g7 sS'model.in1' p10 g7 -sS'exprs' +sS'x.graphics' p11 -S'matrix' -p12 +g2 sS'mo.inputs' -p13 +p12 S'vector' -p14 +p13 sS'x.graphics.in_implicit' +p14 +S'matrix' p15 -g12 sS'mo.parameters' p16 S'list' @@ -57,44 +57,44 @@ g5 sS'model.equations' p19 g7 -sS'mo.outputs' +sS'model.equations.parameters[2]' p20 +g17 +sS'mo.outputs' +p21 g5 sS'x.graphics.out_implicit' -p21 -g14 -sS'model.rpar' p22 -g12 -sS'graphics.exprs' +g13 +sS'model.rpar' p23 -NsS'typ' +g15 +sS'graphics.exprs' p24 -g14 -sS'model.blocktype' +NsS'typ' p25 +g13 +sS'model.blocktype' +p26 g5 sS'mo' -p26 -g2 -sS'x.graphics' p27 g2 sS'model.dep_ut' p28 -g14 -sS"model.equations.parameters[('2', 'double')]" +g13 +sS'exprs' p29 -g17 +g15 sS'gr_i' p30 -g14 +g13 sS'p_rho' p31 g7 sS'y' p32 -g14 +g13 sS'x' p33 g7 diff --git a/js/IntegerOp/BITCLEAR.js b/js/IntegerOp/BITCLEAR.js index 715efd0a..fdf24c73 100644 --- a/js/IntegerOp/BITCLEAR.js +++ b/js/IntegerOp/BITCLEAR.js @@ -2,14 +2,14 @@ function BITCLEAR() { BITCLEAR.prototype.define = function BITCLEAR() { this.model = scicos_model(); - this.model.sim = list("bit_clear_32",4); + this.model.sim = list(new ScilabString("bit_clear_32"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(1); this.model.in2 = new ScilabDouble(1); this.model.out = new ScilabDouble(1); this.model.out2 = new ScilabDouble(1); this.model.intyp = new ScilabDouble(3); this.model.outtyp = new ScilabDouble(3); - this.model.opar = list(int32(0)); + this.model.opar = list(new ScilabDouble(int32(0))); this.model.blocktype = new ScilabString("c"); this.model.dep_ut = [true,false]; exprs = [[sci2exp(3)],[sci2exp(0)]]; @@ -51,7 +51,7 @@ function BITCLEAR() { this.bit = uint32(this.bit); n = (2^32-1)-2^this.bit; n = uint32(n); - this.model.sim = list("bit_clear_32",4); + this.model.sim = list(new ScilabString("bit_clear_32"),new ScilabDouble(4)); } } else if ((this.Datatype==4)||(this.Datatype==7)) { if (this.bit>15||this.bit<0) { @@ -61,7 +61,7 @@ function BITCLEAR() { this.bit = uint16(this.bit); n = (2^16-1)-2^this.bit; n = uint16(n); - this.model.sim = list("bit_clear_16",4); + this.model.sim = list(new ScilabString("bit_clear_16"),new ScilabDouble(4)); } } else if ((this.Datatype==5)||(this.Datatype==8)) { if (this.bit>7||this.bit<0) { @@ -71,7 +71,7 @@ function BITCLEAR() { this.bit = uint8(this.bit); n = (2^8-1)-2^this.bit; n = uint8(n); - this.model.sim = list("bit_clear_8",4); + this.model.sim = list(new ScilabString("bit_clear_8"),new ScilabDouble(4)); } } else { block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %d.","Data Type",this.Datatype),msprintf("Must be in the interval %s.","[3, 8]")); @@ -85,7 +85,7 @@ function BITCLEAR() { } if (ok) { graphics.exprs = exprs; - this.model.opar = list(n); + this.model.opar = list(new ScilabDouble(n)); this.x.graphics = graphics; this.x.model = this.model; break; diff --git a/js/IntegerOp/BITSET.js b/js/IntegerOp/BITSET.js index 01591724..84ced0bb 100644 --- a/js/IntegerOp/BITSET.js +++ b/js/IntegerOp/BITSET.js @@ -2,14 +2,14 @@ function BITSET() { BITSET.prototype.define = function BITSET() { this.model = scicos_model(); - this.model.sim = list("bit_set_32",4); + this.model.sim = list(new ScilabString("bit_set_32"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(1); this.model.in2 = new ScilabDouble(1); this.model.out = new ScilabDouble(1); this.model.out2 = new ScilabDouble(1); this.model.intyp = new ScilabDouble(3); this.model.outtyp = new ScilabDouble(3); - this.model.opar = list(uint32(0)); + this.model.opar = list(new ScilabDouble(uint32(0))); this.model.blocktype = new ScilabString("c"); this.model.dep_ut = [true,false]; exprs = [[sci2exp(3)],[sci2exp(0)]]; @@ -52,7 +52,7 @@ function BITSET() { this.bit = uint32(this.bit); n = 2^this.bit; n = uint32(n); - this.model.sim = list("bit_set_32",4); + this.model.sim = list(new ScilabString("bit_set_32"),new ScilabDouble(4)); } else if ((this.Datatype==4)||(this.Datatype==7)) { if (this.bit>15||this.bit<0) { block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %d.","Index of Bit",this.bit),msprintf("Must be in the interval %s.","[0, 15]")); @@ -61,7 +61,7 @@ function BITSET() { this.bit = uint16(this.bit); n = 2^this.bit; n = uint16(n); - this.model.sim = list("bit_set_16",4); + this.model.sim = list(new ScilabString("bit_set_16"),new ScilabDouble(4)); } else if ((this.Datatype==5)||(this.Datatype==8)) { if (this.bit>7||this.bit<0) { block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %d.","Index of Bit",this.bit),msprintf("Must be in the interval %s.","[0, 7]")); @@ -70,7 +70,7 @@ function BITSET() { this.bit = uint8(this.bit); n = 2^this.bit; n = uint8(n); - this.model.sim = list("bit_set_8",4); + this.model.sim = list(new ScilabString("bit_set_8"),new ScilabDouble(4)); } else { block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %d.","Data Type",this.Datatype),msprintf("Must be in the interval %s.","[3, 8]")); ok = false; @@ -83,7 +83,7 @@ function BITSET() { } if (ok) { graphics.exprs = exprs; - this.model.opar = list(n); + this.model.opar = list(new ScilabDouble(n)); this.x.graphics = graphics; this.x.model = this.model; break; diff --git a/js/IntegerOp/CONVERT.js b/js/IntegerOp/CONVERT.js index 79db9513..b6a29de9 100644 --- a/js/IntegerOp/CONVERT.js +++ b/js/IntegerOp/CONVERT.js @@ -3,7 +3,7 @@ function CONVERT() { CONVERT.prototype.define = function CONVERT() { sgn = 2; this.model = scicos_model(); - this.model.sim = list("convert",4); + this.model.sim = list(new ScilabString("convert"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(-1); this.model.out = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-2); @@ -59,7 +59,7 @@ function CONVERT() { block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %d.","Output Type",this.ot),msprintf("Must be in the interval %s.","[1, 8]")); ok = false; } - this.model.sim = list("convert",4); + this.model.sim = list(new ScilabString("convert"),new ScilabDouble(4)); if ((this.it==this.ot)) { this.model.ipar = new ScilabDouble(1); } else { diff --git a/js/IntegerOp/EXTRACTBITS.js b/js/IntegerOp/EXTRACTBITS.js index ee87859f..74a7c6c0 100644 --- a/js/IntegerOp/EXTRACTBITS.js +++ b/js/IntegerOp/EXTRACTBITS.js @@ -3,7 +3,7 @@ function EXTRACTBITS() { EXTRACTBITS.prototype.define = function EXTRACTBITS() { numb = []; this.model = scicos_model(); - this.model.sim = list("extract_bit_32_UH0",4); + this.model.sim = list(new ScilabString("extract_bit_32_UH0"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(1); this.model.in2 = new ScilabDouble(1); this.model.out = new ScilabDouble(1); @@ -87,41 +87,41 @@ function EXTRACTBITS() { case 1: switch (this.scal) { case 0: - this.model.sim = list("extract_bit_32_UH0",4); + this.model.sim = list(new ScilabString("extract_bit_32_UH0"),new ScilabDouble(4)); case 1: switch (this.Datatype) { case 3: - this.model.sim = list("extract_bit_32_UH1",4); + this.model.sim = list(new ScilabString("extract_bit_32_UH1"),new ScilabDouble(4)); case 6: - this.model.sim = list("extract_bit_u32_UH1",4); + this.model.sim = list(new ScilabString("extract_bit_u32_UH1"),new ScilabDouble(4)); } } case 2: - this.model.sim = list("extract_bit_32_LH",4); + this.model.sim = list(new ScilabString("extract_bit_32_LH"),new ScilabDouble(4)); case 3: switch (this.scal) { case 0: - this.model.sim = list("extract_bit_32_MSB0",4); + this.model.sim = list(new ScilabString("extract_bit_32_MSB0"),new ScilabDouble(4)); case 1: switch (this.Datatype) { case 3: - this.model.sim = list("extract_bit_32_MSB1",4); + this.model.sim = list(new ScilabString("extract_bit_32_MSB1"),new ScilabDouble(4)); case 6: - this.model.sim = list("extract_bit_u32_MSB1",4); + this.model.sim = list(new ScilabString("extract_bit_u32_MSB1"),new ScilabDouble(4)); } } case 4: - this.model.sim = list("extract_bit_32_LSB",4); + this.model.sim = list(new ScilabString("extract_bit_32_LSB"),new ScilabDouble(4)); case 5: switch (this.scal) { case 0: - this.model.sim = list("extract_bit_32_RB0",4); + this.model.sim = list(new ScilabString("extract_bit_32_RB0"),new ScilabDouble(4)); case 1: switch (this.Datatype) { case 3: - this.model.sim = list("extract_bit_32_RB1",4); + this.model.sim = list(new ScilabString("extract_bit_32_RB1"),new ScilabDouble(4)); case 6: - this.model.sim = list("extract_bit_u32_RB1",4); + this.model.sim = list(new ScilabString("extract_bit_u32_RB1"),new ScilabDouble(4)); } } } @@ -134,41 +134,41 @@ function EXTRACTBITS() { case 1: switch (this.scal) { case 0: - this.model.sim = list("extract_bit_16_UH0",4); + this.model.sim = list(new ScilabString("extract_bit_16_UH0"),new ScilabDouble(4)); case 1: switch (this.Datatype) { case 4: - this.model.sim = list("extract_bit_16_UH1",4); + this.model.sim = list(new ScilabString("extract_bit_16_UH1"),new ScilabDouble(4)); case 7: - this.model.sim = list("extract_bit_u16_UH1",4); + this.model.sim = list(new ScilabString("extract_bit_u16_UH1"),new ScilabDouble(4)); } } case 2: - this.model.sim = list("extract_bit_16_LH",4); + this.model.sim = list(new ScilabString("extract_bit_16_LH"),new ScilabDouble(4)); case 3: switch (this.scal) { case 0: - this.model.sim = list("extract_bit_16_MSB0",4); + this.model.sim = list(new ScilabString("extract_bit_16_MSB0"),new ScilabDouble(4)); case 1: switch (this.Datatype) { case 4: - this.model.sim = list("extract_bit_16_MSB1",4); + this.model.sim = list(new ScilabString("extract_bit_16_MSB1"),new ScilabDouble(4)); case 7: - this.model.sim = list("extract_bit_u16_MSB1",4); + this.model.sim = list(new ScilabString("extract_bit_u16_MSB1"),new ScilabDouble(4)); } } case 4: - this.model.sim = list("extract_bit_16_LSB",4); + this.model.sim = list(new ScilabString("extract_bit_16_LSB"),new ScilabDouble(4)); case 5: switch (this.scal) { case 0: - this.model.sim = list("extract_bit_16_RB0",4); + this.model.sim = list(new ScilabString("extract_bit_16_RB0"),new ScilabDouble(4)); case 1: switch (this.Datatype) { case 4: - this.model.sim = list("extract_bit_16_RB1",4); + this.model.sim = list(new ScilabString("extract_bit_16_RB1"),new ScilabDouble(4)); case 7: - this.model.sim = list("extract_bit_u16_RB1",4); + this.model.sim = list(new ScilabString("extract_bit_u16_RB1"),new ScilabDouble(4)); } } } @@ -181,41 +181,41 @@ function EXTRACTBITS() { case 1: switch (this.scal) { case 0: - this.model.sim = list("extract_bit_8_UH0",4); + this.model.sim = list(new ScilabString("extract_bit_8_UH0"),new ScilabDouble(4)); case 1: switch (this.Datatype) { case 5: - this.model.sim = list("extract_bit_8_UH1",4); + this.model.sim = list(new ScilabString("extract_bit_8_UH1"),new ScilabDouble(4)); case 8: - this.model.sim = list("extract_bit_u8_UH1",4); + this.model.sim = list(new ScilabString("extract_bit_u8_UH1"),new ScilabDouble(4)); } } case 2: - this.model.sim = list("extract_bit_8_LH",4); + this.model.sim = list(new ScilabString("extract_bit_8_LH"),new ScilabDouble(4)); case 3: switch (this.scal) { case 0: - this.model.sim = list("extract_bit_8_MSB0",4); + this.model.sim = list(new ScilabString("extract_bit_8_MSB0"),new ScilabDouble(4)); case 1: switch (this.Datatype) { case 5: - this.model.sim = list("extract_bit_8_MSB1",4); + this.model.sim = list(new ScilabString("extract_bit_8_MSB1"),new ScilabDouble(4)); case 8: - this.model.sim = list("extract_bit_u8_MSB1",4); + this.model.sim = list(new ScilabString("extract_bit_u8_MSB1"),new ScilabDouble(4)); } } case 4: - this.model.sim = list("extract_bit_8_LSB",4); + this.model.sim = list(new ScilabString("extract_bit_8_LSB"),new ScilabDouble(4)); case 5: switch (this.scal) { case 0: - this.model.sim = list("extract_bit_8_RB0",4); + this.model.sim = list(new ScilabString("extract_bit_8_RB0"),new ScilabDouble(4)); case 1: switch (this.Datatype) { case 5: - this.model.sim = list("extract_bit_8_RB1",4); + this.model.sim = list(new ScilabString("extract_bit_8_RB1"),new ScilabDouble(4)); case 8: - this.model.sim = list("extract_bit_u8_RB1",4); + this.model.sim = list(new ScilabString("extract_bit_u8_RB1"),new ScilabDouble(4)); } } } diff --git a/js/IntegerOp/INTMUL.js b/js/IntegerOp/INTMUL.js index a5174c26..e3328f4a 100644 --- a/js/IntegerOp/INTMUL.js +++ b/js/IntegerOp/INTMUL.js @@ -3,7 +3,7 @@ function INTMUL() { INTMUL.prototype.define = function INTMUL() { sgn = 0; this.model = scicos_model(); - this.model.sim = list("matmul_i32",4); + this.model.sim = list(new ScilabString("matmul_i32"),new ScilabDouble(4)); this.model.in1 = [[-1],[-2]]; this.model.out = new ScilabDouble(-1); this.model.in2 = [[-2],[-3]]; @@ -48,51 +48,51 @@ function INTMUL() { ok = false; } else if (this.Datatype==3) { if (this.np==0) { - this.model.sim = list("matmul_i32n",4); + this.model.sim = list(new ScilabString("matmul_i32n"),new ScilabDouble(4)); } else if (this.np==1) { - this.model.sim = list("matmul_i32s",4); + this.model.sim = list(new ScilabString("matmul_i32s"),new ScilabDouble(4)); } else { - this.model.sim = list("matmul_i32e",4); + this.model.sim = list(new ScilabString("matmul_i32e"),new ScilabDouble(4)); } } else if (this.Datatype==4) { if (this.np==0) { - this.model.sim = list("matmul_i16n",4); + this.model.sim = list(new ScilabString("matmul_i16n"),new ScilabDouble(4)); } else if (this.np==1) { - this.model.sim = list("matmul_i16s",4); + this.model.sim = list(new ScilabString("matmul_i16s"),new ScilabDouble(4)); } else { - this.model.sim = list("matmul_i16e",4); + this.model.sim = list(new ScilabString("matmul_i16e"),new ScilabDouble(4)); } } else if (this.Datatype==5) { if (this.np==0) { - this.model.sim = list("matmul_i8n",4); + this.model.sim = list(new ScilabString("matmul_i8n"),new ScilabDouble(4)); } else if (this.np==1) { - this.model.sim = list("matmul_i8s",4); + this.model.sim = list(new ScilabString("matmul_i8s"),new ScilabDouble(4)); } else { - this.model.sim = list("matmul_i8e",4); + this.model.sim = list(new ScilabString("matmul_i8e"),new ScilabDouble(4)); } } else if (this.Datatype==6) { if (this.np==0) { - this.model.sim = list("matmul_ui32n",4); + this.model.sim = list(new ScilabString("matmul_ui32n"),new ScilabDouble(4)); } else if (this.np==1) { - this.model.sim = list("matmul_ui32s",4); + this.model.sim = list(new ScilabString("matmul_ui32s"),new ScilabDouble(4)); } else { - this.model.sim = list("matmul_ui32e",4); + this.model.sim = list(new ScilabString("matmul_ui32e"),new ScilabDouble(4)); } } else if (this.Datatype==7) { if (this.np==0) { - this.model.sim = list("matmul_ui16n",4); + this.model.sim = list(new ScilabString("matmul_ui16n"),new ScilabDouble(4)); } else if (this.np==1) { - this.model.sim = list("matmul_ui16s",4); + this.model.sim = list(new ScilabString("matmul_ui16s"),new ScilabDouble(4)); } else { - this.model.sim = list("matmul_ui16e",4); + this.model.sim = list(new ScilabString("matmul_ui16e"),new ScilabDouble(4)); } } else if (this.Datatype==8) { if (this.np==0) { - this.model.sim = list("matmul_ui8n",4); + this.model.sim = list(new ScilabString("matmul_ui8n"),new ScilabDouble(4)); } else if (this.np==1) { - this.model.sim = list("matmul_ui8s",4); + this.model.sim = list(new ScilabString("matmul_ui8s"),new ScilabDouble(4)); } else { - this.model.sim = list("matmul_ui8e",4); + this.model.sim = list(new ScilabString("matmul_ui8e"),new ScilabDouble(4)); } } else { block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %d.","Data Type",ot),msprintf("Must be in the interval %s.","[3, 8]")); diff --git a/js/IntegerOp/JKFLIPFLOP.js b/js/IntegerOp/JKFLIPFLOP.js index b855e347..91ed0354 100644 --- a/js/IntegerOp/JKFLIPFLOP.js +++ b/js/IntegerOp/JKFLIPFLOP.js @@ -83,7 +83,7 @@ function JKFLIPFLOP() { } if (ok) { xx.graphics.exprs[1-1] = this.exprs0; - this.model.odstate[('1', 'double')] = new ScilabDouble(this.init); + this.model.odstate[1] = new ScilabDouble(this.init); xx.model = this.model; arg1.model.rpar.objs[path-1] = xx; break; diff --git a/js/IntegerOp/JKFLIPFLOP.pickle b/js/IntegerOp/JKFLIPFLOP.pickle index 13898da4..25ffe935 100644 --- a/js/IntegerOp/JKFLIPFLOP.pickle +++ b/js/IntegerOp/JKFLIPFLOP.pickle @@ -13,201 +13,201 @@ p5 atp6 Rp7 .(dp0 -S'xx.model' +S'model.odstate[1]' p1 -S'object' +S'double' p2 -sS'model.sim' +sS'xx.model' p3 -S'string' +S'object' p4 -sS'arg1' +sS'model.sim' p5 -g2 -sS'scs_m_1.objs[6-1]' +S'string' p6 -S'double' +sS'arg1' p7 -sS'scs_m_1.objs[3-1]' +g4 +sS'scs_m_1.objs[6-1]' p8 -g7 -sS'xx.graphics' +g2 +sS'scs_m_1.objs[3-1]' p9 g2 -sS'model.out' +sS'xx.graphics' p10 -S'matrix' +g4 +sS'model.out' p11 -sS'xx' +S'matrix' p12 -g2 -sS'o' +sS'xx' p13 -g2 -sS'scs_m_1.objs[7-1]' +g4 +sS'o' p14 -g7 -sS'xx.graphics.exprs[1-1]' +g4 +sS'scs_m_1.objs[7-1]' p15 -NsS'scs_m.objs[20-1]' +g2 +sS'xx.graphics.exprs[1-1]' p16 -g7 -sS'scs_m.objs[2-1]' +NsS'scs_m.objs[20-1]' p17 -g7 -sS'scs_m.objs[5-1]' +g2 +sS'scs_m.objs[2-1]' p18 -g7 -sS'scs_m.objs[10-1]' +g2 +sS'scs_m.objs[5-1]' p19 -g7 -sS'scs_m' +g2 +sS'scs_m.objs[10-1]' p20 -g7 -sS'model.in1' +g2 +sS'scs_m' p21 -g11 -sS'scs_m.objs[19-1]' +g2 +sS'model.in1' p22 -g7 -sS'scs_m.objs[1-1]' +g12 +sS'scs_m.objs[19-1]' p23 -g7 -sS'scs_m.objs[18-1]' +g2 +sS'scs_m.objs[1-1]' p24 -g7 -sS'model.dep_ut' +g2 +sS'scs_m.objs[18-1]' p25 -S'vector' +g2 +sS'model.dep_ut' p26 -sS'newpar[size(newpar)+1-1]' +S'vector' p27 -g7 -sS'init' +sS'newpar[size(newpar)+1-1]' p28 -g7 -sS'scs_m_1' +g2 +sS'init' p29 -g7 -sS'scs_m.objs[9-1]' +g2 +sS'scs_m_1' p30 -g7 -sS'scs_m_1.objs[2-1]' +g2 +sS'scs_m.objs[22-1]' p31 -g7 -sS'init_old' +g2 +sS'scs_m_1.objs[2-1]' p32 -g7 -sS'scs_m.objs[13-1]' +g2 +sS'init_old' p33 -g7 -sS'model.firing' +g2 +sS'scs_m.objs[13-1]' p34 -S'boolean' +g2 +sS'model.firing' p35 -sS'newpar' +S'boolean' p36 -S'list' +sS'newpar' p37 -sS'model.in2' +S'list' p38 -g11 -sS'scs_m.objs[6-1]' +sS'model.in2' p39 -g7 -sS'scs_m_1.objs[4-1]' +g12 +sS'scs_m.objs[6-1]' p40 -g7 -sS'model.out2' +g2 +sS'scs_m.objs[9-1]' p41 -g11 -sS'model.intyp' +g2 +sS'model.out2' p42 -g26 -sS'model.rpar' +g12 +sS'model.intyp' p43 -g7 -sS'scs_m.objs[3-1]' +g27 +sS'model.rpar' p44 -g7 -sS"model.odstate[('1', 'double')]" +g2 +sS'scs_m.objs[3-1]' p45 -g7 -sS'scs_m.objs[16-1]' +g2 +sS'scs_m_1.objs[4-1]' p46 -g7 -sS'scs_m.objs[11-1]' +g2 +sS'scs_m.objs[16-1]' p47 -g7 -sS'scs_m.objs[14-1]' +g2 +sS'scs_m.objs[11-1]' p48 -g7 -sS'scs_m.objs[17-1]' +g2 +sS'scs_m.objs[14-1]' p49 -g7 -sS'scs_m_1.objs[5-1]' +g2 +sS'scs_m.objs[17-1]' p50 -g7 -sS'path' +g2 +sS'scs_m_1.objs[5-1]' p51 -NsS'scs_m.objs[4-1]' +g2 +sS'path' p52 -g7 -sS'scs_m.objs[7-1]' +NsS'scs_m.objs[4-1]' p53 -g7 -sS'typ' +g2 +sS'scs_m.objs[7-1]' p54 -g37 -sS'model.outtyp' +g2 +sS'typ' p55 -g26 -sS'needcompile' +g38 +sS'model.outtyp' p56 -g7 -sS'arg1.model' +g27 +sS'needcompile' p57 g2 -sS'model.blocktype' +sS'arg1.model' p58 g4 -sS'scs_m.objs[8-1]' +sS'model.blocktype' p59 -g7 -sS'scs_m.objs[15-1]' +g6 +sS'scs_m.objs[8-1]' p60 -g7 -sS'scs_m.objs[21-1]' +g2 +sS'scs_m.objs[15-1]' p61 -g7 -sS'scs_m.objs[22-1]' +g2 +sS'scs_m.objs[21-1]' p62 -g7 +g2 sS'scs_m_1.objs[1-1]' p63 -g7 +g2 sS'arg1.model.rpar.objs[path-1]' p64 -g2 +g4 sS'exprs' p65 -g7 +g2 sS'gr_i' p66 -g26 +g27 sS'scs_m.objs[12-1]' p67 -g7 +g2 sS'y' p68 -g7 +g2 sS'x' p69 -g7 +g2 sS'model' p70 -g2 +g4 sS'arg1.model.rpar' p71 -g2 +g4 s.
\ No newline at end of file diff --git a/js/IntegerOp/LOGIC.js b/js/IntegerOp/LOGIC.js index bd8d7406..4e1e2c01 100644 --- a/js/IntegerOp/LOGIC.js +++ b/js/IntegerOp/LOGIC.js @@ -3,7 +3,7 @@ function LOGIC() { LOGIC.prototype.define = function LOGIC() { this.mat = [[0],[0],[0],[1]]; this.model = scicos_model(); - this.model.sim = list("logic",4); + this.model.sim = list(new ScilabString("logic"),new ScilabDouble(4)); this.model.in1 = [[1],[1]]; this.model.in2 = [[1],[1]]; this.model.out = new ScilabDouble(1); @@ -11,7 +11,7 @@ function LOGIC() { this.model.evtin = new ScilabDouble(1); this.model.intyp = [5,5]; this.model.outtyp = new ScilabDouble(5); - this.model.opar = list(int8(this.mat)); + 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]; @@ -65,7 +65,7 @@ function LOGIC() { if (ok) { graphics.exprs = exprs; this.mat = int8(this.mat); - this.model.opar = list(this.mat); + this.model.opar = list(new ScilabDouble(this.mat)); this.x.graphics = graphics; this.x.model = this.model; break; diff --git a/js/IntegerOp/SHIFT.js b/js/IntegerOp/SHIFT.js index a3ac6a6e..b223a951 100644 --- a/js/IntegerOp/SHIFT.js +++ b/js/IntegerOp/SHIFT.js @@ -4,7 +4,7 @@ function SHIFT() { sgn = [[0],[0]]; OPER = 0; this.model = scicos_model(); - this.model.sim = list("shift_32_LA",4); + this.model.sim = list(new ScilabString("shift_32_LA"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(-1); this.model.out = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-2); @@ -54,63 +54,63 @@ function SHIFT() { if (this.nb>0) { switch (this.np) { case 0: - this.model.sim = list("shift_32_LA",4); + this.model.sim = list(new ScilabString("shift_32_LA"),new ScilabDouble(4)); case 1: - this.model.sim = list("shift_32_LC",4); + this.model.sim = list(new ScilabString("shift_32_LC"),new ScilabDouble(4)); } } else if (this.nb<0) { switch (this.np) { case 0: switch (this.Datatype) { case 3: - this.model.sim = list("shift_32_RA",4); + this.model.sim = list(new ScilabString("shift_32_RA"),new ScilabDouble(4)); case 6: - this.model.sim = list("shift_u32_RA",4); + this.model.sim = list(new ScilabString("shift_u32_RA"),new ScilabDouble(4)); } case 1: - this.model.sim = list("shift_32_RC",4); + this.model.sim = list(new ScilabString("shift_32_RC"),new ScilabDouble(4)); } } } else if ((this.Datatype==4||this.Datatype==7)) { if (this.nb>0) { switch (this.np) { case 0: - this.model.sim = list("shift_16_LA",4); + this.model.sim = list(new ScilabString("shift_16_LA"),new ScilabDouble(4)); case 1: - this.model.sim = list("shift_16_LC",4); + this.model.sim = list(new ScilabString("shift_16_LC"),new ScilabDouble(4)); } } else if (this.nb<0) { switch (this.np) { case 0: switch (this.Datatype) { case 4: - this.model.sim = list("shift_16_RA",4); + this.model.sim = list(new ScilabString("shift_16_RA"),new ScilabDouble(4)); case 7: - this.model.sim = list("shift_u16_RA",4); + this.model.sim = list(new ScilabString("shift_u16_RA"),new ScilabDouble(4)); } case 1: - this.model.sim = list("shift_16_RC",4); + this.model.sim = list(new ScilabString("shift_16_RC"),new ScilabDouble(4)); } } } else if ((this.Datatype==5||this.Datatype==8)) { if (this.nb>0) { switch (this.np) { case 0: - this.model.sim = list("shift_8_LA",4); + this.model.sim = list(new ScilabString("shift_8_LA"),new ScilabDouble(4)); case 1: - this.model.sim = list("shift_8_LC",4); + this.model.sim = list(new ScilabString("shift_8_LC"),new ScilabDouble(4)); } } else if (this.nb<0) { switch (this.np) { case 0: switch (this.Datatype) { case 5: - this.model.sim = list("shift_8_RA",4); + this.model.sim = list(new ScilabString("shift_8_RA"),new ScilabDouble(4)); case 8: - this.model.sim = list("shift_u8_RA",4); + this.model.sim = list(new ScilabString("shift_u8_RA"),new ScilabDouble(4)); } case 1: - this.model.sim = list("shift_8_RC",4); + this.model.sim = list(new ScilabString("shift_8_RC"),new ScilabDouble(4)); } } } else { diff --git a/js/IntegerOp/SRFLIPFLOP.js b/js/IntegerOp/SRFLIPFLOP.js index 354f75f6..712c5b72 100644 --- a/js/IntegerOp/SRFLIPFLOP.js +++ b/js/IntegerOp/SRFLIPFLOP.js @@ -67,7 +67,7 @@ function SRFLIPFLOP() { } if (ok) { xx.graphics.exprs[1-1] = this.exprs0; - this.model.odstate[('1', 'double')] = new ScilabDouble(this.init); + this.model.odstate[1] = new ScilabDouble(this.init); xx.model = this.model; arg1.model.rpar.objs[path-1] = xx; break; diff --git a/js/IntegerOp/SRFLIPFLOP.pickle b/js/IntegerOp/SRFLIPFLOP.pickle index e240cb2d..ceaa93a4 100644 --- a/js/IntegerOp/SRFLIPFLOP.pickle +++ b/js/IntegerOp/SRFLIPFLOP.pickle @@ -13,152 +13,152 @@ p5 atp6 Rp7 .(dp0 -S'xx.model' +S'model.odstate[1]' p1 -S'object' +S'double' p2 -sS'model.sim' +sS'xx.model' p3 -S'string' +S'object' p4 -sS'arg1' +sS'model.sim' p5 -g2 -sS'xx.graphics' +S'string' p6 -g2 -sS'model.out' +sS'arg1' p7 -S'matrix' +g4 +sS'xx.graphics' p8 -sS'xx' +g4 +sS'model.out' p9 -g2 -sS'o' +S'matrix' p10 -g2 -sS'xx.graphics.exprs[1-1]' +sS'xx' p11 -NsS'scs_m.objs[2-1]' +g4 +sS'o' p12 -S'double' +g4 +sS'xx.graphics.exprs[1-1]' p13 -sS'scs_m.objs[5-1]' +NsS'scs_m.objs[2-1]' p14 -g13 -sS'scs_m.objs[10-1]' +g2 +sS'scs_m.objs[5-1]' p15 -g13 -sS'scs_m' +g2 +sS'scs_m.objs[10-1]' p16 -g13 -sS'model.in1' +g2 +sS'scs_m' p17 -g8 -sS'scs_m.objs[1-1]' +g2 +sS'model.in1' p18 -g13 -sS'model.dep_ut' +g10 +sS'scs_m.objs[1-1]' p19 -S'vector' +g2 +sS'model.dep_ut' p20 -sS'newpar[size(newpar)+1-1]' +S'vector' p21 -NsS'init' +sS'newpar[size(newpar)+1-1]' p22 -g13 -sS'scs_m.objs[12-1]' +NsS'init' p23 -g13 -sS'init_old' +g2 +sS'scs_m.objs[12-1]' p24 -g13 -sS'scs_m.objs[13-1]' +g2 +sS'init_old' p25 -g13 -sS'newpar' +g2 +sS'scs_m.objs[13-1]' p26 -S'list' +g2 +sS'newpar' p27 -sS'model.in2' +S'list' p28 -g8 -sS'scs_m.objs[6-1]' +sS'model.in2' p29 -g13 -sS'scs_m.objs[9-1]' +g10 +sS'scs_m.objs[6-1]' p30 -g13 -sS'model.out2' +g2 +sS'scs_m.objs[9-1]' p31 -g8 -sS'model.intyp' +g2 +sS'model.out2' p32 -g20 -sS'model.rpar' +g10 +sS'model.intyp' p33 -g13 -sS'scs_m.objs[3-1]' +g21 +sS'model.rpar' p34 -g13 -sS"model.odstate[('1', 'double')]" +g2 +sS'scs_m.objs[3-1]' p35 -g13 -sS'scs_m.objs[11-1]' +g2 +sS'model.outtyp' p36 -g13 -sS'scs_m.objs[14-1]' +g21 +sS'scs_m.objs[11-1]' p37 -g13 -sS'path' +g2 +sS'scs_m.objs[14-1]' p38 -NsS'scs_m.objs[4-1]' +g2 +sS'path' p39 -g13 -sS'scs_m.objs[7-1]' +NsS'scs_m.objs[4-1]' p40 -g13 -sS'typ' +g2 +sS'scs_m.objs[7-1]' p41 -g27 -sS'model.outtyp' +g2 +sS'typ' p42 -g20 +g28 sS'needcompile' p43 -g13 +g2 sS'arg1.model' p44 -g2 +g4 sS'model.blocktype' p45 -g4 +g6 sS'scs_m.objs[8-1]' p46 -g13 +g2 sS'arg1.model.rpar.objs[path-1]' p47 -g2 +g4 sS'exprs' p48 -g13 +g2 sS'gr_i' p49 -g20 +g21 sS'model.firing' p50 S'boolean' p51 sS'y' p52 -g13 +g2 sS'x' p53 -g13 +g2 sS'model' p54 -g2 +g4 sS'arg1.model.rpar' p55 -g2 +g4 s.
\ No newline at end of file diff --git a/js/Linear/BIGSOM_f.js b/js/Linear/BIGSOM_f.js index c4c0daca..bafc0ea1 100644 --- a/js/Linear/BIGSOM_f.js +++ b/js/Linear/BIGSOM_f.js @@ -3,7 +3,7 @@ function BIGSOM_f() { BIGSOM_f.prototype.define = function BIGSOM_f() { this.sgn = [[1],[1]]; this.model = scicos_model(); - this.model.sim = list("sum",2); + this.model.sim = list(new ScilabString("sum"),new ScilabDouble(2)); this.model.in1 = [[-1],[-1]]; this.model.out = new ScilabDouble(-1); this.model.rpar = this.sgn; diff --git a/js/Linear/CLINDUMMY_f.js b/js/Linear/CLINDUMMY_f.js index e61f81b0..55895e48 100644 --- a/js/Linear/CLINDUMMY_f.js +++ b/js/Linear/CLINDUMMY_f.js @@ -3,7 +3,7 @@ function CLINDUMMY_f() { CLINDUMMY_f.prototype.define = function CLINDUMMY_f() { x0 = 0; this.model = scicos_model(); - this.model.sim = list("cdummy",4); + 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 = []; diff --git a/js/Linear/CLR.js b/js/Linear/CLR.js index 504c40e1..447f9ce7 100644 --- a/js/Linear/CLR.js +++ b/js/Linear/CLR.js @@ -8,7 +8,7 @@ function CLR() { D = 0; exprs = [["1"],["1+s"]]; this.model = scicos_model(); - this.model.sim = list("csslti4",4); + this.model.sim = list(new ScilabString("csslti4"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(1); this.model.out = new ScilabDouble(1); this.model.state = new ScilabDouble(x0); diff --git a/js/Linear/CLR_f.js b/js/Linear/CLR_f.js index bb1ff3ff..5f862678 100644 --- a/js/Linear/CLR_f.js +++ b/js/Linear/CLR_f.js @@ -8,7 +8,7 @@ function CLR_f() { D = 0; exprs = [["1"],["1+s"]]; this.model = scicos_model(); - this.model.sim = list("csslti",1); + this.model.sim = list(new ScilabString("csslti"),new ScilabDouble(1)); this.model.in1 = new ScilabDouble(1); this.model.out = new ScilabDouble(1); this.model.state = new ScilabDouble(x0); diff --git a/js/Linear/CLSS.js b/js/Linear/CLSS.js index 2f336b4a..e721700d 100644 --- a/js/Linear/CLSS.js +++ b/js/Linear/CLSS.js @@ -9,7 +9,7 @@ function CLSS() { in1 = 1; out = 1; this.model = scicos_model(); - this.model.sim = list("csslti4",4); + this.model.sim = list(new ScilabString("csslti4"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(in1); this.model.out = new ScilabDouble(out); this.model.state = new ScilabDouble(this.x0); diff --git a/js/Linear/CLSS_f.js b/js/Linear/CLSS_f.js index 2576257d..8cb38f15 100644 --- a/js/Linear/CLSS_f.js +++ b/js/Linear/CLSS_f.js @@ -9,7 +9,7 @@ function CLSS_f() { in1 = 1; out = 1; this.model = scicos_model(); - this.model.sim = list("csslti",1); + this.model.sim = list(new ScilabString("csslti"),new ScilabDouble(1)); this.model.in1 = new ScilabDouble(in1); this.model.out = new ScilabDouble(out); this.model.state = new ScilabDouble(this.x0); diff --git a/js/Linear/DELAYV_f.js b/js/Linear/DELAYV_f.js index e2c55b04..1f569d9b 100644 --- a/js/Linear/DELAYV_f.js +++ b/js/Linear/DELAYV_f.js @@ -6,7 +6,7 @@ function DELAYV_f() { this.zz0 = z0.slice(1-1,$-1); this.T = 1; this.model = scicos_model(); - this.model.sim = list("delayv",1); + this.model.sim = list(new ScilabString("delayv"),new ScilabDouble(1)); this.model.in1 = [[this.nin],[1]]; this.model.out = new ScilabDouble(this.nin); this.model.evtin = new ScilabDouble(1); diff --git a/js/Linear/DERIV.js b/js/Linear/DERIV.js index 811fb47a..ba5c9ca6 100644 --- a/js/Linear/DERIV.js +++ b/js/Linear/DERIV.js @@ -2,7 +2,7 @@ function DERIV() { DERIV.prototype.define = function DERIV() { this.model = scicos_model(); - this.model.sim = list("deriv",4); + this.model.sim = list(new ScilabString("deriv"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(-1); this.model.out = new ScilabDouble(-1); this.model.blocktype = new ScilabString("x"); diff --git a/js/Linear/DIFF_c.js b/js/Linear/DIFF_c.js index 9549a346..396fa350 100644 --- a/js/Linear/DIFF_c.js +++ b/js/Linear/DIFF_c.js @@ -3,7 +3,7 @@ function DIFF_c() { DIFF_c.prototype.define = function DIFF_c() { this.x0 = [[0],[0]]; this.model = scicos_model(); - this.model.sim = list("diffblk_c",10004); + this.model.sim = list(new ScilabString("diffblk_c"),new ScilabDouble(10004)); this.model.in1 = new ScilabDouble(1); this.model.out = new ScilabDouble(1); this.model.state = this.x0; diff --git a/js/Linear/DLR.js b/js/Linear/DLR.js index 4107e913..01f49792 100644 --- a/js/Linear/DLR.js +++ b/js/Linear/DLR.js @@ -8,7 +8,7 @@ function DLR() { D = 0; exprs = [["1"],["1+z"]]; this.model = scicos_model(); - this.model.sim = list("dsslti4",4); + this.model.sim = list(new ScilabString("dsslti4"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(1); this.model.out = new ScilabDouble(1); this.model.evtin = new ScilabDouble(1); diff --git a/js/Linear/DLSS.js b/js/Linear/DLSS.js index d9b17858..9bb137e6 100644 --- a/js/Linear/DLSS.js +++ b/js/Linear/DLSS.js @@ -7,7 +7,7 @@ function DLSS() { this.C = 1; this.D = 0; this.model = scicos_model(); - this.model.sim = list("dsslti4",4); + this.model.sim = list(new ScilabString("dsslti4"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(1); this.model.out = new ScilabDouble(1); this.model.evtin = new ScilabDouble(1); diff --git a/js/Linear/DLSS_f.js b/js/Linear/DLSS_f.js index 7d40c411..29b08e92 100644 --- a/js/Linear/DLSS_f.js +++ b/js/Linear/DLSS_f.js @@ -7,7 +7,7 @@ function DLSS_f() { this.C = 1; this.D = 0; this.model = scicos_model(); - this.model.sim = list("dsslti",1); + this.model.sim = list(new ScilabString("dsslti"),new ScilabDouble(1)); this.model.in1 = new ScilabDouble(1); this.model.out = new ScilabDouble(1); this.model.evtin = new ScilabDouble(1); diff --git a/js/Linear/DOLLAR.js b/js/Linear/DOLLAR.js index 6fd66945..3962490d 100644 --- a/js/Linear/DOLLAR.js +++ b/js/Linear/DOLLAR.js @@ -6,7 +6,7 @@ function DOLLAR() { in1 = 1; exprs = string([[z],[this.inh]]); this.model = scicos_model(); - this.model.sim = list("dollar4",4); + this.model.sim = list(new ScilabString("dollar4"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(in1); this.model.out = new ScilabDouble(in1); this.model.evtin = new ScilabDouble(1-this.inh); @@ -47,15 +47,15 @@ function DOLLAR() { out = []; } in1 = out; - this.model.sim = list("dollar4_m",4); - this.model.odstate = list(this.a); + this.model.sim = list(new ScilabString("dollar4_m"),new ScilabDouble(4)); + this.model.odstate = list(new ScilabDouble(this.a)); this.model.dstate = []; if (this.type[(this.a)==1-1]) { if (isreal(this.a)) { it = 1; ot = 1; if ((size(this.a,1)==1||size(this.a,2)==1)) { - this.model.sim = list("dollar4",4); + this.model.sim = list(new ScilabString("dollar4"),new ScilabDouble(4)); this.model.dstate = this.a.slice(); this.model.odstate = list(); } diff --git a/js/Linear/DOLLAR_m.js b/js/Linear/DOLLAR_m.js index d85e0cd8..0e67e2ca 100644 --- a/js/Linear/DOLLAR_m.js +++ b/js/Linear/DOLLAR_m.js @@ -6,7 +6,7 @@ function DOLLAR_m() { in1 = 1; exprs = string([[z],[this.inh]]); this.model = scicos_model(); - this.model.sim = list("dollar4",4); + this.model.sim = list(new ScilabString("dollar4"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(in1); this.model.out = new ScilabDouble(in1); this.model.evtin = new ScilabDouble(1-this.inh); @@ -47,15 +47,15 @@ function DOLLAR_m() { out = []; } in1 = out; - this.model.sim = list("dollar4_m",4); - this.model.odstate = list(this.a); + this.model.sim = list(new ScilabString("dollar4_m"),new ScilabDouble(4)); + this.model.odstate = list(new ScilabDouble(this.a)); this.model.dstate = []; if ((this.type[this.a-1]==1)) { if (isreal(this.a)) { it = 1; ot = 1; if ((size(this.a,1)==1||size(this.a,2)==1)) { - this.model.sim = list("dollar4",4); + this.model.sim = list(new ScilabString("dollar4"),new ScilabDouble(4)); this.model.dstate = this.a.slice(); this.model.odstate = list(); } diff --git a/js/Linear/GAINBLK.js b/js/Linear/GAINBLK.js index 99ff7bc0..ae4ad2ec 100644 --- a/js/Linear/GAINBLK.js +++ b/js/Linear/GAINBLK.js @@ -7,7 +7,7 @@ function GAINBLK() { in2 = -2; out2 = -2; this.model = scicos_model(); - this.model.sim = list("gainblk",4); + this.model.sim = list(new ScilabString("gainblk"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(in1); this.model.out = new ScilabDouble(out); this.model.in2 = new ScilabDouble(in2); @@ -52,7 +52,7 @@ function GAINBLK() { if (isreal(this.gain)) { it = 1; ot = 1; - this.model.sim = list("gainblk",4); + this.model.sim = list(new ScilabString("gainblk"),new ScilabDouble(4)); this.model.rpar = this.gain.slice(); this.model.opar = list(); } else { @@ -63,22 +63,22 @@ function GAINBLK() { if ((this.over==0)) { if ((typeof(this.gain)=="int32")) { ot = 3; - this.model.sim = list("gainblk_i32n",4); + this.model.sim = list(new ScilabString("gainblk_i32n"),new ScilabDouble(4)); } else if ((typeof(this.gain)=="int16")) { ot = 4; - this.model.sim = list("gainblk_i16n",4); + this.model.sim = list(new ScilabString("gainblk_i16n"),new ScilabDouble(4)); } else if ((typeof(this.gain)=="int8")) { ot = 5; - this.model.sim = list("gainblk_i8n",4); + this.model.sim = list(new ScilabString("gainblk_i8n"),new ScilabDouble(4)); } else if ((typeof(this.gain)=="uint32")) { ot = 6; - this.model.sim = list("gainblk_ui32n",4); + this.model.sim = list(new ScilabString("gainblk_ui32n"),new ScilabDouble(4)); } else if ((typeof(this.gain)=="uint16")) { ot = 7; - this.model.sim = list("gainblk_ui16n",4); + this.model.sim = list(new ScilabString("gainblk_ui16n"),new ScilabDouble(4)); } else if ((typeof(this.gain)=="uint8")) { ot = 8; - this.model.sim = list("gainblk_ui8n",4); + this.model.sim = list(new ScilabString("gainblk_ui8n"),new ScilabDouble(4)); } else { message("type is not supported."); ok = false; @@ -86,22 +86,22 @@ function GAINBLK() { } else if ((this.over==1)) { if ((typeof(this.gain)=="int32")) { ot = 3; - this.model.sim = list("gainblk_i32s",4); + this.model.sim = list(new ScilabString("gainblk_i32s"),new ScilabDouble(4)); } else if ((typeof(this.gain)=="int16")) { ot = 4; - this.model.sim = list("gainblk_i16s",4); + this.model.sim = list(new ScilabString("gainblk_i16s"),new ScilabDouble(4)); } else if ((typeof(this.gain)=="int8")) { ot = 5; - this.model.sim = list("gainblk_i8s",4); + this.model.sim = list(new ScilabString("gainblk_i8s"),new ScilabDouble(4)); } else if ((typeof(this.gain)=="uint32")) { ot = 6; - this.model.sim = list("gainblk_ui32s",4); + this.model.sim = list(new ScilabString("gainblk_ui32s"),new ScilabDouble(4)); } else if ((typeof(this.gain)=="uint16")) { ot = 7; - this.model.sim = list("gainblk_ui16s",4); + this.model.sim = list(new ScilabString("gainblk_ui16s"),new ScilabDouble(4)); } else if ((typeof(this.gain)=="uint8")) { ot = 8; - this.model.sim = list("gainblk_ui8s",4); + this.model.sim = list(new ScilabString("gainblk_ui8s"),new ScilabDouble(4)); } else { message("type is not supported."); ok = false; @@ -109,22 +109,22 @@ function GAINBLK() { } else if ((this.over==2)) { if ((typeof(this.gain)=="int32")) { ot = 3; - this.model.sim = list("gainblk_i32e",4); + this.model.sim = list(new ScilabString("gainblk_i32e"),new ScilabDouble(4)); } else if ((typeof(this.gain)=="int16")) { ot = 4; - this.model.sim = list("gainblk_i16e",4); + this.model.sim = list(new ScilabString("gainblk_i16e"),new ScilabDouble(4)); } else if ((typeof(this.gain)=="int8")) { ot = 5; - this.model.sim = list("gainblk_i8e",4); + this.model.sim = list(new ScilabString("gainblk_i8e"),new ScilabDouble(4)); } else if ((typeof(this.gain)=="uint32")) { ot = 6; - this.model.sim = list("gainblk_ui32e",4); + this.model.sim = list(new ScilabString("gainblk_ui32e"),new ScilabDouble(4)); } else if ((typeof(this.gain)=="uint16")) { ot = 7; - this.model.sim = list("gainblk_ui16e",4); + this.model.sim = list(new ScilabString("gainblk_ui16e"),new ScilabDouble(4)); } else if ((typeof(this.gain)=="uint8")) { ot = 8; - this.model.sim = list("gainblk_ui8e",4); + this.model.sim = list(new ScilabString("gainblk_ui8e"),new ScilabDouble(4)); } else { message("type is not an integer."); ok = false; diff --git a/js/Linear/INTEGRAL.js b/js/Linear/INTEGRAL.js index db35386c..f5bc3520 100644 --- a/js/Linear/INTEGRAL.js +++ b/js/Linear/INTEGRAL.js @@ -6,7 +6,7 @@ function INTEGRAL() { rpar = []; this.model = scicos_model(); this.model.state = new ScilabDouble(0); - this.model.sim = list("integral_func",4); + 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; diff --git a/js/Linear/INTEGRAL_m.js b/js/Linear/INTEGRAL_m.js index 39215001..65423493 100644 --- a/js/Linear/INTEGRAL_m.js +++ b/js/Linear/INTEGRAL_m.js @@ -6,7 +6,7 @@ function INTEGRAL_m() { rpar = []; this.model = scicos_model(); this.model.state = new ScilabDouble(0); - this.model.sim = list("integral_func",4); + 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.in2 = new ScilabDouble(1); @@ -109,12 +109,12 @@ function INTEGRAL_m() { this.model.rpar = rpar; if ((Datatype==1)) { this.model.state = new ScilabDouble(real(this.x0.slice())); - this.model.sim = list("integral_func",4); + this.model.sim = list(new ScilabString("integral_func"),new ScilabDouble(4)); it = [[1],[ones(this.reinit,1)]]; ot = 1; } else if ((Datatype==2)) { this.model.state = [[real(this.x0.slice())],[imag(this.x0.slice())]]; - this.model.sim = list("integralz_func",4); + this.model.sim = list(new ScilabString("integralz_func"),new ScilabDouble(4)); it = [[2],[2*ones(this.reinit,1)]]; ot = 2; } else { diff --git a/js/Linear/REGISTER.js b/js/Linear/REGISTER.js index 4569e7d9..ee8118c3 100644 --- a/js/Linear/REGISTER.js +++ b/js/Linear/REGISTER.js @@ -3,7 +3,7 @@ function REGISTER() { REGISTER.prototype.define = function REGISTER() { this.z0 = zeros(10,1); this.model = scicos_model(); - this.model.sim = list("delay4",4); + this.model.sim = list(new ScilabString("delay4"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(1); this.model.out = new ScilabDouble(1); this.model.evtin = new ScilabDouble(1); @@ -45,34 +45,34 @@ function REGISTER() { ok = false; } if (this.it==1) { - this.model.sim = list("delay4",4); + this.model.sim = list(new ScilabString("delay4"),new ScilabDouble(4)); this.z0 = double(this.z0); this.model.dstate = new ScilabDouble(this.z0); this.model.odstate = list(); } else { if (this.it==3) { - this.model.sim = list("delay4_i32",4); + this.model.sim = list(new ScilabString("delay4_i32"),new ScilabDouble(4)); this.z0 = int32(this.z0); } else if (this.it==4) { - this.model.sim = list("delay4_i16",4); + this.model.sim = list(new ScilabString("delay4_i16"),new ScilabDouble(4)); this.z0 = int16(this.z0); } else if (this.it==5) { - this.model.sim = list("delay4_i8",4); + this.model.sim = list(new ScilabString("delay4_i8"),new ScilabDouble(4)); this.z0 = int8(this.z0); } else if (this.it==6) { - this.model.sim = list("delay4_ui32",4); + this.model.sim = list(new ScilabString("delay4_ui32"),new ScilabDouble(4)); this.z0 = uint32(this.z0); } else if (this.it==7) { - this.model.sim = list("delay4_ui16",4); + this.model.sim = list(new ScilabString("delay4_ui16"),new ScilabDouble(4)); this.z0 = uint16(this.z0); } else if (this.it==8) { - this.model.sim = list("delay4_ui8",4); + this.model.sim = list(new ScilabString("delay4_ui8"),new ScilabDouble(4)); this.z0 = uint8(this.z0); } else { message("Datatype is not supported"); ok = false; } - this.model.odstate = list(this.z0); + this.model.odstate = list(new ScilabDouble(this.z0)); this.model.dstate = []; } if (ok) { diff --git a/js/Linear/SAMPHOLD.js b/js/Linear/SAMPHOLD.js index e47fcee2..94a9ecec 100644 --- a/js/Linear/SAMPHOLD.js +++ b/js/Linear/SAMPHOLD.js @@ -3,7 +3,7 @@ function SAMPHOLD() { SAMPHOLD.prototype.define = function SAMPHOLD() { in1 = -1; this.model = scicos_model(); - this.model.sim = list("samphold4",4); + this.model.sim = list(new ScilabString("samphold4"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(-1); this.model.out = new ScilabDouble(-1); this.model.evtin = new ScilabDouble(1); diff --git a/js/Linear/SAMPHOLD_m.js b/js/Linear/SAMPHOLD_m.js index 29972426..87550934 100644 --- a/js/Linear/SAMPHOLD_m.js +++ b/js/Linear/SAMPHOLD_m.js @@ -2,7 +2,7 @@ function SAMPHOLD_m() { SAMPHOLD_m.prototype.define = function SAMPHOLD_m() { this.model = scicos_model(); - this.model.sim = list("samphold4_m",4); + this.model.sim = list(new ScilabString("samphold4_m"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-2); this.model.intyp = new ScilabDouble(1); diff --git a/js/Linear/SOM_f.js b/js/Linear/SOM_f.js index 421ab2df..5c068e3e 100644 --- a/js/Linear/SOM_f.js +++ b/js/Linear/SOM_f.js @@ -3,7 +3,7 @@ function SOM_f() { SOM_f.prototype.define = function SOM_f() { sgn = [[1],[1],[1]]; this.model = scicos_model(); - this.model.sim = list("sum",2); + this.model.sim = list(new ScilabString("sum"),new ScilabDouble(2)); this.model.in1 = [[-1],[-1],[-1]]; this.model.out = new ScilabDouble(-1); this.model.rpar = sgn; diff --git a/js/Linear/SUMMATION.js b/js/Linear/SUMMATION.js index ec0683cf..996168f6 100644 --- a/js/Linear/SUMMATION.js +++ b/js/Linear/SUMMATION.js @@ -3,7 +3,7 @@ function SUMMATION() { SUMMATION.prototype.define = function SUMMATION() { this.sgn = [[1],[-1]]; this.model = scicos_model(); - this.model.sim = list("summation",4); + this.model.sim = list(new ScilabString("summation"),new ScilabDouble(4)); this.model.in1 = [[-1],[-1]]; this.model.out = new ScilabDouble(-1); this.model.in2 = [[-2],[-2]]; @@ -81,54 +81,54 @@ function SUMMATION() { it = this.Datatype*ones(1,size(in1,1)); ot = this.Datatype; if (this.Datatype==1) { - this.model.sim = list("summation",4); + this.model.sim = list(new ScilabString("summation"),new ScilabDouble(4)); } else if (this.Datatype==2) { - this.model.sim = list("summation_z",4); + this.model.sim = list(new ScilabString("summation_z"),new ScilabDouble(4)); } else if (((this.Datatype<1)||(this.Datatype>8))) { message("Datatype is not supported"); ok = false; } else { if (this.satur==0) { if (this.Datatype==3) { - this.model.sim = list("summation_i32n",4); + this.model.sim = list(new ScilabString("summation_i32n"),new ScilabDouble(4)); } else if (this.Datatype==4) { - this.model.sim = list("summation_i16n",4); + this.model.sim = list(new ScilabString("summation_i16n"),new ScilabDouble(4)); } else if (this.Datatype==5) { - this.model.sim = list("summation_i8n",4); + this.model.sim = list(new ScilabString("summation_i8n"),new ScilabDouble(4)); } else if (this.Datatype==6) { - this.model.sim = list("summation_ui32n",4); + this.model.sim = list(new ScilabString("summation_ui32n"),new ScilabDouble(4)); } else if (this.Datatype==7) { - this.model.sim = list("summation_ui16n",4); + this.model.sim = list(new ScilabString("summation_ui16n"),new ScilabDouble(4)); } else if (this.Datatype==8) { - this.model.sim = list("summation_ui8n",4); + this.model.sim = list(new ScilabString("summation_ui8n"),new ScilabDouble(4)); } } else if (this.satur==1) { if (this.Datatype==3) { - this.model.sim = list("summation_i32s",4); + this.model.sim = list(new ScilabString("summation_i32s"),new ScilabDouble(4)); } else if (this.Datatype==4) { - this.model.sim = list("summation_i16s",4); + this.model.sim = list(new ScilabString("summation_i16s"),new ScilabDouble(4)); } else if (this.Datatype==5) { - this.model.sim = list("summation_i8s",4); + this.model.sim = list(new ScilabString("summation_i8s"),new ScilabDouble(4)); } else if (this.Datatype==6) { - this.model.sim = list("summation_ui32s",4); + this.model.sim = list(new ScilabString("summation_ui32s"),new ScilabDouble(4)); } else if (this.Datatype==7) { - this.model.sim = list("summation_ui16s",4); + this.model.sim = list(new ScilabString("summation_ui16s"),new ScilabDouble(4)); } else if (this.Datatype==8) { - this.model.sim = list("summation_ui8s",4); + this.model.sim = list(new ScilabString("summation_ui8s"),new ScilabDouble(4)); } } else if (this.satur==2) { if (this.Datatype==3) { - this.model.sim = list("summation_i32e",4); + this.model.sim = list(new ScilabString("summation_i32e"),new ScilabDouble(4)); } else if (this.Datatype==4) { - this.model.sim = list("summation_i16e",4); + this.model.sim = list(new ScilabString("summation_i16e"),new ScilabDouble(4)); } else if (this.Datatype==5) { - this.model.sim = list("summation_i8e",4); + this.model.sim = list(new ScilabString("summation_i8e"),new ScilabDouble(4)); } else if (this.Datatype==6) { - this.model.sim = list("summation_ui32e",4); + this.model.sim = list(new ScilabString("summation_ui32e"),new ScilabDouble(4)); } else if (this.Datatype==7) { - this.model.sim = list("summation_ui16e",4); + this.model.sim = list(new ScilabString("summation_ui16e"),new ScilabDouble(4)); } else if (this.Datatype==8) { - this.model.sim = list("summation_ui8e",4); + this.model.sim = list(new ScilabString("summation_ui8e"),new ScilabDouble(4)); } } } diff --git a/js/Linear/SUM_f.js b/js/Linear/SUM_f.js index 76f1d489..ab5e7e3b 100644 --- a/js/Linear/SUM_f.js +++ b/js/Linear/SUM_f.js @@ -2,7 +2,7 @@ function SUM_f() { SUM_f.prototype.define = function SUM_f() { this.model = scicos_model(); - this.model.sim = list("plusblk",2); + this.model.sim = list(new ScilabString("plusblk"),new ScilabDouble(2)); this.model.in1 = [[-1],[-1],[-1]]; this.model.out = new ScilabDouble(-1); this.model.blocktype = new ScilabString("c"); diff --git a/js/Linear/TCLSS.js b/js/Linear/TCLSS.js index dc538324..a4929c9c 100644 --- a/js/Linear/TCLSS.js +++ b/js/Linear/TCLSS.js @@ -10,7 +10,7 @@ function TCLSS() { nx = size(this.x0,"*"); out = 1; this.model = scicos_model(); - this.model.sim = list("tcslti4",4); + this.model.sim = list(new ScilabString("tcslti4"),new ScilabDouble(4)); this.model.in1 = [[in1],[nx]]; this.model.out = new ScilabDouble(out); this.model.evtin = new ScilabDouble(1); @@ -85,9 +85,9 @@ function TCLSS() { this.model.state = this.x0.slice(); this.model.rpar = rpar; if (this.D!=[]) { - this.model.sim = list("tcslti4",4); + this.model.sim = list(new ScilabString("tcslti4"),new ScilabDouble(4)); } else { - this.model.sim = list("tcsltj4",4); + this.model.sim = list(new ScilabString("tcsltj4"),new ScilabDouble(4)); } this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Linear/TCLSS_f.js b/js/Linear/TCLSS_f.js index 00370934..f040dc61 100644 --- a/js/Linear/TCLSS_f.js +++ b/js/Linear/TCLSS_f.js @@ -10,7 +10,7 @@ function TCLSS_f() { nx = size(this.x0,"*"); out = 1; this.model = scicos_model(); - this.model.sim = list("tcslti",1); + this.model.sim = list(new ScilabString("tcslti"),new ScilabDouble(1)); this.model.in1 = [[in1],[nx]]; this.model.out = new ScilabDouble(out); this.model.evtin = new ScilabDouble(1); @@ -85,9 +85,9 @@ function TCLSS_f() { this.model.state = this.x0.slice(); this.model.rpar = rpar; if (this.D!=[]) { - this.model.sim = list("tcslti",1); + this.model.sim = list(new ScilabString("tcslti"),new ScilabDouble(1)); } else { - this.model.sim = list("tcsltj",1); + this.model.sim = list(new ScilabString("tcsltj"),new ScilabDouble(1)); } this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Linear/TIME_DELAY.js b/js/Linear/TIME_DELAY.js index ce36dfc9..963504ab 100644 --- a/js/Linear/TIME_DELAY.js +++ b/js/Linear/TIME_DELAY.js @@ -6,7 +6,7 @@ function TIME_DELAY() { this.init = 0; this.N = 1024; this.model = scicos_model(); - this.model.sim = list("time_delay",4); + this.model.sim = list(new ScilabString("time_delay"),new ScilabDouble(4)); this.model.in1 = [nin]; this.model.out = new ScilabDouble(nin); this.model.rpar = [this.T,this.init]; diff --git a/js/Linear/VARIABLE_DELAY.js b/js/Linear/VARIABLE_DELAY.js index 9b4fc33f..50216a5b 100644 --- a/js/Linear/VARIABLE_DELAY.js +++ b/js/Linear/VARIABLE_DELAY.js @@ -6,7 +6,7 @@ function VARIABLE_DELAY() { this.init = 0; this.N = 1024; this.model = scicos_model(); - this.model.sim = list("variable_delay",4); + this.model.sim = list(new ScilabString("variable_delay"),new ScilabDouble(4)); this.model.in1 = [[nin],[1]]; this.model.out = new ScilabDouble(nin); this.model.rpar = [this.T,this.init]; diff --git a/js/MatrixOp/CUMSUM.js b/js/MatrixOp/CUMSUM.js index fab59e4e..4757f5cb 100644 --- a/js/MatrixOp/CUMSUM.js +++ b/js/MatrixOp/CUMSUM.js @@ -4,7 +4,7 @@ function CUMSUM() { this.model = scicos_model(); function_name = "cumsum_m"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-2); this.model.intyp = new ScilabDouble(1); @@ -92,7 +92,7 @@ function CUMSUM() { [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); } if (ok) { - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); arg1.model = this.model; graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/MatrixOp/EXTRACT.js b/js/MatrixOp/EXTRACT.js index 0ddee0c2..96f0f745 100644 --- a/js/MatrixOp/EXTRACT.js +++ b/js/MatrixOp/EXTRACT.js @@ -4,7 +4,7 @@ function EXTRACT() { this.model = scicos_model(); function_name = "extract"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-2); this.model.intyp = new ScilabDouble(1); @@ -91,7 +91,7 @@ function EXTRACT() { if (ok) { label = exprs; [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); graphics.exprs = label; arg1.graphics = graphics; arg1.model = this.model; diff --git a/js/MatrixOp/EXTTRI.js b/js/MatrixOp/EXTTRI.js index e2591656..a27d03b7 100644 --- a/js/MatrixOp/EXTTRI.js +++ b/js/MatrixOp/EXTTRI.js @@ -4,7 +4,7 @@ function EXTTRI() { this.model = scicos_model(); function_name = "extrilz"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-2); this.model.intyp = new ScilabDouble(1); @@ -89,7 +89,7 @@ function EXTTRI() { [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); } if (ok) { - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); arg1.model = this.model; graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/MatrixOp/MATBKSL.js b/js/MatrixOp/MATBKSL.js index 48a7dd6b..7a603424 100644 --- a/js/MatrixOp/MATBKSL.js +++ b/js/MatrixOp/MATBKSL.js @@ -4,7 +4,7 @@ function MATBKSL() { this.model = scicos_model(); function_name = "mat_bksl"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = [[-1],[-1]]; this.model.in2 = [[-2],[-3]]; this.model.intyp = [1,1]; @@ -66,7 +66,7 @@ function MATBKSL() { if (ok) { label = exprs; [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); graphics.exprs = label; arg1.graphics = graphics; arg1.model = this.model; diff --git a/js/MatrixOp/MATCATH.js b/js/MatrixOp/MATCATH.js index 31889bf1..01fb0d32 100644 --- a/js/MatrixOp/MATCATH.js +++ b/js/MatrixOp/MATCATH.js @@ -4,7 +4,7 @@ function MATCATH() { this.model = scicos_model(); function_name = "mat_cath"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = [[-1],[-1]]; this.model.in2 = [[-2],[-3]]; this.model.intyp = [1,1]; @@ -57,7 +57,7 @@ function MATCATH() { [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); if (ok) { funtyp = 4; - this.model.sim = list("mat_cath",funtyp); + this.model.sim = list(new ScilabString("mat_cath"),new ScilabDouble(funtyp)); graphics.exprs = label; arg1.graphics = graphics; arg1.model = this.model; diff --git a/js/MatrixOp/MATCATV.js b/js/MatrixOp/MATCATV.js index 41205c93..13e3f7ef 100644 --- a/js/MatrixOp/MATCATV.js +++ b/js/MatrixOp/MATCATV.js @@ -5,7 +5,7 @@ function MATCATV() { this.model = scicos_model(); function_name = "mat_catv"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in2 = [[-1],[-1]]; this.model.in1 = [[-2],[-3]]; this.model.intyp = [-1,-1]; @@ -58,7 +58,7 @@ function MATCATV() { [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); if (ok) { funtyp = 4; - this.model.sim = list("mat_catv",funtyp); + this.model.sim = list(new ScilabString("mat_catv"),new ScilabDouble(funtyp)); graphics.exprs = label; arg1.graphics = graphics; arg1.model = this.model; diff --git a/js/MatrixOp/MATDET.js b/js/MatrixOp/MATDET.js index d06fcb58..8dd414c2 100644 --- a/js/MatrixOp/MATDET.js +++ b/js/MatrixOp/MATDET.js @@ -4,7 +4,7 @@ function MATDET() { this.model = scicos_model(); function_name = "mat_det"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-1); this.model.intyp = new ScilabDouble(1); @@ -66,7 +66,7 @@ function MATDET() { if (ok) { label = exprs; [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); graphics.exprs = label; arg1.graphics = graphics; arg1.model = this.model; diff --git a/js/MatrixOp/MATDIAG.js b/js/MatrixOp/MATDIAG.js index 41cac0d7..10277c65 100644 --- a/js/MatrixOp/MATDIAG.js +++ b/js/MatrixOp/MATDIAG.js @@ -4,7 +4,7 @@ function MATDIAG() { this.model = scicos_model(); function_name = "mat_diag"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(1); this.model.intyp = new ScilabDouble(1); @@ -66,7 +66,7 @@ function MATDIAG() { if (ok) { label = exprs; [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); graphics.exprs = label; arg1.graphics = graphics; arg1.model = this.model; diff --git a/js/MatrixOp/MATDIV.js b/js/MatrixOp/MATDIV.js index 91442543..76b03fad 100644 --- a/js/MatrixOp/MATDIV.js +++ b/js/MatrixOp/MATDIV.js @@ -4,7 +4,7 @@ function MATDIV() { this.model = scicos_model(); function_name = "mat_div"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = [[-1],[-2]]; this.model.in2 = [[-3],[-3]]; this.model.intyp = [1,1]; @@ -66,7 +66,7 @@ function MATDIV() { if (ok) { label = exprs; [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); graphics.exprs = label; arg1.graphics = graphics; arg1.model = this.model; diff --git a/js/MatrixOp/MATEIG.js b/js/MatrixOp/MATEIG.js index 2b8e6b7f..9ae3054b 100644 --- a/js/MatrixOp/MATEIG.js +++ b/js/MatrixOp/MATEIG.js @@ -4,7 +4,7 @@ function MATEIG() { this.model = scicos_model(); function_name = "mat_vps"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-1); this.model.intyp = new ScilabDouble(1); @@ -90,7 +90,7 @@ function MATEIG() { [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); } if (ok) { - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); arg1.model = this.model; graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/MatrixOp/MATEXPM.js b/js/MatrixOp/MATEXPM.js index e9aa1f53..ab53af01 100644 --- a/js/MatrixOp/MATEXPM.js +++ b/js/MatrixOp/MATEXPM.js @@ -4,7 +4,7 @@ function MATEXPM() { this.model = scicos_model(); function_name = "mat_expm"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-1); this.model.intyp = new ScilabDouble(1); @@ -66,7 +66,7 @@ function MATEXPM() { if (ok) { label = exprs; [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); graphics.exprs = label; arg1.graphics = graphics; arg1.model = this.model; diff --git a/js/MatrixOp/MATINV.js b/js/MatrixOp/MATINV.js index 40d54de2..319c28ad 100644 --- a/js/MatrixOp/MATINV.js +++ b/js/MatrixOp/MATINV.js @@ -4,7 +4,7 @@ function MATINV() { this.model = scicos_model(); function_name = "mat_inv"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-1); this.model.intyp = new ScilabDouble(1); @@ -66,7 +66,7 @@ function MATINV() { if (ok) { label = exprs; [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); graphics.exprs = label; arg1.graphics = graphics; arg1.model = this.model; diff --git a/js/MatrixOp/MATLU.js b/js/MatrixOp/MATLU.js index 41a6989a..24a703f5 100644 --- a/js/MatrixOp/MATLU.js +++ b/js/MatrixOp/MATLU.js @@ -4,7 +4,7 @@ function MATLU() { this.model = scicos_model(); function_name = "mat_lu"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-1); this.model.intyp = new ScilabDouble(1); @@ -66,7 +66,7 @@ function MATLU() { } if (ok) { funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); graphics.exprs = this.lab; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/MatrixOp/MATMAGPHI.js b/js/MatrixOp/MATMAGPHI.js index 85bdcd7c..b03027d3 100644 --- a/js/MatrixOp/MATMAGPHI.js +++ b/js/MatrixOp/MATMAGPHI.js @@ -4,7 +4,7 @@ function MATMAGPHI() { this.model = scicos_model(); function_name = "matz_abs"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-2); this.model.intyp = new ScilabDouble(2); @@ -71,7 +71,7 @@ function MATMAGPHI() { [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); } if (ok) { - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); arg1.model = this.model; graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/MatrixOp/MATMUL.js b/js/MatrixOp/MATMUL.js index 955f4d7a..9cf4bd3e 100644 --- a/js/MatrixOp/MATMUL.js +++ b/js/MatrixOp/MATMUL.js @@ -2,7 +2,7 @@ function MATMUL() { MATMUL.prototype.define = function MATMUL() { this.model = scicos_model(); - this.model.sim = list("matmul_m",4); + this.model.sim = list(new ScilabString("matmul_m"),new ScilabDouble(4)); this.model.in1 = [[-1],[-2]]; this.model.in2 = [[-2],[-3]]; this.model.out = new ScilabDouble(-1); @@ -63,72 +63,72 @@ function MATMUL() { TABMAX = [[0],[0],[(2^31)-1],[(2^15)-1],[(2^7)-1],[(2^32)-1],[(2^16)-1],[(2^8)-1]]; if (this.rule==2) { if (this.np==0) { - this.model.sim = list("matmul2_m",4); + this.model.sim = list(new ScilabString("matmul2_m"),new ScilabDouble(4)); } else if (this.np==1) { - this.model.sim = list("matmul2_s",4); + this.model.sim = list(new ScilabString("matmul2_s"),new ScilabDouble(4)); } else { - this.model.sim = list("matmul2_e",4); + this.model.sim = list(new ScilabString("matmul2_e"),new ScilabDouble(4)); } } else if (this.rule==3) { if (this.np==0) { - this.model.sim = list("matbyscal",4); + this.model.sim = list(new ScilabString("matbyscal"),new ScilabDouble(4)); } else if (this.np==1) { - this.model.sim = list("matbyscal_s",4); + this.model.sim = list(new ScilabString("matbyscal_s"),new ScilabDouble(4)); } else { - this.model.sim = list("matbyscal_e",4); + this.model.sim = list(new ScilabString("matbyscal_e"),new ScilabDouble(4)); } } else { if ((this.dtype==1)) { - this.model.sim = list("matmul_m",4); + this.model.sim = list(new ScilabString("matmul_m"),new ScilabDouble(4)); } else if ((this.dtype==2)) { - this.model.sim = list("matzmul_m",4); + this.model.sim = list(new ScilabString("matzmul_m"),new ScilabDouble(4)); } else if (this.dtype==3) { if (this.np==0) { - this.model.sim = list("matmul_i32n",4); + this.model.sim = list(new ScilabString("matmul_i32n"),new ScilabDouble(4)); } else if (this.np==1) { - this.model.sim = list("matmul_i32s",4); + this.model.sim = list(new ScilabString("matmul_i32s"),new ScilabDouble(4)); } else { - this.model.sim = list("matmul_i32e",4); + this.model.sim = list(new ScilabString("matmul_i32e"),new ScilabDouble(4)); } } else if (this.dtype==4) { if (this.np==0) { - this.model.sim = list("matmul_i16n",4); + this.model.sim = list(new ScilabString("matmul_i16n"),new ScilabDouble(4)); } else if (this.np==1) { - this.model.sim = list("matmul_i16s",4); + this.model.sim = list(new ScilabString("matmul_i16s"),new ScilabDouble(4)); } else { - this.model.sim = list("matmul_i16e",4); + this.model.sim = list(new ScilabString("matmul_i16e"),new ScilabDouble(4)); } } else if (this.dtype==5) { if (this.np==0) { - this.model.sim = list("matmul_i8n",4); + this.model.sim = list(new ScilabString("matmul_i8n"),new ScilabDouble(4)); } else if (this.np==1) { - this.model.sim = list("matmul_i8s",4); + this.model.sim = list(new ScilabString("matmul_i8s"),new ScilabDouble(4)); } else { - this.model.sim = list("matmul_i8e",4); + this.model.sim = list(new ScilabString("matmul_i8e"),new ScilabDouble(4)); } } else if (this.dtype==6) { if (this.np==0) { - this.model.sim = list("matmul_ui32n",4); + this.model.sim = list(new ScilabString("matmul_ui32n"),new ScilabDouble(4)); } else if (this.np==1) { - this.model.sim = list("matmul_ui32s",4); + this.model.sim = list(new ScilabString("matmul_ui32s"),new ScilabDouble(4)); } else { - this.model.sim = list("matmul_ui32e",4); + this.model.sim = list(new ScilabString("matmul_ui32e"),new ScilabDouble(4)); } } else if (this.dtype==7) { if (this.np==0) { - this.model.sim = list("matmul_ui16n",4); + this.model.sim = list(new ScilabString("matmul_ui16n"),new ScilabDouble(4)); } else if (this.np==1) { - this.model.sim = list("matmul_ui16s",4); + this.model.sim = list(new ScilabString("matmul_ui16s"),new ScilabDouble(4)); } else { - this.model.sim = list("matmul_ui16e",4); + this.model.sim = list(new ScilabString("matmul_ui16e"),new ScilabDouble(4)); } } else if (this.dtype==8) { if (this.np==0) { - this.model.sim = list("matmul_ui8n",4); + this.model.sim = list(new ScilabString("matmul_ui8n"),new ScilabDouble(4)); } else if (this.np==1) { - this.model.sim = list("matmul_ui8s",4); + this.model.sim = list(new ScilabString("matmul_ui8s"),new ScilabDouble(4)); } else { - this.model.sim = list("matmul_ui8e",4); + this.model.sim = list(new ScilabString("matmul_ui8e"),new ScilabDouble(4)); } } } diff --git a/js/MatrixOp/MATPINV.js b/js/MatrixOp/MATPINV.js index f77d1db0..842e7082 100644 --- a/js/MatrixOp/MATPINV.js +++ b/js/MatrixOp/MATPINV.js @@ -4,7 +4,7 @@ function MATPINV() { this.model = scicos_model(); function_name = "mat_pinv"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-2); this.model.intyp = new ScilabDouble(1); @@ -66,7 +66,7 @@ function MATPINV() { if (ok) { label = exprs; [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); graphics.exprs = label; arg1.graphics = graphics; arg1.model = this.model; diff --git a/js/MatrixOp/MATRESH.js b/js/MatrixOp/MATRESH.js index ff814632..363a21c2 100644 --- a/js/MatrixOp/MATRESH.js +++ b/js/MatrixOp/MATRESH.js @@ -4,7 +4,7 @@ function MATRESH() { this.model = scicos_model(); function_name = "mat_reshape"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-2); this.model.intyp = new ScilabDouble(1); @@ -95,7 +95,7 @@ function MATRESH() { } if (ok) { funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); graphics.exprs = label; arg1.graphics = graphics; arg1.model = this.model; diff --git a/js/MatrixOp/MATSING.js b/js/MatrixOp/MATSING.js index 00867c61..99f10974 100644 --- a/js/MatrixOp/MATSING.js +++ b/js/MatrixOp/MATSING.js @@ -4,7 +4,7 @@ function MATSING() { this.model = scicos_model(); function_name = "mat_sing"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-2); this.model.intyp = new ScilabDouble(1); @@ -93,7 +93,7 @@ function MATSING() { [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); } if (ok) { - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); arg1.model = this.model; graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/MatrixOp/MATSUM.js b/js/MatrixOp/MATSUM.js index fda1ba97..a3388ca8 100644 --- a/js/MatrixOp/MATSUM.js +++ b/js/MatrixOp/MATSUM.js @@ -4,7 +4,7 @@ function MATSUM() { this.model = scicos_model(); function_name = "mat_sum"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-2); this.model.intyp = new ScilabDouble(1); @@ -94,7 +94,7 @@ function MATSUM() { [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); } if (ok) { - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); arg1.model = this.model; graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/MatrixOp/MATTRAN.js b/js/MatrixOp/MATTRAN.js index 26aaeca5..aede44ad 100644 --- a/js/MatrixOp/MATTRAN.js +++ b/js/MatrixOp/MATTRAN.js @@ -2,7 +2,7 @@ function MATTRAN() { MATTRAN.prototype.define = function MATTRAN() { this.model = scicos_model(); - this.model.sim = list("mattran_m",4); + this.model.sim = list(new ScilabString("mattran_m"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-2); this.model.out = new ScilabDouble(-2); @@ -60,7 +60,7 @@ function MATTRAN() { if (ok) { label = exprs; [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); graphics.exprs = label; arg1.graphics = graphics; arg1.model = this.model; diff --git a/js/MatrixOp/MATZCONJ.js b/js/MatrixOp/MATZCONJ.js index fb995ca6..7eaa6a4b 100644 --- a/js/MatrixOp/MATZCONJ.js +++ b/js/MatrixOp/MATZCONJ.js @@ -4,7 +4,7 @@ function MATZCONJ() { this.model = scicos_model(); function_name = "matz_conj"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-2); this.model.intyp = new ScilabDouble(2); diff --git a/js/MatrixOp/MATZREIM.js b/js/MatrixOp/MATZREIM.js index 4b42c962..eb526f90 100644 --- a/js/MatrixOp/MATZREIM.js +++ b/js/MatrixOp/MATZREIM.js @@ -4,7 +4,7 @@ function MATZREIM() { this.model = scicos_model(); function_name = "matz_reim"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-2); this.model.intyp = new ScilabDouble(2); @@ -71,7 +71,7 @@ function MATZREIM() { [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); } if (ok) { - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); arg1.model = this.model; graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/MatrixOp/RICC.js b/js/MatrixOp/RICC.js index 9a96442c..2f7d2abb 100644 --- a/js/MatrixOp/RICC.js +++ b/js/MatrixOp/RICC.js @@ -4,7 +4,7 @@ function RICC() { this.model = scicos_model(); function_name = "ricc_m"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = [[-1],[-1],[-1]]; this.model.in2 = [[-1],[-1],[-1]]; this.model.intyp = [1,1,1]; diff --git a/js/MatrixOp/ROOTCOEF.js b/js/MatrixOp/ROOTCOEF.js index 94e09951..15f060df 100644 --- a/js/MatrixOp/ROOTCOEF.js +++ b/js/MatrixOp/ROOTCOEF.js @@ -4,7 +4,7 @@ function ROOTCOEF() { this.model = scicos_model(); function_name = "root_coef"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(1); this.model.intyp = new ScilabDouble(1); @@ -68,7 +68,7 @@ function ROOTCOEF() { if (ok) { label = exprs; [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); graphics.exprs = label; arg1.graphics = graphics; arg1.model = this.model; diff --git a/js/MatrixOp/SQRT.js b/js/MatrixOp/SQRT.js index cddf98f2..9809545e 100644 --- a/js/MatrixOp/SQRT.js +++ b/js/MatrixOp/SQRT.js @@ -2,7 +2,7 @@ function SQRT() { SQRT.prototype.define = function SQRT() { this.model = scicos_model(); - this.model.sim = list("mat_sqrt",4); + this.model.sim = list(new ScilabString("mat_sqrt"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-2); this.model.intyp = new ScilabDouble(1); @@ -51,7 +51,7 @@ function SQRT() { if (ok) { label = exprs; [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); graphics.exprs = label; arg1.graphics = graphics; arg1.model = this.model; diff --git a/js/MatrixOp/SUBMAT.js b/js/MatrixOp/SUBMAT.js index 5db415ed..5b1a1e1c 100644 --- a/js/MatrixOp/SUBMAT.js +++ b/js/MatrixOp/SUBMAT.js @@ -4,7 +4,7 @@ function SUBMAT() { this.model = scicos_model(); function_name = "submat"; funtyp = 4; - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-2); this.model.intyp = new ScilabDouble(1); @@ -97,7 +97,7 @@ function SUBMAT() { label = exprs; if (ok) { [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); graphics.exprs = label; arg1.graphics = graphics; arg1.model = this.model; diff --git a/js/Misc/AUTOMAT.js b/js/Misc/AUTOMAT.js index 2ba7bda8..06b0b664 100644 --- a/js/Misc/AUTOMAT.js +++ b/js/Misc/AUTOMAT.js @@ -12,7 +12,7 @@ function AUTOMAT() { ipar = [[NMode],[this.Minitial],[NX],[this.XP],[C1],[C2]]; rpar = [this.X0]; this.model = scicos_model(); - this.model.sim = list("automat",10004); + this.model.sim = list(new ScilabString("automat"),new ScilabDouble(10004)); this.model.in1 = [[2*NX+1],[2*NX+1]]; this.model.out = [[2],[2*NX]]; this.model.state = new ScilabDouble(ones(2*NX,1)); diff --git a/js/Misc/BACKLASH.js b/js/Misc/BACKLASH.js index 30a8b1ec..14d36de1 100644 --- a/js/Misc/BACKLASH.js +++ b/js/Misc/BACKLASH.js @@ -3,7 +3,7 @@ function BACKLASH() { BACKLASH.prototype.define = function BACKLASH() { exprs = [["0"],["1"],["1"]]; this.model = scicos_model(); - this.model.sim = list("backlash",4); + this.model.sim = list(new ScilabString("backlash"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(1); this.model.out = new ScilabDouble(1); this.model.rpar = [[0],[1]]; diff --git a/js/Misc/BOUNCE.js b/js/Misc/BOUNCE.js index 899d7c5d..fd75dd92 100644 --- a/js/Misc/BOUNCE.js +++ b/js/Misc/BOUNCE.js @@ -24,7 +24,7 @@ function BOUNCE() { state = [this.x,this.xd,this.y,this.yd]; state = transpose(state); this.model = scicos_model(); - this.model.sim = list("bounce_ball",4); + this.model.sim = list(new ScilabString("bounce_ball"),new ScilabDouble(4)); this.model.in1 = []; this.model.out = [[n],[n]]; this.model.state = state.slice(); diff --git a/js/Misc/BOUNCEXY.js b/js/Misc/BOUNCEXY.js index 1f4509c1..a0123d59 100644 --- a/js/Misc/BOUNCEXY.js +++ b/js/Misc/BOUNCEXY.js @@ -10,7 +10,7 @@ function BOUNCEXY() { this.ymin = 0; this.ymax = 15; this.model = scicos_model(); - this.model.sim = list("bouncexy",4); + this.model.sim = list(new ScilabString("bouncexy"),new ScilabDouble(4)); this.model.in1 = [[-1],[-1]]; this.model.in2 = [[1],[1]]; this.model.intyp = [[1],[1]]; diff --git a/js/Misc/BPLATFORM.js b/js/Misc/BPLATFORM.js index 8c7f2bb0..777abcba 100644 --- a/js/Misc/BPLATFORM.js +++ b/js/Misc/BPLATFORM.js @@ -9,7 +9,7 @@ function BPLATFORM() { this.ymin = 0; this.ymax = 15; this.model = scicos_model(); - this.model.sim = list("bplatform2",5); + this.model.sim = list(new ScilabString("bplatform2"),new ScilabDouble(5)); this.model.in1 = [[1],[1]]; this.model.evtin = new ScilabDouble(1); this.model.dstate = new ScilabDouble(0); diff --git a/js/Misc/CBLOCK.js b/js/Misc/CBLOCK.js index 30976cb0..38cb0da0 100644 --- a/js/Misc/CBLOCK.js +++ b/js/Misc/CBLOCK.js @@ -14,7 +14,7 @@ function CBLOCK() { funam = "toto"; this.ng = 0; this.model = scicos_model(); - this.model.sim = list(" ",2004); + 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; @@ -134,7 +134,7 @@ function CBLOCK() { } else { [model,graphics,ok] = check_io(this.model,graphics,this.i,this.o,this.ci,this.co); if (ok) { - this.model.sim = list(funam,funtyp); + this.model.sim = list(new ScilabDouble(funam),new ScilabDouble(funtyp)); this.model.in1 = new ScilabDouble(this.i); this.model.out = new ScilabDouble(this.o); this.model.evtin = new ScilabDouble(this.ci); diff --git a/js/Misc/CBLOCK4.js b/js/Misc/CBLOCK4.js index 84051ad4..19fd7c5c 100644 --- a/js/Misc/CBLOCK4.js +++ b/js/Misc/CBLOCK4.js @@ -3,7 +3,7 @@ function CBLOCK4() { CBLOCK4.prototype.define = function CBLOCK4() { funam = "toto"; this.model = scicos_model(); - this.model.sim = list(" ",2004); + this.model.sim = list(new ScilabString(" "),new ScilabDouble(2004)); this.model.in1 = new ScilabDouble(1); this.model.in2 = new ScilabDouble(1); this.model.intyp = new ScilabDouble(1); @@ -127,7 +127,7 @@ function CBLOCK4() { break; } } else { - this.model.sim = list(funam,funtyp); + this.model.sim = list(new ScilabDouble(funam),new ScilabDouble(funtyp)); this.model.state = this.xx; this.model.dstate = this.z; this.model.odstate = new ScilabDouble(this.oz); diff --git a/js/Misc/CONSTRAINT2_c.js b/js/Misc/CONSTRAINT2_c.js index 8d86b801..88363986 100644 --- a/js/Misc/CONSTRAINT2_c.js +++ b/js/Misc/CONSTRAINT2_c.js @@ -5,7 +5,7 @@ function CONSTRAINT2_c() { this.xd0 = [0]; this.id = [0]; this.model = scicos_model(); - this.model.sim = list("constraint_c",10004); + this.model.sim = list(new ScilabString("constraint_c"),new ScilabDouble(10004)); this.model.in1 = new ScilabDouble(1); this.model.out = [[1],[1]]; this.model.state = [[this.x0],[this.xd0]]; diff --git a/js/Misc/CONSTRAINT_c.js b/js/Misc/CONSTRAINT_c.js index 084c7ef7..6a7ac07c 100644 --- a/js/Misc/CONSTRAINT_c.js +++ b/js/Misc/CONSTRAINT_c.js @@ -3,7 +3,7 @@ function CONSTRAINT_c() { CONSTRAINT_c.prototype.define = function CONSTRAINT_c() { this.x0 = [[0],[0]]; this.model = scicos_model(); - this.model.sim = list("constraint_c",10004); + this.model.sim = list(new ScilabString("constraint_c"),new ScilabDouble(10004)); this.model.in1 = new ScilabDouble(1); this.model.out = new ScilabDouble(1); this.model.ipar = new ScilabDouble(0); diff --git a/js/Misc/DEADBAND.js b/js/Misc/DEADBAND.js index dc380f40..7d1dd640 100644 --- a/js/Misc/DEADBAND.js +++ b/js/Misc/DEADBAND.js @@ -5,7 +5,7 @@ function DEADBAND() { this.maxp = .5; rpar = [[this.maxp],[this.minp]]; this.model = scicos_model(); - this.model.sim = list("deadband",4); + this.model.sim = list(new ScilabString("deadband"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(1); this.model.nzcross = new ScilabDouble(2); this.model.nmode = new ScilabDouble(1); diff --git a/js/Misc/DEBUG.js b/js/Misc/DEBUG.js index fd1547c1..a8f8c683 100644 --- a/js/Misc/DEBUG.js +++ b/js/Misc/DEBUG.js @@ -2,7 +2,7 @@ function DEBUG() { DEBUG.prototype.define = function DEBUG() { this.model = scicos_model(); - this.model.sim = list("%debug_scicos",99); + this.model.sim = list(new ScilabString("%debug_scicos"),new ScilabDouble(99)); this.model.blocktype = new ScilabString("d"); exprs = list("","xcos_debug_gui(flag,block);"); gr_i = []; diff --git a/js/Misc/DIFF_f.js b/js/Misc/DIFF_f.js index cc27fc20..4d8c219c 100644 --- a/js/Misc/DIFF_f.js +++ b/js/Misc/DIFF_f.js @@ -3,7 +3,7 @@ function DIFF_f() { DIFF_f.prototype.define = function DIFF_f() { this.x0 = [[0],[0]]; this.model = scicos_model(); - this.model.sim = list("diffblk",10001); + this.model.sim = list(new ScilabString("diffblk"),new ScilabDouble(10001)); this.model.in1 = new ScilabDouble(1); this.model.out = new ScilabDouble(1); this.model.state = this.x0; diff --git a/js/Misc/EDGETRIGGER.js b/js/Misc/EDGETRIGGER.js index fcbf7b41..5ecdcb0a 100644 --- a/js/Misc/EDGETRIGGER.js +++ b/js/Misc/EDGETRIGGER.js @@ -3,7 +3,7 @@ function EDGETRIGGER() { EDGETRIGGER.prototype.define = function EDGETRIGGER() { this.edge = 1; this.model = scicos_model(); - this.model.sim = list("edgetrig",4); + this.model.sim = list(new ScilabString("edgetrig"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(1); this.model.out = new ScilabDouble(1); this.model.dstate = new ScilabDouble(0); diff --git a/js/Misc/HYSTHERESIS.js b/js/Misc/HYSTHERESIS.js index bb85aa33..2f0a6d56 100644 --- a/js/Misc/HYSTHERESIS.js +++ b/js/Misc/HYSTHERESIS.js @@ -6,7 +6,7 @@ function HYSTHERESIS() { this.nzz = 2; rpar = [[1],[0],[1],[0]]; this.model = scicos_model(); - this.model.sim = list("hystheresis",4); + this.model.sim = list(new ScilabString("hystheresis"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(in1); this.model.out = new ScilabDouble(1); this.model.rpar = rpar; diff --git a/js/Misc/LOGICAL_OP.js b/js/Misc/LOGICAL_OP.js index fbd68077..05bef006 100644 --- a/js/Misc/LOGICAL_OP.js +++ b/js/Misc/LOGICAL_OP.js @@ -5,7 +5,7 @@ function LOGICAL_OP() { ipar = [0]; this.nin = 2; this.model = scicos_model(); - this.model.sim = list("logicalop",4); + this.model.sim = list(new ScilabString("logicalop"),new ScilabDouble(4)); this.model.in1 = in1; this.model.out = new ScilabDouble(-1); this.model.ipar = ipar; @@ -66,21 +66,21 @@ function LOGICAL_OP() { this.tp = 1; } if (this.Datatype==1) { - this.model.sim = list("logicalop",4); + this.model.sim = list(new ScilabString("logicalop"),new ScilabDouble(4)); this.model.ipar = [this.rule]; } else { if (this.Datatype==3) { - this.model.sim = list("logicalop_i32",4); + this.model.sim = list(new ScilabString("logicalop_i32"),new ScilabDouble(4)); } else if (this.Datatype==4) { - this.model.sim = list("logicalop_i16",4); + this.model.sim = list(new ScilabString("logicalop_i16"),new ScilabDouble(4)); } else if (this.Datatype==5) { - this.model.sim = list("logicalop_i8",4); + this.model.sim = list(new ScilabString("logicalop_i8"),new ScilabDouble(4)); } else if (this.Datatype==6) { - this.model.sim = list("logicalop_ui32",4); + this.model.sim = list(new ScilabString("logicalop_ui32"),new ScilabDouble(4)); } else if (this.Datatype==7) { - this.model.sim = list("logicalop_ui16",4); + this.model.sim = list(new ScilabString("logicalop_ui16"),new ScilabDouble(4)); } else if (this.Datatype==8) { - this.model.sim = list("logicalop_ui8",4); + this.model.sim = list(new ScilabString("logicalop_ui8"),new ScilabDouble(4)); } else { message("Datatype is not supported"); ok = false; diff --git a/js/Misc/MBLOCK.js b/js/Misc/MBLOCK.js index 2d5fe3d2..fc1311ce 100644 --- a/js/Misc/MBLOCK.js +++ b/js/Misc/MBLOCK.js @@ -20,7 +20,7 @@ function MBLOCK() { mo = modelica(); mo.model = nameF; mo.parameters = list(param,paramv); - this.model.sim = list(mo.model,30004); + this.model.sim = list(new ScilabString(mo.model),new ScilabDouble(30004)); mo.inputs = this.in1; mo.outputs = this.out; this.model.in1 = new ScilabDouble(ones(size(mo.inputs,"r"),1)); @@ -259,7 +259,7 @@ function MBLOCK() { for (i=1;i<=lstsize(paramv);i+=1) { this.model.rpar = [[this.model.rpar],[paramv[i-1].slice()]]; } - this.model.sim[('1', 'double')] = new ScilabDouble(this.funam); + this.model.sim[1] = new ScilabDouble(this.funam); exprs.in1 = this.lab_1[1-1]; exprs.intype = this.lab_1[2-1]; exprs.out = this.lab_1[3-1]; diff --git a/js/Misc/MBLOCK.pickle b/js/Misc/MBLOCK.pickle index 88091cb4..518419e3 100644 --- a/js/Misc/MBLOCK.pickle +++ b/js/Misc/MBLOCK.pickle @@ -73,9 +73,10 @@ g11 sS'lab_2_tmp' p15 g5 -sS"model.sim[('1', 'double')]" +sS'x.model' p16 -NsS'exprs.outtype' +g7 +sS'exprs.outtype' p17 g11 sS'exprs.intype' @@ -133,13 +134,12 @@ g21 sS'x.graphics.in_implicit' p37 g21 -sS'x.model' -p38 -g7 sS'[ok,tt]' -p39 +p38 g11 -sS'mo.parameters' +sS'model.sim[1]' +p39 +NsS'mo.parameters' p40 g5 sS'Tparam_sz' diff --git a/js/Misc/MPBLOCK.js b/js/Misc/MPBLOCK.js index aaaf1dc5..509c0db0 100644 --- a/js/Misc/MPBLOCK.js +++ b/js/Misc/MPBLOCK.js @@ -20,7 +20,7 @@ function MPBLOCK() { mo = modelica(); mo.model = nameF; mo.parameters = list(param,paramv); - this.model.sim = list(mo.model,10004); + this.model.sim = list(new ScilabString(mo.model),new ScilabDouble(10004)); mo.inputs = this.in1; mo.outputs = this.out; this.model.in1 = new ScilabDouble(ones(size(mo.inputs,"r"),1)); @@ -236,7 +236,7 @@ function MPBLOCK() { for (i=1;i<=lstsize(paramv);i+=1) { this.model.rpar = [[this.model.rpar],[double(paramv[i-1].slice())]]; } - this.model.sim[('1', 'double')] = new ScilabDouble(this.funam); + this.model.sim[1] = new ScilabDouble(this.funam); exprs.in1 = lab_1[1-1]; exprs.intype = lab_1[2-1]; exprs.out = lab_1[3-1]; diff --git a/js/Misc/MPBLOCK.pickle b/js/Misc/MPBLOCK.pickle index c2410df2..64d62a78 100644 --- a/js/Misc/MPBLOCK.pickle +++ b/js/Misc/MPBLOCK.pickle @@ -112,18 +112,18 @@ g31 sS'paramv' p35 g5 -sS"model.sim[('1', 'double')]" +sS'gr_i' p36 -NsS'gr_i' -p37 g31 sS'x.graphics.in_implicit' -p38 +p37 g31 sS'x.model' -p39 +p38 g9 -sS'mo.parameters' +sS'model.sim[1]' +p39 +NsS'mo.parameters' p40 g5 sS'Tparam_sz' diff --git a/js/Misc/PENDULUM_ANIM.js b/js/Misc/PENDULUM_ANIM.js index 375b3739..456ca1ef 100644 --- a/js/Misc/PENDULUM_ANIM.js +++ b/js/Misc/PENDULUM_ANIM.js @@ -9,7 +9,7 @@ function PENDULUM_ANIM() { this.ymin = -5; this.ymax = 5; this.model = scicos_model(); - this.model.sim = list("anim_pen",5); + this.model.sim = list(new ScilabString("anim_pen"),new ScilabDouble(5)); this.model.in1 = [[1],[1]]; this.model.evtin = new ScilabDouble(1); this.model.dstate = new ScilabDouble(0); diff --git a/js/Misc/RATELIMITER.js b/js/Misc/RATELIMITER.js index 55ea69c5..ba4a5958 100644 --- a/js/Misc/RATELIMITER.js +++ b/js/Misc/RATELIMITER.js @@ -5,7 +5,7 @@ function RATELIMITER() { this.maxp = 1; rpar = [[this.maxp],[this.minp]]; this.model = scicos_model(); - this.model.sim = list("ratelimiter",4); + this.model.sim = list(new ScilabString("ratelimiter"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(1); this.model.out = new ScilabDouble(1); this.model.rpar = rpar; diff --git a/js/Misc/RELATIONALOP.js b/js/Misc/RELATIONALOP.js index 9cf2543e..a98b7e5d 100644 --- a/js/Misc/RELATIONALOP.js +++ b/js/Misc/RELATIONALOP.js @@ -4,7 +4,7 @@ function RELATIONALOP() { ipar = [2]; label = "<"; this.model = scicos_model(); - this.model.sim = list("relationalop",4); + this.model.sim = list(new ScilabString("relationalop"),new ScilabDouble(4)); this.model.in1 = [[1],[1]]; this.model.out = new ScilabDouble(1); this.model.ipar = ipar; @@ -52,19 +52,19 @@ function RELATIONALOP() { ok = false; } if ((this.Datatype==1)) { - this.model.sim = list("relational_op",4); + this.model.sim = list(new ScilabString("relational_op"),new ScilabDouble(4)); } else if ((this.Datatype==3||this.Datatype==9)) { - this.model.sim = list("relational_op_i32",4); + this.model.sim = list(new ScilabString("relational_op_i32"),new ScilabDouble(4)); } else if ((this.Datatype==4)) { - this.model.sim = list("relational_op_i16",4); + this.model.sim = list(new ScilabString("relational_op_i16"),new ScilabDouble(4)); } else if ((this.Datatype==5)) { - this.model.sim = list("relational_op_i8",4); + this.model.sim = list(new ScilabString("relational_op_i8"),new ScilabDouble(4)); } else if ((this.Datatype==6)) { - this.model.sim = list("relational_op_ui32",4); + this.model.sim = list(new ScilabString("relational_op_ui32"),new ScilabDouble(4)); } else if ((this.Datatype==7)) { - this.model.sim = list("relational_op_ui16",4); + this.model.sim = list(new ScilabString("relational_op_ui16"),new ScilabDouble(4)); } else if ((this.Datatype==8)) { - this.model.sim = list("relational_op_ui8",4); + this.model.sim = list(new ScilabString("relational_op_ui8"),new ScilabDouble(4)); } else { message("Datatype is not supported"); ok = false; diff --git a/js/Misc/c_block.js b/js/Misc/c_block.js index 3c1e294c..32685ce8 100644 --- a/js/Misc/c_block.js +++ b/js/Misc/c_block.js @@ -12,7 +12,7 @@ function c_block() { this.rpar = []; this.funam = "toto"; this.model = scicos_model(); - this.model.sim = list(" ",2001); + 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; @@ -75,7 +75,7 @@ function c_block() { } [model,graphics,ok] = check_io(this.model,graphics,this.i,this.o,[],[]); if (ok) { - this.model.sim[('1', 'double')] = new ScilabString(this.funam); + this.model.sim[1] = new ScilabString(this.funam); this.model.rpar = this.rpar; label[2-1] = tt; this.x.model = this.model; diff --git a/js/Misc/c_block.pickle b/js/Misc/c_block.pickle index 4696c640..bb191268 100644 --- a/js/Misc/c_block.pickle +++ b/js/Misc/c_block.pickle @@ -80,47 +80,47 @@ g9 sS'model.evtin' p24 g3 -sS'model.firing' +sS'model.sim[1]' p25 +NsS'model.firing' +p26 g3 sS'model.sim' -p26 +p27 g22 sS'model.evtout' -p27 +p28 g3 sS'clkout' -p28 +p29 g3 sS'auto' -p29 +p30 g3 sS'label[2-1]' -p30 +p31 g3 sS'in1' -p31 +p32 g9 sS'model.rpar' -p32 +p33 g3 sS'model.state' -p33 +p34 g3 sS'graphics.exprs' -p34 -NsS'x0' p35 +NsS'x0' +p36 g3 sS'model.ipar' -p36 +p37 g9 sS'typ' -p37 -g13 -sS"model.sim[('1', 'double')]" p38 -NsS'[model,graphics,ok]' +g13 +sS'[model,graphics,ok]' p39 g9 sS'model.blocktype' diff --git a/js/Misc/fortran_block.js b/js/Misc/fortran_block.js index e1653c52..7a5ba3e3 100644 --- a/js/Misc/fortran_block.js +++ b/js/Misc/fortran_block.js @@ -2,7 +2,7 @@ function fortran_block() { fortran_block.prototype.define = function fortran_block() { this.model = scicos_model(); - this.model.sim = list(" ",1001); + this.model.sim = list(new ScilabString(" "),new ScilabDouble(1001)); this.model.in1 = new ScilabDouble(1); this.model.out = new ScilabDouble(1); this.model.evtin = []; @@ -66,7 +66,7 @@ function fortran_block() { } [model,graphics,ok] = check_io(this.model,graphics,this.i,this.o,[],[]); if (ok) { - this.model.sim[('1', 'double')] = new ScilabString(this.funam); + this.model.sim[1] = new ScilabString(this.funam); this.model.rpar = this.rpar; label[2-1] = tt; this.x.model = this.model; diff --git a/js/Misc/fortran_block.pickle b/js/Misc/fortran_block.pickle index ef801090..862c80a8 100644 --- a/js/Misc/fortran_block.pickle +++ b/js/Misc/fortran_block.pickle @@ -71,35 +71,35 @@ g13 sS'model.evtin' p21 g3 -sS'model.firing' +sS'model.sim[1]' p22 +NsS'model.firing' +p23 g3 sS'model.sim' -p23 +p24 g19 sS'model.evtout' -p24 +p25 g3 sS'label[2-1]' -p25 +p26 g3 sS'model.rpar' -p26 +p27 g3 sS'model.state' -p27 +p28 g3 sS'graphics.exprs' -p28 -NsS'model.ipar' p29 +NsS'model.ipar' +p30 g13 sS'typ' -p30 -g3 -sS"model.sim[('1', 'double')]" p31 -NsS'[model,graphics,ok]' +g3 +sS'[model,graphics,ok]' p32 g13 sS'model.blocktype' diff --git a/js/Misc/generic_block.js b/js/Misc/generic_block.js index a7cf464a..075b2906 100644 --- a/js/Misc/generic_block.js +++ b/js/Misc/generic_block.js @@ -4,7 +4,7 @@ function generic_block() { this.model = scicos_model(); this.function_name = "sinblk"; this.funtyp = 1; - this.model.sim = list(this.function_name,this.funtyp); + 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 = []; @@ -110,7 +110,7 @@ function generic_block() { if (this.funtyp==3) { needcompile = 4; } - this.model.sim = list(this.function_name,this.funtyp); + 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; diff --git a/js/Misc/generic_block2.js b/js/Misc/generic_block2.js index 238255e7..55bec7e6 100644 --- a/js/Misc/generic_block2.js +++ b/js/Misc/generic_block2.js @@ -4,7 +4,7 @@ function generic_block2() { this.model = scicos_model(); this.function_name = "sinblk"; this.funtyp = 1; - this.model.sim = list(this.function_name,this.funtyp); + 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 = []; @@ -114,7 +114,7 @@ function generic_block2() { if (this.funtyp==3) { needcompile = 4; } - this.model.sim = list(this.function_name,this.funtyp); + 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; diff --git a/js/Misc/generic_block3.js b/js/Misc/generic_block3.js index d2f1d8c3..22ff6155 100644 --- a/js/Misc/generic_block3.js +++ b/js/Misc/generic_block3.js @@ -4,7 +4,7 @@ function generic_block3() { this.model = scicos_model(); this.function_name = "sinblk"; this.funtyp = 4; - this.model.sim = list(this.function_name,this.funtyp); + this.model.sim = list(new ScilabString(this.function_name),new ScilabDouble(this.funtyp)); this.model.in1 = new ScilabDouble(1); this.model.in2 = new ScilabDouble(1); this.model.intyp = new ScilabDouble(1); @@ -124,7 +124,7 @@ function generic_block3() { if (this.funtyp==3) { needcompile = 4; } - this.model.sim = list(this.function_name,this.funtyp); + 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.odstate = new ScilabDouble(this.oz); diff --git a/js/Misc/scifunc_block.js b/js/Misc/scifunc_block.js index a68de77f..45da6f37 100644 --- a/js/Misc/scifunc_block.js +++ b/js/Misc/scifunc_block.js @@ -11,7 +11,7 @@ function scifunc_block() { auto = []; this.rpar = []; this.model = scicos_model(); - this.model.sim = list("scifunc",3); + 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; diff --git a/js/Misc/scifunc_block_m.js b/js/Misc/scifunc_block_m.js index 869b6256..924149d8 100644 --- a/js/Misc/scifunc_block_m.js +++ b/js/Misc/scifunc_block_m.js @@ -12,7 +12,7 @@ function scifunc_block_m() { this.rpar = []; it = 1; this.model = scicos_model(); - this.model.sim = list("scifunc",3); + this.model.sim = list(new ScilabString("scifunc"),new ScilabDouble(3)); this.model.in1 = new ScilabDouble(in1); this.model.in2 = new ScilabDouble(in1); this.model.intyp = new ScilabDouble(it); diff --git a/js/NonLinear/ABSBLK_f.js b/js/NonLinear/ABSBLK_f.js index 3d5ab9ed..42525187 100644 --- a/js/NonLinear/ABSBLK_f.js +++ b/js/NonLinear/ABSBLK_f.js @@ -2,7 +2,7 @@ function ABSBLK_f() { ABSBLK_f.prototype.define = function ABSBLK_f() { this.model = scicos_model(); - this.model.sim = list("absblk",1); + this.model.sim = list(new ScilabString("absblk"),new ScilabDouble(1)); this.model.in1 = new ScilabDouble(-1); this.model.out = new ScilabDouble(-1); this.model.blocktype = new ScilabString("c"); diff --git a/js/NonLinear/ABS_VALUE.js b/js/NonLinear/ABS_VALUE.js index fa386164..a82d06b9 100644 --- a/js/NonLinear/ABS_VALUE.js +++ b/js/NonLinear/ABS_VALUE.js @@ -3,7 +3,7 @@ function ABS_VALUE() { ABS_VALUE.prototype.define = function ABS_VALUE() { nu = -1; this.model = scicos_model(); - this.model.sim = list("absolute_value",4); + this.model.sim = list(new ScilabString("absolute_value"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(nu); this.model.out = new ScilabDouble(nu); this.model.nzcross = new ScilabDouble(nu); diff --git a/js/NonLinear/EXPBLK_m.js b/js/NonLinear/EXPBLK_m.js index cb002f76..ee2f8fa0 100644 --- a/js/NonLinear/EXPBLK_m.js +++ b/js/NonLinear/EXPBLK_m.js @@ -4,7 +4,7 @@ function EXPBLK_m() { in1 = 1; this.a = math.E; this.model = scicos_model(); - this.model.sim = list("expblk_m",4); + this.model.sim = list(new ScilabString("expblk_m"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-2); this.model.out = new ScilabDouble(-1); diff --git a/js/NonLinear/FSV_f.js b/js/NonLinear/FSV_f.js index 957153ed..e0b8bb31 100644 --- a/js/NonLinear/FSV_f.js +++ b/js/NonLinear/FSV_f.js @@ -3,7 +3,7 @@ function FSV_f() { FSV_f.prototype.define = function FSV_f() { in1 = 1; this.model = scicos_model(); - this.model.sim = list("fsv",1); + this.model.sim = list(new ScilabString("fsv"),new ScilabDouble(1)); this.model.in1 = new ScilabDouble(in1); this.model.out = new ScilabDouble(in1); this.model.blocktype = new ScilabString("c"); diff --git a/js/NonLinear/INTRP2BLK_f.js b/js/NonLinear/INTRP2BLK_f.js index 9c16b0e5..eb655461 100644 --- a/js/NonLinear/INTRP2BLK_f.js +++ b/js/NonLinear/INTRP2BLK_f.js @@ -5,7 +5,7 @@ function INTRP2BLK_f() { this.b = [[0],[1]]; this.c = [[0,1],[1,2]]; this.model = scicos_model(); - this.model.sim = list("intrp2",1); + this.model.sim = list(new ScilabString("intrp2"),new ScilabDouble(1)); this.model.in1 = [[1],[1]]; this.model.out = new ScilabDouble(1); this.model.rpar = [[this.a],[this.b],[this.c.slice()]]; diff --git a/js/NonLinear/INVBLK.js b/js/NonLinear/INVBLK.js index b212b08b..75116a85 100644 --- a/js/NonLinear/INVBLK.js +++ b/js/NonLinear/INVBLK.js @@ -3,7 +3,7 @@ function INVBLK() { INVBLK.prototype.define = function INVBLK() { in1 = -1; this.model = scicos_model(); - this.model.sim = list("invblk4",4); + this.model.sim = list(new ScilabString("invblk4"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(in1); this.model.out = new ScilabDouble(in1); this.model.blocktype = new ScilabString("c"); diff --git a/js/NonLinear/LOOKUP2D.js b/js/NonLinear/LOOKUP2D.js index bc8e4d59..88be58d5 100644 --- a/js/NonLinear/LOOKUP2D.js +++ b/js/NonLinear/LOOKUP2D.js @@ -9,7 +9,7 @@ function LOOKUP2D() { Graf = "n"; Nx = length(this.xx); Ny = length(this.yy); - this.model.sim = list("lookup2d",4); + this.model.sim = list(new ScilabString("lookup2d"),new ScilabDouble(4)); this.model.in1 = [[1],[1]]; this.model.out = new ScilabDouble(1); this.model.rpar = [[this.xx.slice()],[this.yy.slice()],[this.zz.slice()]]; diff --git a/js/NonLinear/MAXMIN.js b/js/NonLinear/MAXMIN.js index 1b4004c0..f4b1686c 100644 --- a/js/NonLinear/MAXMIN.js +++ b/js/NonLinear/MAXMIN.js @@ -2,7 +2,7 @@ function MAXMIN() { MAXMIN.prototype.define = function MAXMIN() { this.model = scicos_model(); - this.model.sim = list("minmax",4); + this.model.sim = list(new ScilabString("minmax"),new ScilabDouble(4)); this.model.out = new ScilabDouble(1); this.model.in1 = new ScilabDouble(-1); this.model.blocktype = new ScilabString("c"); diff --git a/js/NonLinear/PRODUCT.js b/js/NonLinear/PRODUCT.js index 8e3f9a39..049d4f4a 100644 --- a/js/NonLinear/PRODUCT.js +++ b/js/NonLinear/PRODUCT.js @@ -3,7 +3,7 @@ function PRODUCT() { PRODUCT.prototype.define = function PRODUCT() { this.sgn = [[1],[-1]]; this.model = scicos_model(); - this.model.sim = list("product",4); + this.model.sim = list(new ScilabString("product"),new ScilabDouble(4)); this.model.in1 = [[-1],[-1]]; this.model.out = new ScilabDouble(-1); this.model.ipar = this.sgn; diff --git a/js/NonLinear/PROD_f.js b/js/NonLinear/PROD_f.js index cf325e3e..711db852 100644 --- a/js/NonLinear/PROD_f.js +++ b/js/NonLinear/PROD_f.js @@ -2,7 +2,7 @@ function PROD_f() { PROD_f.prototype.define = function PROD_f() { this.model = scicos_model(); - this.model.sim = list("prod",2); + this.model.sim = list(new ScilabString("prod"),new ScilabDouble(2)); this.model.in1 = [[-1],[-1]]; this.model.out = new ScilabDouble(-1); this.model.blocktype = new ScilabString("c"); diff --git a/js/NonLinear/SATURATION.js b/js/NonLinear/SATURATION.js index a6f2ac2b..ac51562b 100644 --- a/js/NonLinear/SATURATION.js +++ b/js/NonLinear/SATURATION.js @@ -5,7 +5,7 @@ function SATURATION() { this.maxp = 1; rpar = [[this.maxp],[this.minp]]; this.model = scicos_model(); - this.model.sim = list("satur",4); + this.model.sim = list(new ScilabString("satur"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(1); this.model.nzcross = new ScilabDouble(2); this.model.nmode = new ScilabDouble(1); diff --git a/js/NonLinear/SAT_f.js b/js/NonLinear/SAT_f.js index f0122f8a..d7d1dfc0 100644 --- a/js/NonLinear/SAT_f.js +++ b/js/NonLinear/SAT_f.js @@ -6,7 +6,7 @@ function SAT_f() { slope = 1; rpar = [[this.minp],[this.maxp],[slope]]; this.model = scicos_model(); - this.model.sim = list("lusat",1); + this.model.sim = list(new ScilabString("lusat"),new ScilabDouble(1)); this.model.in1 = new ScilabDouble(1); this.model.nzcross = new ScilabDouble(2); this.model.out = new ScilabDouble(1); diff --git a/js/NonLinear/SIGNUM.js b/js/NonLinear/SIGNUM.js index 274537ab..13d20f58 100644 --- a/js/NonLinear/SIGNUM.js +++ b/js/NonLinear/SIGNUM.js @@ -3,7 +3,7 @@ function SIGNUM() { SIGNUM.prototype.define = function SIGNUM() { nu = -1; this.model = scicos_model(); - this.model.sim = list("signum",4); + this.model.sim = list(new ScilabString("signum"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(nu); this.model.out = new ScilabDouble(nu); this.model.nzcross = new ScilabDouble(nu); diff --git a/js/NonLinear/TrigFun.js b/js/NonLinear/TrigFun.js index 5459db52..de52d12e 100644 --- a/js/NonLinear/TrigFun.js +++ b/js/NonLinear/TrigFun.js @@ -2,7 +2,7 @@ function TrigFun() { TrigFun.prototype.define = function TrigFun() { this.model = scicos_model(); - this.model.sim = list("sin_blk",4); + this.model.sim = list(new ScilabString("sin_blk"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(-1); this.model.out = new ScilabDouble(-1); this.model.blocktype = new ScilabString("c"); diff --git a/js/PDE/PDE.js b/js/PDE/PDE.js index 3e8a52d7..29a7c951 100644 --- a/js/PDE/PDE.js +++ b/js/PDE/PDE.js @@ -3,7 +3,7 @@ function PDE() { PDE.prototype.define = function PDE() { this.model = scicos_model(); this.model.state = new ScilabDouble(zeros(10,1)); - this.model.sim = list("PDE",0); + this.model.sim = list(new ScilabString("PDE"),new ScilabDouble(0)); this.model.in1 = [[1],[1],[1],[1],[1]]; this.model.out = [[10],[0]]; this.model.blocktype = new ScilabString("c"); @@ -96,14 +96,14 @@ function PDE() { out = [[Nbr_maillage],[size(mesures,"*")]]; } if ((flag_type==1)) { - this.model.sim = list(this.rdnom,2004); + this.model.sim = list(new ScilabDouble(this.rdnom),new ScilabDouble(2004)); if ((find(oper==1)!=[])) { this.model.state = new ScilabDouble(zeros(2*Nbr_maillage,1)); } else { this.model.state = new ScilabDouble(zeros(Nbr_maillage,1)); } } else if ((flag_type==2)) { - this.model.sim = list(this.rdnom,12004); + this.model.sim = list(new ScilabDouble(this.rdnom),new ScilabDouble(12004)); if ((find(oper==1)!=[])) { if ((type_meth==3&&(find(oper==2)!=[]||find(oper==4)!=[]))) { this.model.state = new ScilabDouble(zeros(6*Nbr_maillage,1)); diff --git a/js/Sinks/AFFICH_m.js b/js/Sinks/AFFICH_m.js index 5121a006..14957e35 100644 --- a/js/Sinks/AFFICH_m.js +++ b/js/Sinks/AFFICH_m.js @@ -8,7 +8,7 @@ function AFFICH_m() { this.nd = 1; this.in1 = [1,1]; this.model = scicos_model(); - this.model.sim = list("affich2",4); + this.model.sim = list(new ScilabString("affich2"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(this.in1[1-1][1-1]); this.model.in2 = new ScilabDouble(this.in1[1-1][2-1]); this.model.evtin = new ScilabDouble(1); diff --git a/js/Sinks/BARXY.js b/js/Sinks/BARXY.js index 88d642d7..09aa6382 100644 --- a/js/Sinks/BARXY.js +++ b/js/Sinks/BARXY.js @@ -6,7 +6,7 @@ function BARXY() { this.xmax = 15; this.ymin = -15; this.ymax = 15; - this.model.sim = list("BARXY_sim",5); + this.model.sim = list(new ScilabString("BARXY_sim"),new ScilabDouble(5)); this.model.blocktype = new ScilabString("d"); this.model.dep_ut = [true,false]; this.model.in1 = [[-1],[-1]]; diff --git a/js/Sinks/CANIMXY.js b/js/Sinks/CANIMXY.js index 6779db88..ab1397e4 100644 --- a/js/Sinks/CANIMXY.js +++ b/js/Sinks/CANIMXY.js @@ -13,7 +13,7 @@ function CANIMXY() { this.ymax = 15; this.nbr_curves = 1; this.model = scicos_model(); - this.model.sim = list("canimxy",4); + this.model.sim = list(new ScilabString("canimxy"),new ScilabDouble(4)); this.model.in1 = [[1],[1]]; this.model.in2 = [[1],[1]]; this.model.intyp = [[1],[1]]; diff --git a/js/Sinks/CANIMXY3D.js b/js/Sinks/CANIMXY3D.js index fcbbfcf4..bb181733 100644 --- a/js/Sinks/CANIMXY3D.js +++ b/js/Sinks/CANIMXY3D.js @@ -13,7 +13,7 @@ function CANIMXY3D() { this.vec_z = [[-15],[15]]; this.nbr_curves = 1; this.model = scicos_model(); - this.model.sim = list("canimxy3d",4); + this.model.sim = list(new ScilabString("canimxy3d"),new ScilabDouble(4)); this.model.in1 = [[1],[1],[1]]; this.model.evtin = new ScilabDouble(1); this.model.in2 = [[1],[1],[1]]; diff --git a/js/Sinks/CEVENTSCOPE.js b/js/Sinks/CEVENTSCOPE.js index 4c4319d8..3a9a058f 100644 --- a/js/Sinks/CEVENTSCOPE.js +++ b/js/Sinks/CEVENTSCOPE.js @@ -8,7 +8,7 @@ function CEVENTSCOPE() { this.wpos = [[-1],[-1]]; this.per = 30; this.model = scicos_model(); - this.model.sim = list("cevscpe",4); + this.model.sim = list(new ScilabString("cevscpe"),new ScilabDouble(4)); this.model.evtin = new ScilabDouble(1); this.model.rpar = new ScilabDouble(this.per); this.model.ipar = [[this.win],[1],[this.clrs[this.nclock-1]],[this.wpos.slice()],[this.wdim.slice()]]; diff --git a/js/Sinks/CFSCOPE.js b/js/Sinks/CFSCOPE.js index 099c58b7..8fad283d 100644 --- a/js/Sinks/CFSCOPE.js +++ b/js/Sinks/CFSCOPE.js @@ -10,7 +10,7 @@ function CFSCOPE() { this.ymax = 15; this.per = 30; this.model = scicos_model(); - this.model.sim = list("cfscope",4); + this.model.sim = list(new ScilabString("cfscope"),new ScilabDouble(4)); this.model.evtin = new ScilabDouble(1); this.model.rpar = [[0],[this.ymin],[this.ymax],[this.per]]; this.model.ipar = [[this.win],[1],[this.N],[this.clrs],[this.wpos],[this.wdim],[1],[1]]; diff --git a/js/Sinks/CMAT3D.js b/js/Sinks/CMAT3D.js index 04cefb73..010fa534 100644 --- a/js/Sinks/CMAT3D.js +++ b/js/Sinks/CMAT3D.js @@ -10,7 +10,7 @@ function CMAT3D() { size_x = 1; size_y = 1; this.model = scicos_model(); - this.model.sim = list("cmat3d",4); + this.model.sim = list(new ScilabString("cmat3d"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-2); this.model.intyp = new ScilabDouble(1); diff --git a/js/Sinks/CMATVIEW.js b/js/Sinks/CMATVIEW.js index 884f173d..03232d25 100644 --- a/js/Sinks/CMATVIEW.js +++ b/js/Sinks/CMATVIEW.js @@ -8,7 +8,7 @@ function CMATVIEW() { alpha_c = 0.24; beta_c = 1; this.model = scicos_model(); - this.model.sim = list("cmatview",4); + this.model.sim = list(new ScilabString("cmatview"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-2); this.model.intyp = new ScilabDouble(1); diff --git a/js/Sinks/CMSCOPE.js b/js/Sinks/CMSCOPE.js index 6a5670b1..a16eb019 100644 --- a/js/Sinks/CMSCOPE.js +++ b/js/Sinks/CMSCOPE.js @@ -13,7 +13,7 @@ function CMSCOPE() { yy = [[transpose(this.ymin.slice())],[transpose(this.ymax.slice())]]; period = transpose(this.per.slice()); this.model = scicos_model(); - this.model.sim = list("cmscope",4); + this.model.sim = list(new ScilabString("cmscope"),new ScilabDouble(4)); this.model.in1 = this.in1; this.model.in2 = [[1],[1]]; this.model.intyp = [[1],[1]]; diff --git a/js/Sinks/CSCOPE.js b/js/Sinks/CSCOPE.js index 286de553..9e636ba6 100644 --- a/js/Sinks/CSCOPE.js +++ b/js/Sinks/CSCOPE.js @@ -10,7 +10,7 @@ function CSCOPE() { this.ymax = 15; this.per = 30; this.model = scicos_model(); - this.model.sim = list("cscope",4); + this.model.sim = list(new ScilabString("cscope"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(1); this.model.evtin = new ScilabDouble(1); diff --git a/js/Sinks/CSCOPXY.js b/js/Sinks/CSCOPXY.js index 41dda84c..c9f2b9e6 100644 --- a/js/Sinks/CSCOPXY.js +++ b/js/Sinks/CSCOPXY.js @@ -13,7 +13,7 @@ function CSCOPXY() { this.ymax = 15; this.nbr_curves = 1; this.model = scicos_model(); - this.model.sim = list("cscopxy",4); + this.model.sim = list(new ScilabString("cscopxy"),new ScilabDouble(4)); this.model.in1 = [[1],[1]]; this.model.in2 = [[1],[1]]; this.model.intyp = [[1],[1]]; diff --git a/js/Sinks/CSCOPXY3D.js b/js/Sinks/CSCOPXY3D.js index 1a323cc1..1b1b7996 100644 --- a/js/Sinks/CSCOPXY3D.js +++ b/js/Sinks/CSCOPXY3D.js @@ -13,7 +13,7 @@ function CSCOPXY3D() { this.vec_z = [[-15],[15]]; this.nbr_curves = 1; this.model = scicos_model(); - this.model.sim = list("cscopxy3d",4); + this.model.sim = list(new ScilabString("cscopxy3d"),new ScilabDouble(4)); this.model.in1 = [[1],[1],[1]]; this.model.in2 = [[1],[1],[1]]; this.model.intyp = [[1],[1],[1]]; diff --git a/js/Sinks/TOWS_c.js b/js/Sinks/TOWS_c.js index dea5b7ba..5b84ca01 100644 --- a/js/Sinks/TOWS_c.js +++ b/js/Sinks/TOWS_c.js @@ -6,7 +6,7 @@ function TOWS_c() { this.varnam = "A"; this.herit = 0; this.model = scicos_model(); - this.model.sim = list("tows_c",4); + this.model.sim = list(new ScilabString("tows_c"),new ScilabDouble(4)); this.model.in1 = [nu]; this.model.in2 = new ScilabDouble(-2); this.model.intyp = new ScilabDouble(-1); diff --git a/js/Sinks/WRITEAU_f.js b/js/Sinks/WRITEAU_f.js index 529703df..0287ad13 100644 --- a/js/Sinks/WRITEAU_f.js +++ b/js/Sinks/WRITEAU_f.js @@ -9,7 +9,7 @@ function WRITEAU_f() { lunit = 0; this.N = 2; this.model = scicos_model(); - this.model.sim = list("writeau",2); + this.model.sim = list(new ScilabString("writeau"),new ScilabDouble(2)); this.model.in1 = new ScilabDouble(in1); this.model.evtin = new ScilabDouble(1); this.model.dstate = [[-1],[lunit],[zeros((nin+1)*this.N,1)]]; diff --git a/js/Sinks/WRITEC_f.js b/js/Sinks/WRITEC_f.js index 1198b764..0cea309b 100644 --- a/js/Sinks/WRITEC_f.js +++ b/js/Sinks/WRITEC_f.js @@ -9,7 +9,7 @@ function WRITEC_f() { lunit = 0; this.N = 2; this.model = scicos_model(); - this.model.sim = list("writec",2); + this.model.sim = list(new ScilabString("writec"),new ScilabDouble(2)); this.model.in1 = new ScilabDouble(this.in1); this.model.evtin = new ScilabDouble(1); this.model.dstate = [[-1],[lunit],[zeros((nin+1)*this.N,1)]]; diff --git a/js/Sources/CONST.js b/js/Sources/CONST.js index af405b98..2c9dae8a 100644 --- a/js/Sources/CONST.js +++ b/js/Sources/CONST.js @@ -3,7 +3,7 @@ function CONST() { CONST.prototype.define = function CONST() { this.C = 1; this.model = scicos_model(); - this.model.sim = list("cstblk4",4); + this.model.sim = list(new ScilabString("cstblk4"),new ScilabDouble(4)); this.model.in1 = []; this.model.out = new ScilabDouble(1); this.model.rpar = new ScilabDouble(this.C); diff --git a/js/Sources/CONST_f.js b/js/Sources/CONST_f.js index edc52303..e5182263 100644 --- a/js/Sources/CONST_f.js +++ b/js/Sources/CONST_f.js @@ -3,7 +3,7 @@ function CONST_f() { CONST_f.prototype.define = function CONST_f() { this.C = 1; this.model = scicos_model(); - this.model.sim = list("cstblk",1); + this.model.sim = list(new ScilabString("cstblk"),new ScilabDouble(1)); this.model.in1 = []; this.model.out = new ScilabDouble(1); this.model.rpar = new ScilabDouble(this.C); diff --git a/js/Sources/CONST_m.js b/js/Sources/CONST_m.js index 5fea4537..4d03f8ea 100644 --- a/js/Sources/CONST_m.js +++ b/js/Sources/CONST_m.js @@ -3,7 +3,7 @@ function CONST_m() { CONST_m.prototype.define = function CONST_m() { this.C = [1]; this.model = scicos_model(); - this.model.sim = list("cstblk4",4); + this.model.sim = list(new ScilabString("cstblk4"),new ScilabDouble(4)); this.model.in1 = []; this.model.out = new ScilabDouble(size(this.C,1)); this.model.in2 = []; @@ -40,7 +40,7 @@ function CONST_m() { if (find(nout==0)!=[]) { block_parameter_error(msprintf("Wrong size for \'%s\' parameter","Constant Value"),"Constant value must have at least one element."); } else { - this.model.sim = list("cstblk4_m",4); + this.model.sim = list(new ScilabString("cstblk4_m"),new ScilabDouble(4)); this.model.opar = list(this.C); if ((this.type[this.C-1]==1)) { if (isreal(this.C)) { diff --git a/js/Sources/Counter.js b/js/Sources/Counter.js index 4053bfb2..0d62bd5a 100644 --- a/js/Sources/Counter.js +++ b/js/Sources/Counter.js @@ -5,7 +5,7 @@ function Counter() { this.maxim = 2; this.rule = 1; this.model = scicos_model(); - this.model.sim = list("counter",4); + this.model.sim = list(new ScilabString("counter"),new ScilabDouble(4)); this.model.evtin = new ScilabDouble(1); this.model.out = new ScilabDouble(1); this.model.out2 = new ScilabDouble(1); diff --git a/js/Sources/FROMWS_c.js b/js/Sources/FROMWS_c.js index 4b058495..c5ca8be4 100644 --- a/js/Sources/FROMWS_c.js +++ b/js/Sources/FROMWS_c.js @@ -6,7 +6,7 @@ function FROMWS_c() { this.ZC = 1; this.OutEnd = 0; this.model = scicos_model(); - this.model.sim = list("fromws_c",4); + this.model.sim = list(new ScilabString("fromws_c"),new ScilabDouble(4)); this.model.out = new ScilabDouble(-1); this.model.out2 = new ScilabDouble(-2); this.model.outtyp = new ScilabDouble(-1); diff --git a/js/Sources/Ground_g.js b/js/Sources/Ground_g.js index 37887703..13967102 100644 --- a/js/Sources/Ground_g.js +++ b/js/Sources/Ground_g.js @@ -3,7 +3,7 @@ function Ground_g() { Ground_g.prototype.define = function Ground_g() { C = [0]; this.model = scicos_model(); - this.model.sim = list("cstblk4_m",4); + this.model.sim = list(new ScilabString("cstblk4_m"),new ScilabDouble(4)); this.model.in1 = []; this.model.out = new ScilabDouble(1); this.model.in2 = []; diff --git a/js/Sources/Modulo_Count.js b/js/Sources/Modulo_Count.js index fa1eb183..a01089c5 100644 --- a/js/Sources/Modulo_Count.js +++ b/js/Sources/Modulo_Count.js @@ -4,7 +4,7 @@ function Modulo_Count() { this.ini_c = 0; this.base = 3; this.model = scicos_model(); - this.model.sim = list("modulo_count",4); + this.model.sim = list(new ScilabString("modulo_count"),new ScilabDouble(4)); this.model.evtin = new ScilabDouble(1); this.model.out = new ScilabDouble(1); this.model.dstate = new ScilabDouble(this.ini_c); diff --git a/js/Sources/RAMP.js b/js/Sources/RAMP.js index e3ad460e..a6fc7582 100644 --- a/js/Sources/RAMP.js +++ b/js/Sources/RAMP.js @@ -6,7 +6,7 @@ function RAMP() { this.stt = 0; rpar = [[this.slope],[this.stt],[this.iout]]; this.model = scicos_model(); - this.model.sim = list("ramp",4); + this.model.sim = list(new ScilabString("ramp"),new ScilabDouble(4)); this.model.in1 = []; this.model.out = new ScilabDouble(1); this.model.rpar = rpar; diff --git a/js/Sources/RAND_m.js b/js/Sources/RAND_m.js index d8fc327c..cd4c8808 100644 --- a/js/Sources/RAND_m.js +++ b/js/Sources/RAND_m.js @@ -8,7 +8,7 @@ function RAND_m() { function_name = "rndblk_m"; funtyp = 4; this.model = scicos_model(); - this.model.sim = list(function_name,funtyp); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(funtyp)); this.model.in1 = []; this.model.in2 = []; this.model.intyp = []; @@ -81,7 +81,7 @@ function RAND_m() { if (ok) { [model,graphics,ok] = set_io(this.model,graphics,list([],[]),list(out,ot),1,[]); if (ok) { - this.model.sim = list(function_name,4); + this.model.sim = list(new ScilabString(function_name),new ScilabDouble(4)); graphics.exprs = exprs; this.model.ipar = new ScilabDouble(this.flag); this.x.graphics = graphics; diff --git a/js/Sources/READAU_f.js b/js/Sources/READAU_f.js index 9a3996f2..77627c37 100644 --- a/js/Sources/READAU_f.js +++ b/js/Sources/READAU_f.js @@ -13,7 +13,7 @@ function READAU_f() { ievt = 0; nout = size(outmask,"*"); this.model = scicos_model(); - this.model.sim = list("readau",2); + this.model.sim = list(new ScilabString("readau"),new ScilabDouble(2)); this.model.out = new ScilabDouble(nout); this.model.evtin = new ScilabDouble(1); this.model.dstate = [[1],[1],[lunit],[zeros(this.N*M,1)]]; diff --git a/js/Sources/READC_f.js b/js/Sources/READC_f.js index 5084d60e..9e456d2b 100644 --- a/js/Sources/READC_f.js +++ b/js/Sources/READC_f.js @@ -15,7 +15,7 @@ function READC_f() { nout = size(this.outmask,"*"); ipar = [[length(fname)],[this._str2code[frmt-1]],[ievt],[this.N],[this.M],[this.swap],[this.offset],[this._str2code[fname-1]],[tmask],[this.outmask]]; this.model = scicos_model(); - this.model.sim = list("readc",2); + 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 = []; diff --git a/js/Sources/STEP.js b/js/Sources/STEP.js index af7fb2cc..3672850d 100644 --- a/js/Sources/STEP.js +++ b/js/Sources/STEP.js @@ -3,7 +3,7 @@ function STEP() { STEP.prototype.define = function STEP() { rpar = [[0],[1]]; this.model = scicos_model(); - this.model.sim = list("step_func",4); + this.model.sim = list(new ScilabString("step_func"),new ScilabDouble(4)); this.model.evtin = new ScilabDouble(1); this.model.evtout = new ScilabDouble(1); this.model.out = new ScilabDouble(1); diff --git a/js/Sources/TKSCALE.js b/js/Sources/TKSCALE.js index 4f31582a..23270b87 100644 --- a/js/Sources/TKSCALE.js +++ b/js/Sources/TKSCALE.js @@ -5,7 +5,7 @@ function TKSCALE() { this.b = 10; this.f = 1; this.model = scicos_model(); - this.model.sim = list("tkscaleblk",5); + this.model.sim = list(new ScilabString("tkscaleblk"),new ScilabDouble(5)); this.model.out = new ScilabDouble(1); this.model.evtin = new ScilabDouble(1); this.model.rpar = [[this.a],[this.b],[this.f]]; diff --git a/js/Threshold/GENERAL_f.js b/js/Threshold/GENERAL_f.js index cc6e31c3..81323f62 100644 --- a/js/Threshold/GENERAL_f.js +++ b/js/Threshold/GENERAL_f.js @@ -5,7 +5,7 @@ function GENERAL_f() { this.in1 = 1; this.out = 1; this.model = scicos_model(); - this.model.sim = list("zcross",1); + this.model.sim = list(new ScilabString("zcross"),new ScilabDouble(1)); this.model.nzcross = new ScilabDouble(this.in1); this.model.in1 = new ScilabDouble(this.in1); this.model.evtout = new ScilabDouble(ones(this.out,1)); diff --git a/js/Threshold/NEGTOPOS_f.js b/js/Threshold/NEGTOPOS_f.js index 81862e86..8cc16952 100644 --- a/js/Threshold/NEGTOPOS_f.js +++ b/js/Threshold/NEGTOPOS_f.js @@ -2,7 +2,7 @@ function NEGTOPOS_f() { NEGTOPOS_f.prototype.define = function NEGTOPOS_f() { this.model = scicos_model(); - this.model.sim = list("zcross",1); + this.model.sim = list(new ScilabString("zcross"),new ScilabDouble(1)); this.model.nzcross = new ScilabDouble(1); this.model.in1 = new ScilabDouble(1); this.model.evtout = new ScilabDouble(1); diff --git a/js/Threshold/POSTONEG_f.js b/js/Threshold/POSTONEG_f.js index 8913a995..4d4ec11f 100644 --- a/js/Threshold/POSTONEG_f.js +++ b/js/Threshold/POSTONEG_f.js @@ -3,7 +3,7 @@ function POSTONEG_f() { POSTONEG_f.prototype.define = function POSTONEG_f() { rpar = [[-1],[-1],[-1],[0]]; this.model = scicos_model(); - this.model.sim = list("zcross",1); + this.model.sim = list(new ScilabString("zcross"),new ScilabDouble(1)); this.model.nzcross = new ScilabDouble(1); this.model.in1 = new ScilabDouble(1); this.model.evtout = new ScilabDouble(1); diff --git a/js/Threshold/ZCROSS_f.js b/js/Threshold/ZCROSS_f.js index 606966d0..edf214d0 100644 --- a/js/Threshold/ZCROSS_f.js +++ b/js/Threshold/ZCROSS_f.js @@ -4,7 +4,7 @@ function ZCROSS_f() { rpar = [[-1],[-1],[0],[0]]; this.in1 = 1; this.model = scicos_model(); - this.model.sim = list("zcross",1); + this.model.sim = list(new ScilabString("zcross"),new ScilabDouble(1)); this.model.in1 = new ScilabDouble(this.in1); this.model.nzcross = new ScilabDouble(this.in1); this.model.evtout = new ScilabDouble(1); |