show type for matrix also

11 files changed, 29 insertions, 29 deletions

diff --git a/js/NonLinear/DLRADAPT_f.js b/js/NonLinear/DLRADAPT_f.js
index 9f080d2c..7abecd16 100644
--- a/js/NonLinear/DLRADAPT_f.js
+++ b/js/NonLinear/DLRADAPT_f.js
@@ -12,9 +12,9 @@ function DLRADAPT_f() {
         this.model.in1 = [[1],[1]];
         this.model.out = new ScilabDouble([1]);
         this.model.evtin = new ScilabDouble([1]);
-        this.model.dstate = [[this.last_u],[this.last_y]];
-        this.model.rpar = [[this.p.slice()],[real(this.rn.slice())],[imag(this.rn.slice())],[real(this.rd.slice())],[imag(this.rd.slice())],[this.g.slice()]];
-        this.model.ipar = [[0],[2],[2]];
+        this.model.dstate = new ScilabDouble([this.last_u],[this.last_y]);
+        this.model.rpar = new ScilabDouble([this.p.slice()],[real(this.rn.slice())],[imag(this.rn.slice())],[real(this.rd.slice())],[imag(this.rd.slice())],[this.g.slice()]);
+        this.model.ipar = new ScilabDouble([0],[2],[2]);
         this.model.blocktype = new ScilabString(["d"]);
         this.model.firing = [];
         this.model.dep_ut = [true,false];
@@ -62,9 +62,9 @@ function DLRADAPT_f() {
             } else {
                 rpar = [[this.p.slice()],[real(this.rn.slice())],[imag(this.rn.slice())],[real(this.rd.slice())],[imag(this.rd.slice())],[this.g.slice()]];
                 ipar = [[m],[n],[npt]];
-                this.model.dstate = [[this.last_u.slice()],[this.last_y.slice()]];
-                this.model.rpar = rpar;
-                this.model.ipar = ipar;
+                this.model.dstate = new ScilabDouble([this.last_u.slice()],[this.last_y.slice()]);
+                this.model.rpar = new ScilabDouble(rpar);
+                this.model.ipar = new ScilabDouble(ipar);
                 graphics.exprs = exprs;
                 this.x.graphics = graphics;
                 this.x.model = this.model;
diff --git a/js/NonLinear/INTRP2BLK_f.js b/js/NonLinear/INTRP2BLK_f.js
index ef1ab80a..fd6fa8c2 100644
--- a/js/NonLinear/INTRP2BLK_f.js
+++ b/js/NonLinear/INTRP2BLK_f.js
@@ -8,8 +8,8 @@ function INTRP2BLK_f() {
         this.model.sim = list(new ScilabString(["intrp2"]), new ScilabDouble([1]));
         this.model.in1 = [[1],[1]];
         this.model.out = new ScilabDouble([1]);
-        this.model.rpar = [[this.a],[this.b],[this.c.slice()]];
-        this.model.ipar = [[2],[2]];
+        this.model.rpar = new ScilabDouble([this.a],[this.b],[this.c.slice()]);
+        this.model.ipar = new ScilabDouble([2],[2]);
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = [true,false];
         exprs = [[strcat(sci2exp(this.a))],[strcat(sci2exp(this.b))],[strcat(sci2exp(this.c,0))]];
@@ -48,8 +48,8 @@ function INTRP2BLK_f() {
             } else {
                 if (ok) {
                     graphics.exprs = exprs;
-                    this.model.rpar = [[this.a.slice()],[this.b.slice()],[this.c.slice()]];
-                    this.model.ipar = [[size(this.a,"*")],[size(this.b,"*")]];
+                    this.model.rpar = new ScilabDouble([this.a.slice()],[this.b.slice()],[this.c.slice()]);
+                    this.model.ipar = new ScilabDouble([size(this.a,"*")],[size(this.b,"*")]);
                     this.x.graphics = graphics;
                     this.x.model = this.model;
                     break;
diff --git a/js/NonLinear/INTRPLBLK_f.js b/js/NonLinear/INTRPLBLK_f.js
index 84011cdd..fd4e720d 100644
--- a/js/NonLinear/INTRPLBLK_f.js
+++ b/js/NonLinear/INTRPLBLK_f.js
@@ -7,7 +7,7 @@ function INTRPLBLK_f() {
         this.model.sim = new ScilabString(["intrpl"]);
         this.model.in1 = new ScilabDouble([1]);
         this.model.out = new ScilabDouble([1]);
-        this.model.rpar = [[this.a],[this.b]];
+        this.model.rpar = new ScilabDouble([this.a],[this.b]);
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = [true,false];
         exprs = [[strcat(sci2exp(this.a))],[strcat(sci2exp(this.b))]];
@@ -44,7 +44,7 @@ function INTRPLBLK_f() {
             } else {
                 if (ok) {
                     graphics.exprs = exprs;
-                    this.model.rpar = [[this.a.slice()],[this.b.slice()]];
+                    this.model.rpar = new ScilabDouble([this.a.slice()],[this.b.slice()]);
                     this.x.graphics = graphics;
                     this.x.model = this.model;
                     break;
diff --git a/js/NonLinear/LOOKUP2D.js b/js/NonLinear/LOOKUP2D.js
index a4130d63..30a3daab 100644
--- a/js/NonLinear/LOOKUP2D.js
+++ b/js/NonLinear/LOOKUP2D.js
@@ -12,8 +12,8 @@ function LOOKUP2D() {
         this.model.sim = list(new ScilabString(["lookup2d"]), new ScilabDouble([4]));
         this.model.in1 = [[1],[1]];
         this.model.out = new ScilabDouble([1]);
-        this.model.rpar = [[this.xx.slice()],[this.yy.slice()],[this.zz.slice()]];
-        this.model.ipar = [[Nx],[Ny],[this.Method]];
+        this.model.rpar = new ScilabDouble([this.xx.slice()],[this.yy.slice()],[this.zz.slice()]);
+        this.model.ipar = new ScilabDouble([Nx],[Ny],[this.Method]);
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = [true,false];
         exprs = list(strcat(sci2exp(this.xx)),strcat(sci2exp(this.yy)),strcat(sci2exp(this.zz)),sci2exp(this.Method),Graf);
@@ -101,8 +101,8 @@ function LOOKUP2D() {
                     curwin = save_curwin;
                     gh.figure_id = curwin;
                 }
-                this.model.rpar = [[this.xx.slice()],[this.yy.slice()],[this.zz.slice()]];
-                this.model.ipar = [[nx],[ny],[mtd]];
+                this.model.rpar = new ScilabDouble([this.xx.slice()],[this.yy.slice()],[this.zz.slice()]);
+                this.model.ipar = new ScilabDouble([nx],[ny],[mtd]);
                 graphics.exprs = exprs;
                 this.x.model = this.model;
                 this.x.graphics = graphics;
diff --git a/js/NonLinear/LOOKUP_c.js b/js/NonLinear/LOOKUP_c.js
index c3913e43..51ce5f2c 100644
--- a/js/NonLinear/LOOKUP_c.js
+++ b/js/NonLinear/LOOKUP_c.js
@@ -14,8 +14,8 @@ function LOOKUP_c() {
         this.model.out = new ScilabDouble([-1]);
         this.model.out2 = new ScilabDouble([-2]);
         this.model.outtyp = new ScilabDouble([-1]);
-        this.model.rpar = [[this.xx.slice()],[this.yy.slice()]];
-        this.model.ipar = [[N],[this.Method],[0],[0]];
+        this.model.rpar = new ScilabDouble([this.xx.slice()],[this.yy.slice()]);
+        this.model.ipar = new ScilabDouble([N],[this.Method],[0],[0]);
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = [true,false];
         this.model.evtin = [];
@@ -157,8 +157,8 @@ function LOOKUP_c() {
                 } else {
                     this.model.firing = new ScilabDouble([-1]);
                 }
-                this.model.rpar = orpar;
-                this.model.ipar = oipar;
+                this.model.rpar = new ScilabDouble(orpar);
+                this.model.ipar = new ScilabDouble(oipar);
                 graphics.exprs = exprs;
                 this.x.model = this.model;
                 this.x.graphics = graphics;
diff --git a/js/NonLinear/LOOKUP_f.js b/js/NonLinear/LOOKUP_f.js
index bebd414e..cb9d3d7d 100644
--- a/js/NonLinear/LOOKUP_f.js
+++ b/js/NonLinear/LOOKUP_f.js
@@ -5,7 +5,7 @@ function LOOKUP_f() {
         this.model.sim = new ScilabString(["lookup"]);
         this.model.in1 = new ScilabDouble([1]);
         this.model.out = new ScilabDouble([1]);
-        this.model.rpar = [[-2],[-1],[1],[2],[-1],[1],[-1],[1]];
+        this.model.rpar = new ScilabDouble([-2],[-1],[1],[2],[-1],[1],[-1],[1]);
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = [true,false];
         gr_i = [];
@@ -45,7 +45,7 @@ function LOOKUP_f() {
                 ok = false;
             }
             if (ok) {
-                this.model.rpar = [[xx.slice()],[yy.slice()]];
+                this.model.rpar = new ScilabDouble([xx.slice()],[yy.slice()]);
                 this.x.graphics = graphics;
                 this.x.model = this.model;
                 break;
diff --git a/js/NonLinear/MAX_f.js b/js/NonLinear/MAX_f.js
index 242d9ccc..9a8719df 100644
--- a/js/NonLinear/MAX_f.js
+++ b/js/NonLinear/MAX_f.js
@@ -6,7 +6,7 @@ function MAX_f() {
         this.model.sim = new ScilabString(["maxblk"]);
         this.model.in1 = new ScilabDouble([in1]);
         this.model.out = new ScilabDouble([1]);
-        this.model.dstate = [[0],[0]];
+        this.model.dstate = new ScilabDouble([0],[0]);
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = [true,false];
         exprs = " ";
diff --git a/js/NonLinear/MIN_f.js b/js/NonLinear/MIN_f.js
index a0582914..7c4a9e88 100644
--- a/js/NonLinear/MIN_f.js
+++ b/js/NonLinear/MIN_f.js
@@ -6,7 +6,7 @@ function MIN_f() {
         this.model.sim = new ScilabString(["minblk"]);
         this.model.in1 = new ScilabDouble([in1]);
         this.model.out = new ScilabDouble([1]);
-        this.model.dstate = [[0],[0]];
+        this.model.dstate = new ScilabDouble([0],[0]);
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = [true,false];
         exprs = sci2exp(in1);
diff --git a/js/NonLinear/PRODUCT.js b/js/NonLinear/PRODUCT.js
index 446dd314..718fec80 100644
--- a/js/NonLinear/PRODUCT.js
+++ b/js/NonLinear/PRODUCT.js
@@ -6,7 +6,7 @@ function PRODUCT() {
         this.model.sim = list(new ScilabString(["product"]), new ScilabDouble([4]));
         this.model.in1 = [[-1],[-1]];
         this.model.out = new ScilabDouble([-1]);
-        this.model.ipar = this.sgn;
+        this.model.ipar = new ScilabDouble(this.sgn);
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = [true,false];
         exprs = sci2exp(this.sgn);
diff --git a/js/NonLinear/SATURATION.js b/js/NonLinear/SATURATION.js
index 1b9ed2e5..28ddbc8f 100644
--- a/js/NonLinear/SATURATION.js
+++ b/js/NonLinear/SATURATION.js
@@ -10,7 +10,7 @@ function SATURATION() {
         this.model.nzcross = new ScilabDouble([2]);
         this.model.nmode = new ScilabDouble([1]);
         this.model.out = new ScilabDouble([1]);
-        this.model.rpar = rpar;
+        this.model.rpar = new ScilabDouble(rpar);
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = [true,false];
         exprs = [[string(this.maxp)],[string(this.minp)],[string(this.model.nmode)]];
@@ -46,7 +46,7 @@ function SATURATION() {
                 message("Upper limit must be > Lower limit");
             } else {
                 rpar = [[this.maxp],[this.minp]];
-                this.model.rpar = rpar;
+                this.model.rpar = new ScilabDouble(rpar);
                 if (this.zeroc!=0) {
                     this.model.nzcross = new ScilabDouble([2]);
                     this.model.nmode = new ScilabDouble([1]);
diff --git a/js/NonLinear/SAT_f.js b/js/NonLinear/SAT_f.js
index b04e7d09..30dc8d49 100644
--- a/js/NonLinear/SAT_f.js
+++ b/js/NonLinear/SAT_f.js
@@ -10,7 +10,7 @@ function SAT_f() {
         this.model.in1 = new ScilabDouble([1]);
         this.model.nzcross = new ScilabDouble([2]);
         this.model.out = new ScilabDouble([1]);
-        this.model.rpar = [[this.minp],[this.maxp],[slope]];
+        this.model.rpar = new ScilabDouble([this.minp],[this.maxp],[slope]);
         this.model.blocktype = new ScilabString(["c"]);
         this.model.dep_ut = [true,false];
         exprs = [[string(this.minp)],[string(this.maxp)],[string(slope)]];
@@ -48,7 +48,7 @@ function SAT_f() {
                 message("Slope must be strictly positive");
             } else {
                 rpar = [[this.minp/this.pente],[this.maxp/this.pente],[this.pente]];
-                this.model.rpar = rpar;
+                this.model.rpar = new ScilabDouble(rpar);
                 this.model.firing = [];
                 graphics.exprs = exprs;
                 this.x.graphics = graphics;