summaryrefslogtreecommitdiff
path: root/js/Branching
diff options
context:
space:
mode:
authorSunil Shetye2018-07-09 18:10:31 +0530
committerSunil Shetye2018-07-10 11:24:53 +0530
commit9b18945e2e2348db85595fb096a1e1eba04f9baf (patch)
treebb13cffc501f152b1d33870bdeff6f274aecbf7b /js/Branching
parentf19304a4fe99556c5ddc35024c818d00ffe7e23a (diff)
downloadsci2js-9b18945e2e2348db85595fb096a1e1eba04f9baf.tar.gz
sci2js-9b18945e2e2348db85595fb096a1e1eba04f9baf.tar.bz2
sci2js-9b18945e2e2348db85595fb096a1e1eba04f9baf.zip
remove type from list
Diffstat (limited to 'js/Branching')
-rw-r--r--js/Branching/CLKFROM.js16
-rw-r--r--js/Branching/CLKGOTO.js20
-rw-r--r--js/Branching/CLKGotoTagVisibility.js14
-rw-r--r--js/Branching/DEMUX.js10
-rw-r--r--js/Branching/DEMUX_f.js10
-rw-r--r--js/Branching/ESELECT_f.js28
-rw-r--r--js/Branching/EXTRACTOR.js10
-rw-r--r--js/Branching/FROM.js16
-rw-r--r--js/Branching/FROMMO.js16
-rw-r--r--js/Branching/GOTO.js20
-rw-r--r--js/Branching/GOTOMO.js18
-rw-r--r--js/Branching/GotoTagVisibility.js14
-rw-r--r--js/Branching/GotoTagVisibilityMO.js14
-rw-r--r--js/Branching/ISELECT_f.js12
-rw-r--r--js/Branching/ISELECT_m.js18
-rw-r--r--js/Branching/MUX.js10
-rw-r--r--js/Branching/MUX_f.js10
-rw-r--r--js/Branching/M_SWITCH.js6
-rw-r--r--js/Branching/NRMSOM_f.js6
-rw-r--r--js/Branching/RELAY_f.js12
-rw-r--r--js/Branching/SCALAR2VECTOR.js8
-rw-r--r--js/Branching/SELECT_f.js12
-rw-r--r--js/Branching/SELECT_m.js18
-rw-r--r--js/Branching/SWITCH2.js24
-rw-r--r--js/Branching/SWITCH2_m.js30
-rw-r--r--js/Branching/SWITCH_f.js10
26 files changed, 191 insertions, 191 deletions
diff --git a/js/Branching/CLKFROM.js b/js/Branching/CLKFROM.js
index 2b4ed4be..b3a992b0 100644
--- a/js/Branching/CLKFROM.js
+++ b/js/Branching/CLKFROM.js
@@ -2,11 +2,11 @@
function CLKFROM() {
CLKFROM.prototype.define = function CLKFROM() {
this.model = scicos_model();
- this.model.sim = new ScilabString("clkfrom");
- this.model.evtout = new ScilabDouble(1);
- this.model.opar = list(new ScilabString("A"));
- this.model.blocktype = new ScilabString("d");
- this.model.firing = new ScilabDouble(-1);
+ this.model.sim = new ScilabString(["clkfrom"]);
+ this.model.evtout = new ScilabDouble([1]);
+ 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];
exprs = "A";
this.x = standard_define([2,1],this.model,exprs," ");
@@ -36,9 +36,9 @@ function CLKFROM() {
needcompile = 4;
y = needcompile;
}
- this.model.opar = list(new ScilabDouble(this.tag));
- this.model.evtout = new ScilabDouble(1);
- this.model.firing = new ScilabDouble(-1);
+ this.model.opar = list(new ScilabDouble([this.tag]));
+ this.model.evtout = new ScilabDouble([1]);
+ this.model.firing = new ScilabDouble([-1]);
graphics.exprs = exprs;
this.x.graphics = graphics;
this.x.model = this.model;
diff --git a/js/Branching/CLKGOTO.js b/js/Branching/CLKGOTO.js
index 4fd32282..55d9edba 100644
--- a/js/Branching/CLKGOTO.js
+++ b/js/Branching/CLKGOTO.js
@@ -2,12 +2,12 @@
function CLKGOTO() {
CLKGOTO.prototype.define = function CLKGOTO() {
this.model = scicos_model();
- this.model.sim = new ScilabString("clkgoto");
- this.model.evtin = new ScilabDouble(1);
- 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);
+ this.model.sim = new ScilabString(["clkgoto"]);
+ this.model.evtin = new ScilabDouble([1]);
+ 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]);
this.model.dep_ut = [false,false];
exprs = [["A"],[sci2exp(1)]];
this.x = standard_define([2,1],this.model,exprs," ");
@@ -46,10 +46,10 @@ function CLKGOTO() {
needcompile = 4;
y = needcompile;
}
- 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);
+ 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]);
graphics.exprs = exprs;
this.x.graphics = graphics;
this.x.model = this.model;
diff --git a/js/Branching/CLKGotoTagVisibility.js b/js/Branching/CLKGotoTagVisibility.js
index 620e53ef..1104d22b 100644
--- a/js/Branching/CLKGotoTagVisibility.js
+++ b/js/Branching/CLKGotoTagVisibility.js
@@ -2,17 +2,17 @@
function CLKGotoTagVisibility() {
CLKGotoTagVisibility.prototype.define = function CLKGotoTagVisibility() {
this.model = scicos_model();
- this.model.sim = new ScilabString("clkgototagvisibility");
+ this.model.sim = new ScilabString(["clkgototagvisibility"]);
this.model.in1 = [];
this.model.in2 = [];
this.model.out = [];
this.model.out2 = [];
this.model.evtin = [];
- this.model.intyp = new ScilabDouble(1);
- this.model.outtyp = new ScilabDouble(1);
- this.model.opar = list(new ScilabString("A"));
- this.model.blocktype = new ScilabString("c");
- this.model.firing = new ScilabBoolean(false);
+ this.model.intyp = new ScilabDouble([1]);
+ this.model.outtyp = new ScilabDouble([1]);
+ this.model.opar = list(new ScilabString(["A"]));
+ this.model.blocktype = new ScilabString(["c"]);
+ this.model.firing = new ScilabBoolean([false]);
this.model.dep_ut = [false,false];
exprs = "A";
gr_i = [];
@@ -45,7 +45,7 @@ function CLKGotoTagVisibility() {
y = needcompile;
}
graphics.exprs = exprs;
- this.model.opar = list(new ScilabDouble(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 863ae9cf..f477a529 100644
--- a/js/Branching/DEMUX.js
+++ b/js/Branching/DEMUX.js
@@ -3,11 +3,11 @@ function DEMUX() {
DEMUX.prototype.define = function DEMUX() {
this.out = 2;
this.model = scicos_model();
- this.model.sim = list(new ScilabString("multiplex"),new ScilabDouble(4));
- this.model.in1 = new ScilabDouble(0);
+ 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);
- this.model.blocktype = new ScilabString("c");
+ this.model.ipar = new ScilabDouble([this.out]);
+ this.model.blocktype = new ScilabString(["c"]);
this.model.firing = [];
this.model.dep_ut = [true,false];
exprs = string(this.out);
@@ -60,7 +60,7 @@ function DEMUX() {
}
if (ok) {
graphics.exprs = exprs;
- this.model.ipar = new ScilabDouble(this.out);
+ this.model.ipar = new ScilabDouble([this.out]);
this.x.graphics = graphics;
this.x.model = this.model;
break;
diff --git a/js/Branching/DEMUX_f.js b/js/Branching/DEMUX_f.js
index 526d0e0b..3ef295d7 100644
--- a/js/Branching/DEMUX_f.js
+++ b/js/Branching/DEMUX_f.js
@@ -3,11 +3,11 @@ function DEMUX_f() {
DEMUX_f.prototype.define = function DEMUX_f() {
this.out = 2;
this.model = scicos_model();
- this.model.sim = list(new ScilabString("demux"),new ScilabDouble(1));
- this.model.in1 = new ScilabDouble(0);
+ 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);
- this.model.blocktype = new ScilabString("c");
+ this.model.ipar = new ScilabDouble([this.out]);
+ this.model.blocktype = new ScilabString(["c"]);
this.model.firing = [];
this.model.dep_ut = [true,false];
exprs = string(this.out);
@@ -60,7 +60,7 @@ function DEMUX_f() {
}
if (ok) {
graphics.exprs = exprs;
- this.model.ipar = new ScilabDouble(this.out);
+ this.model.ipar = new ScilabDouble([this.out]);
this.x.graphics = graphics;
this.x.model = this.model;
break;
diff --git a/js/Branching/ESELECT_f.js b/js/Branching/ESELECT_f.js
index c36e74b8..faca22b4 100644
--- a/js/Branching/ESELECT_f.js
+++ b/js/Branching/ESELECT_f.js
@@ -3,17 +3,17 @@ function ESELECT_f() {
ESELECT_f.prototype.define = function ESELECT_f() {
this.out = 2;
this.model = scicos_model();
- 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);
- this.model.evtin = new ScilabDouble(1);
- this.model.evtout = new ScilabDouble(ones(this.out,1));
- this.model.blocktype = new ScilabString("l");
- this.model.firing = new ScilabDouble(-ones(this.out,1));
+ this.model.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]);
+ this.model.evtin = new ScilabDouble([1]);
+ this.model.evtout = new ScilabDouble([ones(this.out,1)]);
+ this.model.blocktype = new ScilabString(["l"]);
+ this.model.firing = new ScilabDouble([-ones(this.out,1)]);
this.model.dep_ut = [true,false];
- this.model.nmode = new ScilabDouble(0);
- this.model.nzcross = new ScilabDouble(0);
+ this.model.nmode = new ScilabDouble([0]);
+ this.model.nzcross = new ScilabDouble([0]);
gr_i = [];
exprs = [[string(this.out)],[string(1)],[string(this.model.nmode)]];
this.x = standard_define([4,2],this.model,exprs,gr_i);
@@ -64,11 +64,11 @@ function ESELECT_f() {
[model,graphics,ok] = check_io(this.model,graphics,1,[],this.inh,[ones(this.out,1)]);
if (ok) {
graphics.exprs = exprs;
- this.model.evtout = new ScilabDouble(ones(this.out,1));
- this.model.firing = new ScilabDouble(-ones(this.out,1));
+ this.model.evtout = new ScilabDouble([ones(this.out,1)]);
+ this.model.firing = new ScilabDouble([-ones(this.out,1)]);
this.x.graphics = graphics;
- this.model.nmode = new ScilabDouble(this.nmod);
- this.model.nzcross = new ScilabDouble(this.nmod);
+ this.model.nmode = new ScilabDouble([this.nmod]);
+ this.model.nzcross = new ScilabDouble([this.nmod]);
this.x.model = this.model;
break;
}
diff --git a/js/Branching/EXTRACTOR.js b/js/Branching/EXTRACTOR.js
index a5da89a1..ddfad024 100644
--- a/js/Branching/EXTRACTOR.js
+++ b/js/Branching/EXTRACTOR.js
@@ -3,12 +3,12 @@ function EXTRACTOR() {
EXTRACTOR.prototype.define = function EXTRACTOR() {
this.ind = 1;
this.model = scicos_model();
- 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");
+ 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"]);
this.model.dep_ut = [true,false];
- this.model.ipar = new ScilabDouble(this.ind);
+ this.model.ipar = new ScilabDouble([this.ind]);
exprs = [sci2exp(this.ind)];
gr_i = [];
this.x = standard_define([3,2],this.model,exprs,gr_i);
diff --git a/js/Branching/FROM.js b/js/Branching/FROM.js
index d1781046..49334ffd 100644
--- a/js/Branching/FROM.js
+++ b/js/Branching/FROM.js
@@ -2,16 +2,16 @@
function FROM() {
FROM.prototype.define = function FROM() {
this.model = scicos_model();
- this.model.sim = new ScilabString("from");
+ this.model.sim = new ScilabString(["from"]);
this.model.in1 = [];
this.model.in2 = [];
- this.model.intyp = new ScilabDouble(1);
- this.model.out = new ScilabDouble(-1);
- this.model.out2 = new ScilabDouble(-2);
- this.model.outtyp = new ScilabDouble(-1);
+ this.model.intyp = new ScilabDouble([1]);
+ this.model.out = new ScilabDouble([-1]);
+ this.model.out2 = new ScilabDouble([-2]);
+ this.model.outtyp = new ScilabDouble([-1]);
this.model.ipar = [];
- this.model.opar = list(new ScilabString("A"));
- this.model.blocktype = new ScilabString("c");
+ this.model.opar = list(new ScilabString(["A"]));
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [false,false];
exprs = ["A"];
gr_i = [];
@@ -45,7 +45,7 @@ function FROM() {
y = needcompile;
}
graphics.exprs = exprs;
- this.model.opar = list(new ScilabDouble(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 afb0b62d..9f2f6582 100644
--- a/js/Branching/FROMMO.js
+++ b/js/Branching/FROMMO.js
@@ -2,16 +2,16 @@
function FROMMO() {
FROMMO.prototype.define = function FROMMO() {
this.model = scicos_model();
- this.model.sim = new ScilabString("frommo");
+ this.model.sim = new ScilabString(["frommo"]);
this.model.in1 = [];
this.model.in2 = [];
- this.model.intyp = new ScilabDouble(1);
- this.model.out = new ScilabDouble(-1);
- this.model.out2 = new ScilabDouble(-2);
- this.model.outtyp = new ScilabDouble(-1);
+ this.model.intyp = new ScilabDouble([1]);
+ this.model.out = new ScilabDouble([-1]);
+ this.model.out2 = new ScilabDouble([-2]);
+ this.model.outtyp = new ScilabDouble([-1]);
this.model.ipar = [];
- this.model.opar = list(new ScilabString("A"));
- this.model.blocktype = new ScilabString("c");
+ this.model.opar = list(new ScilabString(["A"]));
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [false,false];
mo = modelica();
mo.model = "frommo";
@@ -48,7 +48,7 @@ function FROMMO() {
y = needcompile;
}
graphics.exprs = exprs;
- this.model.opar = list(new ScilabDouble(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 bc5c0245..383adc99 100644
--- a/js/Branching/GOTO.js
+++ b/js/Branching/GOTO.js
@@ -2,16 +2,16 @@
function GOTO() {
GOTO.prototype.define = function GOTO() {
this.model = scicos_model();
- this.model.sim = new ScilabString("goto");
- this.model.in1 = new ScilabDouble(-1);
- this.model.in2 = new ScilabDouble(-2);
- this.model.intyp = new ScilabDouble(-1);
+ this.model.sim = new ScilabString(["goto"]);
+ this.model.in1 = new ScilabDouble([-1]);
+ this.model.in2 = new ScilabDouble([-2]);
+ this.model.intyp = new ScilabDouble([-1]);
this.model.out = [];
this.model.out2 = [];
- this.model.outtyp = new ScilabDouble(1);
- this.model.ipar = new ScilabDouble(int(1));
- this.model.opar = list(new ScilabString("A"));
- this.model.blocktype = new ScilabString("c");
+ this.model.outtyp = new ScilabDouble([1]);
+ this.model.ipar = new ScilabDouble([int(1)]);
+ this.model.opar = list(new ScilabString(["A"]));
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [false,false];
exprs = [["A"],[sci2exp(1)]];
gr_i = [];
@@ -52,8 +52,8 @@ function GOTO() {
y = needcompile;
}
graphics.exprs = exprs;
- this.model.opar = list(new ScilabDouble(this.tag));
- this.model.ipar = new ScilabDouble(this.tagvis);
+ this.model.opar = list(new ScilabDouble([this.tag]));
+ this.model.ipar = new ScilabDouble([this.tagvis]);
this.x.model = this.model;
this.x.graphics = graphics;
arg1 = this.x;
diff --git a/js/Branching/GOTOMO.js b/js/Branching/GOTOMO.js
index bd12f72e..81683fcd 100644
--- a/js/Branching/GOTOMO.js
+++ b/js/Branching/GOTOMO.js
@@ -2,16 +2,16 @@
function GOTOMO() {
GOTOMO.prototype.define = function GOTOMO() {
this.model = scicos_model();
- this.model.sim = new ScilabString("gotomo");
- this.model.in1 = new ScilabDouble(-1);
- this.model.in2 = new ScilabDouble(-2);
+ this.model.sim = new ScilabString(["gotomo"]);
+ this.model.in1 = new ScilabDouble([-1]);
+ this.model.in2 = new ScilabDouble([-2]);
this.model.intyp = [];
this.model.out = [];
this.model.out2 = [];
- this.model.outtyp = new ScilabDouble(1);
- this.model.ipar = new ScilabDouble(int(1));
- this.model.opar = list(new ScilabString("A"));
- this.model.blocktype = new ScilabString("c");
+ this.model.outtyp = new ScilabDouble([1]);
+ this.model.ipar = new ScilabDouble([int(1)]);
+ this.model.opar = list(new ScilabString(["A"]));
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [false,false];
mo = modelica();
mo.model = "gotomo";
@@ -55,8 +55,8 @@ function GOTOMO() {
y = needcompile;
}
graphics.exprs = exprs;
- this.model.opar = list(new ScilabDouble(this.tag));
- this.model.ipar = new ScilabDouble(this.tagvis);
+ this.model.opar = list(new ScilabDouble([this.tag]));
+ this.model.ipar = new ScilabDouble([this.tagvis]);
this.x.model = this.model;
this.x.graphics = graphics;
arg1 = this.x;
diff --git a/js/Branching/GotoTagVisibility.js b/js/Branching/GotoTagVisibility.js
index d568b4b6..7010e090 100644
--- a/js/Branching/GotoTagVisibility.js
+++ b/js/Branching/GotoTagVisibility.js
@@ -2,17 +2,17 @@
function GotoTagVisibility() {
GotoTagVisibility.prototype.define = function GotoTagVisibility() {
this.model = scicos_model();
- this.model.sim = new ScilabString("gototagvisibility");
+ this.model.sim = new ScilabString(["gototagvisibility"]);
this.model.in1 = [];
this.model.in2 = [];
this.model.out = [];
this.model.out2 = [];
this.model.evtin = [];
- this.model.intyp = new ScilabDouble(1);
- this.model.outtyp = new ScilabDouble(1);
- this.model.opar = list(new ScilabString("A"));
- this.model.blocktype = new ScilabString("c");
- this.model.firing = new ScilabBoolean(false);
+ this.model.intyp = new ScilabDouble([1]);
+ this.model.outtyp = new ScilabDouble([1]);
+ this.model.opar = list(new ScilabString(["A"]));
+ this.model.blocktype = new ScilabString(["c"]);
+ this.model.firing = new ScilabBoolean([false]);
this.model.dep_ut = [false,false];
exprs = "A";
gr_i = [];
@@ -45,7 +45,7 @@ function GotoTagVisibility() {
y = needcompile;
}
graphics.exprs = exprs;
- this.model.opar = list(new ScilabDouble(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 942512e3..fdacf43e 100644
--- a/js/Branching/GotoTagVisibilityMO.js
+++ b/js/Branching/GotoTagVisibilityMO.js
@@ -2,17 +2,17 @@
function GotoTagVisibilityMO() {
GotoTagVisibilityMO.prototype.define = function GotoTagVisibilityMO() {
this.model = scicos_model();
- this.model.sim = new ScilabString("gototagvisibilitymo");
+ this.model.sim = new ScilabString(["gototagvisibilitymo"]);
this.model.in1 = [];
this.model.in2 = [];
this.model.out = [];
this.model.out2 = [];
this.model.evtin = [];
- this.model.intyp = new ScilabDouble(1);
- this.model.outtyp = new ScilabDouble(1);
- this.model.opar = list(new ScilabString("A"));
- this.model.blocktype = new ScilabString("c");
- this.model.firing = new ScilabBoolean(false);
+ this.model.intyp = new ScilabDouble([1]);
+ this.model.outtyp = new ScilabDouble([1]);
+ this.model.opar = list(new ScilabString(["A"]));
+ this.model.blocktype = new ScilabString(["c"]);
+ this.model.firing = new ScilabBoolean([false]);
this.model.dep_ut = [false,false];
exprs = "A";
gr_i = [];
@@ -45,7 +45,7 @@ function GotoTagVisibilityMO() {
y = needcompile;
}
graphics.exprs = exprs;
- this.model.opar = list(new ScilabDouble(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 df715ba5..adaf51f0 100644
--- a/js/Branching/ISELECT_f.js
+++ b/js/Branching/ISELECT_f.js
@@ -5,12 +5,12 @@ function ISELECT_f() {
out = [[-1],[-1]];
this.nout = 2;
this.model = scicos_model();
- this.model.sim = list(new ScilabString("selector"),new ScilabDouble(2));
- this.model.in1 = new ScilabDouble(-1);
+ 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));
- this.model.dstate = new ScilabDouble(this.z0);
- this.model.blocktype = new ScilabString("c");
+ this.model.evtin = new ScilabDouble([ones(out)]);
+ this.model.dstate = new ScilabDouble([this.z0]);
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = [[string(this.nout)],[string(this.z0+1)]];
gr_i = [];
@@ -45,7 +45,7 @@ function ISELECT_f() {
[model,graphics,ok] = check_io(this.model,graphics,-1,-ones(this.nout,1),ones(this.nout,1),[]);
if (ok) {
graphics.exprs = exprs;
- this.model.dstate = new ScilabDouble(this.z0-1);
+ this.model.dstate = new ScilabDouble([this.z0-1]);
this.x.graphics = graphics;
this.x.model = this.model;
break;
diff --git a/js/Branching/ISELECT_m.js b/js/Branching/ISELECT_m.js
index fbdac6f1..7a82ad23 100644
--- a/js/Branching/ISELECT_m.js
+++ b/js/Branching/ISELECT_m.js
@@ -4,21 +4,21 @@ function ISELECT_m() {
this.z0 = 1;
this.nout = 2;
this.model = scicos_model();
- this.model.sim = list(new ScilabString("selector_m"),new ScilabDouble(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);
- this.model.in1 = new ScilabDouble(-1);
- this.model.in2 = new ScilabDouble(-2);
- this.model.intyp = new ScilabDouble(1);
+ this.model.outtyp = new ScilabDouble([1]);
+ this.model.in1 = new ScilabDouble([-1]);
+ this.model.in2 = new ScilabDouble([-2]);
+ this.model.intyp = new ScilabDouble([1]);
this.model.evtout = [];
this.model.state = [];
this.model.rpar = [];
this.model.ipar = [];
this.model.firing = [];
- this.model.evtin = new ScilabDouble(ones(this.nout,1));
- this.model.dstate = new ScilabDouble(this.z0);
- this.model.blocktype = new ScilabString("c");
+ this.model.evtin = new ScilabDouble([ones(this.nout,1)]);
+ this.model.dstate = new ScilabDouble([this.z0]);
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = [[sci2exp(1)],[sci2exp(this.nout)],[sci2exp(this.z0)]];
gr_i = [];
@@ -63,7 +63,7 @@ function ISELECT_m() {
[model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),ones(this.nout,1),[]);
if (ok) {
graphics.exprs = exprs;
- this.model.dstate = new ScilabDouble(this.z0);
+ this.model.dstate = new ScilabDouble([this.z0]);
this.x.graphics = graphics;
this.x.model = this.model;
break;
diff --git a/js/Branching/MUX.js b/js/Branching/MUX.js
index 72b2a620..523f8f2d 100644
--- a/js/Branching/MUX.js
+++ b/js/Branching/MUX.js
@@ -3,11 +3,11 @@ function MUX() {
MUX.prototype.define = function MUX() {
this.in1 = 2;
this.model = scicos_model();
- this.model.sim = list(new ScilabString("multiplex"),new ScilabDouble(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);
- this.model.blocktype = new ScilabString("c");
+ this.model.out = new ScilabDouble([0]);
+ this.model.ipar = new ScilabDouble([this.in1]);
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = string(this.in1);
gr_i = [];
@@ -58,7 +58,7 @@ function MUX() {
}
if (ok) {
graphics.exprs = exprs;
- this.model.ipar = new ScilabDouble(this.in1);
+ this.model.ipar = new ScilabDouble([this.in1]);
this.x.graphics = graphics;
this.x.model = this.model;
break;
diff --git a/js/Branching/MUX_f.js b/js/Branching/MUX_f.js
index c157b922..1e197b51 100644
--- a/js/Branching/MUX_f.js
+++ b/js/Branching/MUX_f.js
@@ -3,11 +3,11 @@ function MUX_f() {
MUX_f.prototype.define = function MUX_f() {
this.in1 = 2;
this.model = scicos_model();
- this.model.sim = list(new ScilabString("mux"),new ScilabDouble(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);
- this.model.blocktype = new ScilabString("c");
+ this.model.out = new ScilabDouble([0]);
+ this.model.ipar = new ScilabDouble([this.in1]);
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = string(this.in1);
gr_i = [];
@@ -58,7 +58,7 @@ function MUX_f() {
}
if (ok) {
graphics.exprs = exprs;
- this.model.ipar = new ScilabDouble(this.in1);
+ this.model.ipar = new ScilabDouble([this.in1]);
this.x.graphics = graphics;
this.x.model = this.model;
break;
diff --git a/js/Branching/M_SWITCH.js b/js/Branching/M_SWITCH.js
index 2bd2cec7..93b27c32 100644
--- a/js/Branching/M_SWITCH.js
+++ b/js/Branching/M_SWITCH.js
@@ -5,11 +5,11 @@ function M_SWITCH() {
ipar = [[1],[3]];
this.nin = 2;
this.model = scicos_model();
- this.model.sim = list(new ScilabString("mswitch"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["mswitch"]), new ScilabDouble([4]));
this.model.in1 = in1;
- this.model.out = new ScilabDouble(-1);
+ this.model.out = new ScilabDouble([-1]);
this.model.ipar = ipar;
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = [[string(this.nin)],[string(ipar)]];
gr_i = [];
diff --git a/js/Branching/NRMSOM_f.js b/js/Branching/NRMSOM_f.js
index eee8baed..98d295c9 100644
--- a/js/Branching/NRMSOM_f.js
+++ b/js/Branching/NRMSOM_f.js
@@ -4,10 +4,10 @@ function NRMSOM_f() {
in1 = [[-1],[-1]];
this.nin = 2;
this.model = scicos_model();
- this.model.sim = new ScilabString("junk");
+ this.model.sim = new ScilabString(["junk"]);
this.model.in1 = in1;
- this.model.out = new ScilabDouble(-1);
- this.model.blocktype = new ScilabString("c");
+ this.model.out = new ScilabDouble([-1]);
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = [string(this.nin)];
gr_i = [];
diff --git a/js/Branching/RELAY_f.js b/js/Branching/RELAY_f.js
index 8dbc9e77..32e0ee29 100644
--- a/js/Branching/RELAY_f.js
+++ b/js/Branching/RELAY_f.js
@@ -5,12 +5,12 @@ function RELAY_f() {
in1 = [[-1],[-1]];
this.nin = 2;
this.model = scicos_model();
- this.model.sim = list(new ScilabString("relay"),new ScilabDouble(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));
- this.model.dstate = new ScilabDouble(i0);
- this.model.blocktype = new ScilabString("c");
+ this.model.out = new ScilabDouble([-1]);
+ this.model.evtin = new ScilabDouble([ones(in1)]);
+ this.model.dstate = new ScilabDouble([i0]);
+ this.model.blocktype = new ScilabString(["c"]);
this.model.firing = [];
this.model.dep_ut = [true,true];
exprs = [[string(this.nin)],[string(i0+1)]];
@@ -47,7 +47,7 @@ function RELAY_f() {
[model,graphics,ok] = check_io(this.model,graphics,-ones(this.nin,1),-1,ones(this.nin,1),[]);
if (ok) {
graphics.exprs = exprs;
- this.model.dstate = new ScilabString(this.z0-1);
+ this.model.dstate = new ScilabString([this.z0-1]);
this.x.graphics = graphics;
this.x.model = this.model;
break;
diff --git a/js/Branching/SCALAR2VECTOR.js b/js/Branching/SCALAR2VECTOR.js
index 6c2bcecf..ec37f19e 100644
--- a/js/Branching/SCALAR2VECTOR.js
+++ b/js/Branching/SCALAR2VECTOR.js
@@ -3,10 +3,10 @@ function SCALAR2VECTOR() {
SCALAR2VECTOR.prototype.define = function SCALAR2VECTOR() {
this.nout = -1;
this.model = scicos_model();
- 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");
+ 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"]);
this.model.dep_ut = [true,false];
exprs = [string([this.nout])];
gr_i = [];
diff --git a/js/Branching/SELECT_f.js b/js/Branching/SELECT_f.js
index 1881f9e8..4b287f3a 100644
--- a/js/Branching/SELECT_f.js
+++ b/js/Branching/SELECT_f.js
@@ -5,12 +5,12 @@ function SELECT_f() {
in1 = [[-1],[-1]];
this.nin = 2;
this.model = scicos_model();
- this.model.sim = list(new ScilabString("selector"),new ScilabDouble(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));
- this.model.dstate = new ScilabDouble(this.z0);
- this.model.blocktype = new ScilabString("c");
+ this.model.out = new ScilabDouble([-1]);
+ this.model.evtin = new ScilabDouble([ones(in1)]);
+ this.model.dstate = new ScilabDouble([this.z0]);
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = [[string(this.nin)],[string(this.z0+1)]];
gr_i = [];
@@ -45,7 +45,7 @@ function SELECT_f() {
[model,graphics,ok] = check_io(this.model,graphics,-ones(this.nin,1),-1,ones(this.nin,1),[]);
if (ok) {
graphics.exprs = exprs;
- this.model.dstate = new ScilabDouble(this.z0-1);
+ this.model.dstate = new ScilabDouble([this.z0-1]);
this.x.graphics = graphics;
this.x.model = this.model;
break;
diff --git a/js/Branching/SELECT_m.js b/js/Branching/SELECT_m.js
index 80cfda5f..3fffd8e7 100644
--- a/js/Branching/SELECT_m.js
+++ b/js/Branching/SELECT_m.js
@@ -4,21 +4,21 @@ function SELECT_m() {
this.z0 = 1;
this.nin = 2;
this.model = scicos_model();
- this.model.sim = list(new ScilabString("selector_m"),new ScilabDouble(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);
- this.model.out = new ScilabDouble(-1);
- this.model.out2 = new ScilabDouble(-2);
- this.model.outtyp = new ScilabDouble(1);
+ this.model.intyp = new ScilabDouble([1]);
+ this.model.out = new ScilabDouble([-1]);
+ this.model.out2 = new ScilabDouble([-2]);
+ this.model.outtyp = new ScilabDouble([1]);
this.model.evtout = [];
this.model.state = [];
this.model.rpar = [];
this.model.ipar = [];
this.model.firing = [];
- this.model.evtin = new ScilabDouble(ones(this.nin,1));
- this.model.dstate = new ScilabDouble(this.z0);
- this.model.blocktype = new ScilabString("c");
+ this.model.evtin = new ScilabDouble([ones(this.nin,1)]);
+ this.model.dstate = new ScilabDouble([this.z0]);
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = [[sci2exp(1)],[sci2exp(this.nin)],[sci2exp(this.z0)]];
gr_i = [];
@@ -63,7 +63,7 @@ function SELECT_m() {
[model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),ones(this.nin,1),[]);
if (ok) {
graphics.exprs = exprs;
- this.model.dstate = new ScilabDouble(this.z0);
+ this.model.dstate = new ScilabDouble([this.z0]);
this.x.graphics = graphics;
this.x.model = this.model;
break;
diff --git a/js/Branching/SWITCH2.js b/js/Branching/SWITCH2.js
index 5029e43f..8c1270d3 100644
--- a/js/Branching/SWITCH2.js
+++ b/js/Branching/SWITCH2.js
@@ -6,14 +6,14 @@ function SWITCH2() {
this.nzz = 1;
rpar = 0;
this.model = scicos_model();
- this.model.sim = list(new ScilabString("switch2"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["switch2"]), new ScilabDouble([4]));
this.model.in1 = in1;
- this.model.out = new ScilabDouble(-1);
+ this.model.out = new ScilabDouble([-1]);
this.model.ipar = ipar;
- this.model.rpar = new ScilabDouble(rpar);
- this.model.nzcross = new ScilabDouble(this.nzz);
- this.model.nmode = new ScilabDouble(1);
- this.model.blocktype = new ScilabString("c");
+ this.model.rpar = new ScilabDouble([rpar]);
+ this.model.nzcross = new ScilabDouble([this.nzz]);
+ this.model.nmode = new ScilabDouble([1]);
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = [[string(ipar)],[string(rpar)],[string(this.nzz)]];
gr_i = [];
@@ -52,14 +52,14 @@ function SWITCH2() {
this.rule = 2;
}
graphics.exprs = exprs;
- this.model.ipar = new ScilabDouble(this.rule);
- this.model.rpar = new ScilabDouble(this.thra);
+ this.model.ipar = new ScilabDouble([this.rule]);
+ this.model.rpar = new ScilabDouble([this.thra]);
if (this.nzz!=0) {
- this.model.nmode = new ScilabDouble(1);
- this.model.nzcross = new ScilabDouble(1);
+ this.model.nmode = new ScilabDouble([1]);
+ this.model.nzcross = new ScilabDouble([1]);
} else {
- this.model.nmode = new ScilabDouble(0);
- this.model.nzcross = new ScilabDouble(0);
+ this.model.nmode = new ScilabDouble([0]);
+ this.model.nzcross = new ScilabDouble([0]);
}
this.x.graphics = graphics;
this.x.model = this.model;
diff --git a/js/Branching/SWITCH2_m.js b/js/Branching/SWITCH2_m.js
index 080c3d90..d83240fb 100644
--- a/js/Branching/SWITCH2_m.js
+++ b/js/Branching/SWITCH2_m.js
@@ -5,18 +5,18 @@ function SWITCH2_m() {
this.nzz = 1;
rpar = 0;
this.model = scicos_model();
- this.model.sim = list(new ScilabString("switch2_m"),new ScilabDouble(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);
- this.model.out = new ScilabDouble(-1);
- this.model.out2 = new ScilabDouble(-2);
- this.model.outtyp = new ScilabDouble(1);
+ this.model.intyp = new ScilabDouble([1]);
+ this.model.out = new ScilabDouble([-1]);
+ this.model.out2 = new ScilabDouble([-2]);
+ this.model.outtyp = new ScilabDouble([1]);
this.model.ipar = ipar;
- this.model.rpar = new ScilabDouble(rpar);
- this.model.nzcross = new ScilabDouble(this.nzz);
- this.model.nmode = new ScilabDouble(1);
- this.model.blocktype = new ScilabString("c");
+ this.model.rpar = new ScilabDouble([rpar]);
+ this.model.nzcross = new ScilabDouble([this.nzz]);
+ this.model.nmode = new ScilabDouble([1]);
+ this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = [[sci2exp(1)],[string(ipar)],[string(rpar)],[string(this.nzz)]];
gr_i = [];
@@ -57,14 +57,14 @@ function SWITCH2_m() {
this.rule = 2;
}
graphics.exprs = exprs;
- this.model.ipar = new ScilabDouble(this.rule);
- this.model.rpar = new ScilabDouble(this.thra);
+ this.model.ipar = new ScilabDouble([this.rule]);
+ this.model.rpar = new ScilabDouble([this.thra]);
if (this.nzz!=0) {
- this.model.nmode = new ScilabDouble(1);
- this.model.nzcross = new ScilabDouble(1);
+ this.model.nmode = new ScilabDouble([1]);
+ this.model.nzcross = new ScilabDouble([1]);
} else {
- this.model.nmode = new ScilabDouble(0);
- this.model.nzcross = new ScilabDouble(0);
+ this.model.nmode = new ScilabDouble([0]);
+ this.model.nzcross = new ScilabDouble([0]);
}
if (((this.ot<1)||(this.ot>8))&&(this.ot!=-1)) {
message("Datatype is not supported");
diff --git a/js/Branching/SWITCH_f.js b/js/Branching/SWITCH_f.js
index d139589b..c4e2b75a 100644
--- a/js/Branching/SWITCH_f.js
+++ b/js/Branching/SWITCH_f.js
@@ -5,11 +5,11 @@ function SWITCH_f() {
in1 = [[-1],[-1]];
this.nin = 2;
this.model = scicos_model();
- this.model.sim = list(new ScilabString("switchn"),new ScilabDouble(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);
- this.model.blocktype = new ScilabString("c");
+ this.model.out = new ScilabDouble([-1]);
+ this.model.ipar = new ScilabDouble([i0]);
+ this.model.blocktype = new ScilabString(["c"]);
this.model.firing = [];
this.model.dep_ut = [true,true];
exprs = [[string(this.nin)],[string(i0+1)]];
@@ -46,7 +46,7 @@ function SWITCH_f() {
[model,graphics,ok] = check_io(this.model,graphics,-ones(this.nin,1),-1,[],[]);
if (ok) {
graphics.exprs = exprs;
- this.model.ipar = new ScilabString(this.z0-1);
+ this.model.ipar = new ScilabString([this.z0-1]);
this.x.graphics = graphics;
this.x.model = this.model;
break;