summaryrefslogtreecommitdiff
path: root/js/NonLinear
diff options
context:
space:
mode:
authorSunil Shetye2018-07-13 23:47:42 +0530
committerSunil Shetye2018-07-15 07:11:58 +0530
commit884d1b369dec2654d46c2dab31d2ae85b0be01ba (patch)
tree07284f0a65cca09fd7811c9592c33f17b4d0f8ad /js/NonLinear
parent6ee02952c836bb31e9b51783e6a16724fba64637 (diff)
downloadsci2js-884d1b369dec2654d46c2dab31d2ae85b0be01ba.tar.gz
sci2js-884d1b369dec2654d46c2dab31d2ae85b0be01ba.tar.bz2
sci2js-884d1b369dec2654d46c2dab31d2ae85b0be01ba.zip
support for new standard_define
Diffstat (limited to 'js/NonLinear')
-rw-r--r--js/NonLinear/ABSBLK_f.js2
-rw-r--r--js/NonLinear/ABSBLK_f.pickle3
-rw-r--r--js/NonLinear/ABS_VALUE.js2
-rw-r--r--js/NonLinear/ABS_VALUE.pickle3
-rw-r--r--js/NonLinear/COSBLK_f.js2
-rw-r--r--js/NonLinear/COSBLK_f.pickle3
-rw-r--r--js/NonLinear/DLRADAPT_f.js2
-rw-r--r--js/NonLinear/DLRADAPT_f.pickle3
-rw-r--r--js/NonLinear/EXPBLK_f.js2
-rw-r--r--js/NonLinear/EXPBLK_f.pickle3
-rw-r--r--js/NonLinear/EXPBLK_m.js2
-rw-r--r--js/NonLinear/EXPBLK_m.pickle3
-rw-r--r--js/NonLinear/FSV_f.js2
-rw-r--r--js/NonLinear/FSV_f.pickle3
-rw-r--r--js/NonLinear/INTRP2BLK_f.js2
-rw-r--r--js/NonLinear/INTRP2BLK_f.pickle11
-rw-r--r--js/NonLinear/INTRPLBLK_f.js2
-rw-r--r--js/NonLinear/INTRPLBLK_f.pickle3
-rw-r--r--js/NonLinear/INVBLK.js2
-rw-r--r--js/NonLinear/INVBLK.pickle3
-rw-r--r--js/NonLinear/INVBLK_f.js2
-rw-r--r--js/NonLinear/INVBLK_f.pickle3
-rw-r--r--js/NonLinear/LOGBLK_f.js2
-rw-r--r--js/NonLinear/LOGBLK_f.pickle3
-rw-r--r--js/NonLinear/LOOKUP2D.js2
-rw-r--r--js/NonLinear/LOOKUP2D.pickle3
-rw-r--r--js/NonLinear/LOOKUP_c.js2
-rw-r--r--js/NonLinear/LOOKUP_f.js2
-rw-r--r--js/NonLinear/LOOKUP_f.pickle3
-rw-r--r--js/NonLinear/MAXMIN.js2
-rw-r--r--js/NonLinear/MAXMIN.pickle3
-rw-r--r--js/NonLinear/MAX_f.js2
-rw-r--r--js/NonLinear/MAX_f.pickle3
-rw-r--r--js/NonLinear/MIN_f.js2
-rw-r--r--js/NonLinear/MIN_f.pickle3
-rw-r--r--js/NonLinear/POWBLK_f.js2
-rw-r--r--js/NonLinear/POWBLK_f.pickle3
-rw-r--r--js/NonLinear/PRODUCT.js2
-rw-r--r--js/NonLinear/PRODUCT.pickle3
-rw-r--r--js/NonLinear/PROD_f.js2
-rw-r--r--js/NonLinear/PROD_f.pickle3
-rw-r--r--js/NonLinear/QUANT_f.js2
-rw-r--r--js/NonLinear/QUANT_f.pickle3
-rw-r--r--js/NonLinear/SATURATION.js2
-rw-r--r--js/NonLinear/SATURATION.pickle3
-rw-r--r--js/NonLinear/SAT_f.js2
-rw-r--r--js/NonLinear/SAT_f.pickle3
-rw-r--r--js/NonLinear/SIGNUM.js2
-rw-r--r--js/NonLinear/SIGNUM.pickle3
-rw-r--r--js/NonLinear/SINBLK_f.js2
-rw-r--r--js/NonLinear/SINBLK_f.pickle3
-rw-r--r--js/NonLinear/TANBLK_f.js2
-rw-r--r--js/NonLinear/TANBLK_f.pickle3
-rw-r--r--js/NonLinear/TrigFun.js2
-rw-r--r--js/NonLinear/TrigFun.pickle3
55 files changed, 59 insertions, 86 deletions
diff --git a/js/NonLinear/ABSBLK_f.js b/js/NonLinear/ABSBLK_f.js
index 4aa265a4..5425305b 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 ScilabDouble([true,false]);
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ABSBLK_f\",sz(1),sz(2));"]);
- this.x = standard_define([2,2],this.model,[],this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i);
return new BasicBlock(this.x);
}
ABSBLK_f.prototype.details = function ABSBLK_f() {
diff --git a/js/NonLinear/ABSBLK_f.pickle b/js/NonLinear/ABSBLK_f.pickle
index 1ef3fb82..71de1bca 100644
--- a/js/NonLinear/ABSBLK_f.pickle
+++ b/js/NonLinear/ABSBLK_f.pickle
@@ -42,8 +42,7 @@ p11
g6
sS'x'
p12
-g8
-sS'model'
+NsS'model'
p13
S'object'
p14
diff --git a/js/NonLinear/ABS_VALUE.js b/js/NonLinear/ABS_VALUE.js
index 496d0a87..72816ca7 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 ScilabDouble([true,false]);
this.exprs = [string([1])];
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ABS_VALUE\",sz(1),sz(2));"]);
- this.x = standard_define([2,2],this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
return new BasicBlock(this.x);
}
ABS_VALUE.prototype.details = function ABS_VALUE() {
diff --git a/js/NonLinear/ABS_VALUE.pickle b/js/NonLinear/ABS_VALUE.pickle
index 289fe0f7..e31d1d91 100644
--- a/js/NonLinear/ABS_VALUE.pickle
+++ b/js/NonLinear/ABS_VALUE.pickle
@@ -67,8 +67,7 @@ p20
g13
sS'x'
p21
-g4
-sS'model'
+NsS'model'
p22
g8
sS'typ'
diff --git a/js/NonLinear/COSBLK_f.js b/js/NonLinear/COSBLK_f.js
index cd2525a5..82d79ff8 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 ScilabDouble([true,false]);
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"COSBLK_f\",sz(1),sz(2));"]);
- this.x = standard_define([2,2],this.model,[],this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i);
return new BasicBlock(this.x);
}
COSBLK_f.prototype.details = function COSBLK_f() {
diff --git a/js/NonLinear/COSBLK_f.pickle b/js/NonLinear/COSBLK_f.pickle
index f3e87953..f0c888ff 100644
--- a/js/NonLinear/COSBLK_f.pickle
+++ b/js/NonLinear/COSBLK_f.pickle
@@ -44,8 +44,7 @@ p11
g7
sS'x'
p12
-g5
-sS'model'
+NsS'model'
p13
S'object'
p14
diff --git a/js/NonLinear/DLRADAPT_f.js b/js/NonLinear/DLRADAPT_f.js
index d821aa28..b474db34 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 ScilabDouble([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 = standard_define([2,2],this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
return new BasicBlock(this.x);
}
DLRADAPT_f.prototype.details = function DLRADAPT_f() {
diff --git a/js/NonLinear/DLRADAPT_f.pickle b/js/NonLinear/DLRADAPT_f.pickle
index 53f09156..c072ce90 100644
--- a/js/NonLinear/DLRADAPT_f.pickle
+++ b/js/NonLinear/DLRADAPT_f.pickle
@@ -116,8 +116,7 @@ p33
g14
sS'x'
p34
-g9
-sS'model'
+NsS'model'
p35
g4
s. \ No newline at end of file
diff --git a/js/NonLinear/EXPBLK_f.js b/js/NonLinear/EXPBLK_f.js
index 111b9833..5e0bc5b4 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 ScilabDouble([true,false]);
this.exprs = ["%e"];
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXPBLK_f\",sz(1),sz(2));"]);
- this.x = standard_define([2,2],this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
return new BasicBlock(this.x);
}
EXPBLK_f.prototype.details = function EXPBLK_f() {
diff --git a/js/NonLinear/EXPBLK_f.pickle b/js/NonLinear/EXPBLK_f.pickle
index dc13791b..7c9a0548 100644
--- a/js/NonLinear/EXPBLK_f.pickle
+++ b/js/NonLinear/EXPBLK_f.pickle
@@ -70,8 +70,7 @@ p20
g14
sS'x'
p21
-g2
-sS'model'
+NsS'model'
p22
g8
sS'typ'
diff --git a/js/NonLinear/EXPBLK_m.js b/js/NonLinear/EXPBLK_m.js
index 2159634f..0cb66b96 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 ScilabDouble([true,false]);
this.exprs = ["%e"];
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXPBLK_m\",sz(1),sz(2));"]);
- this.x = standard_define([2,2],this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
return new BasicBlock(this.x);
}
EXPBLK_m.prototype.details = function EXPBLK_m() {
diff --git a/js/NonLinear/EXPBLK_m.pickle b/js/NonLinear/EXPBLK_m.pickle
index 2f63aefd..37d444a7 100644
--- a/js/NonLinear/EXPBLK_m.pickle
+++ b/js/NonLinear/EXPBLK_m.pickle
@@ -86,8 +86,7 @@ p26
g6
sS'x'
p27
-g6
-sS'model'
+NsS'model'
p28
g2
s. \ No newline at end of file
diff --git a/js/NonLinear/FSV_f.js b/js/NonLinear/FSV_f.js
index ef4d31b3..5a6f7046 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 ScilabDouble([true,false]);
this.exprs = " ";
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FSV_f\",sz(1),sz(2));"]);
- this.x = standard_define([2,2],this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
return new BasicBlock(this.x);
}
FSV_f.prototype.details = function FSV_f() {
diff --git a/js/NonLinear/FSV_f.pickle b/js/NonLinear/FSV_f.pickle
index e756a04e..60656cd6 100644
--- a/js/NonLinear/FSV_f.pickle
+++ b/js/NonLinear/FSV_f.pickle
@@ -48,8 +48,7 @@ p13
g9
sS'x'
p14
-g7
-sS'model'
+NsS'model'
p15
S'object'
p16
diff --git a/js/NonLinear/INTRP2BLK_f.js b/js/NonLinear/INTRP2BLK_f.js
index 0f25e1fd..5cb4604d 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 ScilabDouble([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 = standard_define([3,2],this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i);
return new BasicBlock(this.x);
}
INTRP2BLK_f.prototype.details = function INTRP2BLK_f() {
diff --git a/js/NonLinear/INTRP2BLK_f.pickle b/js/NonLinear/INTRP2BLK_f.pickle
index c808353d..a21e3536 100644
--- a/js/NonLinear/INTRP2BLK_f.pickle
+++ b/js/NonLinear/INTRP2BLK_f.pickle
@@ -74,18 +74,17 @@ p21
g17
sS'x'
p22
-S'double'
+NsS'model'
p23
-sS'model'
-p24
g10
sS'model.ipar'
-p25
+p24
g2
sS'typ'
-p26
+p25
g17
sS'model.out'
+p26
+S'double'
p27
-g23
s. \ No newline at end of file
diff --git a/js/NonLinear/INTRPLBLK_f.js b/js/NonLinear/INTRPLBLK_f.js
index 03022c73..a990bbb1 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 ScilabDouble([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 = standard_define([2,2],this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
return new BasicBlock(this.x);
}
INTRPLBLK_f.prototype.details = function INTRPLBLK_f() {
diff --git a/js/NonLinear/INTRPLBLK_f.pickle b/js/NonLinear/INTRPLBLK_f.pickle
index e4d076d8..e482b97d 100644
--- a/js/NonLinear/INTRPLBLK_f.pickle
+++ b/js/NonLinear/INTRPLBLK_f.pickle
@@ -72,8 +72,7 @@ p21
g17
sS'x'
p22
-g6
-sS'model'
+NsS'model'
p23
g10
sS'typ'
diff --git a/js/NonLinear/INVBLK.js b/js/NonLinear/INVBLK.js
index a3b6f8c1..1906beb7 100644
--- a/js/NonLinear/INVBLK.js
+++ b/js/NonLinear/INVBLK.js
@@ -10,7 +10,7 @@ function INVBLK() {
this.model.dep_ut = new ScilabDouble([true,false]);
this.exprs = " ";
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INVBLK\",sz(1),sz(2));"]);
- this.x = standard_define([2,2],this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
return new BasicBlock(this.x);
}
INVBLK.prototype.details = function INVBLK() {
diff --git a/js/NonLinear/INVBLK.pickle b/js/NonLinear/INVBLK.pickle
index e756a04e..60656cd6 100644
--- a/js/NonLinear/INVBLK.pickle
+++ b/js/NonLinear/INVBLK.pickle
@@ -48,8 +48,7 @@ p13
g9
sS'x'
p14
-g7
-sS'model'
+NsS'model'
p15
S'object'
p16
diff --git a/js/NonLinear/INVBLK_f.js b/js/NonLinear/INVBLK_f.js
index c505c7f1..6383212c 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 ScilabDouble([true,false]);
this.exprs = " ";
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INVBLK_f\",sz(1),sz(2));"]);
- this.x = standard_define([2,2],this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
return new BasicBlock(this.x);
}
INVBLK_f.prototype.details = function INVBLK_f() {
diff --git a/js/NonLinear/INVBLK_f.pickle b/js/NonLinear/INVBLK_f.pickle
index 3c2d269d..ddc91776 100644
--- a/js/NonLinear/INVBLK_f.pickle
+++ b/js/NonLinear/INVBLK_f.pickle
@@ -47,8 +47,7 @@ p12
g8
sS'x'
p13
-g6
-sS'model'
+NsS'model'
p14
S'object'
p15
diff --git a/js/NonLinear/LOGBLK_f.js b/js/NonLinear/LOGBLK_f.js
index 72669ba6..6dffed6f 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 ScilabDouble([true,false]);
this.exprs = "%e";
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOGBLK_f\",sz(1),sz(2));"]);
- this.x = standard_define([2,2],this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
return new BasicBlock(this.x);
}
LOGBLK_f.prototype.details = function LOGBLK_f() {
diff --git a/js/NonLinear/LOGBLK_f.pickle b/js/NonLinear/LOGBLK_f.pickle
index becbf40c..952da34c 100644
--- a/js/NonLinear/LOGBLK_f.pickle
+++ b/js/NonLinear/LOGBLK_f.pickle
@@ -70,8 +70,7 @@ p20
g16
sS'x'
p21
-g2
-sS'model'
+NsS'model'
p22
g8
sS'typ'
diff --git a/js/NonLinear/LOOKUP2D.js b/js/NonLinear/LOOKUP2D.js
index a423c30e..db6d365e 100644
--- a/js/NonLinear/LOOKUP2D.js
+++ b/js/NonLinear/LOOKUP2D.js
@@ -18,7 +18,7 @@ function LOOKUP2D() {
this.model.dep_ut = new ScilabDouble([true,false]);
this.exprs = list(strcat(sci2exp(this.xx)),strcat(sci2exp(this.yy)),strcat(sci2exp(this.zz)),sci2exp(this.Method),Graf);
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOOKUP2D\",sz(1),sz(2));"]);
- this.x = standard_define([2.5,2],this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,this.exprs,this.gr_i);
return new BasicBlock(this.x);
}
LOOKUP2D.prototype.details = function LOOKUP2D() {
diff --git a/js/NonLinear/LOOKUP2D.pickle b/js/NonLinear/LOOKUP2D.pickle
index f7203e42..e4356e53 100644
--- a/js/NonLinear/LOOKUP2D.pickle
+++ b/js/NonLinear/LOOKUP2D.pickle
@@ -136,8 +136,7 @@ p42
g11
sS'x'
p43
-g8
-sS'model'
+NsS'model'
p44
g4
sS'graf'
diff --git a/js/NonLinear/LOOKUP_c.js b/js/NonLinear/LOOKUP_c.js
index 62b500b3..08f1ddb5 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 = standard_define([2,2],this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,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 b81270c8..b8a60f1d 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 ScilabDouble([true,false]);
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOOKUP_f\",sz(1),sz(2));"]);
- this.x = standard_define([2,2],this.model,[],this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i);
return new BasicBlock(this.x);
}
LOOKUP_f.prototype.details = function LOOKUP_f() {
diff --git a/js/NonLinear/LOOKUP_f.pickle b/js/NonLinear/LOOKUP_f.pickle
index 3b7a3227..7e9f98a5 100644
--- a/js/NonLinear/LOOKUP_f.pickle
+++ b/js/NonLinear/LOOKUP_f.pickle
@@ -72,8 +72,7 @@ p23
g16
sS'x'
p24
-g4
-sS'model'
+NsS'model'
p25
g9
sS'n'
diff --git a/js/NonLinear/MAXMIN.js b/js/NonLinear/MAXMIN.js
index 4e4cf002..56f8a8d3 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 = standard_define([2,2],this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
this.x.graphics.style = "MAXMIN;displayedLabel=MAX";
return new BasicBlock(this.x);
}
diff --git a/js/NonLinear/MAXMIN.pickle b/js/NonLinear/MAXMIN.pickle
index 2b7f21f2..a8f6f334 100644
--- a/js/NonLinear/MAXMIN.pickle
+++ b/js/NonLinear/MAXMIN.pickle
@@ -96,8 +96,7 @@ p29
g12
sS'x'
p30
-g6
-sS'model'
+NsS'model'
p31
g2
s. \ No newline at end of file
diff --git a/js/NonLinear/MAX_f.js b/js/NonLinear/MAX_f.js
index 3ca90eb0..f258c935 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 ScilabDouble([true,false]);
this.exprs = " ";
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MAX_f\",sz(1),sz(2));"]);
- this.x = standard_define([2,2],this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
return new BasicBlock(this.x);
}
MAX_f.prototype.details = function MAX_f() {
diff --git a/js/NonLinear/MAX_f.pickle b/js/NonLinear/MAX_f.pickle
index d4bf1ac5..9471b916 100644
--- a/js/NonLinear/MAX_f.pickle
+++ b/js/NonLinear/MAX_f.pickle
@@ -51,8 +51,7 @@ p14
g10
sS'x'
p15
-g8
-sS'model'
+NsS'model'
p16
S'object'
p17
diff --git a/js/NonLinear/MIN_f.js b/js/NonLinear/MIN_f.js
index 7a157259..244a414d 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 ScilabDouble([true,false]);
this.exprs = sci2exp(in1);
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MIN_f\",sz(1),sz(2));"]);
- this.x = standard_define([2,2],this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
return new BasicBlock(this.x);
}
MIN_f.prototype.details = function MIN_f() {
diff --git a/js/NonLinear/MIN_f.pickle b/js/NonLinear/MIN_f.pickle
index d4bf1ac5..9471b916 100644
--- a/js/NonLinear/MIN_f.pickle
+++ b/js/NonLinear/MIN_f.pickle
@@ -51,8 +51,7 @@ p14
g10
sS'x'
p15
-g8
-sS'model'
+NsS'model'
p16
S'object'
p17
diff --git a/js/NonLinear/POWBLK_f.js b/js/NonLinear/POWBLK_f.js
index bec8fe51..c7d70e81 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 ScilabDouble([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 = standard_define([2,2],this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
return new BasicBlock(this.x);
}
POWBLK_f.prototype.details = function POWBLK_f() {
diff --git a/js/NonLinear/POWBLK_f.pickle b/js/NonLinear/POWBLK_f.pickle
index dd1ad090..3b71ccc3 100644
--- a/js/NonLinear/POWBLK_f.pickle
+++ b/js/NonLinear/POWBLK_f.pickle
@@ -70,8 +70,7 @@ p20
g16
sS'x'
p21
-g2
-sS'model'
+NsS'model'
p22
g8
sS'model.ipar'
diff --git a/js/NonLinear/PRODUCT.js b/js/NonLinear/PRODUCT.js
index 4f8ff4d5..c01104d4 100644
--- a/js/NonLinear/PRODUCT.js
+++ b/js/NonLinear/PRODUCT.js
@@ -11,7 +11,7 @@ function PRODUCT() {
this.model.dep_ut = new ScilabDouble([true,false]);
this.exprs = sci2exp(this.sgn);
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PRODUCT\",sz(1),sz(2));"]);
- this.x = standard_define([2,3],this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,3]),this.model,this.exprs,this.gr_i);
return new Product(this.x);
}
PRODUCT.prototype.details = function PRODUCT() {
diff --git a/js/NonLinear/PRODUCT.pickle b/js/NonLinear/PRODUCT.pickle
index 5e4dd023..97be2d1c 100644
--- a/js/NonLinear/PRODUCT.pickle
+++ b/js/NonLinear/PRODUCT.pickle
@@ -69,8 +69,7 @@ p22
g15
sS'x'
p23
-g4
-sS'model'
+NsS'model'
p24
g10
sS'model.ipar'
diff --git a/js/NonLinear/PROD_f.js b/js/NonLinear/PROD_f.js
index 3e67f178..ee3954bc 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 ScilabDouble([true,false]);
- this.x = standard_define([1,1],this.model,[],[]);
+ this.x = new standard_define(new ScilabDouble([1,1]),this.model,[],[]);
return new BasicBlock(this.x);
}
PROD_f.prototype.details = function PROD_f() {
diff --git a/js/NonLinear/PROD_f.pickle b/js/NonLinear/PROD_f.pickle
index 3c98d962..cd57a97f 100644
--- a/js/NonLinear/PROD_f.pickle
+++ b/js/NonLinear/PROD_f.pickle
@@ -43,8 +43,7 @@ p12
g8
sS'x'
p13
-g4
-sS'model'
+NsS'model'
p14
S'object'
p15
diff --git a/js/NonLinear/QUANT_f.js b/js/NonLinear/QUANT_f.js
index 785401c5..ff846e2b 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 ScilabDouble([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 = standard_define([2,2],this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
return new BasicBlock(this.x);
}
QUANT_f.prototype.details = function QUANT_f() {
diff --git a/js/NonLinear/QUANT_f.pickle b/js/NonLinear/QUANT_f.pickle
index 7de54b31..be4d0864 100644
--- a/js/NonLinear/QUANT_f.pickle
+++ b/js/NonLinear/QUANT_f.pickle
@@ -71,8 +71,7 @@ p21
g17
sS'x'
p22
-g4
-sS'model'
+NsS'model'
p23
g8
sS'model.ipar'
diff --git a/js/NonLinear/SATURATION.js b/js/NonLinear/SATURATION.js
index 4f116bf3..4a34ff87 100644
--- a/js/NonLinear/SATURATION.js
+++ b/js/NonLinear/SATURATION.js
@@ -15,7 +15,7 @@ function SATURATION() {
this.model.dep_ut = new ScilabDouble([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 = standard_define([2,2],this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
return new BasicBlock(this.x);
}
SATURATION.prototype.details = function SATURATION() {
diff --git a/js/NonLinear/SATURATION.pickle b/js/NonLinear/SATURATION.pickle
index 64da890e..0326c662 100644
--- a/js/NonLinear/SATURATION.pickle
+++ b/js/NonLinear/SATURATION.pickle
@@ -87,8 +87,7 @@ p26
g12
sS'x'
p27
-g7
-sS'model'
+NsS'model'
p28
g2
s. \ No newline at end of file
diff --git a/js/NonLinear/SAT_f.js b/js/NonLinear/SAT_f.js
index d4061ca8..44776f9b 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 ScilabDouble([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 = standard_define([2,2],this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
return new BasicBlock(this.x);
}
SAT_f.prototype.details = function SAT_f() {
diff --git a/js/NonLinear/SAT_f.pickle b/js/NonLinear/SAT_f.pickle
index 5463c231..ed5199b1 100644
--- a/js/NonLinear/SAT_f.pickle
+++ b/js/NonLinear/SAT_f.pickle
@@ -90,8 +90,7 @@ p27
g13
sS'x'
p28
-g2
-sS'model'
+NsS'model'
p29
g4
s. \ No newline at end of file
diff --git a/js/NonLinear/SIGNUM.js b/js/NonLinear/SIGNUM.js
index 316ac142..1649d7f7 100644
--- a/js/NonLinear/SIGNUM.js
+++ b/js/NonLinear/SIGNUM.js
@@ -12,7 +12,7 @@ function SIGNUM() {
this.model.dep_ut = new ScilabDouble([true,false]);
this.exprs = [string([1])];
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SIGNUM\",sz(1),sz(2));"]);
- this.x = standard_define([2,2],this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
return new BasicBlock(this.x);
}
SIGNUM.prototype.details = function SIGNUM() {
diff --git a/js/NonLinear/SIGNUM.pickle b/js/NonLinear/SIGNUM.pickle
index 289fe0f7..e31d1d91 100644
--- a/js/NonLinear/SIGNUM.pickle
+++ b/js/NonLinear/SIGNUM.pickle
@@ -67,8 +67,7 @@ p20
g13
sS'x'
p21
-g4
-sS'model'
+NsS'model'
p22
g8
sS'typ'
diff --git a/js/NonLinear/SINBLK_f.js b/js/NonLinear/SINBLK_f.js
index 621fe1dc..37304b71 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 ScilabDouble([true,false]);
this.exprs = " ";
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SINBLK_f\",sz(1),sz(2));"]);
- this.x = standard_define([2,2],this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
return new BasicBlock(this.x);
}
SINBLK_f.prototype.details = function SINBLK_f() {
diff --git a/js/NonLinear/SINBLK_f.pickle b/js/NonLinear/SINBLK_f.pickle
index 08fc2768..aac36c43 100644
--- a/js/NonLinear/SINBLK_f.pickle
+++ b/js/NonLinear/SINBLK_f.pickle
@@ -44,8 +44,7 @@ p11
g6
sS'x'
p12
-g8
-sS'model'
+NsS'model'
p13
S'object'
p14
diff --git a/js/NonLinear/TANBLK_f.js b/js/NonLinear/TANBLK_f.js
index 9cc919cd..4693fb68 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 ScilabDouble([true,false]);
this.exprs = sci2exp(in1);
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TANBLK_f\",sz(1),sz(2));"]);
- this.x = standard_define([2,2],this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i);
return new BasicBlock(this.x);
}
TANBLK_f.prototype.details = function TANBLK_f() {
diff --git a/js/NonLinear/TANBLK_f.pickle b/js/NonLinear/TANBLK_f.pickle
index dac5e218..378aaddd 100644
--- a/js/NonLinear/TANBLK_f.pickle
+++ b/js/NonLinear/TANBLK_f.pickle
@@ -50,8 +50,7 @@ p13
g5
sS'x'
p14
-g8
-sS'model'
+NsS'model'
p15
S'object'
p16
diff --git a/js/NonLinear/TrigFun.js b/js/NonLinear/TrigFun.js
index 1b089e62..86ae4d56 100644
--- a/js/NonLinear/TrigFun.js
+++ b/js/NonLinear/TrigFun.js
@@ -9,7 +9,7 @@ function TrigFun() {
this.model.dep_ut = new ScilabDouble([true,false]);
this.exprs = "sin";
this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TrigFun\",sz(1),sz(2));"]);
- this.x = standard_define([4,2],this.model,this.exprs,this.gr_i);
+ this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i);
return new BasicBlock(this.x);
}
TrigFun.prototype.details = function TrigFun() {
diff --git a/js/NonLinear/TrigFun.pickle b/js/NonLinear/TrigFun.pickle
index 983ac5a2..4911d539 100644
--- a/js/NonLinear/TrigFun.pickle
+++ b/js/NonLinear/TrigFun.pickle
@@ -68,8 +68,7 @@ p21
g17
sS'x'
p22
-g4
-sS'model'
+NsS'model'
p23
g8
sS'typ'