diff options
author | Sunil Shetye | 2018-07-09 17:07:46 +0530 |
---|---|---|
committer | Sunil Shetye | 2018-07-10 11:24:53 +0530 |
commit | f19304a4fe99556c5ddc35024c818d00ffe7e23a (patch) | |
tree | f795b52492d1962f66c2f84f575ce5074b0668a8 /js/Linear | |
parent | cbc375d9bc42bc29eeb919a020dfbf15921d3cf0 (diff) | |
download | sci2js-f19304a4fe99556c5ddc35024c818d00ffe7e23a.tar.gz sci2js-f19304a4fe99556c5ddc35024c818d00ffe7e23a.tar.bz2 sci2js-f19304a4fe99556c5ddc35024c818d00ffe7e23a.zip |
handle list separately
Diffstat (limited to 'js/Linear')
-rw-r--r-- | js/Linear/BIGSOM_f.js | 2 | ||||
-rw-r--r-- | js/Linear/CLINDUMMY_f.js | 2 | ||||
-rw-r--r-- | js/Linear/CLR.js | 2 | ||||
-rw-r--r-- | js/Linear/CLR_f.js | 2 | ||||
-rw-r--r-- | js/Linear/CLSS.js | 2 | ||||
-rw-r--r-- | js/Linear/CLSS_f.js | 2 | ||||
-rw-r--r-- | js/Linear/DELAYV_f.js | 2 | ||||
-rw-r--r-- | js/Linear/DERIV.js | 2 | ||||
-rw-r--r-- | js/Linear/DIFF_c.js | 2 | ||||
-rw-r--r-- | js/Linear/DLR.js | 2 | ||||
-rw-r--r-- | js/Linear/DLSS.js | 2 | ||||
-rw-r--r-- | js/Linear/DLSS_f.js | 2 | ||||
-rw-r--r-- | js/Linear/DOLLAR.js | 8 | ||||
-rw-r--r-- | js/Linear/DOLLAR_m.js | 8 | ||||
-rw-r--r-- | js/Linear/GAINBLK.js | 40 | ||||
-rw-r--r-- | js/Linear/INTEGRAL.js | 2 | ||||
-rw-r--r-- | js/Linear/INTEGRAL_m.js | 6 | ||||
-rw-r--r-- | js/Linear/REGISTER.js | 18 | ||||
-rw-r--r-- | js/Linear/SAMPHOLD.js | 2 | ||||
-rw-r--r-- | js/Linear/SAMPHOLD_m.js | 2 | ||||
-rw-r--r-- | js/Linear/SOM_f.js | 2 | ||||
-rw-r--r-- | js/Linear/SUMMATION.js | 42 | ||||
-rw-r--r-- | js/Linear/SUM_f.js | 2 | ||||
-rw-r--r-- | js/Linear/TCLSS.js | 6 | ||||
-rw-r--r-- | js/Linear/TCLSS_f.js | 6 | ||||
-rw-r--r-- | js/Linear/TIME_DELAY.js | 2 | ||||
-rw-r--r-- | js/Linear/VARIABLE_DELAY.js | 2 |
27 files changed, 86 insertions, 86 deletions
diff --git a/js/Linear/BIGSOM_f.js b/js/Linear/BIGSOM_f.js index c4c0daca..bafc0ea1 100644 --- a/js/Linear/BIGSOM_f.js +++ b/js/Linear/BIGSOM_f.js @@ -3,7 +3,7 @@ function BIGSOM_f() { BIGSOM_f.prototype.define = function BIGSOM_f() { this.sgn = [[1],[1]]; this.model = scicos_model(); - this.model.sim = list("sum",2); + this.model.sim = list(new ScilabString("sum"),new ScilabDouble(2)); this.model.in1 = [[-1],[-1]]; this.model.out = new ScilabDouble(-1); this.model.rpar = this.sgn; diff --git a/js/Linear/CLINDUMMY_f.js b/js/Linear/CLINDUMMY_f.js index e61f81b0..55895e48 100644 --- a/js/Linear/CLINDUMMY_f.js +++ b/js/Linear/CLINDUMMY_f.js @@ -3,7 +3,7 @@ function CLINDUMMY_f() { CLINDUMMY_f.prototype.define = function CLINDUMMY_f() { x0 = 0; this.model = scicos_model(); - this.model.sim = list("cdummy",4); + this.model.sim = list(new ScilabString("cdummy"),new ScilabDouble(4)); this.model.state = new ScilabDouble(x0); this.model.blocktype = new ScilabString("c"); this.model.firing = []; diff --git a/js/Linear/CLR.js b/js/Linear/CLR.js index 504c40e1..447f9ce7 100644 --- a/js/Linear/CLR.js +++ b/js/Linear/CLR.js @@ -8,7 +8,7 @@ function CLR() { D = 0; exprs = [["1"],["1+s"]]; this.model = scicos_model(); - this.model.sim = list("csslti4",4); + this.model.sim = list(new ScilabString("csslti4"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(1); this.model.out = new ScilabDouble(1); this.model.state = new ScilabDouble(x0); diff --git a/js/Linear/CLR_f.js b/js/Linear/CLR_f.js index bb1ff3ff..5f862678 100644 --- a/js/Linear/CLR_f.js +++ b/js/Linear/CLR_f.js @@ -8,7 +8,7 @@ function CLR_f() { D = 0; exprs = [["1"],["1+s"]]; this.model = scicos_model(); - this.model.sim = list("csslti",1); + this.model.sim = list(new ScilabString("csslti"),new ScilabDouble(1)); this.model.in1 = new ScilabDouble(1); this.model.out = new ScilabDouble(1); this.model.state = new ScilabDouble(x0); diff --git a/js/Linear/CLSS.js b/js/Linear/CLSS.js index 2f336b4a..e721700d 100644 --- a/js/Linear/CLSS.js +++ b/js/Linear/CLSS.js @@ -9,7 +9,7 @@ function CLSS() { in1 = 1; out = 1; this.model = scicos_model(); - this.model.sim = list("csslti4",4); + this.model.sim = list(new ScilabString("csslti4"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(in1); this.model.out = new ScilabDouble(out); this.model.state = new ScilabDouble(this.x0); diff --git a/js/Linear/CLSS_f.js b/js/Linear/CLSS_f.js index 2576257d..8cb38f15 100644 --- a/js/Linear/CLSS_f.js +++ b/js/Linear/CLSS_f.js @@ -9,7 +9,7 @@ function CLSS_f() { in1 = 1; out = 1; this.model = scicos_model(); - this.model.sim = list("csslti",1); + this.model.sim = list(new ScilabString("csslti"),new ScilabDouble(1)); this.model.in1 = new ScilabDouble(in1); this.model.out = new ScilabDouble(out); this.model.state = new ScilabDouble(this.x0); diff --git a/js/Linear/DELAYV_f.js b/js/Linear/DELAYV_f.js index e2c55b04..1f569d9b 100644 --- a/js/Linear/DELAYV_f.js +++ b/js/Linear/DELAYV_f.js @@ -6,7 +6,7 @@ function DELAYV_f() { this.zz0 = z0.slice(1-1,$-1); this.T = 1; this.model = scicos_model(); - this.model.sim = list("delayv",1); + this.model.sim = list(new ScilabString("delayv"),new ScilabDouble(1)); this.model.in1 = [[this.nin],[1]]; this.model.out = new ScilabDouble(this.nin); this.model.evtin = new ScilabDouble(1); diff --git a/js/Linear/DERIV.js b/js/Linear/DERIV.js index 811fb47a..ba5c9ca6 100644 --- a/js/Linear/DERIV.js +++ b/js/Linear/DERIV.js @@ -2,7 +2,7 @@ function DERIV() { DERIV.prototype.define = function DERIV() { this.model = scicos_model(); - this.model.sim = list("deriv",4); + this.model.sim = list(new ScilabString("deriv"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(-1); this.model.out = new ScilabDouble(-1); this.model.blocktype = new ScilabString("x"); diff --git a/js/Linear/DIFF_c.js b/js/Linear/DIFF_c.js index 9549a346..396fa350 100644 --- a/js/Linear/DIFF_c.js +++ b/js/Linear/DIFF_c.js @@ -3,7 +3,7 @@ function DIFF_c() { DIFF_c.prototype.define = function DIFF_c() { this.x0 = [[0],[0]]; this.model = scicos_model(); - this.model.sim = list("diffblk_c",10004); + this.model.sim = list(new ScilabString("diffblk_c"),new ScilabDouble(10004)); this.model.in1 = new ScilabDouble(1); this.model.out = new ScilabDouble(1); this.model.state = this.x0; diff --git a/js/Linear/DLR.js b/js/Linear/DLR.js index 4107e913..01f49792 100644 --- a/js/Linear/DLR.js +++ b/js/Linear/DLR.js @@ -8,7 +8,7 @@ function DLR() { D = 0; exprs = [["1"],["1+z"]]; this.model = scicos_model(); - this.model.sim = list("dsslti4",4); + this.model.sim = list(new ScilabString("dsslti4"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(1); this.model.out = new ScilabDouble(1); this.model.evtin = new ScilabDouble(1); diff --git a/js/Linear/DLSS.js b/js/Linear/DLSS.js index d9b17858..9bb137e6 100644 --- a/js/Linear/DLSS.js +++ b/js/Linear/DLSS.js @@ -7,7 +7,7 @@ function DLSS() { this.C = 1; this.D = 0; this.model = scicos_model(); - this.model.sim = list("dsslti4",4); + this.model.sim = list(new ScilabString("dsslti4"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(1); this.model.out = new ScilabDouble(1); this.model.evtin = new ScilabDouble(1); diff --git a/js/Linear/DLSS_f.js b/js/Linear/DLSS_f.js index 7d40c411..29b08e92 100644 --- a/js/Linear/DLSS_f.js +++ b/js/Linear/DLSS_f.js @@ -7,7 +7,7 @@ function DLSS_f() { this.C = 1; this.D = 0; this.model = scicos_model(); - this.model.sim = list("dsslti",1); + this.model.sim = list(new ScilabString("dsslti"),new ScilabDouble(1)); this.model.in1 = new ScilabDouble(1); this.model.out = new ScilabDouble(1); this.model.evtin = new ScilabDouble(1); diff --git a/js/Linear/DOLLAR.js b/js/Linear/DOLLAR.js index 6fd66945..3962490d 100644 --- a/js/Linear/DOLLAR.js +++ b/js/Linear/DOLLAR.js @@ -6,7 +6,7 @@ function DOLLAR() { in1 = 1; exprs = string([[z],[this.inh]]); this.model = scicos_model(); - this.model.sim = list("dollar4",4); + this.model.sim = list(new ScilabString("dollar4"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(in1); this.model.out = new ScilabDouble(in1); this.model.evtin = new ScilabDouble(1-this.inh); @@ -47,15 +47,15 @@ function DOLLAR() { out = []; } in1 = out; - this.model.sim = list("dollar4_m",4); - this.model.odstate = list(this.a); + this.model.sim = list(new ScilabString("dollar4_m"),new ScilabDouble(4)); + this.model.odstate = list(new ScilabDouble(this.a)); this.model.dstate = []; if (this.type[(this.a)==1-1]) { if (isreal(this.a)) { it = 1; ot = 1; if ((size(this.a,1)==1||size(this.a,2)==1)) { - this.model.sim = list("dollar4",4); + this.model.sim = list(new ScilabString("dollar4"),new ScilabDouble(4)); this.model.dstate = this.a.slice(); this.model.odstate = list(); } diff --git a/js/Linear/DOLLAR_m.js b/js/Linear/DOLLAR_m.js index d85e0cd8..0e67e2ca 100644 --- a/js/Linear/DOLLAR_m.js +++ b/js/Linear/DOLLAR_m.js @@ -6,7 +6,7 @@ function DOLLAR_m() { in1 = 1; exprs = string([[z],[this.inh]]); this.model = scicos_model(); - this.model.sim = list("dollar4",4); + this.model.sim = list(new ScilabString("dollar4"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(in1); this.model.out = new ScilabDouble(in1); this.model.evtin = new ScilabDouble(1-this.inh); @@ -47,15 +47,15 @@ function DOLLAR_m() { out = []; } in1 = out; - this.model.sim = list("dollar4_m",4); - this.model.odstate = list(this.a); + this.model.sim = list(new ScilabString("dollar4_m"),new ScilabDouble(4)); + this.model.odstate = list(new ScilabDouble(this.a)); this.model.dstate = []; if ((this.type[this.a-1]==1)) { if (isreal(this.a)) { it = 1; ot = 1; if ((size(this.a,1)==1||size(this.a,2)==1)) { - this.model.sim = list("dollar4",4); + this.model.sim = list(new ScilabString("dollar4"),new ScilabDouble(4)); this.model.dstate = this.a.slice(); this.model.odstate = list(); } diff --git a/js/Linear/GAINBLK.js b/js/Linear/GAINBLK.js index 99ff7bc0..ae4ad2ec 100644 --- a/js/Linear/GAINBLK.js +++ b/js/Linear/GAINBLK.js @@ -7,7 +7,7 @@ function GAINBLK() { in2 = -2; out2 = -2; this.model = scicos_model(); - this.model.sim = list("gainblk",4); + this.model.sim = list(new ScilabString("gainblk"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(in1); this.model.out = new ScilabDouble(out); this.model.in2 = new ScilabDouble(in2); @@ -52,7 +52,7 @@ function GAINBLK() { if (isreal(this.gain)) { it = 1; ot = 1; - this.model.sim = list("gainblk",4); + this.model.sim = list(new ScilabString("gainblk"),new ScilabDouble(4)); this.model.rpar = this.gain.slice(); this.model.opar = list(); } else { @@ -63,22 +63,22 @@ function GAINBLK() { if ((this.over==0)) { if ((typeof(this.gain)=="int32")) { ot = 3; - this.model.sim = list("gainblk_i32n",4); + this.model.sim = list(new ScilabString("gainblk_i32n"),new ScilabDouble(4)); } else if ((typeof(this.gain)=="int16")) { ot = 4; - this.model.sim = list("gainblk_i16n",4); + this.model.sim = list(new ScilabString("gainblk_i16n"),new ScilabDouble(4)); } else if ((typeof(this.gain)=="int8")) { ot = 5; - this.model.sim = list("gainblk_i8n",4); + this.model.sim = list(new ScilabString("gainblk_i8n"),new ScilabDouble(4)); } else if ((typeof(this.gain)=="uint32")) { ot = 6; - this.model.sim = list("gainblk_ui32n",4); + this.model.sim = list(new ScilabString("gainblk_ui32n"),new ScilabDouble(4)); } else if ((typeof(this.gain)=="uint16")) { ot = 7; - this.model.sim = list("gainblk_ui16n",4); + this.model.sim = list(new ScilabString("gainblk_ui16n"),new ScilabDouble(4)); } else if ((typeof(this.gain)=="uint8")) { ot = 8; - this.model.sim = list("gainblk_ui8n",4); + this.model.sim = list(new ScilabString("gainblk_ui8n"),new ScilabDouble(4)); } else { message("type is not supported."); ok = false; @@ -86,22 +86,22 @@ function GAINBLK() { } else if ((this.over==1)) { if ((typeof(this.gain)=="int32")) { ot = 3; - this.model.sim = list("gainblk_i32s",4); + this.model.sim = list(new ScilabString("gainblk_i32s"),new ScilabDouble(4)); } else if ((typeof(this.gain)=="int16")) { ot = 4; - this.model.sim = list("gainblk_i16s",4); + this.model.sim = list(new ScilabString("gainblk_i16s"),new ScilabDouble(4)); } else if ((typeof(this.gain)=="int8")) { ot = 5; - this.model.sim = list("gainblk_i8s",4); + this.model.sim = list(new ScilabString("gainblk_i8s"),new ScilabDouble(4)); } else if ((typeof(this.gain)=="uint32")) { ot = 6; - this.model.sim = list("gainblk_ui32s",4); + this.model.sim = list(new ScilabString("gainblk_ui32s"),new ScilabDouble(4)); } else if ((typeof(this.gain)=="uint16")) { ot = 7; - this.model.sim = list("gainblk_ui16s",4); + this.model.sim = list(new ScilabString("gainblk_ui16s"),new ScilabDouble(4)); } else if ((typeof(this.gain)=="uint8")) { ot = 8; - this.model.sim = list("gainblk_ui8s",4); + this.model.sim = list(new ScilabString("gainblk_ui8s"),new ScilabDouble(4)); } else { message("type is not supported."); ok = false; @@ -109,22 +109,22 @@ function GAINBLK() { } else if ((this.over==2)) { if ((typeof(this.gain)=="int32")) { ot = 3; - this.model.sim = list("gainblk_i32e",4); + this.model.sim = list(new ScilabString("gainblk_i32e"),new ScilabDouble(4)); } else if ((typeof(this.gain)=="int16")) { ot = 4; - this.model.sim = list("gainblk_i16e",4); + this.model.sim = list(new ScilabString("gainblk_i16e"),new ScilabDouble(4)); } else if ((typeof(this.gain)=="int8")) { ot = 5; - this.model.sim = list("gainblk_i8e",4); + this.model.sim = list(new ScilabString("gainblk_i8e"),new ScilabDouble(4)); } else if ((typeof(this.gain)=="uint32")) { ot = 6; - this.model.sim = list("gainblk_ui32e",4); + this.model.sim = list(new ScilabString("gainblk_ui32e"),new ScilabDouble(4)); } else if ((typeof(this.gain)=="uint16")) { ot = 7; - this.model.sim = list("gainblk_ui16e",4); + this.model.sim = list(new ScilabString("gainblk_ui16e"),new ScilabDouble(4)); } else if ((typeof(this.gain)=="uint8")) { ot = 8; - this.model.sim = list("gainblk_ui8e",4); + this.model.sim = list(new ScilabString("gainblk_ui8e"),new ScilabDouble(4)); } else { message("type is not an integer."); ok = false; diff --git a/js/Linear/INTEGRAL.js b/js/Linear/INTEGRAL.js index db35386c..f5bc3520 100644 --- a/js/Linear/INTEGRAL.js +++ b/js/Linear/INTEGRAL.js @@ -6,7 +6,7 @@ function INTEGRAL() { rpar = []; this.model = scicos_model(); this.model.state = new ScilabDouble(0); - this.model.sim = list("integral_func",4); + this.model.sim = list(new ScilabString("integral_func"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(1); this.model.out = new ScilabDouble(1); this.model.rpar = rpar; diff --git a/js/Linear/INTEGRAL_m.js b/js/Linear/INTEGRAL_m.js index 39215001..65423493 100644 --- a/js/Linear/INTEGRAL_m.js +++ b/js/Linear/INTEGRAL_m.js @@ -6,7 +6,7 @@ function INTEGRAL_m() { rpar = []; this.model = scicos_model(); this.model.state = new ScilabDouble(0); - this.model.sim = list("integral_func",4); + this.model.sim = list(new ScilabString("integral_func"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(1); this.model.out = new ScilabDouble(1); this.model.in2 = new ScilabDouble(1); @@ -109,12 +109,12 @@ function INTEGRAL_m() { this.model.rpar = rpar; if ((Datatype==1)) { this.model.state = new ScilabDouble(real(this.x0.slice())); - this.model.sim = list("integral_func",4); + this.model.sim = list(new ScilabString("integral_func"),new ScilabDouble(4)); it = [[1],[ones(this.reinit,1)]]; ot = 1; } else if ((Datatype==2)) { this.model.state = [[real(this.x0.slice())],[imag(this.x0.slice())]]; - this.model.sim = list("integralz_func",4); + this.model.sim = list(new ScilabString("integralz_func"),new ScilabDouble(4)); it = [[2],[2*ones(this.reinit,1)]]; ot = 2; } else { diff --git a/js/Linear/REGISTER.js b/js/Linear/REGISTER.js index 4569e7d9..ee8118c3 100644 --- a/js/Linear/REGISTER.js +++ b/js/Linear/REGISTER.js @@ -3,7 +3,7 @@ function REGISTER() { REGISTER.prototype.define = function REGISTER() { this.z0 = zeros(10,1); this.model = scicos_model(); - this.model.sim = list("delay4",4); + this.model.sim = list(new ScilabString("delay4"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(1); this.model.out = new ScilabDouble(1); this.model.evtin = new ScilabDouble(1); @@ -45,34 +45,34 @@ function REGISTER() { ok = false; } if (this.it==1) { - this.model.sim = list("delay4",4); + this.model.sim = list(new ScilabString("delay4"),new ScilabDouble(4)); this.z0 = double(this.z0); this.model.dstate = new ScilabDouble(this.z0); this.model.odstate = list(); } else { if (this.it==3) { - this.model.sim = list("delay4_i32",4); + this.model.sim = list(new ScilabString("delay4_i32"),new ScilabDouble(4)); this.z0 = int32(this.z0); } else if (this.it==4) { - this.model.sim = list("delay4_i16",4); + this.model.sim = list(new ScilabString("delay4_i16"),new ScilabDouble(4)); this.z0 = int16(this.z0); } else if (this.it==5) { - this.model.sim = list("delay4_i8",4); + this.model.sim = list(new ScilabString("delay4_i8"),new ScilabDouble(4)); this.z0 = int8(this.z0); } else if (this.it==6) { - this.model.sim = list("delay4_ui32",4); + this.model.sim = list(new ScilabString("delay4_ui32"),new ScilabDouble(4)); this.z0 = uint32(this.z0); } else if (this.it==7) { - this.model.sim = list("delay4_ui16",4); + this.model.sim = list(new ScilabString("delay4_ui16"),new ScilabDouble(4)); this.z0 = uint16(this.z0); } else if (this.it==8) { - this.model.sim = list("delay4_ui8",4); + this.model.sim = list(new ScilabString("delay4_ui8"),new ScilabDouble(4)); this.z0 = uint8(this.z0); } else { message("Datatype is not supported"); ok = false; } - this.model.odstate = list(this.z0); + this.model.odstate = list(new ScilabDouble(this.z0)); this.model.dstate = []; } if (ok) { diff --git a/js/Linear/SAMPHOLD.js b/js/Linear/SAMPHOLD.js index e47fcee2..94a9ecec 100644 --- a/js/Linear/SAMPHOLD.js +++ b/js/Linear/SAMPHOLD.js @@ -3,7 +3,7 @@ function SAMPHOLD() { SAMPHOLD.prototype.define = function SAMPHOLD() { in1 = -1; this.model = scicos_model(); - this.model.sim = list("samphold4",4); + this.model.sim = list(new ScilabString("samphold4"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(-1); this.model.out = new ScilabDouble(-1); this.model.evtin = new ScilabDouble(1); diff --git a/js/Linear/SAMPHOLD_m.js b/js/Linear/SAMPHOLD_m.js index 29972426..87550934 100644 --- a/js/Linear/SAMPHOLD_m.js +++ b/js/Linear/SAMPHOLD_m.js @@ -2,7 +2,7 @@ function SAMPHOLD_m() { SAMPHOLD_m.prototype.define = function SAMPHOLD_m() { this.model = scicos_model(); - this.model.sim = list("samphold4_m",4); + this.model.sim = list(new ScilabString("samphold4_m"),new ScilabDouble(4)); this.model.in1 = new ScilabDouble(-1); this.model.in2 = new ScilabDouble(-2); this.model.intyp = new ScilabDouble(1); diff --git a/js/Linear/SOM_f.js b/js/Linear/SOM_f.js index 421ab2df..5c068e3e 100644 --- a/js/Linear/SOM_f.js +++ b/js/Linear/SOM_f.js @@ -3,7 +3,7 @@ function SOM_f() { SOM_f.prototype.define = function SOM_f() { sgn = [[1],[1],[1]]; this.model = scicos_model(); - this.model.sim = list("sum",2); + this.model.sim = list(new ScilabString("sum"),new ScilabDouble(2)); this.model.in1 = [[-1],[-1],[-1]]; this.model.out = new ScilabDouble(-1); this.model.rpar = sgn; diff --git a/js/Linear/SUMMATION.js b/js/Linear/SUMMATION.js index ec0683cf..996168f6 100644 --- a/js/Linear/SUMMATION.js +++ b/js/Linear/SUMMATION.js @@ -3,7 +3,7 @@ function SUMMATION() { SUMMATION.prototype.define = function SUMMATION() { this.sgn = [[1],[-1]]; this.model = scicos_model(); - this.model.sim = list("summation",4); + this.model.sim = list(new ScilabString("summation"),new ScilabDouble(4)); this.model.in1 = [[-1],[-1]]; this.model.out = new ScilabDouble(-1); this.model.in2 = [[-2],[-2]]; @@ -81,54 +81,54 @@ function SUMMATION() { it = this.Datatype*ones(1,size(in1,1)); ot = this.Datatype; if (this.Datatype==1) { - this.model.sim = list("summation",4); + this.model.sim = list(new ScilabString("summation"),new ScilabDouble(4)); } else if (this.Datatype==2) { - this.model.sim = list("summation_z",4); + this.model.sim = list(new ScilabString("summation_z"),new ScilabDouble(4)); } else if (((this.Datatype<1)||(this.Datatype>8))) { message("Datatype is not supported"); ok = false; } else { if (this.satur==0) { if (this.Datatype==3) { - this.model.sim = list("summation_i32n",4); + this.model.sim = list(new ScilabString("summation_i32n"),new ScilabDouble(4)); } else if (this.Datatype==4) { - this.model.sim = list("summation_i16n",4); + this.model.sim = list(new ScilabString("summation_i16n"),new ScilabDouble(4)); } else if (this.Datatype==5) { - this.model.sim = list("summation_i8n",4); + this.model.sim = list(new ScilabString("summation_i8n"),new ScilabDouble(4)); } else if (this.Datatype==6) { - this.model.sim = list("summation_ui32n",4); + this.model.sim = list(new ScilabString("summation_ui32n"),new ScilabDouble(4)); } else if (this.Datatype==7) { - this.model.sim = list("summation_ui16n",4); + this.model.sim = list(new ScilabString("summation_ui16n"),new ScilabDouble(4)); } else if (this.Datatype==8) { - this.model.sim = list("summation_ui8n",4); + this.model.sim = list(new ScilabString("summation_ui8n"),new ScilabDouble(4)); } } else if (this.satur==1) { if (this.Datatype==3) { - this.model.sim = list("summation_i32s",4); + this.model.sim = list(new ScilabString("summation_i32s"),new ScilabDouble(4)); } else if (this.Datatype==4) { - this.model.sim = list("summation_i16s",4); + this.model.sim = list(new ScilabString("summation_i16s"),new ScilabDouble(4)); } else if (this.Datatype==5) { - this.model.sim = list("summation_i8s",4); + this.model.sim = list(new ScilabString("summation_i8s"),new ScilabDouble(4)); } else if (this.Datatype==6) { - this.model.sim = list("summation_ui32s",4); + this.model.sim = list(new ScilabString("summation_ui32s"),new ScilabDouble(4)); } else if (this.Datatype==7) { - this.model.sim = list("summation_ui16s",4); + this.model.sim = list(new ScilabString("summation_ui16s"),new ScilabDouble(4)); } else if (this.Datatype==8) { - this.model.sim = list("summation_ui8s",4); + this.model.sim = list(new ScilabString("summation_ui8s"),new ScilabDouble(4)); } } else if (this.satur==2) { if (this.Datatype==3) { - this.model.sim = list("summation_i32e",4); + this.model.sim = list(new ScilabString("summation_i32e"),new ScilabDouble(4)); } else if (this.Datatype==4) { - this.model.sim = list("summation_i16e",4); + this.model.sim = list(new ScilabString("summation_i16e"),new ScilabDouble(4)); } else if (this.Datatype==5) { - this.model.sim = list("summation_i8e",4); + this.model.sim = list(new ScilabString("summation_i8e"),new ScilabDouble(4)); } else if (this.Datatype==6) { - this.model.sim = list("summation_ui32e",4); + this.model.sim = list(new ScilabString("summation_ui32e"),new ScilabDouble(4)); } else if (this.Datatype==7) { - this.model.sim = list("summation_ui16e",4); + this.model.sim = list(new ScilabString("summation_ui16e"),new ScilabDouble(4)); } else if (this.Datatype==8) { - this.model.sim = list("summation_ui8e",4); + this.model.sim = list(new ScilabString("summation_ui8e"),new ScilabDouble(4)); } } } diff --git a/js/Linear/SUM_f.js b/js/Linear/SUM_f.js index 76f1d489..ab5e7e3b 100644 --- a/js/Linear/SUM_f.js +++ b/js/Linear/SUM_f.js @@ -2,7 +2,7 @@ function SUM_f() { SUM_f.prototype.define = function SUM_f() { this.model = scicos_model(); - this.model.sim = list("plusblk",2); + this.model.sim = list(new ScilabString("plusblk"),new ScilabDouble(2)); this.model.in1 = [[-1],[-1],[-1]]; this.model.out = new ScilabDouble(-1); this.model.blocktype = new ScilabString("c"); diff --git a/js/Linear/TCLSS.js b/js/Linear/TCLSS.js index dc538324..a4929c9c 100644 --- a/js/Linear/TCLSS.js +++ b/js/Linear/TCLSS.js @@ -10,7 +10,7 @@ function TCLSS() { nx = size(this.x0,"*"); out = 1; this.model = scicos_model(); - this.model.sim = list("tcslti4",4); + this.model.sim = list(new ScilabString("tcslti4"),new ScilabDouble(4)); this.model.in1 = [[in1],[nx]]; this.model.out = new ScilabDouble(out); this.model.evtin = new ScilabDouble(1); @@ -85,9 +85,9 @@ function TCLSS() { this.model.state = this.x0.slice(); this.model.rpar = rpar; if (this.D!=[]) { - this.model.sim = list("tcslti4",4); + this.model.sim = list(new ScilabString("tcslti4"),new ScilabDouble(4)); } else { - this.model.sim = list("tcsltj4",4); + this.model.sim = list(new ScilabString("tcsltj4"),new ScilabDouble(4)); } this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Linear/TCLSS_f.js b/js/Linear/TCLSS_f.js index 00370934..f040dc61 100644 --- a/js/Linear/TCLSS_f.js +++ b/js/Linear/TCLSS_f.js @@ -10,7 +10,7 @@ function TCLSS_f() { nx = size(this.x0,"*"); out = 1; this.model = scicos_model(); - this.model.sim = list("tcslti",1); + this.model.sim = list(new ScilabString("tcslti"),new ScilabDouble(1)); this.model.in1 = [[in1],[nx]]; this.model.out = new ScilabDouble(out); this.model.evtin = new ScilabDouble(1); @@ -85,9 +85,9 @@ function TCLSS_f() { this.model.state = this.x0.slice(); this.model.rpar = rpar; if (this.D!=[]) { - this.model.sim = list("tcslti",1); + this.model.sim = list(new ScilabString("tcslti"),new ScilabDouble(1)); } else { - this.model.sim = list("tcsltj",1); + this.model.sim = list(new ScilabString("tcsltj"),new ScilabDouble(1)); } this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Linear/TIME_DELAY.js b/js/Linear/TIME_DELAY.js index ce36dfc9..963504ab 100644 --- a/js/Linear/TIME_DELAY.js +++ b/js/Linear/TIME_DELAY.js @@ -6,7 +6,7 @@ function TIME_DELAY() { this.init = 0; this.N = 1024; this.model = scicos_model(); - this.model.sim = list("time_delay",4); + this.model.sim = list(new ScilabString("time_delay"),new ScilabDouble(4)); this.model.in1 = [nin]; this.model.out = new ScilabDouble(nin); this.model.rpar = [this.T,this.init]; diff --git a/js/Linear/VARIABLE_DELAY.js b/js/Linear/VARIABLE_DELAY.js index 9b4fc33f..50216a5b 100644 --- a/js/Linear/VARIABLE_DELAY.js +++ b/js/Linear/VARIABLE_DELAY.js @@ -6,7 +6,7 @@ function VARIABLE_DELAY() { this.init = 0; this.N = 1024; this.model = scicos_model(); - this.model.sim = list("variable_delay",4); + this.model.sim = list(new ScilabString("variable_delay"),new ScilabDouble(4)); this.model.in1 = [[nin],[1]]; this.model.out = new ScilabDouble(nin); this.model.rpar = [this.T,this.init]; |