summaryrefslogtreecommitdiff
path: root/js/MatrixOp
diff options
context:
space:
mode:
Diffstat (limited to 'js/MatrixOp')
-rw-r--r--js/MatrixOp/CUMSUM.js18
-rw-r--r--js/MatrixOp/EXTRACT.js18
-rw-r--r--js/MatrixOp/EXTTRI.js18
-rw-r--r--js/MatrixOp/MATBKSL.js12
-rw-r--r--js/MatrixOp/MATCATH.js12
-rw-r--r--js/MatrixOp/MATCATV.js12
-rw-r--r--js/MatrixOp/MATDET.js18
-rw-r--r--js/MatrixOp/MATDIAG.js18
-rw-r--r--js/MatrixOp/MATDIV.js12
-rw-r--r--js/MatrixOp/MATEIG.js18
-rw-r--r--js/MatrixOp/MATEXPM.js18
-rw-r--r--js/MatrixOp/MATINV.js18
-rw-r--r--js/MatrixOp/MATLU.js12
-rw-r--r--js/MatrixOp/MATMAGPHI.js12
-rw-r--r--js/MatrixOp/MATMUL.js64
-rw-r--r--js/MatrixOp/MATPINV.js18
-rw-r--r--js/MatrixOp/MATRESH.js18
-rw-r--r--js/MatrixOp/MATSING.js18
-rw-r--r--js/MatrixOp/MATSUM.js18
-rw-r--r--js/MatrixOp/MATTRAN.js12
-rw-r--r--js/MatrixOp/MATZCONJ.js16
-rw-r--r--js/MatrixOp/MATZREIM.js12
-rw-r--r--js/MatrixOp/RICC.js10
-rw-r--r--js/MatrixOp/ROOTCOEF.js18
-rw-r--r--js/MatrixOp/SQRT.js16
-rw-r--r--js/MatrixOp/SUBMAT.js18
26 files changed, 227 insertions, 227 deletions
diff --git a/js/MatrixOp/CUMSUM.js b/js/MatrixOp/CUMSUM.js
index 4757f5cb..46691ea3 100644
--- a/js/MatrixOp/CUMSUM.js
+++ b/js/MatrixOp/CUMSUM.js
@@ -4,20 +4,20 @@ function CUMSUM() {
this.model = scicos_model();
function_name = "cumsum_m";
funtyp = 4;
- 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);
- this.model.out = new ScilabDouble(-1);
- this.model.out2 = new ScilabDouble(-2);
- this.model.outtyp = new ScilabDouble(1);
+ 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]);
+ this.model.out = new ScilabDouble([-1]);
+ this.model.out2 = new ScilabDouble([-2]);
+ this.model.outtyp = new ScilabDouble([1]);
this.model.evtin = [];
this.model.evtout = [];
this.model.state = [];
this.model.dstate = [];
this.model.rpar = [];
this.model.ipar = [];
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.firing = [];
this.model.dep_ut = [true,false];
label = [[sci2exp(1)],[sci2exp(0)]];
@@ -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(new ScilabString(function_name),new ScilabDouble(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 96f0f745..86a14f92 100644
--- a/js/MatrixOp/EXTRACT.js
+++ b/js/MatrixOp/EXTRACT.js
@@ -4,20 +4,20 @@ function EXTRACT() {
this.model = scicos_model();
function_name = "extract";
funtyp = 4;
- 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);
- this.model.out = new ScilabDouble(1);
- this.model.out2 = new ScilabDouble(1);
- this.model.outtyp = new ScilabDouble(1);
+ 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]);
+ this.model.out = new ScilabDouble([1]);
+ this.model.out2 = new ScilabDouble([1]);
+ this.model.outtyp = new ScilabDouble([1]);
this.model.evtin = [];
this.model.evtout = [];
this.model.state = [];
this.model.dstate = [];
this.model.rpar = [];
this.model.ipar = [1,1,1,1];
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.firing = [];
this.model.dep_ut = [true,false];
label = [[sci2exp(1)],[sci2exp([1])],[sci2exp([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(new ScilabString(function_name),new ScilabDouble(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 a27d03b7..6308b156 100644
--- a/js/MatrixOp/EXTTRI.js
+++ b/js/MatrixOp/EXTTRI.js
@@ -4,20 +4,20 @@ function EXTTRI() {
this.model = scicos_model();
function_name = "extrilz";
funtyp = 4;
- 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);
- this.model.out = new ScilabDouble(-1);
- this.model.out2 = new ScilabDouble(-2);
- this.model.outtyp = new ScilabDouble(1);
+ 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]);
+ this.model.out = new ScilabDouble([-1]);
+ this.model.out2 = new ScilabDouble([-2]);
+ this.model.outtyp = new ScilabDouble([1]);
this.model.evtin = [];
this.model.evtout = [];
this.model.state = [];
this.model.dstate = [];
this.model.rpar = [];
this.model.ipar = [];
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.firing = [];
this.model.dep_ut = [true,false];
label = [[sci2exp(1)],[sci2exp(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(new ScilabString(function_name),new ScilabDouble(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 7a603424..90da221c 100644
--- a/js/MatrixOp/MATBKSL.js
+++ b/js/MatrixOp/MATBKSL.js
@@ -4,20 +4,20 @@ function MATBKSL() {
this.model = scicos_model();
function_name = "mat_bksl";
funtyp = 4;
- this.model.sim = list(new ScilabString(function_name),new ScilabDouble(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];
- this.model.out = new ScilabDouble(-2);
- this.model.out2 = new ScilabDouble(-3);
- this.model.outtyp = new ScilabDouble(1);
+ this.model.out = new ScilabDouble([-2]);
+ this.model.out2 = new ScilabDouble([-3]);
+ this.model.outtyp = new ScilabDouble([1]);
this.model.evtin = [];
this.model.evtout = [];
this.model.state = [];
this.model.dstate = [];
this.model.rpar = [];
this.model.ipar = [];
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.firing = [];
this.model.dep_ut = [true,false];
label = [sci2exp(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(new ScilabString(function_name),new ScilabDouble(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 01fb0d32..480ac3dd 100644
--- a/js/MatrixOp/MATCATH.js
+++ b/js/MatrixOp/MATCATH.js
@@ -4,20 +4,20 @@ function MATCATH() {
this.model = scicos_model();
function_name = "mat_cath";
funtyp = 4;
- this.model.sim = list(new ScilabString(function_name),new ScilabDouble(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];
- this.model.out = new ScilabDouble(-1);
- this.model.out2 = new ScilabDouble(0);
- this.model.outtyp = new ScilabDouble(-1);
+ this.model.out = new ScilabDouble([-1]);
+ this.model.out2 = new ScilabDouble([0]);
+ this.model.outtyp = new ScilabDouble([-1]);
this.model.evtin = [];
this.model.evtout = [];
this.model.state = [];
this.model.dstate = [];
this.model.rpar = [];
this.model.ipar = [];
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.firing = [];
this.model.dep_ut = [true,false];
label = [sci2exp(2)];
@@ -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(new ScilabString("mat_cath"),new ScilabDouble(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 13e3f7ef..4f5fd590 100644
--- a/js/MatrixOp/MATCATV.js
+++ b/js/MatrixOp/MATCATV.js
@@ -5,20 +5,20 @@ function MATCATV() {
this.model = scicos_model();
function_name = "mat_catv";
funtyp = 4;
- this.model.sim = list(new ScilabString(function_name),new ScilabDouble(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];
- this.model.out = new ScilabDouble(0);
- this.model.out2 = new ScilabDouble(-1);
- this.model.outtyp = new ScilabDouble(-1);
+ this.model.out = new ScilabDouble([0]);
+ this.model.out2 = new ScilabDouble([-1]);
+ this.model.outtyp = new ScilabDouble([-1]);
this.model.evtin = [];
this.model.evtout = [];
this.model.state = [];
this.model.dstate = [];
this.model.rpar = [];
this.model.ipar = [];
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.firing = [];
this.model.dep_ut = [true,false];
label = [sci2exp(2)];
@@ -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(new ScilabString("mat_catv"),new ScilabDouble(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 8dd414c2..9c0a203b 100644
--- a/js/MatrixOp/MATDET.js
+++ b/js/MatrixOp/MATDET.js
@@ -4,20 +4,20 @@ function MATDET() {
this.model = scicos_model();
function_name = "mat_det";
funtyp = 4;
- 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);
- this.model.out = new ScilabDouble(1);
- this.model.out2 = new ScilabDouble(1);
- this.model.outtyp = new ScilabDouble(1);
+ 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]);
+ this.model.out = new ScilabDouble([1]);
+ this.model.out2 = new ScilabDouble([1]);
+ this.model.outtyp = new ScilabDouble([1]);
this.model.evtin = [];
this.model.evtout = [];
this.model.state = [];
this.model.dstate = [];
this.model.rpar = [];
this.model.ipar = [];
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.firing = [];
this.model.dep_ut = [true,false];
label = [sci2exp(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(new ScilabString(function_name),new ScilabDouble(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 10277c65..4dba485a 100644
--- a/js/MatrixOp/MATDIAG.js
+++ b/js/MatrixOp/MATDIAG.js
@@ -4,20 +4,20 @@ function MATDIAG() {
this.model = scicos_model();
function_name = "mat_diag";
funtyp = 4;
- 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);
- this.model.out = new ScilabDouble(-1);
- this.model.out2 = new ScilabDouble(-1);
- this.model.outtyp = new ScilabDouble(1);
+ 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]);
+ this.model.out = new ScilabDouble([-1]);
+ this.model.out2 = new ScilabDouble([-1]);
+ this.model.outtyp = new ScilabDouble([1]);
this.model.evtin = [];
this.model.evtout = [];
this.model.state = [];
this.model.dstate = [];
this.model.rpar = [];
this.model.ipar = [];
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.firing = [];
this.model.dep_ut = [true,false];
label = [sci2exp(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(new ScilabString(function_name),new ScilabDouble(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 76b03fad..f63de760 100644
--- a/js/MatrixOp/MATDIV.js
+++ b/js/MatrixOp/MATDIV.js
@@ -4,20 +4,20 @@ function MATDIV() {
this.model = scicos_model();
function_name = "mat_div";
funtyp = 4;
- this.model.sim = list(new ScilabString(function_name),new ScilabDouble(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];
- this.model.out = new ScilabDouble(-1);
- this.model.out2 = new ScilabDouble(-2);
- this.model.outtyp = new ScilabDouble(1);
+ this.model.out = new ScilabDouble([-1]);
+ this.model.out2 = new ScilabDouble([-2]);
+ this.model.outtyp = new ScilabDouble([1]);
this.model.evtin = [];
this.model.evtout = [];
this.model.state = [];
this.model.dstate = [];
this.model.rpar = [];
this.model.ipar = [];
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.firing = [];
this.model.dep_ut = [true,false];
label = [sci2exp(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(new ScilabString(function_name),new ScilabDouble(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 9ae3054b..b6490e9f 100644
--- a/js/MatrixOp/MATEIG.js
+++ b/js/MatrixOp/MATEIG.js
@@ -4,20 +4,20 @@ function MATEIG() {
this.model = scicos_model();
function_name = "mat_vps";
funtyp = 4;
- 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);
- this.model.out = new ScilabDouble(-1);
- this.model.out2 = new ScilabDouble(1);
- this.model.outtyp = new ScilabDouble(2);
+ 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]);
+ this.model.out = new ScilabDouble([-1]);
+ this.model.out2 = new ScilabDouble([1]);
+ this.model.outtyp = new ScilabDouble([2]);
this.model.evtin = [];
this.model.evtout = [];
this.model.state = [];
this.model.dstate = [];
this.model.rpar = [];
this.model.ipar = [];
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.firing = [];
this.model.dep_ut = [true,false];
label = [[sci2exp(1)],[sci2exp(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(new ScilabString(function_name),new ScilabDouble(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 ab53af01..9a93cdac 100644
--- a/js/MatrixOp/MATEXPM.js
+++ b/js/MatrixOp/MATEXPM.js
@@ -4,20 +4,20 @@ function MATEXPM() {
this.model = scicos_model();
function_name = "mat_expm";
funtyp = 4;
- 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);
- this.model.out = new ScilabDouble(-1);
- this.model.out2 = new ScilabDouble(-1);
- this.model.outtyp = new ScilabDouble(1);
+ 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]);
+ this.model.out = new ScilabDouble([-1]);
+ this.model.out2 = new ScilabDouble([-1]);
+ this.model.outtyp = new ScilabDouble([1]);
this.model.evtin = [];
this.model.evtout = [];
this.model.state = [];
this.model.dstate = [];
this.model.rpar = [];
this.model.ipar = [];
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.firing = [];
this.model.dep_ut = [true,false];
label = [sci2exp(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(new ScilabString(function_name),new ScilabDouble(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 319c28ad..d2418006 100644
--- a/js/MatrixOp/MATINV.js
+++ b/js/MatrixOp/MATINV.js
@@ -4,20 +4,20 @@ function MATINV() {
this.model = scicos_model();
function_name = "mat_inv";
funtyp = 4;
- 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);
- this.model.out = new ScilabDouble(-1);
- this.model.out2 = new ScilabDouble(-1);
- this.model.outtyp = new ScilabDouble(1);
+ 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]);
+ this.model.out = new ScilabDouble([-1]);
+ this.model.out2 = new ScilabDouble([-1]);
+ this.model.outtyp = new ScilabDouble([1]);
this.model.evtin = [];
this.model.evtout = [];
this.model.state = [];
this.model.dstate = [];
this.model.rpar = [];
this.model.ipar = [];
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.firing = [];
this.model.dep_ut = [true,false];
label = [sci2exp(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(new ScilabString(function_name),new ScilabDouble(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 24a703f5..a81521e3 100644
--- a/js/MatrixOp/MATLU.js
+++ b/js/MatrixOp/MATLU.js
@@ -4,10 +4,10 @@ function MATLU() {
this.model = scicos_model();
function_name = "mat_lu";
funtyp = 4;
- 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);
+ 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]);
this.model.out = [[-1],[-1]];
this.model.out2 = [[-1],[-1]];
this.model.outtyp = [1,1];
@@ -17,7 +17,7 @@ function MATLU() {
this.model.dstate = [];
this.model.rpar = [];
this.model.ipar = [];
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.firing = [];
this.model.dep_ut = [true,false];
label = sci2exp(1);
@@ -66,7 +66,7 @@ function MATLU() {
}
if (ok) {
funtyp = 4;
- this.model.sim = list(new ScilabString(function_name),new ScilabDouble(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 b03027d3..e46a7675 100644
--- a/js/MatrixOp/MATMAGPHI.js
+++ b/js/MatrixOp/MATMAGPHI.js
@@ -4,10 +4,10 @@ function MATMAGPHI() {
this.model = scicos_model();
function_name = "matz_abs";
funtyp = 4;
- 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);
+ 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]);
this.model.out = [[-1],[-1]];
this.model.out2 = [[-2],[-2]];
this.model.outtyp = [1,1];
@@ -17,7 +17,7 @@ function MATMAGPHI() {
this.model.dstate = [];
this.model.rpar = [];
this.model.ipar = [];
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.firing = [];
this.model.dep_ut = [true,false];
label = [sci2exp(1)];
@@ -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(new ScilabString(function_name),new ScilabDouble(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 9cf4bd3e..4a0d6a2f 100644
--- a/js/MatrixOp/MATMUL.js
+++ b/js/MatrixOp/MATMUL.js
@@ -2,13 +2,13 @@
function MATMUL() {
MATMUL.prototype.define = function MATMUL() {
this.model = scicos_model();
- this.model.sim = list(new ScilabString("matmul_m"),new ScilabDouble(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);
- this.model.out2 = new ScilabDouble(-3);
+ this.model.out = new ScilabDouble([-1]);
+ this.model.out2 = new ScilabDouble([-3]);
this.model.dep_ut = [true,false];
- this.model.ipar = new ScilabDouble(1);
+ this.model.ipar = new ScilabDouble([1]);
label = [sci2exp(this.model.ipar)];
gr_i = [];
this.x = standard_define([3,2],this.model,label,gr_i);
@@ -34,7 +34,7 @@ function MATMUL() {
label = graphics.exprs;
this.model = this.x.model;
if (this.model.ipar==[]) {
- this.model.ipar = new ScilabDouble(1);
+ this.model.ipar = new ScilabDouble([1]);
}
if (size(label,"*")==1) {
label[2-1] = sci2exp(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(new ScilabString("matmul2_m"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["matmul2_m"]), new ScilabDouble([4]));
} else if (this.np==1) {
- this.model.sim = list(new ScilabString("matmul2_s"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["matmul2_s"]), new ScilabDouble([4]));
} else {
- this.model.sim = list(new ScilabString("matmul2_e"),new ScilabDouble(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(new ScilabString("matbyscal"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["matbyscal"]), new ScilabDouble([4]));
} else if (this.np==1) {
- this.model.sim = list(new ScilabString("matbyscal_s"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["matbyscal_s"]), new ScilabDouble([4]));
} else {
- this.model.sim = list(new ScilabString("matbyscal_e"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["matbyscal_e"]), new ScilabDouble([4]));
}
} else {
if ((this.dtype==1)) {
- this.model.sim = list(new ScilabString("matmul_m"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["matmul_m"]), new ScilabDouble([4]));
} else if ((this.dtype==2)) {
- this.model.sim = list(new ScilabString("matzmul_m"),new ScilabDouble(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(new ScilabString("matmul_i32n"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["matmul_i32n"]), new ScilabDouble([4]));
} else if (this.np==1) {
- this.model.sim = list(new ScilabString("matmul_i32s"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["matmul_i32s"]), new ScilabDouble([4]));
} else {
- this.model.sim = list(new ScilabString("matmul_i32e"),new ScilabDouble(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(new ScilabString("matmul_i16n"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["matmul_i16n"]), new ScilabDouble([4]));
} else if (this.np==1) {
- this.model.sim = list(new ScilabString("matmul_i16s"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["matmul_i16s"]), new ScilabDouble([4]));
} else {
- this.model.sim = list(new ScilabString("matmul_i16e"),new ScilabDouble(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(new ScilabString("matmul_i8n"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["matmul_i8n"]), new ScilabDouble([4]));
} else if (this.np==1) {
- this.model.sim = list(new ScilabString("matmul_i8s"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["matmul_i8s"]), new ScilabDouble([4]));
} else {
- this.model.sim = list(new ScilabString("matmul_i8e"),new ScilabDouble(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(new ScilabString("matmul_ui32n"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["matmul_ui32n"]), new ScilabDouble([4]));
} else if (this.np==1) {
- this.model.sim = list(new ScilabString("matmul_ui32s"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["matmul_ui32s"]), new ScilabDouble([4]));
} else {
- this.model.sim = list(new ScilabString("matmul_ui32e"),new ScilabDouble(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(new ScilabString("matmul_ui16n"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["matmul_ui16n"]), new ScilabDouble([4]));
} else if (this.np==1) {
- this.model.sim = list(new ScilabString("matmul_ui16s"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["matmul_ui16s"]), new ScilabDouble([4]));
} else {
- this.model.sim = list(new ScilabString("matmul_ui16e"),new ScilabDouble(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(new ScilabString("matmul_ui8n"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["matmul_ui8n"]), new ScilabDouble([4]));
} else if (this.np==1) {
- this.model.sim = list(new ScilabString("matmul_ui8s"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["matmul_ui8s"]), new ScilabDouble([4]));
} else {
- this.model.sim = list(new ScilabString("matmul_ui8e"),new ScilabDouble(4));
+ this.model.sim = list(new ScilabString(["matmul_ui8e"]), new ScilabDouble([4]));
}
}
}
@@ -149,7 +149,7 @@ function MATMUL() {
[model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]);
if (ok) {
label = exprs;
- this.model.ipar = new ScilabDouble(this.rule);
+ this.model.ipar = new ScilabDouble([this.rule]);
this.model.rpar = [[kmin],[kmax]];
graphics.exprs = label;
this.x.graphics = graphics;
diff --git a/js/MatrixOp/MATPINV.js b/js/MatrixOp/MATPINV.js
index 842e7082..6f4d578a 100644
--- a/js/MatrixOp/MATPINV.js
+++ b/js/MatrixOp/MATPINV.js
@@ -4,20 +4,20 @@ function MATPINV() {
this.model = scicos_model();
function_name = "mat_pinv";
funtyp = 4;
- 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);
- this.model.out = new ScilabDouble(-2);
- this.model.out2 = new ScilabDouble(-1);
- this.model.outtyp = new ScilabDouble(1);
+ 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]);
+ this.model.out = new ScilabDouble([-2]);
+ this.model.out2 = new ScilabDouble([-1]);
+ this.model.outtyp = new ScilabDouble([1]);
this.model.evtin = [];
this.model.evtout = [];
this.model.state = [];
this.model.dstate = [];
this.model.rpar = [];
this.model.ipar = [];
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.firing = [];
this.model.dep_ut = [true,false];
label = [sci2exp(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(new ScilabString(function_name),new ScilabDouble(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 363a21c2..9fc73857 100644
--- a/js/MatrixOp/MATRESH.js
+++ b/js/MatrixOp/MATRESH.js
@@ -4,20 +4,20 @@ function MATRESH() {
this.model = scicos_model();
function_name = "mat_reshape";
funtyp = 4;
- 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);
- this.model.out = new ScilabDouble(-1);
- this.model.out2 = new ScilabDouble(-2);
- this.model.outtyp = new ScilabDouble(1);
+ 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]);
+ this.model.out = new ScilabDouble([-1]);
+ this.model.out2 = new ScilabDouble([-2]);
+ this.model.outtyp = new ScilabDouble([1]);
this.model.evtin = [];
this.model.evtout = [];
this.model.state = [];
this.model.dstate = [];
this.model.rpar = [];
this.model.ipar = [];
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.firing = [];
this.model.dep_ut = [true,false];
label = [[sci2exp(1)],[sci2exp([1,1])],[sci2exp([1,1])]];
@@ -95,7 +95,7 @@ function MATRESH() {
}
if (ok) {
funtyp = 4;
- this.model.sim = list(new ScilabString(function_name),new ScilabDouble(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 99f10974..6074ea98 100644
--- a/js/MatrixOp/MATSING.js
+++ b/js/MatrixOp/MATSING.js
@@ -4,20 +4,20 @@ function MATSING() {
this.model = scicos_model();
function_name = "mat_sing";
funtyp = 4;
- 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);
- this.model.out = new ScilabDouble(-1);
- this.model.out2 = new ScilabDouble(1);
- this.model.outtyp = new ScilabDouble(1);
+ 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]);
+ this.model.out = new ScilabDouble([-1]);
+ this.model.out2 = new ScilabDouble([1]);
+ this.model.outtyp = new ScilabDouble([1]);
this.model.evtin = [];
this.model.evtout = [];
this.model.state = [];
this.model.dstate = [];
this.model.rpar = [];
this.model.ipar = [];
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.firing = [];
this.model.dep_ut = [true,false];
label = [[sci2exp(1)],[sci2exp(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(new ScilabString(function_name),new ScilabDouble(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 a3388ca8..4a1c7f54 100644
--- a/js/MatrixOp/MATSUM.js
+++ b/js/MatrixOp/MATSUM.js
@@ -4,20 +4,20 @@ function MATSUM() {
this.model = scicos_model();
function_name = "mat_sum";
funtyp = 4;
- 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);
- this.model.out = new ScilabDouble(1);
- this.model.out2 = new ScilabDouble(1);
- this.model.outtyp = new ScilabDouble(1);
+ 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]);
+ this.model.out = new ScilabDouble([1]);
+ this.model.out2 = new ScilabDouble([1]);
+ this.model.outtyp = new ScilabDouble([1]);
this.model.evtin = [];
this.model.evtout = [];
this.model.state = [];
this.model.dstate = [];
this.model.rpar = [];
this.model.ipar = [];
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.firing = [];
this.model.dep_ut = [true,false];
label = [[sci2exp(1)],[sci2exp(0)]];
@@ -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(new ScilabString(function_name),new ScilabDouble(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 aede44ad..c26cfbb1 100644
--- a/js/MatrixOp/MATTRAN.js
+++ b/js/MatrixOp/MATTRAN.js
@@ -2,11 +2,11 @@
function MATTRAN() {
MATTRAN.prototype.define = function MATTRAN() {
this.model = scicos_model();
- 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);
- this.model.out2 = new ScilabDouble(-1);
+ 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]);
+ this.model.out2 = new ScilabDouble([-1]);
this.model.dep_ut = [true,false];
label = [sci2exp(1)];
gr_i = [];
@@ -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(new ScilabString(function_name),new ScilabDouble(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 7eaa6a4b..d12db1a6 100644
--- a/js/MatrixOp/MATZCONJ.js
+++ b/js/MatrixOp/MATZCONJ.js
@@ -4,20 +4,20 @@ function MATZCONJ() {
this.model = scicos_model();
function_name = "matz_conj";
funtyp = 4;
- 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);
- this.model.out = new ScilabDouble(-1);
- this.model.out2 = new ScilabDouble(-2);
- this.model.outtyp = new ScilabDouble(2);
+ 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]);
+ this.model.out = new ScilabDouble([-1]);
+ this.model.out2 = new ScilabDouble([-2]);
+ this.model.outtyp = new ScilabDouble([2]);
this.model.evtin = [];
this.model.evtout = [];
this.model.state = [];
this.model.dstate = [];
this.model.rpar = [];
this.model.ipar = [];
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.firing = [];
this.model.dep_ut = [true,false];
label = [];
diff --git a/js/MatrixOp/MATZREIM.js b/js/MatrixOp/MATZREIM.js
index eb526f90..fdbcbc58 100644
--- a/js/MatrixOp/MATZREIM.js
+++ b/js/MatrixOp/MATZREIM.js
@@ -4,10 +4,10 @@ function MATZREIM() {
this.model = scicos_model();
function_name = "matz_reim";
funtyp = 4;
- 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);
+ 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]);
this.model.out = [[-1],[-1]];
this.model.out2 = [[-2],[-2]];
this.model.outtyp = [1,1];
@@ -17,7 +17,7 @@ function MATZREIM() {
this.model.dstate = [];
this.model.rpar = [];
this.model.ipar = [];
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.firing = [];
this.model.dep_ut = [true,false];
label = sci2exp(1);
@@ -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(new ScilabString(function_name),new ScilabDouble(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 2f7d2abb..aaf3745a 100644
--- a/js/MatrixOp/RICC.js
+++ b/js/MatrixOp/RICC.js
@@ -4,20 +4,20 @@ function RICC() {
this.model = scicos_model();
function_name = "ricc_m";
funtyp = 4;
- this.model.sim = list(new ScilabString(function_name),new ScilabDouble(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];
- this.model.out = new ScilabDouble(-1);
- this.model.out2 = new ScilabDouble(-1);
- this.model.outtyp = new ScilabDouble(1);
+ this.model.out = new ScilabDouble([-1]);
+ this.model.out2 = new ScilabDouble([-1]);
+ this.model.outtyp = new ScilabDouble([1]);
this.model.evtin = [];
this.model.evtout = [];
this.model.state = [];
this.model.dstate = [];
this.model.rpar = [];
this.model.ipar = [[1],[1]];
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.firing = [];
this.model.dep_ut = [true,false];
label = [[sci2exp(1)],[sci2exp(1)]];
diff --git a/js/MatrixOp/ROOTCOEF.js b/js/MatrixOp/ROOTCOEF.js
index 15f060df..35ba9f40 100644
--- a/js/MatrixOp/ROOTCOEF.js
+++ b/js/MatrixOp/ROOTCOEF.js
@@ -4,20 +4,20 @@ function ROOTCOEF() {
this.model = scicos_model();
function_name = "root_coef";
funtyp = 4;
- 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);
- this.model.out = new ScilabDouble(-2);
- this.model.out2 = new ScilabDouble(1);
- this.model.outtyp = new ScilabDouble(1);
+ 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]);
+ this.model.out = new ScilabDouble([-2]);
+ this.model.out2 = new ScilabDouble([1]);
+ this.model.outtyp = new ScilabDouble([1]);
this.model.evtin = [];
this.model.evtout = [];
this.model.state = [];
this.model.dstate = [];
this.model.rpar = [];
this.model.ipar = [];
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.firing = [];
this.model.dep_ut = [true,false];
label = [[sci2exp(1)],[sci2exp(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(new ScilabString(function_name),new ScilabDouble(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 9809545e..24b08dfb 100644
--- a/js/MatrixOp/SQRT.js
+++ b/js/MatrixOp/SQRT.js
@@ -2,13 +2,13 @@
function SQRT() {
SQRT.prototype.define = function SQRT() {
this.model = scicos_model();
- 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);
- this.model.outtyp = new ScilabDouble(1);
- this.model.out = new ScilabDouble(-1);
- this.model.out2 = new ScilabDouble(-2);
+ 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]);
+ this.model.outtyp = new ScilabDouble([1]);
+ this.model.out = new ScilabDouble([-1]);
+ this.model.out2 = new ScilabDouble([-2]);
this.model.dep_ut = [true,false];
label = [sci2exp(1)];
gr_i = [];
@@ -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(new ScilabString(function_name),new ScilabDouble(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 5b1a1e1c..dc7e41e3 100644
--- a/js/MatrixOp/SUBMAT.js
+++ b/js/MatrixOp/SUBMAT.js
@@ -4,20 +4,20 @@ function SUBMAT() {
this.model = scicos_model();
function_name = "submat";
funtyp = 4;
- 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);
- this.model.out = new ScilabDouble(-1);
- this.model.out2 = new ScilabDouble(-2);
- this.model.outtyp = new ScilabDouble(1);
+ 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]);
+ this.model.out = new ScilabDouble([-1]);
+ this.model.out2 = new ScilabDouble([-2]);
+ this.model.outtyp = new ScilabDouble([1]);
this.model.evtin = [];
this.model.evtout = [];
this.model.state = [];
this.model.dstate = [];
this.model.rpar = [];
this.model.ipar = [[1],[1],[1],[1]];
- this.model.blocktype = new ScilabString("c");
+ this.model.blocktype = new ScilabString(["c"]);
this.model.firing = [];
this.model.dep_ut = [true,false];
label = [[sci2exp(1)],[sci2exp(1)],[sci2exp(1)],[sci2exp(1)],[sci2exp(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(new ScilabString(function_name),new ScilabDouble(funtyp));
+ this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp]));
graphics.exprs = label;
arg1.graphics = graphics;
arg1.model = this.model;
generated by cgit (git 2.34.1) at 2025-03-13 00:50:55 +0000