From 0047c3bea1d86b12a08544f6f0833c63e77f6eac Mon Sep 17 00:00:00 2001 From: Sunil Shetye Date: Wed, 11 Jul 2018 15:19:38 +0530 Subject: support vector also --- js/Linear/BIGSOM_f.js | 4 ++-- js/Linear/CLINDUMMY_f.js | 4 ++-- js/Linear/CLR.js | 6 +++--- js/Linear/CLR_f.js | 6 +++--- js/Linear/CLSS.js | 8 ++++---- js/Linear/CLSS_f.js | 8 ++++---- js/Linear/DELAYV_f.js | 4 ++-- js/Linear/DERIV.js | 2 +- js/Linear/DIFF_c.js | 4 ++-- js/Linear/DLR.js | 8 ++++---- js/Linear/DLR_f.js | 8 ++++---- js/Linear/DLSS.js | 10 +++++----- js/Linear/DLSS_f.js | 10 +++++----- js/Linear/DOLLAR.js | 6 +++--- js/Linear/DOLLAR_f.js | 6 +++--- js/Linear/DOLLAR_m.js | 6 +++--- js/Linear/GAINBLK.js | 6 +++--- js/Linear/GAINBLK_f.js | 4 ++-- js/Linear/GAIN_f.js | 4 ++-- js/Linear/INTEGRAL.js | 8 ++++---- js/Linear/INTEGRAL_f.js | 2 +- js/Linear/INTEGRAL_m.js | 6 +++--- js/Linear/PID.js | 2 +- js/Linear/REGISTER.js | 4 ++-- js/Linear/REGISTER_f.js | 2 +- js/Linear/SAMPHOLD.js | 2 +- js/Linear/SAMPHOLD_m.js | 2 +- js/Linear/SAMPLEHOLD_f.js | 2 +- js/Linear/SOM_f.js | 2 +- js/Linear/SUMMATION.js | 2 +- js/Linear/SUM_f.js | 2 +- js/Linear/TCLSS.js | 8 ++++---- js/Linear/TCLSS_f.js | 8 ++++---- js/Linear/TIME_DELAY.js | 8 ++++---- js/Linear/VARIABLE_DELAY.js | 4 ++-- 35 files changed, 89 insertions(+), 89 deletions(-) (limited to 'js/Linear') diff --git a/js/Linear/BIGSOM_f.js b/js/Linear/BIGSOM_f.js index 95fe10ed..b0a75d52 100644 --- a/js/Linear/BIGSOM_f.js +++ b/js/Linear/BIGSOM_f.js @@ -8,7 +8,7 @@ function BIGSOM_f() { this.model.out = new ScilabDouble([-1]); this.model.rpar = new ScilabDouble(this.sgn); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = sci2exp(this.sgn); var gr_i = []; this.x = standard_define([2,3],this.model,exprs,gr_i); @@ -39,7 +39,7 @@ function BIGSOM_f() { var graphics = tmpvar0[1] var ok = tmpvar0[2]; if (ok) { - this.model.rpar = this.sgn.slice(); + this.model.rpar = new ScilabDouble(this.sgn.slice()); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Linear/CLINDUMMY_f.js b/js/Linear/CLINDUMMY_f.js index 047efa5f..0159348b 100644 --- a/js/Linear/CLINDUMMY_f.js +++ b/js/Linear/CLINDUMMY_f.js @@ -6,8 +6,8 @@ function CLINDUMMY_f() { 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 = []; - this.model.dep_ut = [false,true]; + this.model.firing = new ScilabDouble([]); + this.model.dep_ut = new ScilabDouble([false,true]); var gr_i = []; this.x = standard_define([3,2],this.model,[],gr_i); return new BasicBlock(this.x); diff --git a/js/Linear/CLR.js b/js/Linear/CLR.js index b4abd599..5edba5dd 100644 --- a/js/Linear/CLR.js +++ b/js/Linear/CLR.js @@ -14,7 +14,7 @@ function CLR() { this.model.state = new ScilabDouble([x0]); this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); @@ -70,14 +70,14 @@ function CLR() { var mmm = [false,true]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = mmm; + this.model.dep_ut = new ScilabDouble(mmm); } if (ns1<=ns) { var x0 = x0.slice(1-1,ns1); } else { x0[ns1-1][1-1] = 0; } - this.model.state = x0; + this.model.state = new ScilabDouble(x0); this.model.rpar = new ScilabDouble(rpar); this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Linear/CLR_f.js b/js/Linear/CLR_f.js index d1b8d23b..0d56c799 100644 --- a/js/Linear/CLR_f.js +++ b/js/Linear/CLR_f.js @@ -14,7 +14,7 @@ function CLR_f() { this.model.state = new ScilabDouble([x0]); this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); var gr_i = []; this.x = standard_define([2.5,2.5],this.model,exprs,gr_i); return new BasicBlock(this.x); @@ -70,14 +70,14 @@ function CLR_f() { var mmm = [false,true]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = mmm; + this.model.dep_ut = new ScilabDouble(mmm); } if (ns1<=ns) { var x0 = x0.slice(1-1,ns1); } else { x0[ns1-1][1-1] = 0; } - this.model.state = x0; + this.model.state = new ScilabDouble(x0); this.model.rpar = new ScilabDouble(rpar); this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Linear/CLSS.js b/js/Linear/CLSS.js index d5fd2d3a..3c095238 100644 --- a/js/Linear/CLSS.js +++ b/js/Linear/CLSS.js @@ -15,7 +15,7 @@ function CLSS() { this.model.state = new ScilabDouble([this.x0]); this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); 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.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; var gr_i = []; this.x = standard_define([4,2],this.model,exprs,gr_i); @@ -90,12 +90,12 @@ function CLSS() { var mmm = [false,true]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = mmm; + this.model.dep_ut = new ScilabDouble(mmm); } } else { - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); } - this.model.state = this.x0.slice(); + this.model.state = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble(rpar); this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Linear/CLSS_f.js b/js/Linear/CLSS_f.js index f6afb7fb..09f6465f 100644 --- a/js/Linear/CLSS_f.js +++ b/js/Linear/CLSS_f.js @@ -15,7 +15,7 @@ function CLSS_f() { this.model.state = new ScilabDouble([this.x0]); this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); 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.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; var gr_i = []; this.x = standard_define([4,2],this.model,exprs,gr_i); @@ -80,12 +80,12 @@ function CLSS_f() { var mmm = [false,true]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = mmm; + this.model.dep_ut = new ScilabDouble(mmm); } } else { - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); } - this.model.state = this.x0.slice(); + this.model.state = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble(rpar); this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Linear/DELAYV_f.js b/js/Linear/DELAYV_f.js index 0cfbfc4d..6e3ada84 100644 --- a/js/Linear/DELAYV_f.js +++ b/js/Linear/DELAYV_f.js @@ -14,8 +14,8 @@ function DELAYV_f() { this.model.dstate = new ScilabDouble([z0]); this.model.rpar = new ScilabDouble([this.T/(size(this.zz0,"*"))]); this.model.blocktype = new ScilabString(["d"]); - this.model.firing = [0,-1]; - this.model.dep_ut = [true,false]; + this.model.firing = new ScilabDouble([0,-1]); + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[string(this.nin)],[strcat(string(z0.slice(1-1,$-1)),";")],[string(this.T)]]; var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); diff --git a/js/Linear/DERIV.js b/js/Linear/DERIV.js index 853643e7..01ef03d1 100644 --- a/js/Linear/DERIV.js +++ b/js/Linear/DERIV.js @@ -6,7 +6,7 @@ function DERIV() { this.model.in1 = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["x"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = []; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/Linear/DIFF_c.js b/js/Linear/DIFF_c.js index f8d77168..057264bf 100644 --- a/js/Linear/DIFF_c.js +++ b/js/Linear/DIFF_c.js @@ -8,7 +8,7 @@ function DIFF_c() { 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); @@ -52,7 +52,7 @@ function DIFF_c() { if (!ask_again) { graphics.exprs = exprs; this.model.state = new ScilabDouble([this.x0],[this.xd0]); - this.model.out = [N]; + this.model.out = new ScilabDouble([N]); this.model.in1 = new ScilabDouble([N]); this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Linear/DLR.js b/js/Linear/DLR.js index 8c4d3f0e..2f686ae0 100644 --- a/js/Linear/DLR.js +++ b/js/Linear/DLR.js @@ -12,10 +12,10 @@ function DLR() { this.model.in1 = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); - this.model.dstate = x0.slice(); + this.model.dstate = new ScilabDouble(x0.slice()); this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); @@ -67,7 +67,7 @@ function DLR() { x0[ns1-1][1-1] = 0; } var rpar = [[A.slice()],[B.slice()],[C.slice()],[D.slice()]]; - this.model.dstate = x0; + this.model.dstate = new ScilabDouble(x0); this.model.rpar = new ScilabDouble(rpar); if (norm(D,1)!=0) { var mmm = [true,false]; @@ -75,7 +75,7 @@ function DLR() { var mmm = [false,false]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = mmm; + this.model.dep_ut = new ScilabDouble(mmm); } this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Linear/DLR_f.js b/js/Linear/DLR_f.js index 0306a6d9..f2702d0e 100644 --- a/js/Linear/DLR_f.js +++ b/js/Linear/DLR_f.js @@ -12,10 +12,10 @@ function DLR_f() { this.model.in1 = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); - this.model.dstate = x0.slice(); + this.model.dstate = new ScilabDouble(x0.slice()); this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var gr_i = []; this.x = standard_define([2.5,2.5],this.model,exprs,gr_i); return new BasicBlock(this.x); @@ -67,7 +67,7 @@ function DLR_f() { x0[ns1-1][1-1] = 0; } var rpar = [[A.slice()],[B.slice()],[C.slice()],[D.slice()]]; - this.model.dstate = x0; + this.model.dstate = new ScilabDouble(x0); this.model.rpar = new ScilabDouble(rpar); if (norm(D,1)!=0) { var mmm = [true,false]; @@ -75,7 +75,7 @@ function DLR_f() { var mmm = [false,false]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = mmm; + this.model.dep_ut = new ScilabDouble(mmm); } this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Linear/DLSS.js b/js/Linear/DLSS.js index 69f34f7c..eb201209 100644 --- a/js/Linear/DLSS.js +++ b/js/Linear/DLSS.js @@ -11,10 +11,10 @@ function DLSS() { this.model.in1 = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); - this.model.dstate = this.x0.slice(); + this.model.dstate = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; var gr_i = []; this.x = standard_define([4,2],this.model,exprs,gr_i); @@ -89,12 +89,12 @@ function DLSS() { var mmm = [false,false]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = mmm; + this.model.dep_ut = new ScilabDouble(mmm); } } else { - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); } - this.model.dstate = this.x0.slice(); + this.model.dstate = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble(rpar); this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Linear/DLSS_f.js b/js/Linear/DLSS_f.js index 81a76895..84024be5 100644 --- a/js/Linear/DLSS_f.js +++ b/js/Linear/DLSS_f.js @@ -11,10 +11,10 @@ function DLSS_f() { this.model.in1 = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); - this.model.dstate = this.x0.slice(); + this.model.dstate = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; var gr_i = []; this.x = standard_define([4,2],this.model,exprs,gr_i); @@ -79,12 +79,12 @@ function DLSS_f() { var mmm = [false,false]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = mmm; + this.model.dep_ut = new ScilabDouble(mmm); } } else { - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); } - this.model.dstate = this.x0.slice(); + this.model.dstate = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble(rpar); this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Linear/DOLLAR.js b/js/Linear/DOLLAR.js index c92f7138..15ecd057 100644 --- a/js/Linear/DOLLAR.js +++ b/js/Linear/DOLLAR.js @@ -12,7 +12,7 @@ function DOLLAR() { this.model.evtin = new ScilabDouble([1-this.inh]); this.model.dstate = new ScilabDouble([z]); this.model.blocktype = new ScilabString(["d"]); - 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); @@ -49,14 +49,14 @@ function DOLLAR() { var in1 = out; this.model.sim = list(new ScilabString(["dollar4_m"]), new ScilabDouble([4])); this.model.odstate = list(new ScilabDouble([this.a])); - this.model.dstate = []; + this.model.dstate = new ScilabDouble([]); if (this.type[(this.a)==1-1]) { if (isreal(this.a)) { var it = 1; var ot = 1; if ((size(this.a,1)==1||size(this.a,2)==1)) { this.model.sim = list(new ScilabString(["dollar4"]), new ScilabDouble([4])); - this.model.dstate = this.a.slice(); + this.model.dstate = new ScilabDouble(this.a.slice()); this.model.odstate = list(); } } else { diff --git a/js/Linear/DOLLAR_f.js b/js/Linear/DOLLAR_f.js index 843477e9..bdc2ea92 100644 --- a/js/Linear/DOLLAR_f.js +++ b/js/Linear/DOLLAR_f.js @@ -12,7 +12,7 @@ function DOLLAR_f() { this.model.evtin = new ScilabDouble([1-this.inh]); this.model.dstate = new ScilabDouble([z]); this.model.blocktype = new ScilabString(["d"]); - 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); @@ -56,8 +56,8 @@ function DOLLAR_f() { if (ok) { graphics.exprs = exprs; this.model.dstate = new ScilabDouble([this.a]); - this.model.in1 = in1; - this.model.out = out; + this.model.in1 = new ScilabDouble(in1); + this.model.out = new ScilabDouble(out); this.x.graphics = graphics; this.x.model = this.model; break; diff --git a/js/Linear/DOLLAR_m.js b/js/Linear/DOLLAR_m.js index daaa8404..34d93154 100644 --- a/js/Linear/DOLLAR_m.js +++ b/js/Linear/DOLLAR_m.js @@ -12,7 +12,7 @@ function DOLLAR_m() { this.model.evtin = new ScilabDouble([1-this.inh]); this.model.dstate = new ScilabDouble([z]); this.model.blocktype = new ScilabString(["d"]); - 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); @@ -49,14 +49,14 @@ function DOLLAR_m() { var in1 = out; this.model.sim = list(new ScilabString(["dollar4_m"]), new ScilabDouble([4])); this.model.odstate = list(new ScilabDouble([this.a])); - this.model.dstate = []; + this.model.dstate = new ScilabDouble([]); if ((this.type[this.a-1]==1)) { if (isreal(this.a)) { var it = 1; var ot = 1; if ((size(this.a,1)==1||size(this.a,2)==1)) { this.model.sim = list(new ScilabString(["dollar4"]), new ScilabDouble([4])); - this.model.dstate = this.a.slice(); + this.model.dstate = new ScilabDouble(this.a.slice()); this.model.odstate = list(); } } else { diff --git a/js/Linear/GAINBLK.js b/js/Linear/GAINBLK.js index 8cd16680..e84f60ef 100644 --- a/js/Linear/GAINBLK.js +++ b/js/Linear/GAINBLK.js @@ -14,7 +14,7 @@ function GAINBLK() { this.model.out2 = new ScilabDouble([out2]); this.model.rpar = new ScilabDouble([this.gain]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [strcat(sci2exp(this.gain))]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); @@ -53,7 +53,7 @@ function GAINBLK() { var it = 1; var ot = 1; this.model.sim = list(new ScilabString(["gainblk"]), new ScilabDouble([4])); - this.model.rpar = this.gain.slice(); + this.model.rpar = new ScilabDouble(this.gain.slice()); this.model.opar = list(); } else { message("type is not supported"); @@ -133,7 +133,7 @@ function GAINBLK() { message("Do on Overflow must be 0,1,2"); var ok = false; } - this.model.rpar = []; + this.model.rpar = new ScilabDouble([]); this.model.opar = list(this.gain.slice()); } if (ok) { diff --git a/js/Linear/GAINBLK_f.js b/js/Linear/GAINBLK_f.js index 55cf64ea..614fc461 100644 --- a/js/Linear/GAINBLK_f.js +++ b/js/Linear/GAINBLK_f.js @@ -10,7 +10,7 @@ function GAINBLK_f() { this.model.out = new ScilabDouble([out]); this.model.rpar = new ScilabDouble([this.gain]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [strcat(sci2exp(this.gain))]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); @@ -48,7 +48,7 @@ function GAINBLK_f() { var ok = tmpvar1[2]; if (ok) { graphics.exprs = exprs; - this.model.rpar = this.gain.slice(); + this.model.rpar = new ScilabDouble(this.gain.slice()); this.x.graphics = graphics; this.x.model = this.model; break; diff --git a/js/Linear/GAIN_f.js b/js/Linear/GAIN_f.js index e987baef..25b99662 100644 --- a/js/Linear/GAIN_f.js +++ b/js/Linear/GAIN_f.js @@ -10,7 +10,7 @@ function GAIN_f() { this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.gain]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[strcat(sci2exp(this.gain))],[strcat(sci2exp(in1))],[strcat(sci2exp(out))]]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); @@ -48,7 +48,7 @@ function GAIN_f() { var ok = tmpvar1[2]; if (ok) { graphics.exprs = exprs; - this.model.rpar = this.gain.slice(); + this.model.rpar = new ScilabDouble(this.gain.slice()); this.x.graphics = graphics; this.x.model = this.model; break; diff --git a/js/Linear/INTEGRAL.js b/js/Linear/INTEGRAL.js index c70354a8..9fc1fc16 100644 --- a/js/Linear/INTEGRAL.js +++ b/js/Linear/INTEGRAL.js @@ -9,9 +9,9 @@ function INTEGRAL() { 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; + this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); var exprs = string([[0],[0],[0],[this.maxp],[minp]]); var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); @@ -80,8 +80,8 @@ function INTEGRAL() { this.model.nmode = new ScilabDouble([0]); } if (ok) { - this.model.rpar = rpar; - this.model.state = this.x0; + this.model.rpar = new ScilabDouble(rpar); + this.model.state = new ScilabDouble(this.x0); var tmpvar0 = check_io(this.model,graphics,size(this.x0,1)*[[1],[ones(this.reinit,1)]],size(this.x0,1),ones(this.reinit,1),[]) this.model = tmpvar0[0] var graphics = tmpvar0[1] diff --git a/js/Linear/INTEGRAL_f.js b/js/Linear/INTEGRAL_f.js index 53ed84e2..5c4b7197 100644 --- a/js/Linear/INTEGRAL_f.js +++ b/js/Linear/INTEGRAL_f.js @@ -8,7 +8,7 @@ function INTEGRAL_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)); var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/Linear/INTEGRAL_m.js b/js/Linear/INTEGRAL_m.js index 667cd9e1..75ed7a6f 100644 --- a/js/Linear/INTEGRAL_m.js +++ b/js/Linear/INTEGRAL_m.js @@ -11,9 +11,9 @@ function INTEGRAL_m() { this.model.out = new ScilabDouble([1]); this.model.in2 = new ScilabDouble([1]); this.model.out2 = new ScilabDouble([1]); - this.model.rpar = rpar; + this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); var exprs = string([[0],[0],[0],[this.maxp],[minp]]); var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); @@ -106,7 +106,7 @@ function INTEGRAL_m() { this.model.nmode = new ScilabDouble([0]); } if (ok) { - this.model.rpar = rpar; + this.model.rpar = new ScilabDouble(rpar); if ((Datatype==1)) { this.model.state = new ScilabDouble([real(this.x0.slice())]); this.model.sim = list(new ScilabString(["integral_func"]), new ScilabDouble([4])); diff --git a/js/Linear/PID.js b/js/Linear/PID.js index 320f1396..659289e1 100644 --- a/js/Linear/PID.js +++ b/js/Linear/PID.js @@ -33,7 +33,7 @@ function PID() { this.model.outtyp = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["h"]); this.model.firing = new ScilabBoolean([false]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); this.model.rpar = new ScilabDouble([scs_m]); var gr_i = []; this.x = standard_define([2,2],this.model,[],gr_i); diff --git a/js/Linear/REGISTER.js b/js/Linear/REGISTER.js index 5e86e2ce..54f732f1 100644 --- a/js/Linear/REGISTER.js +++ b/js/Linear/REGISTER.js @@ -9,7 +9,7 @@ function REGISTER() { this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = strcat(string(this.z0),";"); var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); @@ -73,7 +73,7 @@ function REGISTER() { var ok = false; } this.model.odstate = list(new ScilabDouble([this.z0])); - this.model.dstate = []; + this.model.dstate = new ScilabDouble([]); } if (ok) { var in1 = [1,1]; diff --git a/js/Linear/REGISTER_f.js b/js/Linear/REGISTER_f.js index f61de699..da798aa3 100644 --- a/js/Linear/REGISTER_f.js +++ b/js/Linear/REGISTER_f.js @@ -9,7 +9,7 @@ function REGISTER_f() { this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = strcat(string(this.z0),";"); var gr_i = []; this.x = standard_define([2.5,2.5],this.model,exprs,gr_i); diff --git a/js/Linear/SAMPHOLD.js b/js/Linear/SAMPHOLD.js index a3849f9a..ebb8d78c 100644 --- a/js/Linear/SAMPHOLD.js +++ b/js/Linear/SAMPHOLD.js @@ -8,7 +8,7 @@ function SAMPHOLD() { this.model.out = new ScilabDouble([-1]); this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var gr_i = []; this.x = standard_define([2,2],this.model," ",gr_i); return new BasicBlock(this.x); diff --git a/js/Linear/SAMPHOLD_m.js b/js/Linear/SAMPHOLD_m.js index 8d4d93a5..7d183a79 100644 --- a/js/Linear/SAMPHOLD_m.js +++ b/js/Linear/SAMPHOLD_m.js @@ -11,7 +11,7 @@ function SAMPHOLD_m() { this.model.out2 = new ScilabDouble([-2]); this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; var gr_i = []; this.x = standard_define([2,2],this.model,label,gr_i); diff --git a/js/Linear/SAMPLEHOLD_f.js b/js/Linear/SAMPLEHOLD_f.js index 7421d96e..daca32c1 100644 --- a/js/Linear/SAMPLEHOLD_f.js +++ b/js/Linear/SAMPLEHOLD_f.js @@ -8,7 +8,7 @@ function SAMPLEHOLD_f() { this.model.out = new ScilabDouble([-1]); this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var gr_i = []; this.x = standard_define([2,2],this.model," ",gr_i); return new BasicBlock(this.x); diff --git a/js/Linear/SOM_f.js b/js/Linear/SOM_f.js index 40e4c2ff..d7450565 100644 --- a/js/Linear/SOM_f.js +++ b/js/Linear/SOM_f.js @@ -8,7 +8,7 @@ function SOM_f() { this.model.out = new ScilabDouble([-1]); this.model.rpar = new ScilabDouble(sgn); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = [[sci2exp(1)],[sci2exp(sgn)]]; var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); diff --git a/js/Linear/SUMMATION.js b/js/Linear/SUMMATION.js index d70f6699..96182040 100644 --- a/js/Linear/SUMMATION.js +++ b/js/Linear/SUMMATION.js @@ -10,7 +10,7 @@ function SUMMATION() { this.model.out2 = new ScilabDouble([-2]); this.model.ipar = new ScilabDouble(this.sgn); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = [true,false]; + this.model.dep_ut = new ScilabDouble([true,false]); var exprs = sci2exp(this.sgn); var gr_i = []; this.x = standard_define([2,3],this.model,exprs,gr_i); diff --git a/js/Linear/SUM_f.js b/js/Linear/SUM_f.js index 59abbc82..de2a8e22 100644 --- a/js/Linear/SUM_f.js +++ b/js/Linear/SUM_f.js @@ -6,7 +6,7 @@ function SUM_f() { this.model.in1 = new ScilabDouble([-1],[-1],[-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 gr_i = []; var exprs = []; this.x = standard_define([1,1],this.model,exprs,gr_i); diff --git a/js/Linear/TCLSS.js b/js/Linear/TCLSS.js index 51b90c89..552810c5 100644 --- a/js/Linear/TCLSS.js +++ b/js/Linear/TCLSS.js @@ -17,7 +17,7 @@ function TCLSS() { this.model.state = new ScilabDouble([this.x0]); this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); 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.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); @@ -82,12 +82,12 @@ function TCLSS() { var mmm = [false,true]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = mmm; + this.model.dep_ut = new ScilabDouble(mmm); } } else { - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); } - this.model.state = this.x0.slice(); + this.model.state = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble(rpar); if (this.D!=[]) { this.model.sim = list(new ScilabString(["tcslti4"]), new ScilabDouble([4])); diff --git a/js/Linear/TCLSS_f.js b/js/Linear/TCLSS_f.js index 33f82aa0..da69f8aa 100644 --- a/js/Linear/TCLSS_f.js +++ b/js/Linear/TCLSS_f.js @@ -17,7 +17,7 @@ function TCLSS_f() { this.model.state = new ScilabDouble([this.x0]); this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); 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.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); @@ -82,12 +82,12 @@ function TCLSS_f() { var mmm = [false,true]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = mmm; + this.model.dep_ut = new ScilabDouble(mmm); } } else { - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); } - this.model.state = this.x0.slice(); + this.model.state = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble(rpar); if (this.D!=[]) { this.model.sim = list(new ScilabString(["tcslti"]), new ScilabDouble([1])); diff --git a/js/Linear/TIME_DELAY.js b/js/Linear/TIME_DELAY.js index d02b26f5..a4cee6f2 100644 --- a/js/Linear/TIME_DELAY.js +++ b/js/Linear/TIME_DELAY.js @@ -7,12 +7,12 @@ function TIME_DELAY() { this.N = 1024; this.model = scicos_model(); this.model.sim = list(new ScilabString(["time_delay"]), new ScilabDouble([4])); - this.model.in1 = [nin]; + this.model.in1 = new ScilabDouble([nin]); this.model.out = new ScilabDouble([nin]); - this.model.rpar = [this.T,this.init]; + this.model.rpar = new ScilabDouble([this.T,this.init]); this.model.ipar = new ScilabDouble([this.N]); this.model.blocktype = new ScilabString(["x"]); - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); var exprs = [[string(this.T)],[string(this.init)],[string(this.N)]]; var gr_i = []; this.x = standard_define([3.5,2],this.model,exprs,gr_i); @@ -61,7 +61,7 @@ function TIME_DELAY() { graphics.exprs = exprs; this.model.rpar = new ScilabDouble([this.T],[this.init]); this.model.ipar = new ScilabDouble([this.N]); - this.model.dep_ut = [false,true]; + this.model.dep_ut = new ScilabDouble([false,true]); this.x.graphics = graphics; this.x.model = this.model; break; diff --git a/js/Linear/VARIABLE_DELAY.js b/js/Linear/VARIABLE_DELAY.js index 3be1a51b..ef78520f 100644 --- a/js/Linear/VARIABLE_DELAY.js +++ b/js/Linear/VARIABLE_DELAY.js @@ -9,10 +9,10 @@ function VARIABLE_DELAY() { this.model.sim = list(new ScilabString(["variable_delay"]), new ScilabDouble([4])); this.model.in1 = new ScilabDouble([nin],[1]); this.model.out = new ScilabDouble([nin]); - this.model.rpar = [this.T,this.init]; + this.model.rpar = new ScilabDouble([this.T,this.init]); this.model.ipar = new ScilabDouble([this.N]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = [false,false]; + this.model.dep_ut = new ScilabDouble([false,false]); var exprs = [[string(this.T)],[string(this.init)],[string(this.N)]]; var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); -- cgit