summaryrefslogtreecommitdiff
path: root/js/NonLinear
diff options
context:
space:
mode:
authorSunil Shetye2018-07-10 10:51:41 +0530
committerSunil Shetye2018-07-10 11:24:53 +0530
commite99608a59243936dfe2e5f3aaa81411df3847f18 (patch)
tree6f588a3371c84c158558836a90ba99fb7b6d3a7f /js/NonLinear
parent30c83c60e309a3b94d7bb7dcf5cfebd5db1884cb (diff)
downloadsci2js-e99608a59243936dfe2e5f3aaa81411df3847f18.tar.gz
sci2js-e99608a59243936dfe2e5f3aaa81411df3847f18.tar.bz2
sci2js-e99608a59243936dfe2e5f3aaa81411df3847f18.zip
allow expression in lterm
Diffstat (limited to 'js/NonLinear')
-rw-r--r--js/NonLinear/MAXMIN.js4
-rw-r--r--js/NonLinear/MAXMIN.pickle14
-rw-r--r--js/NonLinear/PRODUCT.js2
-rw-r--r--js/NonLinear/PRODUCT.pickle20
4 files changed, 20 insertions, 20 deletions
diff --git a/js/NonLinear/MAXMIN.js b/js/NonLinear/MAXMIN.js
index a40a5f0b..44dd32f3 100644
--- a/js/NonLinear/MAXMIN.js
+++ b/js/NonLinear/MAXMIN.js
@@ -50,9 +50,9 @@ function MAXMIN() {
}
if (ok) {
if (this.nin==1) {
- [model,graphics,ok] = check_io(this.model,graphics,-1,1,[],[]);
+ [this.model,graphics,ok] = check_io(this.model,graphics,-1,1,[],[]);
} else {
- [model,graphics,ok] = check_io(this.model,graphics,[-1,-1],-1,[],[]);
+ [this.model,graphics,ok] = check_io(this.model,graphics,[-1,-1],-1,[],[]);
}
}
if (ok) {
diff --git a/js/NonLinear/MAXMIN.pickle b/js/NonLinear/MAXMIN.pickle
index 6e28758b..9ea92f76 100644
--- a/js/NonLinear/MAXMIN.pickle
+++ b/js/NonLinear/MAXMIN.pickle
@@ -52,21 +52,21 @@ sS'model.sim'
p15
S'list'
p16
-sS'model.nmode'
+sS'[this.model,graphics,ok]'
p17
g6
-sS'graphics.exprs'
+sS'model.nmode'
p18
-NsS'x.graphics.style'
+g6
+sS'graphics.exprs'
p19
+NsS'x.graphics.style'
+p20
g9
sS'model.ipar'
-p20
-g6
-sS'model.nzcross'
p21
g6
-sS'[model,graphics,ok]'
+sS'model.nzcross'
p22
g6
sS'ok'
diff --git a/js/NonLinear/PRODUCT.js b/js/NonLinear/PRODUCT.js
index fea149d1..446dd314 100644
--- a/js/NonLinear/PRODUCT.js
+++ b/js/NonLinear/PRODUCT.js
@@ -57,7 +57,7 @@ function PRODUCT() {
}
}
if (ok) {
- [model,graphics,ok] = check_io(this.model,graphics,in1,nout,[],[]);
+ [this.model,graphics,ok] = check_io(this.model,graphics,in1,nout,[],[]);
}
if (ok) {
this.model.ipar = new ScilabDouble([this.sgn]);
diff --git a/js/NonLinear/PRODUCT.pickle b/js/NonLinear/PRODUCT.pickle
index f8cfe4af..829508f6 100644
--- a/js/NonLinear/PRODUCT.pickle
+++ b/js/NonLinear/PRODUCT.pickle
@@ -38,21 +38,21 @@ sS'model.sim'
p11
S'list'
p12
-sS'in1'
+sS'[this.model,graphics,ok]'
p13
g8
-sS'graphics.exprs'
+sS'in1'
p14
-NsS'model.ipar'
+g8
+sS'graphics.exprs'
p15
+NsS'model.ipar'
+p16
g6
sS'typ'
-p16
-S'vector'
p17
-sS'[model,graphics,ok]'
+S'vector'
p18
-g8
sS'ok'
p19
S'boolean'
@@ -63,16 +63,16 @@ S'string'
p22
sS'model.dep_ut'
p23
-g17
+g18
sS'exprs'
p24
g8
sS'gr_i'
p25
-g17
+g18
sS'y'
p26
-g17
+g18
sS'x'
p27
g8