diff options
author | Sunil Shetye | 2018-07-11 10:44:34 +0530 |
---|---|---|
committer | Sunil Shetye | 2018-07-11 15:21:08 +0530 |
commit | aabd535925f24c6203eb1a0dcc5b28d9670133de (patch) | |
tree | 73c1021fb17dfdf86f088d930311a007cb3f2120 /js/Misc | |
parent | dc097af448d4ed55d685c5e87c8cffb70b7fb20a (diff) | |
download | sci2js-aabd535925f24c6203eb1a0dcc5b28d9670133de.tar.gz sci2js-aabd535925f24c6203eb1a0dcc5b28d9670133de.tar.bz2 sci2js-aabd535925f24c6203eb1a0dcc5b28d9670133de.zip |
show type for matrix also
Diffstat (limited to 'js/Misc')
-rw-r--r-- | js/Misc/AUTOMAT.js | 6 | ||||
-rw-r--r-- | js/Misc/BACKLASH.js | 4 | ||||
-rw-r--r-- | js/Misc/BOUNCE.js | 6 | ||||
-rw-r--r-- | js/Misc/BOUNCEXY.js | 12 | ||||
-rw-r--r-- | js/Misc/BPLATFORM.js | 4 | ||||
-rw-r--r-- | js/Misc/CONSTRAINT2_c.js | 8 | ||||
-rw-r--r-- | js/Misc/CONSTRAINT_c.js | 4 | ||||
-rw-r--r-- | js/Misc/DEADBAND.js | 4 | ||||
-rw-r--r-- | js/Misc/DIFF_f.js | 4 | ||||
-rw-r--r-- | js/Misc/HYSTHERESIS.js | 2 | ||||
-rw-r--r-- | js/Misc/LOGICAL_OP.js | 2 | ||||
-rw-r--r-- | js/Misc/MBLOCK.js | 4 | ||||
-rw-r--r-- | js/Misc/MPBLOCK.js | 4 | ||||
-rw-r--r-- | js/Misc/PENDULUM_ANIM.js | 4 | ||||
-rw-r--r-- | js/Misc/RATELIMITER.js | 4 | ||||
-rw-r--r-- | js/Misc/SPLIT_f.js | 2 | ||||
-rw-r--r-- | js/Misc/TEXT_f.js | 4 |
17 files changed, 39 insertions, 39 deletions
diff --git a/js/Misc/AUTOMAT.js b/js/Misc/AUTOMAT.js index 27ef497f..bb635dcc 100644 --- a/js/Misc/AUTOMAT.js +++ b/js/Misc/AUTOMAT.js @@ -14,14 +14,14 @@ function AUTOMAT() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["automat"]), new ScilabDouble([10004])); this.model.in1 = [[2*NX+1],[2*NX+1]]; - this.model.out = [[2],[2*NX]]; + this.model.out = new ScilabDouble([2],[2*NX]); this.model.state = new ScilabDouble([ones(2*NX,1)]); this.model.nzcross = new ScilabDouble([1]); 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.ipar = ipar; + this.model.ipar = new ScilabDouble(ipar); this.model.rpar = rpar; gr_i = []; this.x = standard_define([4,2],this.model,exprs,gr_i); @@ -129,7 +129,7 @@ function AUTOMAT() { graphics.gr_i[1-1][1-1] = "txt=[\'Automaton\';\'nM="+string(NMode)+",nX="+string(NX)+"\'];"; graphics.exprs = exprs; this.x.graphics = graphics; - this.model.ipar = ipar; + this.model.ipar = new ScilabDouble(ipar); this.model.rpar = new ScilabDouble([rpar]); this.x.model = this.model; break; diff --git a/js/Misc/BACKLASH.js b/js/Misc/BACKLASH.js index 63dff8f0..bbdfb0f2 100644 --- a/js/Misc/BACKLASH.js +++ b/js/Misc/BACKLASH.js @@ -6,7 +6,7 @@ function BACKLASH() { this.model.sim = list(new ScilabString(["backlash"]), new ScilabDouble([4])); this.model.in1 = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); - this.model.rpar = [[0],[1]]; + 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]; @@ -48,7 +48,7 @@ function BACKLASH() { } else { this.model.nzcross = new ScilabDouble([0]); } - this.model.rpar = rpar; + this.model.rpar = new ScilabDouble(rpar); this.x.graphics = graphics; this.x.model = this.model; break; diff --git a/js/Misc/BOUNCE.js b/js/Misc/BOUNCE.js index d2b87f3f..3399948c 100644 --- a/js/Misc/BOUNCE.js +++ b/js/Misc/BOUNCE.js @@ -26,9 +26,9 @@ function BOUNCE() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["bounce_ball"]), new ScilabDouble([4])); this.model.in1 = []; - this.model.out = [[n],[n]]; + this.model.out = new ScilabDouble([n],[n]); this.model.state = state.slice(); - this.model.rpar = [[this.rpar1],[this.rpar2],[this.walls],[this.g],[this.C]]; + this.model.rpar = new ScilabDouble([this.rpar1],[this.rpar2],[this.walls],[this.g],[this.C]); this.model.ipar = ipar; this.model.nzcross = new ScilabDouble([n*(n-1)/2+4*n]); this.model.blocktype = new ScilabString(["c"]); @@ -114,7 +114,7 @@ function BOUNCE() { k = k+1; } } - this.model.rpar = [[this.rpar1],[this.rpar2],[this.walls],[this.g],[this.C]]; + this.model.rpar = new ScilabDouble([this.rpar1],[this.rpar2],[this.walls],[this.g],[this.C]); this.model.ipar = ipar; state = [this.xt,this.xd,this.y,this.yd]; state = transpose(state); diff --git a/js/Misc/BOUNCEXY.js b/js/Misc/BOUNCEXY.js index 585da84c..6eea589c 100644 --- a/js/Misc/BOUNCEXY.js +++ b/js/Misc/BOUNCEXY.js @@ -12,8 +12,8 @@ function BOUNCEXY() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["bouncexy"]), new ScilabDouble([4])); this.model.in1 = [[-1],[-1]]; - this.model.in2 = [[1],[1]]; - this.model.intyp = [[1],[1]]; + this.model.in2 = new ScilabDouble([1],[1]); + this.model.intyp = new ScilabDouble([1],[1]); this.model.evtin = new ScilabDouble([1]); z = []; for (i=1;i<=size(this.clrs,"*");i+=1) { @@ -25,8 +25,8 @@ function BOUNCEXY() { z[6*(i-1)+6-1] = 64.0*360.000; } this.model.dstate = z; - this.model.rpar = [[this.xmin],[this.xmax],[this.ymin],[this.ymax]]; - this.model.ipar = [[this.win],[this.imode],[this.clrs.slice()]]; + 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]; @@ -102,8 +102,8 @@ function BOUNCEXY() { z[6*(i-1)+6-1] = 64.0*360.000; } this.model.dstate = z; - this.model.rpar = rpar; - this.model.ipar = ipar; + this.model.rpar = new ScilabDouble(rpar); + this.model.ipar = new ScilabDouble(ipar); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Misc/BPLATFORM.js b/js/Misc/BPLATFORM.js index 54c291e7..cfbc15a5 100644 --- a/js/Misc/BPLATFORM.js +++ b/js/Misc/BPLATFORM.js @@ -13,7 +13,7 @@ function BPLATFORM() { this.model.in1 = [[1],[1]]; this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([0]); - this.model.rpar = [[this.plen],[this.csiz],[this.phi],[this.xmin],[this.xmax],[this.ymin],[this.ymax]]; + 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]; exprs = string(this.model.rpar); @@ -71,7 +71,7 @@ function BPLATFORM() { message(mess); } else { rpar = [[this.plen],[this.csiz],[this.phi],[this.xmin],[this.xmax],[this.ymin],[this.ymax]]; - this.model.rpar = rpar; + this.model.rpar = new ScilabDouble(rpar); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Misc/CONSTRAINT2_c.js b/js/Misc/CONSTRAINT2_c.js index 4e80c864..b21ab44f 100644 --- a/js/Misc/CONSTRAINT2_c.js +++ b/js/Misc/CONSTRAINT2_c.js @@ -7,8 +7,8 @@ function CONSTRAINT2_c() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["constraint_c"]), new ScilabDouble([10004])); this.model.in1 = new ScilabDouble([1]); - this.model.out = [[1],[1]]; - this.model.state = [[this.x0],[this.xd0]]; + this.model.out = new ScilabDouble([1],[1]); + this.model.state = new ScilabDouble([this.x0],[this.xd0]); this.model.ipar = this.id; this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [false,true]; @@ -70,8 +70,8 @@ function CONSTRAINT2_c() { } if (!ask_again) { graphics.exprs = exprs; - this.model.state = [[this.x0],[this.xd0]]; - this.model.out = [[N],[N]]; + 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.x.graphics = graphics; diff --git a/js/Misc/CONSTRAINT_c.js b/js/Misc/CONSTRAINT_c.js index 07500b5b..c3c453eb 100644 --- a/js/Misc/CONSTRAINT_c.js +++ b/js/Misc/CONSTRAINT_c.js @@ -7,7 +7,7 @@ function CONSTRAINT_c() { this.model.in1 = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.ipar = new ScilabDouble([0]); - this.model.state = this.x0; + this.model.state = new ScilabDouble(this.x0); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [false,true]; exprs = "0"; @@ -42,7 +42,7 @@ function CONSTRAINT_c() { [this.model,graphics,ok] = check_io(this.model,graphics,N,N,[],[]); if (ok) { graphics.exprs = exprs; - this.model.state = [[this.x0],[zeros(N,1)]]; + this.model.state = new ScilabDouble([this.x0],[zeros(N,1)]); this.model.out = new ScilabDouble([N]); this.model.in1 = new ScilabDouble([N]); this.model.ipar = new ScilabDouble([-1*ones(N,1)]); diff --git a/js/Misc/DEADBAND.js b/js/Misc/DEADBAND.js index 9bcc5fe4..a67aa2b0 100644 --- a/js/Misc/DEADBAND.js +++ b/js/Misc/DEADBAND.js @@ -10,7 +10,7 @@ function DEADBAND() { this.model.nzcross = new ScilabDouble([2]); this.model.nmode = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); - this.model.rpar = rpar; + this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [true,false]; exprs = [[string(this.maxp)],[string(this.minp)],[string(this.model.nmode)]]; @@ -46,7 +46,7 @@ function DEADBAND() { message("Upper limit must be > Lower limit"); } else { rpar = [[this.maxp],[this.minp]]; - this.model.rpar = rpar; + this.model.rpar = new ScilabDouble(rpar); if (this.zeroc!=0) { this.model.nzcross = new ScilabDouble([2]); this.model.nmode = new ScilabDouble([1]); diff --git a/js/Misc/DIFF_f.js b/js/Misc/DIFF_f.js index 706cdc93..8410083c 100644 --- a/js/Misc/DIFF_f.js +++ b/js/Misc/DIFF_f.js @@ -6,7 +6,7 @@ function DIFF_f() { this.model.sim = list(new ScilabString(["diffblk"]), new ScilabDouble([10001])); this.model.in1 = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); - this.model.state = this.x0; + this.model.state = new ScilabDouble(this.x0); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [false,true]; exprs = [[strcat(sci2exp(this.x0[1-1]))],[strcat(sci2exp(this.x0[2-1]))]]; @@ -37,7 +37,7 @@ function DIFF_f() { break; } graphics.exprs = exprs; - this.model.state = [[this.x0.slice()],[this.xd0.slice()]]; + this.model.state = new ScilabDouble([this.x0.slice()],[this.xd0.slice()]); this.x.graphics = graphics; this.x.model = this.model; break; diff --git a/js/Misc/HYSTHERESIS.js b/js/Misc/HYSTHERESIS.js index b4e1421b..9e5509cf 100644 --- a/js/Misc/HYSTHERESIS.js +++ b/js/Misc/HYSTHERESIS.js @@ -9,7 +9,7 @@ function HYSTHERESIS() { this.model.sim = list(new ScilabString(["hystheresis"]), new ScilabDouble([4])); this.model.in1 = new ScilabDouble([in1]); this.model.out = new ScilabDouble([1]); - this.model.rpar = rpar; + this.model.rpar = new ScilabDouble(rpar); this.model.nzcross = new ScilabDouble([this.nzz]); this.model.nmode = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); diff --git a/js/Misc/LOGICAL_OP.js b/js/Misc/LOGICAL_OP.js index 12f553df..61f940f3 100644 --- a/js/Misc/LOGICAL_OP.js +++ b/js/Misc/LOGICAL_OP.js @@ -85,7 +85,7 @@ function LOGICAL_OP() { message("Datatype is not supported"); ok = false; } - this.model.ipar = [[this.rule],[this.tp]]; + this.model.ipar = new ScilabDouble([this.rule],[this.tp]); } if (ok) { it = this.Datatype*ones(this.nin,1); diff --git a/js/Misc/MBLOCK.js b/js/Misc/MBLOCK.js index 17758ca7..c1aaa528 100644 --- a/js/Misc/MBLOCK.js +++ b/js/Misc/MBLOCK.js @@ -15,7 +15,7 @@ function MBLOCK() { this.model.dep_ut = [false,true]; this.model.rpar = []; for (i=1;i<=lstsize(paramv);i+=1) { - this.model.rpar = [[this.model.rpar],[paramv[i-1].slice()]]; + this.model.rpar = new ScilabDouble([this.model.rpar],[paramv[i-1].slice()]); } mo = modelica(); mo.model = nameF; @@ -257,7 +257,7 @@ function MBLOCK() { this.model.equations = new ScilabDouble([mo]); this.model.rpar = []; for (i=1;i<=lstsize(paramv);i+=1) { - this.model.rpar = [[this.model.rpar],[paramv[i-1].slice()]]; + this.model.rpar = new ScilabDouble([this.model.rpar],[paramv[i-1].slice()]); } this.model.sim[1] = new ScilabDouble([this.funam]); exprs.in1 = this.lab_1[1-1]; diff --git a/js/Misc/MPBLOCK.js b/js/Misc/MPBLOCK.js index 447f64bf..29fb583e 100644 --- a/js/Misc/MPBLOCK.js +++ b/js/Misc/MPBLOCK.js @@ -15,7 +15,7 @@ function MPBLOCK() { this.model.dep_ut = [true,true]; this.model.rpar = []; for (i=1;i<=lstsize(paramv);i+=1) { - this.model.rpar = [[this.model.rpar],[paramv[i-1].slice()]]; + this.model.rpar = new ScilabDouble([this.model.rpar],[paramv[i-1].slice()]); } mo = modelica(); mo.model = nameF; @@ -234,7 +234,7 @@ function MPBLOCK() { this.model.equations = new ScilabDouble([mo]); this.model.rpar = []; for (i=1;i<=lstsize(paramv);i+=1) { - this.model.rpar = [[this.model.rpar],[double(paramv[i-1].slice())]]; + this.model.rpar = new ScilabDouble([this.model.rpar],[double(paramv[i-1].slice())]); } this.model.sim[1] = new ScilabDouble([this.funam]); exprs.in1 = lab_1[1-1]; diff --git a/js/Misc/PENDULUM_ANIM.js b/js/Misc/PENDULUM_ANIM.js index a3afd769..b5632e21 100644 --- a/js/Misc/PENDULUM_ANIM.js +++ b/js/Misc/PENDULUM_ANIM.js @@ -13,7 +13,7 @@ function PENDULUM_ANIM() { this.model.in1 = [[1],[1]]; this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([0]); - this.model.rpar = [[this.plen],[this.csiz],[this.phi],[this.xmin],[this.xmax],[this.ymin],[this.ymax]]; + 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]; exprs = string(this.model.rpar); @@ -71,7 +71,7 @@ function PENDULUM_ANIM() { message(mess); } else { rpar = [[this.plen],[this.csiz],[this.phi],[this.xmin],[this.xmax],[this.ymin],[this.ymax]]; - this.model.rpar = rpar; + this.model.rpar = new ScilabDouble(rpar); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Misc/RATELIMITER.js b/js/Misc/RATELIMITER.js index da98d1ec..c3af489f 100644 --- a/js/Misc/RATELIMITER.js +++ b/js/Misc/RATELIMITER.js @@ -8,7 +8,7 @@ function RATELIMITER() { this.model.sim = list(new ScilabString(["ratelimiter"]), new ScilabDouble([4])); this.model.in1 = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); - this.model.rpar = rpar; + this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [true,false]; exprs = [[string(this.maxp)],[string(this.minp)]]; @@ -42,7 +42,7 @@ function RATELIMITER() { message("We must have max_slope> 0 > min_slope."); } else { rpar = [[this.maxp],[this.minp]]; - this.model.rpar = rpar; + this.model.rpar = new ScilabDouble(rpar); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Misc/SPLIT_f.js b/js/Misc/SPLIT_f.js index 2a0adf1a..50681b70 100644 --- a/js/Misc/SPLIT_f.js +++ b/js/Misc/SPLIT_f.js @@ -4,7 +4,7 @@ function SPLIT_f() { this.model = scicos_model(); this.model.sim = new ScilabString(["lsplit"]); this.model.in1 = new ScilabDouble([-1]); - this.model.out = [[-1],[-1],[-1]]; + this.model.out = new ScilabDouble([-1],[-1],[-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [true,false]; this.x = standard_define([1,1]/3,this.model,[],[]); diff --git a/js/Misc/TEXT_f.js b/js/Misc/TEXT_f.js index 67b635cd..c6e3131f 100644 --- a/js/Misc/TEXT_f.js +++ b/js/Misc/TEXT_f.js @@ -6,7 +6,7 @@ function TEXT_f() { this.model = scicos_model(); this.model.sim = new ScilabString(["text"]); this.model.rpar = new ScilabString(["Text"]); - this.model.ipar = [[this.font],[this.siz]]; + this.model.ipar = new ScilabDouble([this.font],[this.siz]); exprs = [["Text"],[string(this.font)],[string(this.siz)]]; graphics = scicos_graphics(); graphics.orig = [0,0]; @@ -68,7 +68,7 @@ function TEXT_f() { this.x.graphics = graphics; ipar = [[this.font],[this.siz]]; this.model.rpar = new ScilabDouble([this.txt]); - this.model.ipar = ipar; + this.model.ipar = new ScilabDouble(ipar); this.x.model = this.model; break; } |