summaryrefslogtreecommitdiff
path: root/js/MatrixOp
diff options
context:
space:
mode:
Diffstat (limited to 'js/MatrixOp')
-rw-r--r--js/MatrixOp/EXTRACT.js2
-rw-r--r--js/MatrixOp/MATBKSL.js2
-rw-r--r--js/MatrixOp/MATCATH.js2
-rw-r--r--js/MatrixOp/MATCATV.js2
-rw-r--r--js/MatrixOp/MATDIV.js2
-rw-r--r--js/MatrixOp/MATLU.js4
-rw-r--r--js/MatrixOp/MATMAGPHI.js4
-rw-r--r--js/MatrixOp/MATMUL.js4
-rw-r--r--js/MatrixOp/MATZREIM.js4
-rw-r--r--js/MatrixOp/RICC.js6
-rw-r--r--js/MatrixOp/SUBMAT.js4
11 files changed, 18 insertions, 18 deletions
diff --git a/js/MatrixOp/EXTRACT.js b/js/MatrixOp/EXTRACT.js
index a47073b4..5120789f 100644
--- a/js/MatrixOp/EXTRACT.js
+++ b/js/MatrixOp/EXTRACT.js
@@ -84,7 +84,7 @@ function EXTRACT() {
ok = false;
}
}
- this.model.ipar = [[this.a],[this.b],[ma],[mb]];
+ this.model.ipar = new ScilabDouble([this.a],[this.b],[ma],[mb]);
in1 = [this.model.in1,this.model.in2];
out = [ma,mb];
funtyp = 4;
diff --git a/js/MatrixOp/MATBKSL.js b/js/MatrixOp/MATBKSL.js
index 120a1e1e..09ae0c16 100644
--- a/js/MatrixOp/MATBKSL.js
+++ b/js/MatrixOp/MATBKSL.js
@@ -6,7 +6,7 @@ function MATBKSL() {
funtyp = 4;
this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp]));
this.model.in1 = [[-1],[-1]];
- this.model.in2 = [[-2],[-3]];
+ this.model.in2 = new ScilabDouble([-2],[-3]);
this.model.intyp = [1,1];
this.model.out = new ScilabDouble([-2]);
this.model.out2 = new ScilabDouble([-3]);
diff --git a/js/MatrixOp/MATCATH.js b/js/MatrixOp/MATCATH.js
index 11fb146f..6474ecca 100644
--- a/js/MatrixOp/MATCATH.js
+++ b/js/MatrixOp/MATCATH.js
@@ -6,7 +6,7 @@ function MATCATH() {
funtyp = 4;
this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp]));
this.model.in1 = [[-1],[-1]];
- this.model.in2 = [[-2],[-3]];
+ this.model.in2 = new ScilabDouble([-2],[-3]);
this.model.intyp = [1,1];
this.model.out = new ScilabDouble([-1]);
this.model.out2 = new ScilabDouble([0]);
diff --git a/js/MatrixOp/MATCATV.js b/js/MatrixOp/MATCATV.js
index 865e1f80..8a3c1886 100644
--- a/js/MatrixOp/MATCATV.js
+++ b/js/MatrixOp/MATCATV.js
@@ -6,7 +6,7 @@ function MATCATV() {
function_name = "mat_catv";
funtyp = 4;
this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp]));
- this.model.in2 = [[-1],[-1]];
+ this.model.in2 = new ScilabDouble([-1],[-1]);
this.model.in1 = [[-2],[-3]];
this.model.intyp = [-1,-1];
this.model.out = new ScilabDouble([0]);
diff --git a/js/MatrixOp/MATDIV.js b/js/MatrixOp/MATDIV.js
index 3243ef61..7293521e 100644
--- a/js/MatrixOp/MATDIV.js
+++ b/js/MatrixOp/MATDIV.js
@@ -6,7 +6,7 @@ function MATDIV() {
funtyp = 4;
this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp]));
this.model.in1 = [[-1],[-2]];
- this.model.in2 = [[-3],[-3]];
+ this.model.in2 = new ScilabDouble([-3],[-3]);
this.model.intyp = [1,1];
this.model.out = new ScilabDouble([-1]);
this.model.out2 = new ScilabDouble([-2]);
diff --git a/js/MatrixOp/MATLU.js b/js/MatrixOp/MATLU.js
index 4165a819..90e16908 100644
--- a/js/MatrixOp/MATLU.js
+++ b/js/MatrixOp/MATLU.js
@@ -8,8 +8,8 @@ function MATLU() {
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.out = new ScilabDouble([-1],[-1]);
+ this.model.out2 = new ScilabDouble([-1],[-1]);
this.model.outtyp = [1,1];
this.model.evtin = [];
this.model.evtout = [];
diff --git a/js/MatrixOp/MATMAGPHI.js b/js/MatrixOp/MATMAGPHI.js
index 66f79ecf..b3760a0d 100644
--- a/js/MatrixOp/MATMAGPHI.js
+++ b/js/MatrixOp/MATMAGPHI.js
@@ -8,8 +8,8 @@ function MATMAGPHI() {
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.out = new ScilabDouble([-1],[-1]);
+ this.model.out2 = new ScilabDouble([-2],[-2]);
this.model.outtyp = [1,1];
this.model.evtin = [];
this.model.evtout = [];
diff --git a/js/MatrixOp/MATMUL.js b/js/MatrixOp/MATMUL.js
index a3120182..b4fbac36 100644
--- a/js/MatrixOp/MATMUL.js
+++ b/js/MatrixOp/MATMUL.js
@@ -4,7 +4,7 @@ function MATMUL() {
this.model = scicos_model();
this.model.sim = list(new ScilabString(["matmul_m"]), new ScilabDouble([4]));
this.model.in1 = [[-1],[-2]];
- this.model.in2 = [[-2],[-3]];
+ this.model.in2 = new ScilabDouble([-2],[-3]);
this.model.out = new ScilabDouble([-1]);
this.model.out2 = new ScilabDouble([-3]);
this.model.dep_ut = [true,false];
@@ -150,7 +150,7 @@ function MATMUL() {
if (ok) {
label = exprs;
this.model.ipar = new ScilabDouble([this.rule]);
- this.model.rpar = [[kmin],[kmax]];
+ this.model.rpar = new ScilabDouble([kmin],[kmax]);
graphics.exprs = label;
this.x.graphics = graphics;
this.x.model = this.model;
diff --git a/js/MatrixOp/MATZREIM.js b/js/MatrixOp/MATZREIM.js
index 432b6148..7e9eb000 100644
--- a/js/MatrixOp/MATZREIM.js
+++ b/js/MatrixOp/MATZREIM.js
@@ -8,8 +8,8 @@ function MATZREIM() {
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.out = new ScilabDouble([-1],[-1]);
+ this.model.out2 = new ScilabDouble([-2],[-2]);
this.model.outtyp = [1,1];
this.model.evtin = [];
this.model.evtout = [];
diff --git a/js/MatrixOp/RICC.js b/js/MatrixOp/RICC.js
index 686cf3af..453e2e36 100644
--- a/js/MatrixOp/RICC.js
+++ b/js/MatrixOp/RICC.js
@@ -6,7 +6,7 @@ function RICC() {
funtyp = 4;
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.in2 = new ScilabDouble([-1],[-1],[-1]);
this.model.intyp = [1,1,1];
this.model.out = new ScilabDouble([-1]);
this.model.out2 = new ScilabDouble([-1]);
@@ -16,7 +16,7 @@ function RICC() {
this.model.state = [];
this.model.dstate = [];
this.model.rpar = [];
- this.model.ipar = [[1],[1]];
+ this.model.ipar = new ScilabDouble([1],[1]);
this.model.blocktype = new ScilabString(["c"]);
this.model.firing = [];
this.model.dep_ut = [true,false];
@@ -57,7 +57,7 @@ function RICC() {
label = exprs;
[this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]);
if (ok) {
- this.model.ipar = [[this.tpe],[this.mod]];
+ this.model.ipar = new ScilabDouble([this.tpe],[this.mod]);
graphics.exprs = label;
arg1.graphics = graphics;
arg1.model = this.model;
diff --git a/js/MatrixOp/SUBMAT.js b/js/MatrixOp/SUBMAT.js
index 0876be30..a91c40c4 100644
--- a/js/MatrixOp/SUBMAT.js
+++ b/js/MatrixOp/SUBMAT.js
@@ -16,7 +16,7 @@ function SUBMAT() {
this.model.state = [];
this.model.dstate = [];
this.model.rpar = [];
- this.model.ipar = [[1],[1],[1],[1]];
+ this.model.ipar = new ScilabDouble([1],[1],[1],[1]);
this.model.blocktype = new ScilabString(["c"]);
this.model.firing = [];
this.model.dep_ut = [true,false];
@@ -90,7 +90,7 @@ function SUBMAT() {
message("index of ending column is out of range");
ok = false;
}
- this.model.ipar = [[this.a],[this.b],[this.c],[this.d]];
+ this.model.ipar = new ScilabDouble([this.a],[this.b],[this.c],[this.d]);
in1 = [this.inp[1-1],this.inp[2-1]];
out = [(this.b-this.a)+1,(this.d-this.c)+1];
funtyp = 4;
generated by cgit (git 2.34.1) at 2025-03-13 15:21:30 +0000