diff options
author | Sunil Shetye | 2018-07-09 18:10:31 +0530 |
---|---|---|
committer | Sunil Shetye | 2018-07-10 11:24:53 +0530 |
commit | 9b18945e2e2348db85595fb096a1e1eba04f9baf (patch) | |
tree | bb13cffc501f152b1d33870bdeff6f274aecbf7b /js/Events | |
parent | f19304a4fe99556c5ddc35024c818d00ffe7e23a (diff) | |
download | sci2js-9b18945e2e2348db85595fb096a1e1eba04f9baf.tar.gz sci2js-9b18945e2e2348db85595fb096a1e1eba04f9baf.tar.bz2 sci2js-9b18945e2e2348db85595fb096a1e1eba04f9baf.zip |
remove type from list
Diffstat (limited to 'js/Events')
-rw-r--r-- | js/Events/ANDLOG_f.js | 6 | ||||
-rw-r--r-- | js/Events/CLKSOMV_f.js | 8 | ||||
-rw-r--r-- | js/Events/CLKSOM_f.js | 8 | ||||
-rw-r--r-- | js/Events/CLKSPLIT_f.js | 6 | ||||
-rw-r--r-- | js/Events/END_c.js | 12 | ||||
-rw-r--r-- | js/Events/EVTDLY_c.js | 12 | ||||
-rw-r--r-- | js/Events/EVTDLY_f.js | 16 | ||||
-rw-r--r-- | js/Events/EVTGEN_f.js | 10 | ||||
-rw-r--r-- | js/Events/EVTVARDLY.js | 16 | ||||
-rw-r--r-- | js/Events/HALT_f.js | 12 | ||||
-rw-r--r-- | js/Events/IFTHEL_f.js | 22 | ||||
-rw-r--r-- | js/Events/MFCLCK_f.js | 16 | ||||
-rw-r--r-- | js/Events/M_freq.js | 12 | ||||
-rw-r--r-- | js/Events/VirtualCLK0.js | 8 | ||||
-rw-r--r-- | js/Events/freq_div.js | 20 |
15 files changed, 92 insertions, 92 deletions
diff --git a/js/Events/ANDLOG_f.js b/js/Events/ANDLOG_f.js index 31deaa17..355019ee 100644 --- a/js/Events/ANDLOG_f.js +++ b/js/Events/ANDLOG_f.js @@ -2,10 +2,10 @@ function ANDLOG_f() { ANDLOG_f.prototype.define = function ANDLOG_f() { this.model = scicos_model(); - this.model.sim = new ScilabString("andlog"); - this.model.out = new ScilabDouble(1); + this.model.sim = new ScilabString(["andlog"]); + this.model.out = new ScilabDouble([1]); this.model.evtin = [[1],[1]]; - this.model.blocktype = new ScilabString("d"); + this.model.blocktype = new ScilabString(["d"]); this.model.firing = []; this.model.dep_ut = [false,false]; gr_i = []; diff --git a/js/Events/CLKSOMV_f.js b/js/Events/CLKSOMV_f.js index 093e9ece..270c9a19 100644 --- a/js/Events/CLKSOMV_f.js +++ b/js/Events/CLKSOMV_f.js @@ -2,11 +2,11 @@ function CLKSOMV_f() { CLKSOMV_f.prototype.define = function CLKSOMV_f() { this.model = scicos_model(); - this.model.sim = new ScilabString("sum"); + this.model.sim = new ScilabString(["sum"]); this.model.evtin = [[1],[1],[1]]; - this.model.evtout = new ScilabDouble(1); - this.model.blocktype = new ScilabString("d"); - this.model.firing = new ScilabDouble(-1); + this.model.evtout = new ScilabDouble([1]); + this.model.blocktype = new ScilabString(["d"]); + this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = [false,false]; gr_i = []; this.x = standard_define([2,2],this.model,[],gr_i); diff --git a/js/Events/CLKSOM_f.js b/js/Events/CLKSOM_f.js index 2f2c9c3b..a8048308 100644 --- a/js/Events/CLKSOM_f.js +++ b/js/Events/CLKSOM_f.js @@ -2,11 +2,11 @@ function CLKSOM_f() { CLKSOM_f.prototype.define = function CLKSOM_f() { this.model = scicos_model(); - this.model.sim = new ScilabString("sum"); + this.model.sim = new ScilabString(["sum"]); this.model.evtin = [[1],[1],[1]]; - this.model.evtout = new ScilabDouble(1); - this.model.blocktype = new ScilabString("d"); - this.model.firing = new ScilabDouble(-1); + this.model.evtout = new ScilabDouble([1]); + this.model.blocktype = new ScilabString(["d"]); + this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = [false,false]; gr_i = []; this.x = standard_define([1,1]/1.2,this.model,[],gr_i); diff --git a/js/Events/CLKSPLIT_f.js b/js/Events/CLKSPLIT_f.js index 222bd91f..de04b2d0 100644 --- a/js/Events/CLKSPLIT_f.js +++ b/js/Events/CLKSPLIT_f.js @@ -2,10 +2,10 @@ function CLKSPLIT_f() { CLKSPLIT_f.prototype.define = function CLKSPLIT_f() { this.model = scicos_model(); - this.model.sim = new ScilabString("split"); - this.model.evtin = new ScilabDouble(1); + this.model.sim = new ScilabString(["split"]); + this.model.evtin = new ScilabDouble([1]); this.model.evtout = [[1],[1]]; - this.model.blocktype = new ScilabString("d"); + this.model.blocktype = new ScilabString(["d"]); this.model.firing = [false,false,false]; this.model.dep_ut = [false,false]; this.x = standard_define([1,1]/3,this.model,[],[]); diff --git a/js/Events/END_c.js b/js/Events/END_c.js index ec27739d..9413584b 100644 --- a/js/Events/END_c.js +++ b/js/Events/END_c.js @@ -3,11 +3,11 @@ function END_c() { END_c.prototype.define = function END_c() { this.tf = 100000000; this.model = scicos_model(); - this.model.sim = list(new ScilabString("scicosexit"),new ScilabDouble(4)); - this.model.evtin = new ScilabDouble(1); - this.model.evtout = new ScilabDouble(1); - this.model.firing = new ScilabDouble(this.tf); - this.model.blocktype = new ScilabString("d"); + this.model.sim = list(new ScilabString(["scicosexit"]), new ScilabDouble([4])); + this.model.evtin = new ScilabDouble([1]); + this.model.evtout = new ScilabDouble([1]); + this.model.firing = new ScilabDouble([this.tf]); + this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = [false,false]; exprs = string(this.tf); gr_i = []; @@ -36,7 +36,7 @@ function END_c() { } if (ok) { graphics.exprs = exprs; - this.model.firing = new ScilabDouble(this.tf); + this.model.firing = new ScilabDouble([this.tf]); this.x.graphics = graphics; this.x.model = this.model; break; diff --git a/js/Events/EVTDLY_c.js b/js/Events/EVTDLY_c.js index 54fca32e..dd014f43 100644 --- a/js/Events/EVTDLY_c.js +++ b/js/Events/EVTDLY_c.js @@ -4,12 +4,12 @@ function EVTDLY_c() { this.dt = 0.1; this.ff = 0.0; this.model = scicos_model(); - this.model.sim = list(new ScilabString("evtdly4"),new ScilabDouble(4)); - this.model.evtin = new ScilabDouble(1); - this.model.evtout = new ScilabDouble(1); + this.model.sim = list(new ScilabString(["evtdly4"]), new ScilabDouble([4])); + this.model.evtin = new ScilabDouble([1]); + this.model.evtout = new ScilabDouble([1]); this.model.rpar = [[this.dt],[this.ff]]; - this.model.blocktype = new ScilabString("d"); - this.model.firing = new ScilabDouble(this.ff); + this.model.blocktype = new ScilabString(["d"]); + this.model.firing = new ScilabDouble([this.ff]); this.model.dep_ut = [false,false]; exprs = [[string(this.dt)],[sci2exp(this.ff)]]; gr_i = []; @@ -45,7 +45,7 @@ function EVTDLY_c() { if (ok) { graphics.exprs = exprs; this.model.rpar = [[this.dt],[this.ff]]; - this.model.firing = new ScilabDouble(this.ff); + this.model.firing = new ScilabDouble([this.ff]); this.x.graphics = graphics; this.x.model = this.model; break; diff --git a/js/Events/EVTDLY_f.js b/js/Events/EVTDLY_f.js index 80e0455b..75a2562a 100644 --- a/js/Events/EVTDLY_f.js +++ b/js/Events/EVTDLY_f.js @@ -4,12 +4,12 @@ function EVTDLY_f() { this.dt = 0.1; this.ff = this.dt; this.model = scicos_model(); - this.model.sim = new ScilabString("evtdly"); - this.model.evtin = new ScilabDouble(1); - this.model.evtout = new ScilabDouble(1); - this.model.rpar = new ScilabDouble(this.dt); - this.model.blocktype = new ScilabString("d"); - this.model.firing = new ScilabDouble(this.ff); + this.model.sim = new ScilabString(["evtdly"]); + this.model.evtin = new ScilabDouble([1]); + this.model.evtout = new ScilabDouble([1]); + this.model.rpar = new ScilabDouble([this.dt]); + this.model.blocktype = new ScilabString(["d"]); + this.model.firing = new ScilabDouble([this.ff]); this.model.dep_ut = [false,false]; exprs = [[string(this.dt)],[sci2exp(this.ff)]]; gr_i = []; @@ -44,8 +44,8 @@ function EVTDLY_f() { } if (ok) { graphics.exprs = exprs; - this.model.rpar = new ScilabDouble(this.dt); - this.model.firing = new ScilabDouble(this.ff); + this.model.rpar = new ScilabDouble([this.dt]); + this.model.firing = new ScilabDouble([this.ff]); this.x.graphics = graphics; this.x.model = this.model; break; diff --git a/js/Events/EVTGEN_f.js b/js/Events/EVTGEN_f.js index 4bb35f72..49aabdb2 100644 --- a/js/Events/EVTGEN_f.js +++ b/js/Events/EVTGEN_f.js @@ -3,10 +3,10 @@ function EVTGEN_f() { EVTGEN_f.prototype.define = function EVTGEN_f() { this.tt = 0; this.model = scicos_model(); - this.model.sim = new ScilabString("trash"); - this.model.evtout = new ScilabDouble(1); - this.model.blocktype = new ScilabString("d"); - this.model.firing = new ScilabDouble(this.tt); + this.model.sim = new ScilabString(["trash"]); + this.model.evtout = new ScilabDouble([1]); + this.model.blocktype = new ScilabString(["d"]); + this.model.firing = new ScilabDouble([this.tt]); this.model.dep_ut = [false,false]; exprs = string(this.tt); gr_i = []; @@ -35,7 +35,7 @@ function EVTGEN_f() { } graphics.exprs = exprs; if (this.model.firing!=this.tt) { - this.model.firing = new ScilabDouble(this.tt); + this.model.firing = new ScilabDouble([this.tt]); } this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Events/EVTVARDLY.js b/js/Events/EVTVARDLY.js index 941f0a28..1359531e 100644 --- a/js/Events/EVTVARDLY.js +++ b/js/Events/EVTVARDLY.js @@ -2,13 +2,13 @@ function EVTVARDLY() { EVTVARDLY.prototype.define = function EVTVARDLY() { this.model = scicos_model(); - this.model.sim = list(new ScilabString("evtvardly"),new ScilabDouble(4)); - this.model.in1 = new ScilabDouble(1); - this.model.evtin = new ScilabDouble(1); - this.model.evtout = new ScilabDouble(1); - this.model.blocktype = new ScilabString("d"); - this.model.firing = new ScilabDouble(-1); - this.model.blocktype = new ScilabString("c"); + this.model.sim = list(new ScilabString(["evtvardly"]), new ScilabDouble([4])); + this.model.in1 = new ScilabDouble([1]); + this.model.evtin = new ScilabDouble([1]); + this.model.evtout = new ScilabDouble([1]); + this.model.blocktype = new ScilabString(["d"]); + this.model.firing = new ScilabDouble([-1]); + this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [true,false]; exprs = string(this.model.firing); gr_i = []; @@ -35,7 +35,7 @@ function EVTVARDLY() { break; } graphics.exprs = exprs; - this.model.firing = new ScilabDouble(this.fir); + this.model.firing = new ScilabDouble([this.fir]); this.x.graphics = graphics; this.x.model = this.model; break; diff --git a/js/Events/HALT_f.js b/js/Events/HALT_f.js index efea87ed..ede573fe 100644 --- a/js/Events/HALT_f.js +++ b/js/Events/HALT_f.js @@ -3,11 +3,11 @@ function HALT_f() { HALT_f.prototype.define = function HALT_f() { this.n = 0; this.model = scicos_model(); - this.model.sim = new ScilabString("hltblk"); - this.model.evtin = new ScilabDouble(1); - this.model.dstate = new ScilabDouble(0); - this.model.ipar = new ScilabDouble(0); - this.model.blocktype = new ScilabString("d"); + this.model.sim = new ScilabString(["hltblk"]); + this.model.evtin = new ScilabDouble([1]); + this.model.dstate = new ScilabDouble([0]); + this.model.ipar = new ScilabDouble([0]); + this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = [false,false]; exprs = string(this.n); gr_i = []; @@ -36,7 +36,7 @@ function HALT_f() { } if (ok) { graphics.exprs = exprs; - this.model.ipar = new ScilabDouble(this.n); + this.model.ipar = new ScilabDouble([this.n]); this.x.graphics = graphics; this.x.model = this.model; break; diff --git a/js/Events/IFTHEL_f.js b/js/Events/IFTHEL_f.js index 73cba2af..8af180bd 100644 --- a/js/Events/IFTHEL_f.js +++ b/js/Events/IFTHEL_f.js @@ -2,17 +2,17 @@ function IFTHEL_f() { IFTHEL_f.prototype.define = function IFTHEL_f() { this.model = scicos_model(); - this.model.sim = list(new ScilabString("ifthel"),new ScilabDouble(-1)); - this.model.in1 = new ScilabDouble(1); - this.model.in2 = new ScilabDouble(1); - this.model.intyp = new ScilabDouble(-1); - this.model.evtin = new ScilabDouble(1); + this.model.sim = list(new ScilabString(["ifthel"]), new ScilabDouble([-1])); + this.model.in1 = new ScilabDouble([1]); + this.model.in2 = new ScilabDouble([1]); + this.model.intyp = new ScilabDouble([-1]); + this.model.evtin = new ScilabDouble([1]); this.model.evtout = [[1],[1]]; - this.model.blocktype = new ScilabString("l"); + this.model.blocktype = new ScilabString(["l"]); this.model.firing = [-1,-1]; this.model.dep_ut = [true,false]; - this.model.nmode = new ScilabDouble(1); - this.model.nzcross = new ScilabDouble(1); + this.model.nmode = new ScilabDouble([1]); + this.model.nzcross = new ScilabDouble([1]); gr_i = []; exprs = [[string(this.model.in1)],[string(this.model.nmode)]]; this.x = standard_define([3,3],this.model,exprs,gr_i); @@ -57,9 +57,9 @@ function IFTHEL_f() { if (ok) { graphics.exprs = exprs; this.model.evtin = this.inh; - this.model.sim[2] = new ScilabDouble(-1); - this.model.nmode = new ScilabDouble(this.nmod); - this.model.nzcross = new ScilabDouble(this.nmod); + this.model.sim[2] = new ScilabDouble([-1]); + this.model.nmode = new ScilabDouble([this.nmod]); + this.model.nzcross = new ScilabDouble([this.nmod]); this.x.graphics = graphics; this.x.model = this.model; break; diff --git a/js/Events/MFCLCK_f.js b/js/Events/MFCLCK_f.js index e529ebb3..3d2761d5 100644 --- a/js/Events/MFCLCK_f.js +++ b/js/Events/MFCLCK_f.js @@ -4,13 +4,13 @@ function MFCLCK_f() { this.nn = 2; this.dt = 0.1; this.model = scicos_model(); - this.model.sim = new ScilabString("mfclck"); - this.model.evtin = new ScilabDouble(1); + this.model.sim = new ScilabString(["mfclck"]); + this.model.evtin = new ScilabDouble([1]); this.model.evtout = [[1],[1]]; - this.model.dstate = new ScilabDouble(0); - this.model.rpar = new ScilabDouble(this.dt); - this.model.ipar = new ScilabDouble(this.nn); - this.model.blocktype = new ScilabString("d"); + this.model.dstate = new ScilabDouble([0]); + this.model.rpar = new ScilabDouble([this.dt]); + this.model.ipar = new ScilabDouble([this.nn]); + this.model.blocktype = new ScilabString(["d"]); this.model.firing = [-1,0]; this.model.dep_ut = [false,false]; exprs = [[string(this.dt)],[string(this.nn)]]; @@ -37,8 +37,8 @@ function MFCLCK_f() { this.model = arg1.model; [ok,this.dt,this.nn,exprs] = scicos_getvalue("Set Multifrequency clock parameters",["basic period (1/f)","multiply by (n)"],list("vec",1,"vec",1),exprs); if (ok) { - this.model.ipar = new ScilabDouble(this.nn); - this.model.rpar = new ScilabDouble(this.dt); + this.model.ipar = new ScilabDouble([this.nn]); + this.model.rpar = new ScilabDouble([this.dt]); hh = this.model.firing; hh[2-1] = 0; this.model.firing = hh; diff --git a/js/Events/M_freq.js b/js/Events/M_freq.js index afbb7a55..c65c5362 100644 --- a/js/Events/M_freq.js +++ b/js/Events/M_freq.js @@ -2,12 +2,12 @@ function M_freq() { M_freq.prototype.define = function M_freq() { this.model = scicos_model(); - this.model.sim = list(new ScilabString("m_frequ"),new ScilabDouble(4)); + this.model.sim = list(new ScilabString(["m_frequ"]), new ScilabDouble([4])); this.model.evtout = [[1],[1],[1]]; - this.model.evtin = new ScilabDouble(1); + this.model.evtin = new ScilabDouble([1]); this.model.rpar = []; - this.model.opar = list([[1,1,0],[1,1,1],[1,3,2]],new ScilabDouble(1),new ScilabDouble(0),new ScilabDouble(0)); - this.model.blocktype = new ScilabString("d"); + this.model.opar = list([[1,1,0],[1,1,1],[1,3,2]], new ScilabDouble([1]), new ScilabDouble([0]), new ScilabDouble([0])); + this.model.blocktype = new ScilabString(["d"]); this.model.firing = [0,-1,-1]; this.model.dep_ut = [false,false]; exprs = [[sci2exp([[1],[2]])],[sci2exp([[0],[0]])]]; @@ -53,7 +53,7 @@ function M_freq() { [m,den,off,count,m1,fir,this.frequ,this.offset,ok] = mfrequ_clk(this.frequ,this.offset); } if (ok) { - this.model.opar = list(m,new ScilabDouble(double(den)),new ScilabDouble(off),new ScilabDouble(count)); + this.model.opar = list(m, new ScilabDouble([double(den)]), new ScilabDouble([off]), new ScilabDouble([count])); mn = (2^size(m1,"*"))-1; [model,graphics,ok] = set_io(this.model,graphics,list(),list(),1,ones(mn,1)); if (mn>3) { @@ -61,7 +61,7 @@ function M_freq() { } else { graphics.sz = [50,40]; } - this.model.firing = new ScilabDouble(fir); + this.model.firing = new ScilabDouble([fir]); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Events/VirtualCLK0.js b/js/Events/VirtualCLK0.js index f3040a9b..c8c77beb 100644 --- a/js/Events/VirtualCLK0.js +++ b/js/Events/VirtualCLK0.js @@ -2,12 +2,12 @@ function VirtualCLK0() { VirtualCLK0.prototype.define = function VirtualCLK0() { this.model = scicos_model(); - this.model.sim = new ScilabString("vrtclk0"); - this.model.evtin = new ScilabDouble(1); + this.model.sim = new ScilabString(["vrtclk0"]); + this.model.evtin = new ScilabDouble([1]); this.model.opar = list(); this.model.ipar = []; - this.model.blocktype = new ScilabString("d"); - this.model.firing = new ScilabDouble(-1); + this.model.blocktype = new ScilabString(["d"]); + this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = [false,false]; exprs = []; this.x = standard_define([2,2],this.model,exprs," "); diff --git a/js/Events/freq_div.js b/js/Events/freq_div.js index ca64c706..b7e4817d 100644 --- a/js/Events/freq_div.js +++ b/js/Events/freq_div.js @@ -18,8 +18,8 @@ function freq_div() { graphics.orig = [0,-100]; graphics.sz = [60,40]; graphics.exprs = [["0"],["3"]]; - this.model.dstate = new ScilabDouble(3); - this.model.ipar = new ScilabDouble(3); + this.model.dstate = new ScilabDouble([3]); + this.model.ipar = new ScilabDouble([3]); graphics.pout = 7; graphics.pein = 10; blk.graphics = graphics; @@ -31,7 +31,7 @@ function freq_div() { graphics.orig = [120,0]; graphics.sz = [20,20]; graphics.exprs = ["1"]; - this.model.ipar = new ScilabDouble(1); + this.model.ipar = new ScilabDouble([1]); graphics.peout = 6; blk.graphics = graphics; blk.model = this.model; @@ -42,7 +42,7 @@ function freq_div() { graphics.orig = [130,-160]; graphics.sz = [20,20]; graphics.exprs = ["1"]; - this.model.ipar = new ScilabDouble(1); + this.model.ipar = new ScilabDouble([1]); graphics.pein = 8; blk.graphics = graphics; blk.model = this.model; @@ -53,7 +53,7 @@ function freq_div() { graphics.orig = [100,-100]; graphics.sz = [60,40]; graphics.exprs = [["1"],["0"]]; - this.model.ipar = new ScilabDouble(1); + this.model.ipar = new ScilabDouble([1]); graphics.pin = 7; graphics.pein = 9; graphics.peout = [[0],[8]]; @@ -99,9 +99,9 @@ function freq_div() { blk={}; lnk={}; this.model = scicos_model(); - this.model.sim = new ScilabString("csuper"); - this.model.evtin = new ScilabDouble(1); - this.model.evtout = new ScilabDouble(1); + this.model.sim = new ScilabString(["csuper"]); + this.model.evtin = new ScilabDouble([1]); + this.model.evtout = new ScilabDouble([1]); this.model.rpar = scs_m_1; gr_i = []; this.x = standard_define([3,2],this.model,[],gr_i); @@ -153,8 +153,8 @@ function freq_div() { %ph = %df-1; } graphics.exprs = exprs; - this.model.ipar = new ScilabDouble(%df); - this.model.dstate = new ScilabDouble(%ph); + this.model.ipar = new ScilabDouble([%df]); + this.model.dstate = new ScilabDouble([%ph]); xxn.graphics = graphics; xxn.model = this.model; break; |