summaryrefslogtreecommitdiff
path: root/js/NonLinear
diff options
context:
space:
mode:
Diffstat (limited to 'js/NonLinear')
-rw-r--r--js/NonLinear/ABSBLK_f.js2
-rw-r--r--js/NonLinear/ABS_VALUE.js2
-rw-r--r--js/NonLinear/COSBLK_f.js2
-rw-r--r--js/NonLinear/DLRADAPT_f.js2
-rw-r--r--js/NonLinear/EXPBLK_f.js2
-rw-r--r--js/NonLinear/EXPBLK_m.js2
-rw-r--r--js/NonLinear/FSV_f.js2
-rw-r--r--js/NonLinear/INTRP2BLK_f.js2
-rw-r--r--js/NonLinear/INTRPLBLK_f.js2
-rw-r--r--js/NonLinear/INVBLK.js2
-rw-r--r--js/NonLinear/INVBLK_f.js2
-rw-r--r--js/NonLinear/LOGBLK_f.js2
-rw-r--r--js/NonLinear/LOOKUP_c.js2
-rw-r--r--js/NonLinear/LOOKUP_f.js2
-rw-r--r--js/NonLinear/MAXMIN.js2
-rw-r--r--js/NonLinear/MAX_f.js2
-rw-r--r--js/NonLinear/MIN_f.js2
-rw-r--r--js/NonLinear/POWBLK_f.js2
-rw-r--r--js/NonLinear/PRODUCT.js2
-rw-r--r--js/NonLinear/PROD_f.js2
-rw-r--r--js/NonLinear/QUANT_f.js2
-rw-r--r--js/NonLinear/SATURATION.js2
-rw-r--r--js/NonLinear/SAT_f.js2
-rw-r--r--js/NonLinear/SIGNUM.js2
-rw-r--r--js/NonLinear/SINBLK_f.js2
-rw-r--r--js/NonLinear/TANBLK_f.js2
-rw-r--r--js/NonLinear/TrigFun.js2
27 files changed, 27 insertions, 27 deletions
diff --git a/js/NonLinear/ABSBLK_f.js b/js/NonLinear/ABSBLK_f.js
index 39e5984c..0c8058bf 100644
--- a/js/NonLinear/ABSBLK_f.js
+++ b/js/NonLinear/ABSBLK_f.js
@@ -8,7 +8,7 @@ function ABSBLK_f() {
this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = new ScilabBoolean([true,false]);
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ABSBLK_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 ScilabDouble([]),this.gr_i);
return new BasicBlock(this.x);
}
ABSBLK_f.prototype.details = function ABSBLK_f() {
diff --git a/js/NonLinear/ABS_VALUE.js b/js/NonLinear/ABS_VALUE.js
index 01c6d20c..5b092794 100644
--- a/js/NonLinear/ABS_VALUE.js
+++ b/js/NonLinear/ABS_VALUE.js
@@ -12,7 +12,7 @@ function ABS_VALUE() {
this.model.dep_ut = new ScilabBoolean([true,false]);
this.exprs = [string([1])];
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ABS_VALUE\",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);
}
ABS_VALUE.prototype.details = function ABS_VALUE() {
diff --git a/js/NonLinear/COSBLK_f.js b/js/NonLinear/COSBLK_f.js
index ad166e28..7735a7ae 100644
--- a/js/NonLinear/COSBLK_f.js
+++ b/js/NonLinear/COSBLK_f.js
@@ -9,7 +9,7 @@ function COSBLK_f() {
this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = new ScilabBoolean([true,false]);
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"COSBLK_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 ScilabDouble([]),this.gr_i);
return new BasicBlock(this.x);
}
COSBLK_f.prototype.details = function COSBLK_f() {
diff --git a/js/NonLinear/DLRADAPT_f.js b/js/NonLinear/DLRADAPT_f.js
index 7283dc3b..b3840590 100644
--- a/js/NonLinear/DLRADAPT_f.js
+++ b/js/NonLinear/DLRADAPT_f.js
@@ -20,7 +20,7 @@ function DLRADAPT_f() {
this.model.dep_ut = new ScilabBoolean([true,false]);
this.exprs = [[sci2exp(this.p)],[sci2exp(this.rn)],[sci2exp(this.rd,0)],[sci2exp(this.g)],[sci2exp(this.last_u)],[sci2exp(this.last_y)]];
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLRADAPT_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);
}
DLRADAPT_f.prototype.details = function DLRADAPT_f() {
diff --git a/js/NonLinear/EXPBLK_f.js b/js/NonLinear/EXPBLK_f.js
index 3cd716fa..707d8fd1 100644
--- a/js/NonLinear/EXPBLK_f.js
+++ b/js/NonLinear/EXPBLK_f.js
@@ -12,7 +12,7 @@ function EXPBLK_f() {
this.model.dep_ut = new ScilabBoolean([true,false]);
this.exprs = ["%e"];
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXPBLK_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);
}
EXPBLK_f.prototype.details = function EXPBLK_f() {
diff --git a/js/NonLinear/EXPBLK_m.js b/js/NonLinear/EXPBLK_m.js
index 55185a54..ddef6624 100644
--- a/js/NonLinear/EXPBLK_m.js
+++ b/js/NonLinear/EXPBLK_m.js
@@ -16,7 +16,7 @@ function EXPBLK_m() {
this.model.dep_ut = new ScilabBoolean([true,false]);
this.exprs = ["%e"];
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXPBLK_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);
}
EXPBLK_m.prototype.details = function EXPBLK_m() {
diff --git a/js/NonLinear/FSV_f.js b/js/NonLinear/FSV_f.js
index 364dd488..ff49f1af 100644
--- a/js/NonLinear/FSV_f.js
+++ b/js/NonLinear/FSV_f.js
@@ -10,7 +10,7 @@ function FSV_f() {
this.model.dep_ut = new ScilabBoolean([true,false]);
this.exprs = " ";
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FSV_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);
}
FSV_f.prototype.details = function FSV_f() {
diff --git a/js/NonLinear/INTRP2BLK_f.js b/js/NonLinear/INTRP2BLK_f.js
index 5cf1f22f..303cdffb 100644
--- a/js/NonLinear/INTRP2BLK_f.js
+++ b/js/NonLinear/INTRP2BLK_f.js
@@ -14,7 +14,7 @@ function INTRP2BLK_f() {
this.model.dep_ut = new ScilabBoolean([true,false]);
this.exprs = [[strcat(sci2exp(this.a))],[strcat(sci2exp(this.b))],[strcat(sci2exp(this.c,0))]];
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTRP2BLK_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);
}
INTRP2BLK_f.prototype.details = function INTRP2BLK_f() {
diff --git a/js/NonLinear/INTRPLBLK_f.js b/js/NonLinear/INTRPLBLK_f.js
index e9347b2c..64077254 100644
--- a/js/NonLinear/INTRPLBLK_f.js
+++ b/js/NonLinear/INTRPLBLK_f.js
@@ -12,7 +12,7 @@ function INTRPLBLK_f() {
this.model.dep_ut = new ScilabBoolean([true,false]);
this.exprs = [[strcat(sci2exp(this.a))],[strcat(sci2exp(this.b))]];
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTRPLBLK_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);
}
INTRPLBLK_f.prototype.details = function INTRPLBLK_f() {
diff --git a/js/NonLinear/INVBLK.js b/js/NonLinear/INVBLK.js
index a86b86d4..324372b1 100644
--- a/js/NonLinear/INVBLK.js
+++ b/js/NonLinear/INVBLK.js
@@ -10,7 +10,7 @@ function INVBLK() {
this.model.dep_ut = new ScilabBoolean([true,false]);
this.exprs = " ";
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INVBLK\",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);
}
INVBLK.prototype.details = function INVBLK() {
diff --git a/js/NonLinear/INVBLK_f.js b/js/NonLinear/INVBLK_f.js
index 1e344ded..1ce1e841 100644
--- a/js/NonLinear/INVBLK_f.js
+++ b/js/NonLinear/INVBLK_f.js
@@ -10,7 +10,7 @@ function INVBLK_f() {
this.model.dep_ut = new ScilabBoolean([true,false]);
this.exprs = " ";
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INVBLK_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);
}
INVBLK_f.prototype.details = function INVBLK_f() {
diff --git a/js/NonLinear/LOGBLK_f.js b/js/NonLinear/LOGBLK_f.js
index e2b14f15..3b97fb56 100644
--- a/js/NonLinear/LOGBLK_f.js
+++ b/js/NonLinear/LOGBLK_f.js
@@ -12,7 +12,7 @@ function LOGBLK_f() {
this.model.dep_ut = new ScilabBoolean([true,false]);
this.exprs = "%e";
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOGBLK_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);
}
LOGBLK_f.prototype.details = function LOGBLK_f() {
diff --git a/js/NonLinear/LOOKUP_c.js b/js/NonLinear/LOOKUP_c.js
index 46efa138..9666b1c6 100644
--- a/js/NonLinear/LOOKUP_c.js
+++ b/js/NonLinear/LOOKUP_c.js
@@ -23,7 +23,7 @@ function LOOKUP_c() {
this.model.firing = new ScilabDouble([0]);
this.exprs = [[sci2exp(this.Method)],[sci2exp(this.xx)],[sci2exp(this.yy)],[sci2exp(0)],[Graf]];
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOOKUP_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);
}
LOOKUP_c.prototype.details = function LOOKUP_c() {
diff --git a/js/NonLinear/LOOKUP_f.js b/js/NonLinear/LOOKUP_f.js
index 471833f3..d1d2abab 100644
--- a/js/NonLinear/LOOKUP_f.js
+++ b/js/NonLinear/LOOKUP_f.js
@@ -9,7 +9,7 @@ function LOOKUP_f() {
this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = new ScilabBoolean([true,false]);
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOOKUP_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 ScilabDouble([]),this.gr_i);
return new BasicBlock(this.x);
}
LOOKUP_f.prototype.details = function LOOKUP_f() {
diff --git a/js/NonLinear/MAXMIN.js b/js/NonLinear/MAXMIN.js
index e2e7f3ef..d0c04381 100644
--- a/js/NonLinear/MAXMIN.js
+++ b/js/NonLinear/MAXMIN.js
@@ -10,7 +10,7 @@ function MAXMIN() {
this.model.ipar = new ScilabDouble([0]);
this.exprs = [string(transpose([2,1,1]))];
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MAXMIN\",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.style = "MAXMIN;displayedLabel=MAX";
return new BasicBlock(this.x);
}
diff --git a/js/NonLinear/MAX_f.js b/js/NonLinear/MAX_f.js
index c7a348bb..8b7bbfc8 100644
--- a/js/NonLinear/MAX_f.js
+++ b/js/NonLinear/MAX_f.js
@@ -11,7 +11,7 @@ function MAX_f() {
this.model.dep_ut = new ScilabBoolean([true,false]);
this.exprs = " ";
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MAX_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);
}
MAX_f.prototype.details = function MAX_f() {
diff --git a/js/NonLinear/MIN_f.js b/js/NonLinear/MIN_f.js
index 316e43e4..34647671 100644
--- a/js/NonLinear/MIN_f.js
+++ b/js/NonLinear/MIN_f.js
@@ -11,7 +11,7 @@ function MIN_f() {
this.model.dep_ut = new ScilabBoolean([true,false]);
this.exprs = sci2exp(in1);
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MIN_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);
}
MIN_f.prototype.details = function MIN_f() {
diff --git a/js/NonLinear/POWBLK_f.js b/js/NonLinear/POWBLK_f.js
index a86c49a2..a6d2b383 100644
--- a/js/NonLinear/POWBLK_f.js
+++ b/js/NonLinear/POWBLK_f.js
@@ -12,7 +12,7 @@ function POWBLK_f() {
this.model.dep_ut = new ScilabBoolean([true,false]);
this.exprs = string(this.a);
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"POWBLK_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);
}
POWBLK_f.prototype.details = function POWBLK_f() {
diff --git a/js/NonLinear/PRODUCT.js b/js/NonLinear/PRODUCT.js
index 1f550e4a..ea3fb92f 100644
--- a/js/NonLinear/PRODUCT.js
+++ b/js/NonLinear/PRODUCT.js
@@ -11,7 +11,7 @@ function PRODUCT() {
this.model.dep_ut = new ScilabBoolean([true,false]);
this.exprs = sci2exp(this.sgn);
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PRODUCT\",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 Product(this.x);
}
PRODUCT.prototype.details = function PRODUCT() {
diff --git a/js/NonLinear/PROD_f.js b/js/NonLinear/PROD_f.js
index 5d6903f4..ead16ab5 100644
--- a/js/NonLinear/PROD_f.js
+++ b/js/NonLinear/PROD_f.js
@@ -7,7 +7,7 @@ function PROD_f() {
this.model.out = new ScilabDouble([-1]);
this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = new ScilabBoolean([true,false]);
- this.x = new standard_define(new ScilabDouble([1,1]),this.model,[],[]);
+ this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabDouble([]),[]);
return new BasicBlock(this.x);
}
PROD_f.prototype.details = function PROD_f() {
diff --git a/js/NonLinear/QUANT_f.js b/js/NonLinear/QUANT_f.js
index ca5cb9e4..b2642a10 100644
--- a/js/NonLinear/QUANT_f.js
+++ b/js/NonLinear/QUANT_f.js
@@ -13,7 +13,7 @@ function QUANT_f() {
this.model.dep_ut = new ScilabBoolean([true,false]);
this.exprs = [[string(this.pas)],[string(this.meth)]];
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"QUANT_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);
}
QUANT_f.prototype.details = function QUANT_f() {
diff --git a/js/NonLinear/SATURATION.js b/js/NonLinear/SATURATION.js
index c87c0edf..c53f10ec 100644
--- a/js/NonLinear/SATURATION.js
+++ b/js/NonLinear/SATURATION.js
@@ -15,7 +15,7 @@ function SATURATION() {
this.model.dep_ut = new ScilabBoolean([true,false]);
this.exprs = [[string(this.maxp)],[string(this.minp)],[string(this.model.nmode)]];
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SATURATION\",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);
}
SATURATION.prototype.details = function SATURATION() {
diff --git a/js/NonLinear/SAT_f.js b/js/NonLinear/SAT_f.js
index 8a5cf3ef..06eaa83f 100644
--- a/js/NonLinear/SAT_f.js
+++ b/js/NonLinear/SAT_f.js
@@ -15,7 +15,7 @@ function SAT_f() {
this.model.dep_ut = new ScilabBoolean([true,false]);
this.exprs = [[string(this.minp)],[string(this.maxp)],[string(slope)]];
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAT_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);
}
SAT_f.prototype.details = function SAT_f() {
diff --git a/js/NonLinear/SIGNUM.js b/js/NonLinear/SIGNUM.js
index dc5b69cf..075f4c92 100644
--- a/js/NonLinear/SIGNUM.js
+++ b/js/NonLinear/SIGNUM.js
@@ -12,7 +12,7 @@ function SIGNUM() {
this.model.dep_ut = new ScilabBoolean([true,false]);
this.exprs = [string([1])];
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SIGNUM\",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);
}
SIGNUM.prototype.details = function SIGNUM() {
diff --git a/js/NonLinear/SINBLK_f.js b/js/NonLinear/SINBLK_f.js
index 7d850bd4..5a5d5548 100644
--- a/js/NonLinear/SINBLK_f.js
+++ b/js/NonLinear/SINBLK_f.js
@@ -9,7 +9,7 @@ function SINBLK_f() {
this.model.dep_ut = new ScilabBoolean([true,false]);
this.exprs = " ";
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SINBLK_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);
}
SINBLK_f.prototype.details = function SINBLK_f() {
diff --git a/js/NonLinear/TANBLK_f.js b/js/NonLinear/TANBLK_f.js
index 288dd11f..05a576da 100644
--- a/js/NonLinear/TANBLK_f.js
+++ b/js/NonLinear/TANBLK_f.js
@@ -10,7 +10,7 @@ function TANBLK_f() {
this.model.dep_ut = new ScilabBoolean([true,false]);
this.exprs = sci2exp(in1);
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TANBLK_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);
}
TANBLK_f.prototype.details = function TANBLK_f() {
diff --git a/js/NonLinear/TrigFun.js b/js/NonLinear/TrigFun.js
index 2a18fff8..a3857b52 100644
--- a/js/NonLinear/TrigFun.js
+++ b/js/NonLinear/TrigFun.js
@@ -9,7 +9,7 @@ function TrigFun() {
this.model.dep_ut = new ScilabBoolean([true,false]);
this.exprs = "sin";
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TrigFun\",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 ScilabString([this.exprs]),this.gr_i);
return new BasicBlock(this.x);
}
TrigFun.prototype.details = function TrigFun() {