summaryrefslogtreecommitdiff
path: root/js/Branching
diff options
context:
space:
mode:
Diffstat (limited to 'js/Branching')
-rw-r--r--js/Branching/CLKFROM.js4
-rw-r--r--js/Branching/CLKGOTO.js4
-rw-r--r--js/Branching/CLKGotoTagVisibility.js4
-rw-r--r--js/Branching/DEMUX.js2
-rw-r--r--js/Branching/DEMUX_f.js2
-rw-r--r--js/Branching/ESELECT_f.js2
-rw-r--r--js/Branching/EXTRACTOR.js2
-rw-r--r--js/Branching/FROM.js4
-rw-r--r--js/Branching/FROMMO.js4
-rw-r--r--js/Branching/GOTO.js4
-rw-r--r--js/Branching/GOTOMO.js4
-rw-r--r--js/Branching/GotoTagVisibility.js4
-rw-r--r--js/Branching/GotoTagVisibilityMO.js4
-rw-r--r--js/Branching/ISELECT_f.js2
-rw-r--r--js/Branching/ISELECT_m.js2
-rw-r--r--js/Branching/MUX.js2
-rw-r--r--js/Branching/MUX_f.js2
-rw-r--r--js/Branching/M_SWITCH.js2
-rw-r--r--js/Branching/RELAY_f.js2
-rw-r--r--js/Branching/SCALAR2VECTOR.js2
-rw-r--r--js/Branching/SELECT_f.js2
-rw-r--r--js/Branching/SELECT_m.js2
-rw-r--r--js/Branching/SWITCH2.js2
-rw-r--r--js/Branching/SWITCH2_m.js2
-rw-r--r--js/Branching/SWITCH_f.js2
25 files changed, 34 insertions, 34 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);
generated by cgit (git 2.34.1) at 2025-03-13 06:02:18 +0000