diff options
author | Sunil Shetye | 2018-07-11 15:19:38 +0530 |
---|---|---|
committer | Sunil Shetye | 2018-07-11 15:21:08 +0530 |
commit | 0047c3bea1d86b12a08544f6f0833c63e77f6eac (patch) | |
tree | 36fc72fa9e5ea73c64a44e061b2c9c80e0307884 /js/Misc | |
parent | 079d0b4a3ec15a4d7d2644484d116df9d1c694bb (diff) | |
download | sci2js-0047c3bea1d86b12a08544f6f0833c63e77f6eac.tar.gz sci2js-0047c3bea1d86b12a08544f6f0833c63e77f6eac.tar.bz2 sci2js-0047c3bea1d86b12a08544f6f0833c63e77f6eac.zip |
support vector also
Diffstat (limited to 'js/Misc')
33 files changed, 128 insertions, 128 deletions
diff --git a/js/Misc/AUTOMAT.js b/js/Misc/AUTOMAT.js index 654543e9..8d6bbe78 100644 --- a/js/Misc/AUTOMAT.js +++ b/js/Misc/AUTOMAT.js @@ -20,9 +20,9 @@ function AUTOMAT() { this.model.blocktype = new ScilabString(["c"]); this.model.evtout = new ScilabDouble([1]); this.model.firing = new ScilabDouble([-1]); - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); this.model.ipar = new ScilabDouble(ipar); - this.model.rpar = rpar; + this.model.rpar = new ScilabDouble(rpar); var gr_i = []; this.x = standard_define([4,2],this.model,exprs,gr_i); return new BasicBlock(this.x); diff --git a/js/Misc/BACKLASH.js b/js/Misc/BACKLASH.js index ffc9f0d7..e28d371d 100644 --- a/js/Misc/BACKLASH.js +++ b/js/Misc/BACKLASH.js @@ -9,7 +9,7 @@ function BACKLASH() { this.model.rpar = new ScilabDouble([0],[1]); this.model.nzcross = new ScilabDouble([2]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); diff --git a/js/Misc/BOUNCE.js b/js/Misc/BOUNCE.js index 1cddf4f2..ab517e1f 100644 --- a/js/Misc/BOUNCE.js +++ b/js/Misc/BOUNCE.js @@ -25,14 +25,14 @@ function BOUNCE() { var state = transpose(state); this.model = scicos_model(); this.model.sim = list(new ScilabString(["bounce_ball"]), new ScilabDouble([4])); - this.model.in1 = []; + this.model.in1 = new ScilabDouble([]); this.model.out = new ScilabDouble([n],[n]); - this.model.state = state.slice(); + this.model.state = new ScilabDouble(state.slice()); this.model.rpar = new ScilabDouble([this.rpar1],[this.rpar2],[this.walls],[this.g],[this.C]); - this.model.ipar = ipar; + this.model.ipar = new ScilabDouble(ipar); this.model.nzcross = new ScilabDouble([n*(n-1)/2+4*n]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); var exprs = [[strcat(sci2exp(this.rpar1))],[strcat(sci2exp(this.rpar2))],[strcat(sci2exp(this.walls))],[strcat(sci2exp(this.x))],[strcat(sci2exp(this.xd))],[strcat(sci2exp(this.y))],[strcat(sci2exp(this.yd))]]; var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); @@ -118,10 +118,10 @@ function BOUNCE() { } } this.model.rpar = new ScilabDouble([this.rpar1],[this.rpar2],[this.walls],[this.g],[this.C]); - this.model.ipar = ipar; + this.model.ipar = new ScilabDouble(ipar); var state = [this.xt,this.xd,this.y,this.yd]; var state = transpose(state); - this.model.state = state.slice(); + this.model.state = new ScilabDouble(state.slice()); this.model.nzcross = new ScilabDouble([n*(n-1)/2+4*n]); graphics.exprs = exprs; this.x.graphics = graphics; diff --git a/js/Misc/BOUNCEXY.js b/js/Misc/BOUNCEXY.js index 1295acf6..826790d9 100644 --- a/js/Misc/BOUNCEXY.js +++ b/js/Misc/BOUNCEXY.js @@ -24,12 +24,12 @@ function BOUNCEXY() { z[6*(i-1)+5-1] = 0.000; z[6*(i-1)+6-1] = 64.0*360.000; } - this.model.dstate = z; + this.model.dstate = new ScilabDouble(z); this.model.rpar = new ScilabDouble([this.xmin],[this.xmax],[this.ymin],[this.ymax]); this.model.ipar = new ScilabDouble([this.win],[this.imode],[this.clrs.slice()]); this.model.blocktype = new ScilabString(["d"]); - this.model.firing = []; - this.model.dep_ut = [false,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[strcat(sci2exp(this.clrs))],[strcat(sci2exp(this.siz))],[strcat(sci2exp(this.win))],[strcat(sci2exp(1))],[strcat(sci2exp(this.xmin))],[strcat(sci2exp(this.xmax))],[strcat(sci2exp(this.ymin))],[strcat(sci2exp(this.ymax))]]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); @@ -101,7 +101,7 @@ function BOUNCEXY() { z[6*(i-1)+5-1] = 0.000; z[6*(i-1)+6-1] = 64.0*360.000; } - this.model.dstate = z; + this.model.dstate = new ScilabDouble(z); this.model.rpar = new ScilabDouble(rpar); this.model.ipar = new ScilabDouble(ipar); graphics.exprs = exprs; diff --git a/js/Misc/BPLATFORM.js b/js/Misc/BPLATFORM.js index 02a231db..f708c217 100644 --- a/js/Misc/BPLATFORM.js +++ b/js/Misc/BPLATFORM.js @@ -15,7 +15,7 @@ function BPLATFORM() { this.model.dstate = new ScilabDouble([0]); this.model.rpar = new ScilabDouble([this.plen],[this.csiz],[this.phi],[this.xmin],[this.xmax],[this.ymin],[this.ymax]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = string(this.model.rpar); var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/Misc/CBLOCK.js b/js/Misc/CBLOCK.js index faf7b1e3..b8371ec1 100644 --- a/js/Misc/CBLOCK.js +++ b/js/Misc/CBLOCK.js @@ -17,15 +17,15 @@ function CBLOCK() { this.model.sim = list(new ScilabString([" "]), new ScilabDouble([2004])); this.model.in1 = new ScilabDouble([in1]); this.model.out = new ScilabDouble([out]); - this.model.evtin = clkin; - this.model.evtout = clkout; - this.model.state = x0; - this.model.dstate = z0; - this.model.rpar = this.rpar; - this.model.ipar = this.ipar; + this.model.evtin = new ScilabDouble(clkin); + this.model.evtout = new ScilabDouble(clkout); + this.model.state = new ScilabDouble(x0); + this.model.dstate = new ScilabDouble(z0); + this.model.rpar = new ScilabDouble(this.rpar); + this.model.ipar = new ScilabDouble(this.ipar); this.model.blocktype = new ScilabString([typ]); - this.model.firing = auto; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble(auto); + this.model.dep_ut = new ScilabDouble([true,false]); this.model.nzcross = new ScilabDouble([this.ng]); var label = list(transpose([funam,"n",sci2exp(in1),sci2exp(out),sci2exp(clkin),sci2exp(clkout),sci2exp(x0),sci2exp(0),sci2exp(z0),sci2exp(this.rpar),sci2exp(this.ipar),sci2exp(auto),"y","n"]),[]); var gr_i = []; @@ -145,12 +145,12 @@ function CBLOCK() { this.model.out = new ScilabDouble([this.o]); this.model.evtin = new ScilabDouble([this.ci]); this.model.evtout = new ScilabDouble([this.co]); - this.model.state = this.xx; - this.model.dstate = this.z; - this.model.rpar = this.rpar; + this.model.state = new ScilabDouble(this.xx); + this.model.dstate = new ScilabDouble(this.z); + this.model.rpar = new ScilabDouble(this.rpar); this.model.ipar = new ScilabDouble([this.ipar]); this.model.firing = new ScilabDouble([this.auto0]); - this.model.dep_ut = dep_ut; + this.model.dep_ut = new ScilabDouble(dep_ut); this.model.nzcross = new ScilabDouble([this.ng]); label[2-1] = tt; this.x.model = this.model; diff --git a/js/Misc/CBLOCK4.js b/js/Misc/CBLOCK4.js index 15889859..5858a1a8 100644 --- a/js/Misc/CBLOCK4.js +++ b/js/Misc/CBLOCK4.js @@ -10,7 +10,7 @@ function CBLOCK4() { this.model.out = new ScilabDouble([1]); this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var label = list([[funam],["n"],[sci2exp([this.model.in1,this.model.in2])],[sci2exp(this.model.intyp)],[sci2exp([this.model.out,this.model.out2])],[sci2exp(this.model.outtyp)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.odstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.opar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]],[]); var gr_i = []; this.x = standard_define([4,2],this.model,label,gr_i); @@ -134,16 +134,16 @@ function CBLOCK4() { } } else { this.model.sim = list(new ScilabDouble([funam]), new ScilabDouble([funtyp])); - this.model.state = this.xx; - this.model.dstate = this.z; + this.model.state = new ScilabDouble(this.xx); + this.model.dstate = new ScilabDouble(this.z); this.model.odstate = new ScilabDouble([this.oz]); - this.model.rpar = this.rpar; + this.model.rpar = new ScilabDouble(this.rpar); this.model.ipar = new ScilabDouble([this.ipar]); this.model.opar = new ScilabDouble([this.opar]); this.model.firing = new ScilabDouble([this.auto0]); this.model.nzcross = new ScilabDouble([this.nzcr]); this.model.nmode = new ScilabDouble([this.nmode]); - this.model.dep_ut = dep_ut; + this.model.dep_ut = new ScilabDouble(dep_ut); label[2-1] = tt; this.x.model = this.model; graphics.exprs = label; diff --git a/js/Misc/CONSTRAINT2_c.js b/js/Misc/CONSTRAINT2_c.js index 012099d4..7c2b0af5 100644 --- a/js/Misc/CONSTRAINT2_c.js +++ b/js/Misc/CONSTRAINT2_c.js @@ -9,9 +9,9 @@ function CONSTRAINT2_c() { this.model.in1 = new ScilabDouble([1]); this.model.out = new ScilabDouble([1],[1]); this.model.state = new ScilabDouble([this.x0],[this.xd0]); - this.model.ipar = this.id; + this.model.ipar = new ScilabDouble(this.id); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); var exprs = list(strcat(sci2exp(this.x0)),strcat(sci2exp(this.xd0)),strcat(sci2exp(this.id))); var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); @@ -73,7 +73,7 @@ function CONSTRAINT2_c() { this.model.state = new ScilabDouble([this.x0],[this.xd0]); this.model.out = new ScilabDouble([N],[N]); this.model.in1 = new ScilabDouble([N]); - this.model.ipar = this.id; + this.model.ipar = new ScilabDouble(this.id); this.x.graphics = graphics; this.x.model = this.model; break; diff --git a/js/Misc/CONSTRAINT_c.js b/js/Misc/CONSTRAINT_c.js index b25271e6..52113803 100644 --- a/js/Misc/CONSTRAINT_c.js +++ b/js/Misc/CONSTRAINT_c.js @@ -9,7 +9,7 @@ function CONSTRAINT_c() { this.model.ipar = new ScilabDouble([0]); this.model.state = new ScilabDouble(this.x0); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); var exprs = "0"; var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); diff --git a/js/Misc/DEADBAND.js b/js/Misc/DEADBAND.js index 6bf8c08d..b4bab67a 100644 --- a/js/Misc/DEADBAND.js +++ b/js/Misc/DEADBAND.js @@ -12,7 +12,7 @@ function DEADBAND() { this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(this.maxp)],[string(this.minp)],[string(this.model.nmode)]]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/Misc/DIFF_f.js b/js/Misc/DIFF_f.js index b68a32d1..9edcc7fb 100644 --- a/js/Misc/DIFF_f.js +++ b/js/Misc/DIFF_f.js @@ -8,7 +8,7 @@ function DIFF_f() { this.model.out = new ScilabDouble([1]); this.model.state = new ScilabDouble(this.x0); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); var exprs = [[strcat(sci2exp(this.x0[1-1]))],[strcat(sci2exp(this.x0[2-1]))]]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/Misc/EDGETRIGGER.js b/js/Misc/EDGETRIGGER.js index f694714f..36e4f317 100644 --- a/js/Misc/EDGETRIGGER.js +++ b/js/Misc/EDGETRIGGER.js @@ -10,7 +10,7 @@ function EDGETRIGGER() { this.model.nzcross = new ScilabDouble([1]); this.model.ipar = new ScilabDouble([sign(this.edge)]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [string(this.edge)]; var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); diff --git a/js/Misc/EDGE_TRIGGER.js b/js/Misc/EDGE_TRIGGER.js index 4349ce08..24c39990 100644 --- a/js/Misc/EDGE_TRIGGER.js +++ b/js/Misc/EDGE_TRIGGER.js @@ -27,7 +27,7 @@ function EDGE_TRIGGER() { graphics.orig = [160,0]; graphics.sz = [60,40]; graphics.exprs = [["0"],["0"]]; - this.model.evtin = []; + this.model.evtin = new ScilabDouble([]); this.model.nzcross = new ScilabDouble([0]); this.model.nmode = new ScilabDouble([0]); graphics.pin = 6; diff --git a/js/Misc/Extract_Activation.js b/js/Misc/Extract_Activation.js index 1497b6a1..16e98353 100644 --- a/js/Misc/Extract_Activation.js +++ b/js/Misc/Extract_Activation.js @@ -16,7 +16,7 @@ function Extract_Activation() { graphics.orig = [80,0]; graphics.sz = [60,40]; graphics.exprs = [["0"],["0"]]; - this.model.evtin = []; + this.model.evtin = new ScilabDouble([]); this.model.nzcross = new ScilabDouble([0]); this.model.nmode = new ScilabDouble([0]); graphics.pin = 7; diff --git a/js/Misc/HYSTHERESIS.js b/js/Misc/HYSTHERESIS.js index 3146e712..981bbdfe 100644 --- a/js/Misc/HYSTHERESIS.js +++ b/js/Misc/HYSTHERESIS.js @@ -13,7 +13,7 @@ function HYSTHERESIS() { this.model.nzcross = new ScilabDouble([this.nzz]); this.model.nmode = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(rpar)],[string(sign(this.nzz))]]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); @@ -51,7 +51,7 @@ function HYSTHERESIS() { message("switch on value must be larger than switch off value"); } else { graphics.exprs = exprs; - this.model.rpar = transpose([this.high_lim,this.low_lim,this.out_high,this.out_low]); + this.model.rpar = new ScilabDouble(transpose([this.high_lim,this.low_lim,this.out_high,this.out_low])); if (this.nzz>0) { this.nzz = 2; } diff --git a/js/Misc/LOGICAL_OP.js b/js/Misc/LOGICAL_OP.js index 83de46aa..4664dae5 100644 --- a/js/Misc/LOGICAL_OP.js +++ b/js/Misc/LOGICAL_OP.js @@ -8,9 +8,9 @@ function LOGICAL_OP() { this.model.sim = list(new ScilabString(["logicalop"]), new ScilabDouble([4])); this.model.in1 = new ScilabDouble(in1); this.model.out = new ScilabDouble([-1]); - this.model.ipar = ipar; + this.model.ipar = new ScilabDouble(ipar); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(this.nin)],[string(ipar)]]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); @@ -67,7 +67,7 @@ function LOGICAL_OP() { } if (this.Datatype==1) { this.model.sim = list(new ScilabString(["logicalop"]), new ScilabDouble([4])); - this.model.ipar = [this.rule]; + this.model.ipar = new ScilabDouble([this.rule]); } else { if (this.Datatype==3) { this.model.sim = list(new ScilabString(["logicalop_i32"]), new ScilabDouble([4])); diff --git a/js/Misc/MBLOCK.js b/js/Misc/MBLOCK.js index dde93d71..b0ceb11f 100644 --- a/js/Misc/MBLOCK.js +++ b/js/Misc/MBLOCK.js @@ -12,8 +12,8 @@ function MBLOCK() { var exprs = tlist(["MBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],sci2exp(this.in1.slice()),sci2exp(this.intype.slice()),sci2exp(this.out.slice()),sci2exp(this.outtype.slice()),sci2exp(param.slice()),list(string(0.1),string(.0001)),sci2exp(this.pprop.slice()),nameF,[]); this.model = scicos_model(); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,true]; - this.model.rpar = []; + this.model.dep_ut = new ScilabDouble([false,true]); + this.model.rpar = new ScilabDouble([]); for (i=1;i<=lstsize(paramv);i+=1) { this.model.rpar = new ScilabDouble([this.model.rpar],[paramv[i-1].slice()]); } @@ -263,7 +263,7 @@ function MBLOCK() { mo.parameters = list(transpose(param),paramv); } this.model.equations = new ScilabDouble([mo]); - this.model.rpar = []; + this.model.rpar = new ScilabDouble([]); for (i=1;i<=lstsize(paramv);i+=1) { this.model.rpar = new ScilabDouble([this.model.rpar],[paramv[i-1].slice()]); } diff --git a/js/Misc/MEMORY_f.js b/js/Misc/MEMORY_f.js index d975cc56..43faface 100644 --- a/js/Misc/MEMORY_f.js +++ b/js/Misc/MEMORY_f.js @@ -12,7 +12,7 @@ function MEMORY_f() { this.model.dstate = new ScilabDouble([0]); this.model.rpar = new ScilabDouble([z]); this.model.blocktype = new ScilabString(["m"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); diff --git a/js/Misc/MPBLOCK.js b/js/Misc/MPBLOCK.js index 0c2ce112..01cecbc4 100644 --- a/js/Misc/MPBLOCK.js +++ b/js/Misc/MPBLOCK.js @@ -12,8 +12,8 @@ function MPBLOCK() { var exprs = tlist(["MPBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],sci2exp(this.in1.slice()),sci2exp(this.intype.slice()),sci2exp(this.out.slice()),sci2exp(this.outtype.slice()),sci2exp(param.slice()),list(string(0.1),string(.0001)),sci2exp(pprop.slice()),nameF,[]); this.model = scicos_model(); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,true]; - this.model.rpar = []; + this.model.dep_ut = new ScilabDouble([true,true]); + this.model.rpar = new ScilabDouble([]); for (i=1;i<=lstsize(paramv);i+=1) { this.model.rpar = new ScilabDouble([this.model.rpar],[paramv[i-1].slice()]); } @@ -247,7 +247,7 @@ function MPBLOCK() { } } this.model.equations = new ScilabDouble([mo]); - this.model.rpar = []; + this.model.rpar = new ScilabDouble([]); for (i=1;i<=lstsize(paramv);i+=1) { this.model.rpar = new ScilabDouble([this.model.rpar],[double(paramv[i-1].slice())]); } diff --git a/js/Misc/PAL_f.js b/js/Misc/PAL_f.js index 7b64b6c3..5a70057c 100644 --- a/js/Misc/PAL_f.js +++ b/js/Misc/PAL_f.js @@ -5,11 +5,11 @@ function PAL_f() { scs.props.title = "Palette"; this.model = scicos_model(); this.model.sim = new ScilabString(["palette"]); - this.model.in1 = []; - this.model.out = []; + this.model.in1 = new ScilabDouble([]); + this.model.out = new ScilabDouble([]); this.model.rpar = new ScilabDouble([scs]); this.model.blocktype = new ScilabString(["h"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var gr_i = []; this.x = standard_define([2,2],this.model,[],gr_i); this.x.graphics.id = scs.props.title[1-1]; diff --git a/js/Misc/PENDULUM_ANIM.js b/js/Misc/PENDULUM_ANIM.js index bf3d386a..05758ed8 100644 --- a/js/Misc/PENDULUM_ANIM.js +++ b/js/Misc/PENDULUM_ANIM.js @@ -15,7 +15,7 @@ function PENDULUM_ANIM() { this.model.dstate = new ScilabDouble([0]); this.model.rpar = new ScilabDouble([this.plen],[this.csiz],[this.phi],[this.xmin],[this.xmax],[this.ymin],[this.ymax]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = string(this.model.rpar); var gr_i = []; this.x = standard_define([3,3],this.model,exprs,gr_i); diff --git a/js/Misc/RATELIMITER.js b/js/Misc/RATELIMITER.js index aa206268..d7f88eff 100644 --- a/js/Misc/RATELIMITER.js +++ b/js/Misc/RATELIMITER.js @@ -10,7 +10,7 @@ function RATELIMITER() { this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(this.maxp)],[string(this.minp)]]; var gr_i = []; this.x = standard_define([3.5,2],this.model,exprs,gr_i); diff --git a/js/Misc/RELATIONALOP.js b/js/Misc/RELATIONALOP.js index 34d9bb78..bd7da970 100644 --- a/js/Misc/RELATIONALOP.js +++ b/js/Misc/RELATIONALOP.js @@ -7,9 +7,9 @@ function RELATIONALOP() { this.model.sim = list(new ScilabString(["relationalop"]), new ScilabDouble([4])); this.model.in1 = new ScilabDouble([1],[1]); this.model.out = new ScilabDouble([1]); - this.model.ipar = ipar; + this.model.ipar = new ScilabDouble(ipar); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(ipar)],[string(0)]]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); @@ -95,7 +95,7 @@ function RELATIONALOP() { } graphics.exprs = exprs; graphics.style = ["fontSize=13;fontStyle=1;displayedLabel="+label]; - this.model.ipar = [this.rule]; + this.model.ipar = new ScilabDouble([this.rule]); this.model.nzcross = new ScilabDouble([this.zcr]); this.model.nmode = new ScilabDouble([this.zcr]); this.x.graphics = graphics; diff --git a/js/Misc/SPLIT_f.js b/js/Misc/SPLIT_f.js index 50681b70..cd072345 100644 --- a/js/Misc/SPLIT_f.js +++ b/js/Misc/SPLIT_f.js @@ -6,7 +6,7 @@ function SPLIT_f() { this.model.in1 = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1],[-1],[-1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); this.x = standard_define([1,1]/3,this.model,[],[]); return new BasicBlock(this.x); } diff --git a/js/Misc/SUPER_f.js b/js/Misc/SUPER_f.js index 5cf0195b..986ce265 100644 --- a/js/Misc/SUPER_f.js +++ b/js/Misc/SUPER_f.js @@ -17,7 +17,7 @@ function SUPER_f() { this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([scs]); this.model.blocktype = new ScilabString(["h"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var gr_i = []; this.x = standard_define([2,2],this.model,[],gr_i); return new SuperBlock(this.x); diff --git a/js/Misc/c_block.js b/js/Misc/c_block.js index 1499b7e8..fd3573df 100644 --- a/js/Misc/c_block.js +++ b/js/Misc/c_block.js @@ -15,15 +15,15 @@ function c_block() { this.model.sim = list(new ScilabString([" "]), new ScilabDouble([2001])); this.model.in1 = new ScilabDouble([in1]); this.model.out = new ScilabDouble([out]); - this.model.evtin = clkin; - this.model.evtout = clkout; - this.model.state = x0; - this.model.dstate = z0; - this.model.rpar = this.rpar; + this.model.evtin = new ScilabDouble(clkin); + this.model.evtout = new ScilabDouble(clkout); + this.model.state = new ScilabDouble(x0); + this.model.dstate = new ScilabDouble(z0); + this.model.rpar = new ScilabDouble(this.rpar); this.model.ipar = new ScilabDouble([0]); this.model.blocktype = new ScilabString([typ]); - this.model.firing = auto; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble(auto); + this.model.dep_ut = new ScilabDouble([true,false]); var label = list([[sci2exp(in1)],[sci2exp(out)],[strcat(sci2exp(this.rpar))],[this.funam]],list([])); var gr_i = []; this.x = standard_define([3,2],this.model,label,gr_i); @@ -81,7 +81,7 @@ function c_block() { var ok = tmpvar1[2]; if (ok) { this.model.sim[1] = new ScilabString([this.funam]); - this.model.rpar = this.rpar; + this.model.rpar = new ScilabDouble(this.rpar); label[2-1] = tt; this.x.model = this.model; graphics.exprs = label; diff --git a/js/Misc/fortran_block.js b/js/Misc/fortran_block.js index bd4d11c7..f04ff321 100644 --- a/js/Misc/fortran_block.js +++ b/js/Misc/fortran_block.js @@ -5,15 +5,15 @@ function fortran_block() { this.model.sim = list(new ScilabString([" "]), new ScilabDouble([1001])); this.model.in1 = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); - this.model.evtin = []; - this.model.evtout = []; - this.model.state = []; - this.model.dstate = []; - this.model.rpar = []; + this.model.evtin = new ScilabDouble([]); + this.model.evtout = new ScilabDouble([]); + this.model.state = new ScilabDouble([]); + this.model.dstate = new ScilabDouble([]); + this.model.rpar = new ScilabDouble([]); this.model.ipar = new ScilabDouble([0]); this.model.blocktype = new ScilabString(["c"]); - this.model.firing = []; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([true,false]); this.funam = "forty"; var label = list([[sci2exp(this.model.in1)],[sci2exp(this.model.out)],[strcat(sci2exp(this.model.rpar))],[this.funam]],list([])); var gr_i = []; @@ -72,7 +72,7 @@ function fortran_block() { var ok = tmpvar1[2]; if (ok) { this.model.sim[1] = new ScilabString([this.funam]); - this.model.rpar = this.rpar; + this.model.rpar = new ScilabDouble(this.rpar); label[2-1] = tt; this.x.model = this.model; graphics.exprs = label; diff --git a/js/Misc/func_block.js b/js/Misc/func_block.js index 2579f2c7..ef6dffca 100644 --- a/js/Misc/func_block.js +++ b/js/Misc/func_block.js @@ -6,7 +6,7 @@ function func_block() { this.model.in1 = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = "v=sin(u);y=u*v"; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/Misc/generic_block.js b/js/Misc/generic_block.js index 93cefd86..e3a2ae82 100644 --- a/js/Misc/generic_block.js +++ b/js/Misc/generic_block.js @@ -7,15 +7,15 @@ function generic_block() { this.model.sim = list(new ScilabString([this.function_name]), new ScilabDouble([this.funtyp])); this.model.in1 = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); - this.model.evtin = []; - this.model.evtout = []; - this.model.state = []; - this.model.dstate = []; - this.model.rpar = []; - this.model.ipar = []; + this.model.evtin = new ScilabDouble([]); + this.model.evtout = new ScilabDouble([]); + this.model.state = new ScilabDouble([]); + this.model.dstate = new ScilabDouble([]); + this.model.rpar = new ScilabDouble([]); + this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); - this.model.firing = []; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([true,false]); var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp(this.model.in1)],[sci2exp(this.model.out)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.firing)],["y"],["n"]]; var gr_i = []; this.x = standard_define([2,2],this.model,label,gr_i); @@ -114,12 +114,12 @@ function generic_block() { var needcompile = 4; } this.model.sim = list(new ScilabDouble([this.function_name]), new ScilabDouble([this.funtyp])); - this.model.state = this.xx; - this.model.dstate = this.z; - this.model.rpar = this.rpar; + this.model.state = new ScilabDouble(this.xx); + this.model.dstate = new ScilabDouble(this.z); + this.model.rpar = new ScilabDouble(this.rpar); this.model.ipar = new ScilabDouble([this.ipar]); this.model.firing = new ScilabDouble([this.auto0]); - this.model.dep_ut = dep_ut; + this.model.dep_ut = new ScilabDouble(dep_ut); arg1.model = this.model; graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/Misc/generic_block2.js b/js/Misc/generic_block2.js index d276b49a..2e4880cc 100644 --- a/js/Misc/generic_block2.js +++ b/js/Misc/generic_block2.js @@ -7,15 +7,15 @@ function generic_block2() { this.model.sim = list(new ScilabString([this.function_name]), new ScilabDouble([this.funtyp])); this.model.in1 = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); - this.model.evtin = []; - this.model.evtout = []; - this.model.state = []; - this.model.dstate = []; - this.model.rpar = []; - this.model.ipar = []; + this.model.evtin = new ScilabDouble([]); + this.model.evtout = new ScilabDouble([]); + this.model.state = new ScilabDouble([]); + this.model.dstate = new ScilabDouble([]); + this.model.rpar = new ScilabDouble([]); + this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); - this.model.firing = []; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([true,false]); var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp(this.model.in1)],[sci2exp(this.model.out)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]]; var gr_i = []; this.x = standard_define([2,2],this.model,label,gr_i); @@ -118,14 +118,14 @@ function generic_block2() { var needcompile = 4; } this.model.sim = list(new ScilabDouble([this.function_name]), new ScilabDouble([this.funtyp])); - this.model.state = this.xx; - this.model.dstate = this.z; - this.model.rpar = this.rpar; + this.model.state = new ScilabDouble(this.xx); + this.model.dstate = new ScilabDouble(this.z); + this.model.rpar = new ScilabDouble(this.rpar); this.model.ipar = new ScilabDouble([this.ipar]); this.model.firing = new ScilabDouble([this.auto0]); this.model.nzcross = new ScilabDouble([this.nzcr]); this.model.nmode = new ScilabDouble([this.nmode]); - this.model.dep_ut = dep_ut; + this.model.dep_ut = new ScilabDouble(dep_ut); arg1.model = this.model; graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/Misc/generic_block3.js b/js/Misc/generic_block3.js index e5bb8697..24888cb8 100644 --- a/js/Misc/generic_block3.js +++ b/js/Misc/generic_block3.js @@ -11,7 +11,7 @@ function generic_block3() { this.model.out = new ScilabDouble([1]); this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp([this.model.in1,this.model.in2])],[sci2exp(this.model.intyp)],[sci2exp([this.model.out,this.model.out2]),sci2exp(this.model.outtyp)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.odstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.opar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]]; var gr_i = []; this.x = standard_define([4,2],this.model,label,gr_i); @@ -128,16 +128,16 @@ function generic_block3() { var needcompile = 4; } this.model.sim = list(new ScilabDouble([this.function_name]), new ScilabDouble([this.funtyp])); - this.model.state = this.xx; - this.model.dstate = this.z; + this.model.state = new ScilabDouble(this.xx); + this.model.dstate = new ScilabDouble(this.z); this.model.odstate = new ScilabDouble([this.oz]); - this.model.rpar = this.rpar; + this.model.rpar = new ScilabDouble(this.rpar); this.model.ipar = new ScilabDouble([this.ipar]); this.model.opar = new ScilabDouble([this.opar]); this.model.firing = new ScilabDouble([this.auto0]); this.model.nzcross = new ScilabDouble([this.nzcr]); this.model.nmode = new ScilabDouble([this.nmode]); - this.model.dep_ut = dep_ut; + this.model.dep_ut = new ScilabDouble(dep_ut); arg1.model = this.model; graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/Misc/scifunc_block.js b/js/Misc/scifunc_block.js index 80f6abb0..96ddc1f3 100644 --- a/js/Misc/scifunc_block.js +++ b/js/Misc/scifunc_block.js @@ -14,16 +14,16 @@ function scifunc_block() { this.model.sim = list(new ScilabString(["scifunc"]), new ScilabDouble([3])); this.model.in1 = new ScilabDouble([in1]); this.model.out = new ScilabDouble([out]); - this.model.evtin = clkin; - this.model.evtout = clkout; - this.model.state = x0; - this.model.dstate = z0; - this.model.rpar = this.rpar; + this.model.evtin = new ScilabDouble(clkin); + this.model.evtout = new ScilabDouble(clkout); + this.model.state = new ScilabDouble(x0); + this.model.dstate = new ScilabDouble(z0); + this.model.rpar = new ScilabDouble(this.rpar); this.model.ipar = new ScilabDouble([0]); this.model.opar = list(); this.model.blocktype = new ScilabString([typ]); - this.model.firing = auto; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble(auto); + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = list([[sci2exp(in1)],[sci2exp(out)],[sci2exp(clkin)],[sci2exp(clkout)],[strcat(sci2exp(x0))],[strcat(sci2exp(z0))],[strcat(sci2exp(this.rpar))],[sci2exp(auto)]],list("y1=sin(u1)"," "," ","y1=sin(u1)"," "," "," ")); var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); @@ -97,9 +97,9 @@ function scifunc_block() { var ok = tmpvar1[2]; if (ok) { var auto = this.auto0; - this.model.state = this.xx; - this.model.dstate = this.z; - this.model.rpar = this.rpar; + this.model.state = new ScilabDouble(this.xx); + this.model.dstate = new ScilabDouble(this.z); + this.model.rpar = new ScilabDouble(this.rpar); if (this.model.ipar!=0) { this.model.opar = new ScilabDouble([this.model.ipar]); this.model.ipar = new ScilabDouble([0]); diff --git a/js/Misc/scifunc_block_m.js b/js/Misc/scifunc_block_m.js index 494f6450..3b54ace1 100644 --- a/js/Misc/scifunc_block_m.js +++ b/js/Misc/scifunc_block_m.js @@ -19,16 +19,16 @@ function scifunc_block_m() { this.model.out = new ScilabDouble([out]); this.model.out2 = new ScilabDouble([out]); this.model.outtyp = new ScilabDouble([it]); - this.model.evtin = clkin; - this.model.evtout = clkout; - this.model.state = x0; - this.model.dstate = z0; - this.model.rpar = this.rpar; + this.model.evtin = new ScilabDouble(clkin); + this.model.evtout = new ScilabDouble(clkout); + this.model.state = new ScilabDouble(x0); + this.model.dstate = new ScilabDouble(z0); + this.model.rpar = new ScilabDouble(this.rpar); this.model.ipar = new ScilabDouble([0]); this.model.opar = list(); this.model.blocktype = new ScilabString([typ]); - this.model.firing = auto; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble(auto); + this.model.dep_ut = new ScilabDouble([true,false]); 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); @@ -99,9 +99,9 @@ function scifunc_block_m() { var ok = tmpvar1[2]; if (ok) { var auto = this.auto0; - this.model.state = this.xx; - this.model.dstate = this.z; - this.model.rpar = this.rpar; + this.model.state = new ScilabDouble(this.xx); + this.model.dstate = new ScilabDouble(this.z); + this.model.rpar = new ScilabDouble(this.rpar); if (this.model.ipar!=0) { this.model.opar = new ScilabDouble([this.model.ipar]); this.model.ipar = new ScilabDouble([0]); |