summaryrefslogtreecommitdiff
path: root/js/Linear
diff options
context:
space:
mode:
authorSunil Shetye2018-07-16 15:29:15 +0530
committerSunil Shetye2018-07-16 15:31:24 +0530
commit5929c9088b6d5dcd23e8bbf9abdc5c9b4a49df1f (patch)
tree8b842ea29c504a11164c39221e948fdaa8fa9035 /js/Linear
parent614f18061faa4fc126f0d3577792dd9adfb3f240 (diff)
downloadsci2js-5929c9088b6d5dcd23e8bbf9abdc5c9b4a49df1f.tar.gz
sci2js-5929c9088b6d5dcd23e8bbf9abdc5c9b4a49df1f.tar.bz2
sci2js-5929c9088b6d5dcd23e8bbf9abdc5c9b4a49df1f.zip
treat third argument of standard_define as model expression
Diffstat (limited to 'js/Linear')
-rw-r--r--js/Linear/BIGSOM_f.js2
-rw-r--r--js/Linear/CLINDUMMY_f.js2
-rw-r--r--js/Linear/CLR.js2
-rw-r--r--js/Linear/CLR_f.js2
-rw-r--r--js/Linear/CLSS.js2
-rw-r--r--js/Linear/CLSS_f.js2
-rw-r--r--js/Linear/DELAYV_f.js2
-rw-r--r--js/Linear/DERIV.js2
-rw-r--r--js/Linear/DIFF_c.js2
-rw-r--r--js/Linear/DLR.js2
-rw-r--r--js/Linear/DLR_f.js2
-rw-r--r--js/Linear/DLSS.js2
-rw-r--r--js/Linear/DLSS_f.js2
-rw-r--r--js/Linear/DOLLAR.js2
-rw-r--r--js/Linear/DOLLAR_f.js2
-rw-r--r--js/Linear/DOLLAR_m.js2
-rw-r--r--js/Linear/GAINBLK.js2
-rw-r--r--js/Linear/GAINBLK_f.js2
-rw-r--r--js/Linear/GAIN_f.js2
-rw-r--r--js/Linear/INTEGRAL.js2
-rw-r--r--js/Linear/INTEGRAL_f.js2
-rw-r--r--js/Linear/INTEGRAL_m.js2
-rw-r--r--js/Linear/PID.js2
-rw-r--r--js/Linear/REGISTER.js2
-rw-r--r--js/Linear/REGISTER_f.js2
-rw-r--r--js/Linear/SAMPHOLD.js2
-rw-r--r--js/Linear/SAMPHOLD_m.js2
-rw-r--r--js/Linear/SAMPLEHOLD_f.js2
-rw-r--r--js/Linear/SOM_f.js2
-rw-r--r--js/Linear/SUMMATION.js2
-rw-r--r--js/Linear/SUM_f.js2
-rw-r--r--js/Linear/TCLSS.js2
-rw-r--r--js/Linear/TCLSS_f.js2
-rw-r--r--js/Linear/TIME_DELAY.js2
-rw-r--r--js/Linear/VARIABLE_DELAY.js2
35 files changed, 35 insertions, 35 deletions
diff --git a/js/Linear/BIGSOM_f.js b/js/Linear/BIGSOM_f.js
index 19a2132e..7eab70db 100644
--- a/js/Linear/BIGSOM_f.js
+++ b/js/Linear/BIGSOM_f.js
@@ -11,7 +11,7 @@ function BIGSOM_f() {
this.model.dep_ut = new ScilabBoolean([true,false]);
this.exprs = sci2exp(this.sgn);
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BIGSOM_f\",sz(1),sz(2));"]);
- this.x = new standard_define(new ScilabDouble([2,3]),this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabString([this.exprs]),this.gr_i);
return new BigSom(this.x);
}
BIGSOM_f.prototype.details = function BIGSOM_f() {
diff --git a/js/Linear/CLINDUMMY_f.js b/js/Linear/CLINDUMMY_f.js
index 14724c74..648c9aec 100644
--- a/js/Linear/CLINDUMMY_f.js
+++ b/js/Linear/CLINDUMMY_f.js
@@ -9,7 +9,7 @@ function CLINDUMMY_f() {
this.model.firing = new ScilabDouble([]);
this.model.dep_ut = new ScilabBoolean([false,true]);
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLINDUMMY_f\",sz(1),sz(2));"]);
- this.x = new standard_define(new ScilabDouble([3,2]),this.model,[],this.gr_i);
+ this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([]),this.gr_i);
return new BasicBlock(this.x);
}
CLINDUMMY_f.prototype.details = function CLINDUMMY_f() {
diff --git a/js/Linear/CLR.js b/js/Linear/CLR.js
index d134aa43..96bce872 100644
--- a/js/Linear/CLR.js
+++ b/js/Linear/CLR.js
@@ -16,7 +16,7 @@ function CLR() {
this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = new ScilabBoolean([false,true]);
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLR\",sz(1),sz(2));"]);
- this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
return new BasicBlock(this.x);
}
CLR.prototype.details = function CLR() {
diff --git a/js/Linear/CLR_f.js b/js/Linear/CLR_f.js
index 6d85a901..c6a4f351 100644
--- a/js/Linear/CLR_f.js
+++ b/js/Linear/CLR_f.js
@@ -16,7 +16,7 @@ function CLR_f() {
this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = new ScilabBoolean([false,true]);
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLR_f\",sz(1),sz(2));"]);
- this.x = new standard_define(new ScilabDouble([2.5,2.5]),this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2.5,2.5]),this.model,new ScilabDouble(this.exprs),this.gr_i);
return new BasicBlock(this.x);
}
CLR_f.prototype.details = function CLR_f() {
diff --git a/js/Linear/CLSS.js b/js/Linear/CLSS.js
index 2b13f73d..bd2aa780 100644
--- a/js/Linear/CLSS.js
+++ b/js/Linear/CLSS.js
@@ -18,7 +18,7 @@ function CLSS() {
this.model.dep_ut = new ScilabBoolean([false,true]);
this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]];
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLSS\",sz(1),sz(2));"]);
- this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
return new BasicBlock(this.x);
}
CLSS.prototype.details = function CLSS() {
diff --git a/js/Linear/CLSS_f.js b/js/Linear/CLSS_f.js
index 3983e7cc..d8232101 100644
--- a/js/Linear/CLSS_f.js
+++ b/js/Linear/CLSS_f.js
@@ -18,7 +18,7 @@ function CLSS_f() {
this.model.dep_ut = new ScilabBoolean([false,true]);
this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]];
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLSS_f\",sz(1),sz(2));"]);
- this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
return new BasicBlock(this.x);
}
CLSS_f.prototype.details = function CLSS_f() {
diff --git a/js/Linear/DELAYV_f.js b/js/Linear/DELAYV_f.js
index 16d1eefe..7677921c 100644
--- a/js/Linear/DELAYV_f.js
+++ b/js/Linear/DELAYV_f.js
@@ -18,7 +18,7 @@ function DELAYV_f() {
this.model.dep_ut = new ScilabBoolean([true,false]);
this.exprs = [[string(this.nin)],[strcat(string(z0.slice(1-1,$-1)),";")],[string(this.T)]];
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DELAYV_f\",sz(1),sz(2));"]);
- this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
return new BasicBlock(this.x);
}
DELAYV_f.prototype.details = function DELAYV_f() {
diff --git a/js/Linear/DERIV.js b/js/Linear/DERIV.js
index 12e3c7ef..8d2599b3 100644
--- a/js/Linear/DERIV.js
+++ b/js/Linear/DERIV.js
@@ -9,7 +9,7 @@ function DERIV() {
this.model.dep_ut = new ScilabBoolean([true,false]);
this.exprs = [];
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DERIV\",sz(1),sz(2));"]);
- this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
return new BasicBlock(this.x);
}
DERIV.prototype.details = function DERIV() {
diff --git a/js/Linear/DIFF_c.js b/js/Linear/DIFF_c.js
index 93835c18..8167fd08 100644
--- a/js/Linear/DIFF_c.js
+++ b/js/Linear/DIFF_c.js
@@ -11,7 +11,7 @@ function DIFF_c() {
this.model.dep_ut = new ScilabBoolean([false,true]);
this.exprs = [[strcat(sci2exp(this.x0[1-1]))],[strcat(sci2exp(this.x0[2-1]))]];
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DIFF_c\",sz(1),sz(2));"]);
- this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
return new BasicBlock(this.x);
}
DIFF_c.prototype.details = function DIFF_c() {
diff --git a/js/Linear/DLR.js b/js/Linear/DLR.js
index 366af3a3..301fee22 100644
--- a/js/Linear/DLR.js
+++ b/js/Linear/DLR.js
@@ -17,7 +17,7 @@ function DLR() {
this.model.blocktype = new ScilabString(["d"]);
this.model.dep_ut = new ScilabBoolean([false,false]);
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLR\",sz(1),sz(2));"]);
- this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
return new BasicBlock(this.x);
}
DLR.prototype.details = function DLR() {
diff --git a/js/Linear/DLR_f.js b/js/Linear/DLR_f.js
index b265a2b0..382213dc 100644
--- a/js/Linear/DLR_f.js
+++ b/js/Linear/DLR_f.js
@@ -17,7 +17,7 @@ function DLR_f() {
this.model.blocktype = new ScilabString(["d"]);
this.model.dep_ut = new ScilabBoolean([false,false]);
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLR_f\",sz(1),sz(2));"]);
- this.x = new standard_define(new ScilabDouble([2.5,2.5]),this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2.5,2.5]),this.model,new ScilabDouble(this.exprs),this.gr_i);
return new BasicBlock(this.x);
}
DLR_f.prototype.details = function DLR_f() {
diff --git a/js/Linear/DLSS.js b/js/Linear/DLSS.js
index a99c81d3..686c712e 100644
--- a/js/Linear/DLSS.js
+++ b/js/Linear/DLSS.js
@@ -17,7 +17,7 @@ function DLSS() {
this.model.dep_ut = new ScilabBoolean([false,false]);
this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]];
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLSS\",sz(1),sz(2));"]);
- this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
return new BasicBlock(this.x);
}
DLSS.prototype.details = function DLSS() {
diff --git a/js/Linear/DLSS_f.js b/js/Linear/DLSS_f.js
index 4afcf99d..a1f27482 100644
--- a/js/Linear/DLSS_f.js
+++ b/js/Linear/DLSS_f.js
@@ -17,7 +17,7 @@ function DLSS_f() {
this.model.dep_ut = new ScilabBoolean([false,false]);
this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]];
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLSS_f\",sz(1),sz(2));"]);
- this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
return new BasicBlock(this.x);
}
DLSS_f.prototype.details = function DLSS_f() {
diff --git a/js/Linear/DOLLAR.js b/js/Linear/DOLLAR.js
index 3b5d3ae4..6541259b 100644
--- a/js/Linear/DOLLAR.js
+++ b/js/Linear/DOLLAR.js
@@ -14,7 +14,7 @@ function DOLLAR() {
this.model.blocktype = new ScilabString(["d"]);
this.model.dep_ut = new ScilabBoolean([false,false]);
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR\",sz(1),sz(2));"]);
- this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i);
return new BasicBlock(this.x);
}
DOLLAR.prototype.details = function DOLLAR() {
diff --git a/js/Linear/DOLLAR_f.js b/js/Linear/DOLLAR_f.js
index 0e89c063..2d580656 100644
--- a/js/Linear/DOLLAR_f.js
+++ b/js/Linear/DOLLAR_f.js
@@ -14,7 +14,7 @@ function DOLLAR_f() {
this.model.blocktype = new ScilabString(["d"]);
this.model.dep_ut = new ScilabBoolean([false,false]);
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR_f\",sz(1),sz(2));"]);
- this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i);
return new BasicBlock(this.x);
}
DOLLAR_f.prototype.details = function DOLLAR_f() {
diff --git a/js/Linear/DOLLAR_m.js b/js/Linear/DOLLAR_m.js
index 9ccaa250..e33e3d33 100644
--- a/js/Linear/DOLLAR_m.js
+++ b/js/Linear/DOLLAR_m.js
@@ -14,7 +14,7 @@ function DOLLAR_m() {
this.model.blocktype = new ScilabString(["d"]);
this.model.dep_ut = new ScilabBoolean([false,false]);
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR_m\",sz(1),sz(2));"]);
- this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i);
return new BasicBlock(this.x);
}
DOLLAR_m.prototype.details = function DOLLAR_m() {
diff --git a/js/Linear/GAINBLK.js b/js/Linear/GAINBLK.js
index 89a5ca05..69ba2837 100644
--- a/js/Linear/GAINBLK.js
+++ b/js/Linear/GAINBLK.js
@@ -17,7 +17,7 @@ function GAINBLK() {
this.model.dep_ut = new ScilabBoolean([true,false]);
this.exprs = [strcat(sci2exp(this.gain))];
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAINBLK\",sz(1),sz(2));"]);
- this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
return new BasicBlock(this.x);
}
GAINBLK.prototype.details = function GAINBLK() {
diff --git a/js/Linear/GAINBLK_f.js b/js/Linear/GAINBLK_f.js
index ee9759a4..2b768006 100644
--- a/js/Linear/GAINBLK_f.js
+++ b/js/Linear/GAINBLK_f.js
@@ -13,7 +13,7 @@ function GAINBLK_f() {
this.model.dep_ut = new ScilabBoolean([true,false]);
this.exprs = [strcat(sci2exp(this.gain))];
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAINBLK_f\",sz(1),sz(2));"]);
- this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
return new BasicBlock(this.x);
}
GAINBLK_f.prototype.details = function GAINBLK_f() {
diff --git a/js/Linear/GAIN_f.js b/js/Linear/GAIN_f.js
index 1588ff5f..026f9ccb 100644
--- a/js/Linear/GAIN_f.js
+++ b/js/Linear/GAIN_f.js
@@ -13,7 +13,7 @@ function GAIN_f() {
this.model.dep_ut = new ScilabBoolean([true,false]);
this.exprs = [[strcat(sci2exp(this.gain))],[strcat(sci2exp(in1))],[strcat(sci2exp(out))]];
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAIN_f\",sz(1),sz(2));"]);
- this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
return new BasicBlock(this.x);
}
GAIN_f.prototype.details = function GAIN_f() {
diff --git a/js/Linear/INTEGRAL.js b/js/Linear/INTEGRAL.js
index b2237506..b2aabccd 100644
--- a/js/Linear/INTEGRAL.js
+++ b/js/Linear/INTEGRAL.js
@@ -14,7 +14,7 @@ function INTEGRAL() {
this.model.dep_ut = new ScilabBoolean([false,true]);
this.exprs = string([[0],[0],[0],[this.maxp],[minp]]);
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL\",sz(1),sz(2));"]);
- this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i);
this.x.graphics.id = "1/s";
return new BasicBlock(this.x);
}
diff --git a/js/Linear/INTEGRAL_f.js b/js/Linear/INTEGRAL_f.js
index f12f476a..ba635b5b 100644
--- a/js/Linear/INTEGRAL_f.js
+++ b/js/Linear/INTEGRAL_f.js
@@ -11,7 +11,7 @@ function INTEGRAL_f() {
this.model.dep_ut = new ScilabBoolean([false,true]);
this.exprs = strcat(sci2exp(this.x0));
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL_f\",sz(1),sz(2));"]);
- this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([this.exprs]),this.gr_i);
return new BasicBlock(this.x);
}
INTEGRAL_f.prototype.details = function INTEGRAL_f() {
diff --git a/js/Linear/INTEGRAL_m.js b/js/Linear/INTEGRAL_m.js
index 3977d3c9..a3e59a09 100644
--- a/js/Linear/INTEGRAL_m.js
+++ b/js/Linear/INTEGRAL_m.js
@@ -16,7 +16,7 @@ function INTEGRAL_m() {
this.model.dep_ut = new ScilabBoolean([false,true]);
this.exprs = string([[0],[0],[0],[this.maxp],[minp]]);
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL_m\",sz(1),sz(2));"]);
- this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i);
return new BasicBlock(this.x);
}
INTEGRAL_m.prototype.details = function INTEGRAL_m() {
diff --git a/js/Linear/PID.js b/js/Linear/PID.js
index 179f12df..5e6e980e 100644
--- a/js/Linear/PID.js
+++ b/js/Linear/PID.js
@@ -36,7 +36,7 @@ function PID() {
this.model.dep_ut = new ScilabBoolean([false,false]);
this.model.rpar = new ScilabDouble([scs_m]);
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PID\",sz(1),sz(2));"]);
- this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),this.gr_i);
return new BasicBlock(this.x);
}
PID.prototype.details = function PID() {
diff --git a/js/Linear/REGISTER.js b/js/Linear/REGISTER.js
index 03e3b2a0..f4e7e926 100644
--- a/js/Linear/REGISTER.js
+++ b/js/Linear/REGISTER.js
@@ -12,7 +12,7 @@ function REGISTER() {
this.model.dep_ut = new ScilabBoolean([false,false]);
this.exprs = strcat(string(this.z0),";");
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"REGISTER\",sz(1),sz(2));"]);
- this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([this.exprs]),this.gr_i);
return new BasicBlock(this.x);
}
REGISTER.prototype.details = function REGISTER() {
diff --git a/js/Linear/REGISTER_f.js b/js/Linear/REGISTER_f.js
index 094eef62..b593af07 100644
--- a/js/Linear/REGISTER_f.js
+++ b/js/Linear/REGISTER_f.js
@@ -12,7 +12,7 @@ function REGISTER_f() {
this.model.dep_ut = new ScilabBoolean([false,false]);
this.exprs = strcat(string(this.z0),";");
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"REGISTER_f\",sz(1),sz(2));"]);
- this.x = new standard_define(new ScilabDouble([2.5,2.5]),this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2.5,2.5]),this.model,new ScilabDouble([this.exprs]),this.gr_i);
return new BasicBlock(this.x);
}
REGISTER_f.prototype.details = function REGISTER_f() {
diff --git a/js/Linear/SAMPHOLD.js b/js/Linear/SAMPHOLD.js
index 70de60f7..819763e1 100644
--- a/js/Linear/SAMPHOLD.js
+++ b/js/Linear/SAMPHOLD.js
@@ -10,7 +10,7 @@ function SAMPHOLD() {
this.model.blocktype = new ScilabString(["d"]);
this.model.dep_ut = new ScilabBoolean([true,false]);
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPHOLD\",sz(1),sz(2));"]);
- this.x = new standard_define(new ScilabDouble([2,2]),this.model," ",this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([" "]),this.gr_i);
return new BasicBlock(this.x);
}
SAMPHOLD.prototype.details = function SAMPHOLD() {
diff --git a/js/Linear/SAMPHOLD_m.js b/js/Linear/SAMPHOLD_m.js
index 4ca5517d..efc1adcc 100644
--- a/js/Linear/SAMPHOLD_m.js
+++ b/js/Linear/SAMPHOLD_m.js
@@ -14,7 +14,7 @@ function SAMPHOLD_m() {
this.model.dep_ut = new ScilabBoolean([true,false]);
var label = [sci2exp(1)];
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPHOLD_m\",sz(1),sz(2));"]);
- this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i);
return new BasicBlock(this.x);
}
SAMPHOLD_m.prototype.details = function SAMPHOLD_m() {
diff --git a/js/Linear/SAMPLEHOLD_f.js b/js/Linear/SAMPLEHOLD_f.js
index dae59724..fb9efb53 100644
--- a/js/Linear/SAMPLEHOLD_f.js
+++ b/js/Linear/SAMPLEHOLD_f.js
@@ -10,7 +10,7 @@ function SAMPLEHOLD_f() {
this.model.blocktype = new ScilabString(["d"]);
this.model.dep_ut = new ScilabBoolean([true,false]);
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPLEHOLD_f\",sz(1),sz(2));"]);
- this.x = new standard_define(new ScilabDouble([2,2]),this.model," ",this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([" "]),this.gr_i);
return new BasicBlock(this.x);
}
SAMPLEHOLD_f.prototype.details = function SAMPLEHOLD_f() {
diff --git a/js/Linear/SOM_f.js b/js/Linear/SOM_f.js
index 2682f8a8..b01c8bf5 100644
--- a/js/Linear/SOM_f.js
+++ b/js/Linear/SOM_f.js
@@ -11,7 +11,7 @@ function SOM_f() {
this.model.dep_ut = new ScilabBoolean([true,false]);
this.exprs = [[sci2exp(1)],[sci2exp(sgn)]];
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SOM_f\",sz(1),sz(2));"]);
- this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
return new BasicBlock(this.x);
}
SOM_f.prototype.details = function SOM_f() {
diff --git a/js/Linear/SUMMATION.js b/js/Linear/SUMMATION.js
index 84a441a8..905cc973 100644
--- a/js/Linear/SUMMATION.js
+++ b/js/Linear/SUMMATION.js
@@ -13,7 +13,7 @@ function SUMMATION() {
this.model.dep_ut = new ScilabBoolean([true,false]);
this.exprs = sci2exp(this.sgn);
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUMMATION\",sz(1),sz(2));"]);
- this.x = new standard_define(new ScilabDouble([2,3]),this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabString([this.exprs]),this.gr_i);
return new Summation(this.x);
}
SUMMATION.prototype.details = function SUMMATION() {
diff --git a/js/Linear/SUM_f.js b/js/Linear/SUM_f.js
index 7cf09c90..e4bb2f8a 100644
--- a/js/Linear/SUM_f.js
+++ b/js/Linear/SUM_f.js
@@ -9,7 +9,7 @@ function SUM_f() {
this.model.dep_ut = new ScilabBoolean([true,false]);
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUM_f\",sz(1),sz(2));"]);
this.exprs = [];
- this.x = new standard_define(new ScilabDouble([1,1]),this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabDouble(this.exprs),this.gr_i);
return new BasicBlock(this.x);
}
SUM_f.prototype.details = function SUM_f() {
diff --git a/js/Linear/TCLSS.js b/js/Linear/TCLSS.js
index 3fda1d85..56aa6d16 100644
--- a/js/Linear/TCLSS.js
+++ b/js/Linear/TCLSS.js
@@ -20,7 +20,7 @@ function TCLSS() {
this.model.dep_ut = new ScilabBoolean([false,true]);
this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]];
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TCLSS\",sz(1),sz(2));"]);
- this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
return new BasicBlock(this.x);
}
TCLSS.prototype.details = function TCLSS() {
diff --git a/js/Linear/TCLSS_f.js b/js/Linear/TCLSS_f.js
index a92c94d8..e224fbf0 100644
--- a/js/Linear/TCLSS_f.js
+++ b/js/Linear/TCLSS_f.js
@@ -20,7 +20,7 @@ function TCLSS_f() {
this.model.dep_ut = new ScilabBoolean([false,true]);
this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]];
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TCLSS_f\",sz(1),sz(2));"]);
- this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
return new BasicBlock(this.x);
}
TCLSS_f.prototype.details = function TCLSS_f() {
diff --git a/js/Linear/TIME_DELAY.js b/js/Linear/TIME_DELAY.js
index 89bc8dc3..6898b79a 100644
--- a/js/Linear/TIME_DELAY.js
+++ b/js/Linear/TIME_DELAY.js
@@ -15,7 +15,7 @@ function TIME_DELAY() {
this.model.dep_ut = new ScilabBoolean([false,true]);
this.exprs = [[string(this.T)],[string(this.init)],[string(this.N)]];
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TIME_DELAY\",sz(1),sz(2));"]);
- this.x = new standard_define(new ScilabDouble([3.5,2]),this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([3.5,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
return new BasicBlock(this.x);
}
TIME_DELAY.prototype.details = function TIME_DELAY() {
diff --git a/js/Linear/VARIABLE_DELAY.js b/js/Linear/VARIABLE_DELAY.js
index d8cb881d..1a0c4bfc 100644
--- a/js/Linear/VARIABLE_DELAY.js
+++ b/js/Linear/VARIABLE_DELAY.js
@@ -15,7 +15,7 @@ function VARIABLE_DELAY() {
this.model.dep_ut = new ScilabBoolean([false,false]);
this.exprs = [[string(this.T)],[string(this.init)],[string(this.N)]];
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VARIABLE_DELAY\",sz(1),sz(2));"]);
- this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i);
return new BasicBlock(this.x);
}
VARIABLE_DELAY.prototype.details = function VARIABLE_DELAY() {