summaryrefslogtreecommitdiff
path: root/js/NonLinear/DLRADAPT_f.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/DLRADAPT_f.js
parent0e9bc36f45fa1bb598c6ebb0febc1989439a8d98 (diff)
downloadsci2js-079d0b4a3ec15a4d7d2644484d116df9d1c694bb.tar.gz
sci2js-079d0b4a3ec15a4d7d2644484d116df9d1c694bb.tar.bz2
sci2js-079d0b4a3ec15a4d7d2644484d116df9d1c694bb.zip
fix assignment to list
Diffstat (limited to 'js/NonLinear/DLRADAPT_f.js')
-rw-r--r--js/NonLinear/DLRADAPT_f.js18
1 files changed, 10 insertions, 8 deletions
diff --git a/js/NonLinear/DLRADAPT_f.js b/js/NonLinear/DLRADAPT_f.js
index f1d5e69d..bbbcc0b1 100644
--- a/js/NonLinear/DLRADAPT_f.js
+++ b/js/NonLinear/DLRADAPT_f.js
@@ -18,8 +18,8 @@ function DLRADAPT_f() {
this.model.blocktype = new ScilabString(["d"]);
this.model.firing = [];
this.model.dep_ut = [true,false];
- exprs = [[sci2exp(this.p)],[sci2exp(this.rn)],[sci2exp(this.rd,0)],[sci2exp(this.g)],[sci2exp(this.last_u)],[sci2exp(this.last_y)]];
- gr_i = [];
+ var exprs = [[sci2exp(this.p)],[sci2exp(this.rn)],[sci2exp(this.rd,0)],[sci2exp(this.g)],[sci2exp(this.last_u)],[sci2exp(this.last_y)]];
+ var gr_i = [];
this.x = standard_define([2,2],this.model,exprs,gr_i);
return new BasicBlock(this.x);
}
@@ -45,23 +45,25 @@ function DLRADAPT_f() {
this.last_u = inverse(arguments[0]["last_u"])
this.last_y = inverse(arguments[0]["last_y"])
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.p,this.rn,this.rd,this.g,this.last_u,this.last_y,exprs] = scicos_getvalue("Set block parameters",["Vector of p mesh points","Numerator roots (one line for each mesh)","Denominator roots (one line for each mesh)","Vector of gain at mesh points","past inputs (Num degree values)","past outputs (Den degree values)"],list("vec",-1,"mat",[-1,-1],"mat",["size(%1,\'*\')","-1"],"vec","size(%1,\'*\')","vec","size(%2,2)","vec","size(%3,2)"),exprs);
if (!ok) {
break;
}
- m = size(this.rn,2);
- [npt,n] = size(this.rd);
+ var m = size(this.rn,2);
+ var tmpvar0 = size(this.rd)
+ var npt = tmpvar0[0]
+ var n = tmpvar0[1];
if (m>=n) {
message("Transfer must be strictly proper");
} else if (size(this.rn,1)!=0&&size(this.rn,1)!=size(this.p,"*")) {
message("Numerator roots matrix row size\'s is incorrect");
} else {
- rpar = [[this.p.slice()],[real(this.rn.slice())],[imag(this.rn.slice())],[real(this.rd.slice())],[imag(this.rd.slice())],[this.g.slice()]];
- ipar = [[m],[n],[npt]];
+ var rpar = [[this.p.slice()],[real(this.rn.slice())],[imag(this.rn.slice())],[real(this.rd.slice())],[imag(this.rd.slice())],[this.g.slice()]];
+ var ipar = [[m],[n],[npt]];
this.model.dstate = new ScilabDouble([this.last_u.slice()],[this.last_y.slice()]);
this.model.rpar = new ScilabDouble(rpar);
this.model.ipar = new ScilabDouble(ipar);