summaryrefslogtreecommitdiff
path: root/js/NonLinear/MAXMIN.js
diff options
context:
space:
mode:
authorSunil Shetye2018-07-11 13:05:13 +0530
committerSunil Shetye2018-07-11 15:21:08 +0530
commit079d0b4a3ec15a4d7d2644484d116df9d1c694bb (patch)
tree785ed59b5b238203a9e91f3e323da59d1083d86e /js/NonLinear/MAXMIN.js
parent0e9bc36f45fa1bb598c6ebb0febc1989439a8d98 (diff)
downloadsci2js-079d0b4a3ec15a4d7d2644484d116df9d1c694bb.tar.gz
sci2js-079d0b4a3ec15a4d7d2644484d116df9d1c694bb.tar.bz2
sci2js-079d0b4a3ec15a4d7d2644484d116df9d1c694bb.zip
fix assignment to list
Diffstat (limited to 'js/NonLinear/MAXMIN.js')
-rw-r--r--js/NonLinear/MAXMIN.js24
1 files changed, 15 insertions, 9 deletions
diff --git a/js/NonLinear/MAXMIN.js b/js/NonLinear/MAXMIN.js
index 44dd32f3..c973c2c3 100644
--- a/js/NonLinear/MAXMIN.js
+++ b/js/NonLinear/MAXMIN.js
@@ -8,8 +8,8 @@ function MAXMIN() {
this.model.blocktype = new ScilabString(["c"]);
this.model.dep_ut = [true,false];
this.model.ipar = new ScilabDouble([0]);
- exprs = [string(transpose([2,1,1]))];
- gr_i = [];
+ var exprs = [string(transpose([2,1,1]))];
+ var gr_i = [];
this.x = standard_define([2,2],this.model,exprs,gr_i);
this.x.graphics.style = "MAXMIN;displayedLabel=MAX";
return new BasicBlock(this.x);
@@ -30,8 +30,8 @@ function MAXMIN() {
this.nin = arguments[0]["nin"]
this.zcr = parseFloat(arguments[0]["zcr"])
this.x = arg1;
- graphics = arg1.graphics;
- exprs = graphics.exprs;
+ var graphics = arg1.graphics;
+ var exprs = graphics.exprs;
this.model = arg1.model;
while (true) {
[ok,this.mm,this.nin,this.zcr,exprs] = scicos_getvalue("Set Max/Min block parameters",["Min (1) or Max (2) ","Number of input vectors (1 or 2)","zero-crossing (1: yes, 0;no)"],list("vec",1,"vec",1,"vec",1),exprs);
@@ -46,13 +46,19 @@ function MAXMIN() {
}
if (this.nin!=1&&this.nin!=2) {
message("Wrong number of inputs, only 1 and 2 allowed");
- ok = false;
+ var ok = false;
}
if (ok) {
if (this.nin==1) {
- [this.model,graphics,ok] = check_io(this.model,graphics,-1,1,[],[]);
+ var tmpvar0 = check_io(this.model,graphics,-1,1,[],[])
+ this.model = tmpvar0[0]
+ var graphics = tmpvar0[1]
+ var ok = tmpvar0[2];
} else {
- [this.model,graphics,ok] = check_io(this.model,graphics,[-1,-1],-1,[],[]);
+ var tmpvar1 = check_io(this.model,graphics,[-1,-1],-1,[],[])
+ this.model = tmpvar1[0]
+ var graphics = tmpvar1[1]
+ var ok = tmpvar1[2];
}
}
if (ok) {
@@ -64,9 +70,9 @@ function MAXMIN() {
}
this.model.ipar = new ScilabDouble([this.mm]);
if (this.mm==1) {
- label = "MIN";
+ var label = "MIN";
} else {
- label = "MAX";
+ var label = "MAX";
}
graphics.style = "MAXMIN;displayedLabel="+label;
graphics.exprs = exprs;