diff options
author | Sunil Shetye | 2018-07-11 13:05:13 +0530 |
---|---|---|
committer | Sunil Shetye | 2018-07-11 15:21:08 +0530 |
commit | 079d0b4a3ec15a4d7d2644484d116df9d1c694bb (patch) | |
tree | 785ed59b5b238203a9e91f3e323da59d1083d86e /js/Misc/scifunc_block_m.js | |
parent | 0e9bc36f45fa1bb598c6ebb0febc1989439a8d98 (diff) | |
download | sci2js-079d0b4a3ec15a4d7d2644484d116df9d1c694bb.tar.gz sci2js-079d0b4a3ec15a4d7d2644484d116df9d1c694bb.tar.bz2 sci2js-079d0b4a3ec15a4d7d2644484d116df9d1c694bb.zip |
fix assignment to list
Diffstat (limited to 'js/Misc/scifunc_block_m.js')
-rw-r--r-- | js/Misc/scifunc_block_m.js | 56 |
1 files changed, 31 insertions, 25 deletions
diff --git a/js/Misc/scifunc_block_m.js b/js/Misc/scifunc_block_m.js index e96e9bdb..494f6450 100644 --- a/js/Misc/scifunc_block_m.js +++ b/js/Misc/scifunc_block_m.js @@ -1,16 +1,16 @@ /* autogenerated from "macros/Misc/scifunc_block_m.sci" */ function scifunc_block_m() { scifunc_block_m.prototype.define = function scifunc_block_m() { - in1 = 1; - out = 1; - clkin = []; - clkout = []; - x0 = []; - z0 = []; - typ = "c"; - auto = []; + var in1 = 1; + var out = 1; + var clkin = []; + var clkout = []; + var x0 = []; + var z0 = []; + var typ = "c"; + var auto = []; this.rpar = []; - it = 1; + var it = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["scifunc"]), new ScilabDouble([3])); this.model.in1 = new ScilabDouble([in1]); @@ -29,8 +29,8 @@ function scifunc_block_m() { this.model.blocktype = new ScilabString([typ]); this.model.firing = auto; this.model.dep_ut = [true,false]; - exprs = list([[sci2exp([in1,in1])],[sci2exp([out,out])],[sci2exp(clkin)],[sci2exp(clkout)],[strcat(sci2exp(x0))],[strcat(sci2exp(z0))],[strcat(sci2exp(this.rpar))],[sci2exp(auto)],[sci2exp(0)]],list("y1=sin(u1)"," "," ","y1=sin(u1)"," "," "," ")); - gr_i = []; + var exprs = list([[sci2exp([in1,in1])],[sci2exp([out,out])],[sci2exp(clkin)],[sci2exp(clkout)],[strcat(sci2exp(x0))],[strcat(sci2exp(z0))],[strcat(sci2exp(this.rpar))],[sci2exp(auto)],[sci2exp(0)]],list("y1=sin(u1)"," "," ","y1=sin(u1)"," "," "," ")); + var gr_i = []; this.x = standard_define([4,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -62,11 +62,11 @@ function scifunc_block_m() { this.auto0 = arguments[0]["auto0"] this.deptime = arguments[0]["deptime"] this.lab = arguments[0]["lab"] - needcompile = 0; + var needcompile = 0; this.x = arg1; this.model = arg1.model; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = graphics.exprs; while (true) { [ok,this.i,this.o,this.ci,this.co,this.xx,this.z,this.rpar,this.auto0,this.deptime,this.lab] = scicos_getvalue([["Set scifunc_block parameters"],["only regular blocks supported"]],["input ports sizes","output port sizes","input event ports sizes","output events ports sizes","initial continuous state","initial discrete state","System parameters vector","initial firing vector (<0 for no firing)","is block always active (0:no, 1:yes)"],list("mat",[-1,2],"mat",[-2,2],"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",1),exprs[1-1]); if (!ok) { @@ -76,23 +76,29 @@ function scifunc_block_m() { this.xx = this.xx.slice(); this.z = this.z.slice(); this.rpar = this.rpar.slice(); - it = ones(1,size(this.i,1)); - ot = ones(1,size(this.o,1)); - nrp = prod(size(this.rpar)); - ni = size(this.i,1); - no = size(this.o,1); + var it = ones(1,size(this.i,1)); + var ot = ones(1,size(this.o,1)); + var nrp = prod(size(this.rpar)); + var ni = size(this.i,1); + var no = size(this.o,1); this.ci = int(this.ci.slice()); - nci = size(this.ci,1); + var nci = size(this.ci,1); this.co = int(this.co.slice()); - nco = size(this.co,1); - [ok,tt,dep_ut] = genfunc2(exprs[2-1],this.i,this.o,nci,nco,size(this.xx,1),size(this.z,1),nrp,"c"); + var nco = size(this.co,1); + var tmpvar0 = genfunc2(exprs[2-1],this.i,this.o,nci,nco,size(this.xx,1),size(this.z,1),nrp,"c") + var ok = tmpvar0[0] + var tt = tmpvar0[1] + var dep_ut = tmpvar0[2]; dep_ut[2-1] = (1==this.deptime); if (!ok) { break; } - [this.model,graphics,ok] = set_io(this.model,graphics,list(this.i,it),list(this.o,ot),this.ci,this.co); + var tmpvar1 = set_io(this.model,graphics,list(this.i,it),list(this.o,ot),this.ci,this.co) + this.model = tmpvar1[0] + var graphics = tmpvar1[1] + var ok = tmpvar1[2]; if (ok) { - auto = this.auto0; + var auto = this.auto0; this.model.state = this.xx; this.model.dstate = this.z; this.model.rpar = this.rpar; @@ -101,7 +107,7 @@ function scifunc_block_m() { this.model.ipar = new ScilabDouble([0]); } if (or(this.model.opar!=tt)) { - needcompile = 4; + var needcompile = 4; } this.model.opar = new ScilabDouble([tt]); this.model.firing = new ScilabDouble([auto]); |