summaryrefslogtreecommitdiff
path: root/js/Linear
diff options
context:
space:
mode:
authorSunil Shetye2018-07-11 10:44:34 +0530
committerSunil Shetye2018-07-11 15:21:08 +0530
commitaabd535925f24c6203eb1a0dcc5b28d9670133de (patch)
tree73c1021fb17dfdf86f088d930311a007cb3f2120 /js/Linear
parentdc097af448d4ed55d685c5e87c8cffb70b7fb20a (diff)
downloadsci2js-aabd535925f24c6203eb1a0dcc5b28d9670133de.tar.gz
sci2js-aabd535925f24c6203eb1a0dcc5b28d9670133de.tar.bz2
sci2js-aabd535925f24c6203eb1a0dcc5b28d9670133de.zip
show type for matrix also
Diffstat (limited to 'js/Linear')
-rw-r--r--js/Linear/BIGSOM_f.js2
-rw-r--r--js/Linear/CLR.js4
-rw-r--r--js/Linear/CLR_f.js4
-rw-r--r--js/Linear/CLSS.js4
-rw-r--r--js/Linear/CLSS_f.js4
-rw-r--r--js/Linear/DELAYV_f.js4
-rw-r--r--js/Linear/DIFF_c.js4
-rw-r--r--js/Linear/DLR.js4
-rw-r--r--js/Linear/DLR_f.js4
-rw-r--r--js/Linear/DLSS.js4
-rw-r--r--js/Linear/DLSS_f.js4
-rw-r--r--js/Linear/INTEGRAL_m.js2
-rw-r--r--js/Linear/SOM_f.js2
-rw-r--r--js/Linear/SUMMATION.js4
-rw-r--r--js/Linear/TCLSS.js4
-rw-r--r--js/Linear/TCLSS_f.js4
-rw-r--r--js/Linear/TIME_DELAY.js2
-rw-r--r--js/Linear/VARIABLE_DELAY.js2
18 files changed, 31 insertions, 31 deletions
diff --git a/js/Linear/BIGSOM_f.js b/js/Linear/BIGSOM_f.js
index 3339ed52..5c887738 100644
--- a/js/Linear/BIGSOM_f.js
+++ b/js/Linear/BIGSOM_f.js
@@ -6,7 +6,7 @@ function BIGSOM_f() {
this.model.sim = list(new ScilabString(["sum"]), new ScilabDouble([2]));
this.model.in1 = [[-1],[-1]];
this.model.out = new ScilabDouble([-1]);
- this.model.rpar = this.sgn;
+ this.model.rpar = new ScilabDouble(this.sgn);
this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = sci2exp(this.sgn);
diff --git a/js/Linear/CLR.js b/js/Linear/CLR.js
index 0083f80e..64751b07 100644
--- a/js/Linear/CLR.js
+++ b/js/Linear/CLR.js
@@ -12,7 +12,7 @@ function CLR() {
this.model.in1 = new ScilabDouble([1]);
this.model.out = new ScilabDouble([1]);
this.model.state = new ScilabDouble([x0]);
- this.model.rpar = [[A.slice()],[B.slice()],[C.slice()],[D.slice()]];
+ this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]);
this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [false,true];
gr_i = [];
@@ -72,7 +72,7 @@ function CLR() {
x0[ns1-1][1-1] = 0;
}
this.model.state = x0;
- this.model.rpar = rpar;
+ this.model.rpar = new ScilabDouble(rpar);
this.x.graphics = graphics;
this.x.model = this.model;
break;
diff --git a/js/Linear/CLR_f.js b/js/Linear/CLR_f.js
index 75c60598..d91ac6e5 100644
--- a/js/Linear/CLR_f.js
+++ b/js/Linear/CLR_f.js
@@ -12,7 +12,7 @@ function CLR_f() {
this.model.in1 = new ScilabDouble([1]);
this.model.out = new ScilabDouble([1]);
this.model.state = new ScilabDouble([x0]);
- this.model.rpar = [[A.slice()],[B.slice()],[C.slice()],[D.slice()]];
+ this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]);
this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [false,true];
gr_i = [];
@@ -72,7 +72,7 @@ function CLR_f() {
x0[ns1-1][1-1] = 0;
}
this.model.state = x0;
- this.model.rpar = rpar;
+ this.model.rpar = new ScilabDouble(rpar);
this.x.graphics = graphics;
this.x.model = this.model;
break;
diff --git a/js/Linear/CLSS.js b/js/Linear/CLSS.js
index 2581ea97..679b0e73 100644
--- a/js/Linear/CLSS.js
+++ b/js/Linear/CLSS.js
@@ -13,7 +13,7 @@ function CLSS() {
this.model.in1 = new ScilabDouble([in1]);
this.model.out = new ScilabDouble([out]);
this.model.state = new ScilabDouble([this.x0]);
- this.model.rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]];
+ this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]);
this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [false,true];
exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]];
@@ -91,7 +91,7 @@ function CLSS() {
this.model.dep_ut = [false,true];
}
this.model.state = this.x0.slice();
- this.model.rpar = rpar;
+ this.model.rpar = new ScilabDouble(rpar);
this.x.graphics = graphics;
this.x.model = this.model;
break;
diff --git a/js/Linear/CLSS_f.js b/js/Linear/CLSS_f.js
index 00f1abee..77ee0162 100644
--- a/js/Linear/CLSS_f.js
+++ b/js/Linear/CLSS_f.js
@@ -13,7 +13,7 @@ function CLSS_f() {
this.model.in1 = new ScilabDouble([in1]);
this.model.out = new ScilabDouble([out]);
this.model.state = new ScilabDouble([this.x0]);
- this.model.rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]];
+ this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]);
this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [false,true];
exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]];
@@ -81,7 +81,7 @@ function CLSS_f() {
this.model.dep_ut = [false,true];
}
this.model.state = this.x0.slice();
- this.model.rpar = rpar;
+ this.model.rpar = new ScilabDouble(rpar);
this.x.graphics = graphics;
this.x.model = this.model;
break;
diff --git a/js/Linear/DELAYV_f.js b/js/Linear/DELAYV_f.js
index 32b88214..cfadf33e 100644
--- a/js/Linear/DELAYV_f.js
+++ b/js/Linear/DELAYV_f.js
@@ -10,7 +10,7 @@ function DELAYV_f() {
this.model.in1 = [[this.nin],[1]];
this.model.out = new ScilabDouble([this.nin]);
this.model.evtin = new ScilabDouble([1]);
- this.model.evtout = [[1],[1]];
+ this.model.evtout = new ScilabDouble([1],[1]);
this.model.dstate = new ScilabDouble([z0]);
this.model.rpar = new ScilabDouble([this.T/(size(this.zz0,"*"))]);
this.model.blocktype = new ScilabString(["d"]);
@@ -62,7 +62,7 @@ function DELAYV_f() {
}
if (ok) {
graphics.exprs = exprs;
- this.model.dstate = [[this.zz0.slice()],[told]];
+ this.model.dstate = new ScilabDouble([this.zz0.slice()],[told]);
this.model.rpar = new ScilabDouble([this.T/(size(this.zz0,"*"))]);
this.x.graphics = graphics;
this.x.model = this.model;
diff --git a/js/Linear/DIFF_c.js b/js/Linear/DIFF_c.js
index cceb973a..f1a45eeb 100644
--- a/js/Linear/DIFF_c.js
+++ b/js/Linear/DIFF_c.js
@@ -6,7 +6,7 @@ function DIFF_c() {
this.model.sim = list(new ScilabString(["diffblk_c"]), new ScilabDouble([10004]));
this.model.in1 = new ScilabDouble([1]);
this.model.out = new ScilabDouble([1]);
- this.model.state = this.x0;
+ this.model.state = new ScilabDouble(this.x0);
this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [false,true];
exprs = [[strcat(sci2exp(this.x0[1-1]))],[strcat(sci2exp(this.x0[2-1]))]];
@@ -51,7 +51,7 @@ function DIFF_c() {
}
if (!ask_again) {
graphics.exprs = exprs;
- this.model.state = [[this.x0],[this.xd0]];
+ this.model.state = new ScilabDouble([this.x0],[this.xd0]);
this.model.out = [N];
this.model.in1 = new ScilabDouble([N]);
this.x.graphics = graphics;
diff --git a/js/Linear/DLR.js b/js/Linear/DLR.js
index 07ba0182..96fe4163 100644
--- a/js/Linear/DLR.js
+++ b/js/Linear/DLR.js
@@ -13,7 +13,7 @@ function DLR() {
this.model.out = new ScilabDouble([1]);
this.model.evtin = new ScilabDouble([1]);
this.model.dstate = x0.slice();
- this.model.rpar = [[A.slice()],[B.slice()],[C.slice()],[D.slice()]];
+ this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]);
this.model.blocktype = new ScilabString(["d"]);
this.model.dep_ut = [false,false];
gr_i = [];
@@ -62,7 +62,7 @@ function DLR() {
}
rpar = [[A.slice()],[B.slice()],[C.slice()],[D.slice()]];
this.model.dstate = x0;
- this.model.rpar = rpar;
+ this.model.rpar = new ScilabDouble(rpar);
if (norm(D,1)!=0) {
mmm = [true,false];
} else {
diff --git a/js/Linear/DLR_f.js b/js/Linear/DLR_f.js
index bf9af7b1..801be7cb 100644
--- a/js/Linear/DLR_f.js
+++ b/js/Linear/DLR_f.js
@@ -13,7 +13,7 @@ function DLR_f() {
this.model.out = new ScilabDouble([1]);
this.model.evtin = new ScilabDouble([1]);
this.model.dstate = x0.slice();
- this.model.rpar = [[A.slice()],[B.slice()],[C.slice()],[D.slice()]];
+ this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]);
this.model.blocktype = new ScilabString(["d"]);
this.model.dep_ut = [false,false];
gr_i = [];
@@ -62,7 +62,7 @@ function DLR_f() {
}
rpar = [[A.slice()],[B.slice()],[C.slice()],[D.slice()]];
this.model.dstate = x0;
- this.model.rpar = rpar;
+ this.model.rpar = new ScilabDouble(rpar);
if (norm(D,1)!=0) {
mmm = [true,false];
} else {
diff --git a/js/Linear/DLSS.js b/js/Linear/DLSS.js
index 429e50be..49becba3 100644
--- a/js/Linear/DLSS.js
+++ b/js/Linear/DLSS.js
@@ -12,7 +12,7 @@ function DLSS() {
this.model.out = new ScilabDouble([1]);
this.model.evtin = new ScilabDouble([1]);
this.model.dstate = this.x0.slice();
- this.model.rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]];
+ this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]);
this.model.blocktype = new ScilabString(["d"]);
this.model.dep_ut = [false,false];
exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]];
@@ -90,7 +90,7 @@ function DLSS() {
this.model.dep_ut = [false,false];
}
this.model.dstate = this.x0.slice();
- this.model.rpar = rpar;
+ this.model.rpar = new ScilabDouble(rpar);
this.x.graphics = graphics;
this.x.model = this.model;
break;
diff --git a/js/Linear/DLSS_f.js b/js/Linear/DLSS_f.js
index f936cceb..409916ab 100644
--- a/js/Linear/DLSS_f.js
+++ b/js/Linear/DLSS_f.js
@@ -12,7 +12,7 @@ function DLSS_f() {
this.model.out = new ScilabDouble([1]);
this.model.evtin = new ScilabDouble([1]);
this.model.dstate = this.x0.slice();
- this.model.rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]];
+ this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]);
this.model.blocktype = new ScilabString(["d"]);
this.model.dep_ut = [false,false];
exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]];
@@ -80,7 +80,7 @@ function DLSS_f() {
this.model.dep_ut = [false,false];
}
this.model.dstate = this.x0.slice();
- this.model.rpar = rpar;
+ this.model.rpar = new ScilabDouble(rpar);
this.x.graphics = graphics;
this.x.model = this.model;
break;
diff --git a/js/Linear/INTEGRAL_m.js b/js/Linear/INTEGRAL_m.js
index 11639e30..842615a0 100644
--- a/js/Linear/INTEGRAL_m.js
+++ b/js/Linear/INTEGRAL_m.js
@@ -113,7 +113,7 @@ function INTEGRAL_m() {
it = [[1],[ones(this.reinit,1)]];
ot = 1;
} else if ((Datatype==2)) {
- this.model.state = [[real(this.x0.slice())],[imag(this.x0.slice())]];
+ this.model.state = new ScilabDouble([real(this.x0.slice())],[imag(this.x0.slice())]);
this.model.sim = list(new ScilabString(["integralz_func"]), new ScilabDouble([4]));
it = [[2],[2*ones(this.reinit,1)]];
ot = 2;
diff --git a/js/Linear/SOM_f.js b/js/Linear/SOM_f.js
index c6886bcc..33b8d81b 100644
--- a/js/Linear/SOM_f.js
+++ b/js/Linear/SOM_f.js
@@ -6,7 +6,7 @@ function SOM_f() {
this.model.sim = list(new ScilabString(["sum"]), new ScilabDouble([2]));
this.model.in1 = [[-1],[-1],[-1]];
this.model.out = new ScilabDouble([-1]);
- this.model.rpar = sgn;
+ this.model.rpar = new ScilabDouble(sgn);
this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
exprs = [[sci2exp(1)],[sci2exp(sgn)]];
diff --git a/js/Linear/SUMMATION.js b/js/Linear/SUMMATION.js
index dc3d3136..f6258a04 100644
--- a/js/Linear/SUMMATION.js
+++ b/js/Linear/SUMMATION.js
@@ -6,9 +6,9 @@ function SUMMATION() {
this.model.sim = list(new ScilabString(["summation"]), new ScilabDouble([4]));
this.model.in1 = [[-1],[-1]];
this.model.out = new ScilabDouble([-1]);
- this.model.in2 = [[-2],[-2]];
+ this.model.in2 = new ScilabDouble([-2],[-2]);
this.model.out2 = new ScilabDouble([-2]);
- 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/Linear/TCLSS.js b/js/Linear/TCLSS.js
index 4b3ceb4c..bce3ad8b 100644
--- a/js/Linear/TCLSS.js
+++ b/js/Linear/TCLSS.js
@@ -15,7 +15,7 @@ function TCLSS() {
this.model.out = new ScilabDouble([out]);
this.model.evtin = new ScilabDouble([1]);
this.model.state = new ScilabDouble([this.x0]);
- this.model.rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]];
+ this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]);
this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [false,true];
exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]];
@@ -83,7 +83,7 @@ function TCLSS() {
this.model.dep_ut = [false,true];
}
this.model.state = this.x0.slice();
- this.model.rpar = rpar;
+ this.model.rpar = new ScilabDouble(rpar);
if (this.D!=[]) {
this.model.sim = list(new ScilabString(["tcslti4"]), new ScilabDouble([4]));
} else {
diff --git a/js/Linear/TCLSS_f.js b/js/Linear/TCLSS_f.js
index 7be4b972..d74c397a 100644
--- a/js/Linear/TCLSS_f.js
+++ b/js/Linear/TCLSS_f.js
@@ -15,7 +15,7 @@ function TCLSS_f() {
this.model.out = new ScilabDouble([out]);
this.model.evtin = new ScilabDouble([1]);
this.model.state = new ScilabDouble([this.x0]);
- this.model.rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]];
+ this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]);
this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [false,true];
exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]];
@@ -83,7 +83,7 @@ function TCLSS_f() {
this.model.dep_ut = [false,true];
}
this.model.state = this.x0.slice();
- this.model.rpar = rpar;
+ this.model.rpar = new ScilabDouble(rpar);
if (this.D!=[]) {
this.model.sim = list(new ScilabString(["tcslti"]), new ScilabDouble([1]));
} else {
diff --git a/js/Linear/TIME_DELAY.js b/js/Linear/TIME_DELAY.js
index 817dab75..466e3ee5 100644
--- a/js/Linear/TIME_DELAY.js
+++ b/js/Linear/TIME_DELAY.js
@@ -56,7 +56,7 @@ function TIME_DELAY() {
}
if (ok) {
graphics.exprs = exprs;
- this.model.rpar = [[this.T],[this.init]];
+ this.model.rpar = new ScilabDouble([this.T],[this.init]);
this.model.ipar = new ScilabDouble([this.N]);
this.model.dep_ut = [false,true];
this.x.graphics = graphics;
diff --git a/js/Linear/VARIABLE_DELAY.js b/js/Linear/VARIABLE_DELAY.js
index 6cbff388..52e6067c 100644
--- a/js/Linear/VARIABLE_DELAY.js
+++ b/js/Linear/VARIABLE_DELAY.js
@@ -56,7 +56,7 @@ function VARIABLE_DELAY() {
}
if (ok) {
graphics.exprs = exprs;
- this.model.rpar = [[this.T],[this.init]];
+ this.model.rpar = new ScilabDouble([this.T],[this.init]);
this.model.ipar = new ScilabDouble([this.N]);
this.x.graphics = graphics;
this.x.model = this.model;