diff options
Diffstat (limited to 'js/Linear')
72 files changed, 393 insertions, 537 deletions
diff --git a/js/Linear/BIGSOM_f.js b/js/Linear/BIGSOM_f.js index 5020005d..56f0180a 100644 --- a/js/Linear/BIGSOM_f.js +++ b/js/Linear/BIGSOM_f.js @@ -9,9 +9,9 @@ function BIGSOM_f() { this.model.rpar = new ScilabDouble(this.sgn); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = sci2exp(this.sgn); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BIGSOM_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = sci2exp(this.sgn); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BIGSOM_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabString([exprs]),gr_i); return new BigSom(this.x); } BIGSOM_f.prototype.details = function BIGSOM_f() { @@ -24,7 +24,7 @@ function BIGSOM_f() { return options; } BIGSOM_f.prototype.set = function BIGSOM_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.sgn = inverse(arguments[0]["sgn"]); @@ -38,7 +38,7 @@ function BIGSOM_f() { var ok = tmpvar0[2]; if (ok) { this.model.rpar = new ScilabDouble(this.sgn.slice()); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; diff --git a/js/Linear/BIGSOM_f.pickle b/js/Linear/BIGSOM_f.pickle index 90662ba0..a1957198 100644 --- a/js/Linear/BIGSOM_f.pickle +++ b/js/Linear/BIGSOM_f.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'graphics' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' -p4 aS'sgn' +p4 +aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'sgn' p1 diff --git a/js/Linear/CLINDUMMY_f.js b/js/Linear/CLINDUMMY_f.js index a635e859..6ad21810 100644 --- a/js/Linear/CLINDUMMY_f.js +++ b/js/Linear/CLINDUMMY_f.js @@ -8,8 +8,8 @@ function CLINDUMMY_f() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLINDUMMY_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLINDUMMY_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([]),gr_i); return new BasicBlock(this.x); } CLINDUMMY_f.prototype.details = function CLINDUMMY_f() { diff --git a/js/Linear/CLINDUMMY_f.pickle b/js/Linear/CLINDUMMY_f.pickle index 2718e79a..51140ca2 100644 --- a/js/Linear/CLINDUMMY_f.pickle +++ b/js/Linear/CLINDUMMY_f.pickle @@ -6,14 +6,10 @@ S'x' p2 aS'model' p3 -aS'gr_i' -p4 -aS'exprs' -p5 aS'graphics' -p6 -atp7 -Rp8 +p4 +atp5 +Rp6 .(dp0 S'model.sim' p1 diff --git a/js/Linear/CLR.js b/js/Linear/CLR.js index b8ae68c6..d321e6cf 100644 --- a/js/Linear/CLR.js +++ b/js/Linear/CLR.js @@ -6,7 +6,7 @@ function CLR() { var B = 1; var C = 1; var D = 0; - this.exprs = [["1"],["1+s"]]; + var exprs = [["1"],["1+s"]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["csslti4"]), new ScilabDouble([4])); this.model.in = new ScilabDouble([1]); @@ -15,8 +15,8 @@ function CLR() { this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLR\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLR\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } CLR.prototype.details = function CLR() { @@ -30,7 +30,7 @@ function CLR() { return options; } CLR.prototype.set = function CLR() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var x0 = this.model.state; var rpar = this.model.rpar; var ns = prod(size(x0)); @@ -57,7 +57,7 @@ function CLR() { var B = tmpvar0[1]; var C = tmpvar0[2]; var D = tmpvar0[3]; - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); var tmpvar1 = size(A); var ns1 = tmpvar1[0]; var ns1 = tmpvar1[1]; diff --git a/js/Linear/CLR.pickle b/js/Linear/CLR.pickle index 7d9eff5b..39082dd4 100644 --- a/js/Linear/CLR.pickle +++ b/js/Linear/CLR.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'num' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'num' p4 aS'den' p5 aS'graphics' p6 -aS'x' -p7 -aS'model' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/Linear/CLR_f.js b/js/Linear/CLR_f.js index dc279d57..93df4407 100644 --- a/js/Linear/CLR_f.js +++ b/js/Linear/CLR_f.js @@ -6,7 +6,7 @@ function CLR_f() { var B = 1; var C = 1; var D = 0; - this.exprs = [["1"],["1+s"]]; + var exprs = [["1"],["1+s"]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["csslti"]), new ScilabDouble([1])); this.model.in = new ScilabDouble([1]); @@ -15,8 +15,8 @@ function CLR_f() { this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLR_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2.5,2.5]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLR_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2.5,2.5]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } CLR_f.prototype.details = function CLR_f() { @@ -30,7 +30,7 @@ function CLR_f() { return options; } CLR_f.prototype.set = function CLR_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var x0 = this.model.state; var rpar = this.model.rpar; var ns = prod(size(x0)); @@ -57,7 +57,7 @@ function CLR_f() { var B = tmpvar0[1]; var C = tmpvar0[2]; var D = tmpvar0[3]; - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); var tmpvar1 = size(A); var ns1 = tmpvar1[0]; var ns1 = tmpvar1[1]; diff --git a/js/Linear/CLR_f.pickle b/js/Linear/CLR_f.pickle index 7d9eff5b..39082dd4 100644 --- a/js/Linear/CLR_f.pickle +++ b/js/Linear/CLR_f.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'num' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'num' p4 aS'den' p5 aS'graphics' p6 -aS'x' -p7 -aS'model' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/Linear/CLSS.js b/js/Linear/CLSS.js index 5208c088..fd96652d 100644 --- a/js/Linear/CLSS.js +++ b/js/Linear/CLSS.js @@ -16,9 +16,9 @@ function CLSS() { 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 = new ScilabBoolean([false,true]); - this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLSS\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + 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 = new ScilabString(["xstringb(orig(1),orig(2),\"CLSS\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } CLSS.prototype.details = function CLSS() { @@ -35,9 +35,9 @@ function CLSS() { return options; } CLSS.prototype.set = function CLSS() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")==7) { - this.exprs = this.exprs[[1:4,7]-1]; + var exprs = this.graphics.exprs; + if (size(exprs,"*")==7) { + var exprs = exprs[[1:4,7]-1]; } while (true) { var ok = true; @@ -79,7 +79,7 @@ function CLSS() { this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; if (this.D.length!=0) { if (norm(this.D,1)!=0) { diff --git a/js/Linear/CLSS.pickle b/js/Linear/CLSS.pickle index 0d6f50f2..582ebfbc 100644 --- a/js/Linear/CLSS.pickle +++ b/js/Linear/CLSS.pickle @@ -10,20 +10,16 @@ aS'B' p4 aS'D' p5 -aS'exprs' -p6 -aS'gr_i' -p7 aS'graphics' -p8 +p6 aS'x' -p9 +p7 aS'model' -p10 +p8 aS'x0' -p11 -atp12 -Rp13 +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/Linear/CLSS_f.js b/js/Linear/CLSS_f.js index 74e9dd5b..9ba6e096 100644 --- a/js/Linear/CLSS_f.js +++ b/js/Linear/CLSS_f.js @@ -16,9 +16,9 @@ function CLSS_f() { 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 = new ScilabBoolean([false,true]); - this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLSS_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + 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 = new ScilabString(["xstringb(orig(1),orig(2),\"CLSS_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } CLSS_f.prototype.details = function CLSS_f() { @@ -35,9 +35,9 @@ function CLSS_f() { return options; } CLSS_f.prototype.set = function CLSS_f() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")==7) { - this.exprs = this.exprs[[1:4,7]-1]; + var exprs = this.graphics.exprs; + if (size(exprs,"*")==7) { + var exprs = exprs[[1:4,7]-1]; } while (true) { var ok = true; @@ -69,7 +69,7 @@ function CLSS_f() { this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; if (this.D.length!=0) { if (norm(this.D,1)!=0) { diff --git a/js/Linear/CLSS_f.pickle b/js/Linear/CLSS_f.pickle index 3dc6c326..7ae568f9 100644 --- a/js/Linear/CLSS_f.pickle +++ b/js/Linear/CLSS_f.pickle @@ -10,20 +10,16 @@ aS'B' p4 aS'D' p5 -aS'exprs' -p6 -aS'gr_i' -p7 aS'graphics' -p8 +p6 aS'x' -p9 +p7 aS'model' -p10 +p8 aS'x0' -p11 -atp12 -Rp13 +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/Linear/DELAYV_f.js b/js/Linear/DELAYV_f.js index 7ecd61f0..44c7740d 100644 --- a/js/Linear/DELAYV_f.js +++ b/js/Linear/DELAYV_f.js @@ -16,9 +16,9 @@ function DELAYV_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([0,-1]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[string(this.nin)],[strcat(string(z0.slice(1-1,$-1)),";")],[string(this.T)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DELAYV_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[string(this.nin)],[strcat(string(z0.slice(1-1,$-1)),";")],[string(this.T)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DELAYV_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } DELAYV_f.prototype.details = function DELAYV_f() { @@ -33,7 +33,7 @@ function DELAYV_f() { return options; } DELAYV_f.prototype.set = function DELAYV_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; this.nin = this.model.in[1-1]; var z0 = this.model.dstate; this.zz0 = z0.slice(1-1,$-1); @@ -63,7 +63,7 @@ function DELAYV_f() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.dstate = new ScilabDouble([this.zz0.slice()],[told]); this.model.rpar = new ScilabDouble([this.T/(size(this.zz0,"*"))]); this.x.graphics = this.graphics; diff --git a/js/Linear/DELAYV_f.pickle b/js/Linear/DELAYV_f.pickle index 81a7bc97..fbf11c3a 100644 --- a/js/Linear/DELAYV_f.pickle +++ b/js/Linear/DELAYV_f.pickle @@ -6,20 +6,16 @@ S'nin' p2 aS'zz0' p3 -aS'exprs' -p4 -aS'gr_i' -p5 aS'T' -p6 +p4 aS'graphics' -p7 +p5 aS'x' -p8 +p6 aS'model' -p9 -atp10 -Rp11 +p7 +atp8 +Rp9 .(dp0 S'model.dstate' p1 diff --git a/js/Linear/DELAY_f.js b/js/Linear/DELAY_f.js index 383db3f2..9fba30db 100644 --- a/js/Linear/DELAY_f.js +++ b/js/Linear/DELAY_f.js @@ -92,7 +92,7 @@ function DELAY_f() { var evtdly = this.x.model.rpar.objs[ppath[2-1]-1]; var register_exprs = register.graphics.exprs; var evtdly_exprs = evtdly.graphics.exprs; - this.exprs = [[evtdly_exprs[1-1]],[register_exprs]]; + var exprs = [[evtdly_exprs[1-1]],[register_exprs]]; while (true) { var ok = true; this.dt = arguments[0]["dt"]; @@ -113,13 +113,13 @@ function DELAY_f() { message(mess); throw "user error"; } else { - evtdly.graphics.exprs[1-1] = this.exprs[1-1]; + evtdly.graphics.exprs[1-1] = exprs[1-1]; if (evtdly.model.rpar!=this.dt) { evtdly.model.rpar = this.dt; newpar[$+1-1] = ppath[2-1]; } this.x.model.rpar.objs[ppath[2-1]-1] = evtdly; - register.graphics.exprs = this.exprs[2-1]; + register.graphics.exprs = exprs[2-1]; if (or(register.model.dstate!=this.z0.slice())) { register.model.dstate = this.z0.slice(); newpar[$+1-1] = ppath[1-1]; diff --git a/js/Linear/DELAY_f.pickle b/js/Linear/DELAY_f.pickle index 3ea3b379..bf1c5cbe 100644 --- a/js/Linear/DELAY_f.pickle +++ b/js/Linear/DELAY_f.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'x' p2 -aS'gr_i' +aS'model' p3 -aS'graphics' +aS'z0' p4 -aS'x' +aS'dt' p5 -aS'model' +aS'graphics' p6 -aS'z0' -p7 -aS'dt' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'diagram.objs[1-1]' p1 diff --git a/js/Linear/DERIV.js b/js/Linear/DERIV.js index 45b2345e..55cc8833 100644 --- a/js/Linear/DERIV.js +++ b/js/Linear/DERIV.js @@ -7,9 +7,9 @@ function DERIV() { this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["x"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = []; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DERIV\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DERIV\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } DERIV.prototype.details = function DERIV() { diff --git a/js/Linear/DERIV.pickle b/js/Linear/DERIV.pickle index f97402c1..cbe22810 100644 --- a/js/Linear/DERIV.pickle +++ b/js/Linear/DERIV.pickle @@ -6,14 +6,10 @@ S'x' p2 aS'model' p3 -aS'gr_i' -p4 -aS'exprs' -p5 aS'graphics' -p6 -atp7 -Rp8 +p4 +atp5 +Rp6 .(dp0 S'model.sim' p1 diff --git a/js/Linear/DIFF_c.js b/js/Linear/DIFF_c.js index 10c440bb..c57690c2 100644 --- a/js/Linear/DIFF_c.js +++ b/js/Linear/DIFF_c.js @@ -9,9 +9,9 @@ function DIFF_c() { this.model.state = new ScilabDouble(this.x0); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.exprs = [[strcat(sci2exp(this.x0[1-1]))],[strcat(sci2exp(this.x0[2-1]))]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DIFF_c\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[strcat(sci2exp(this.x0[1-1]))],[strcat(sci2exp(this.x0[2-1]))]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DIFF_c\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } DIFF_c.prototype.details = function DIFF_c() { @@ -25,7 +25,7 @@ function DIFF_c() { return options; } DIFF_c.prototype.set = function DIFF_c() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ask_again = false; var ok = true; @@ -48,7 +48,7 @@ function DIFF_c() { var ask_again = true; } if (!ask_again) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.state = new ScilabDouble([this.x0],[this.xd0]); this.model.out = new ScilabDouble([N]); this.model.in = new ScilabDouble([N]); diff --git a/js/Linear/DIFF_c.pickle b/js/Linear/DIFF_c.pickle index cf3a2b5f..a0e60696 100644 --- a/js/Linear/DIFF_c.pickle +++ b/js/Linear/DIFF_c.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'xd0' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'xd0' p4 -aS'graphics' +aS'x0' p5 -aS'x' +aS'graphics' p6 -aS'model' -p7 -aS'x0' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/Linear/DLR.js b/js/Linear/DLR.js index 1c248b71..4c37051c 100644 --- a/js/Linear/DLR.js +++ b/js/Linear/DLR.js @@ -6,7 +6,7 @@ function DLR() { var B = 1; var C = 1; var D = 0; - this.exprs = [["1"],["1+z"]]; + var exprs = [["1"],["1+z"]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["dsslti4"]), new ScilabDouble([4])); this.model.in = new ScilabDouble([1]); @@ -16,8 +16,8 @@ function DLR() { this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLR\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLR\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } DLR.prototype.details = function DLR() { @@ -31,7 +31,7 @@ function DLR() { return options; } DLR.prototype.set = function DLR() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var x0 = this.model.dstate; var ns = prod(size(x0)); var PREVAR_scicos_context = PREVAR_scicos_context; @@ -55,7 +55,7 @@ function DLR() { var B = tmpvar0[1]; var C = tmpvar0[2]; var D = tmpvar0[3]; - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); var tmpvar1 = size(A); var ns1 = tmpvar1[0]; var ns1 = tmpvar1[1]; diff --git a/js/Linear/DLR.pickle b/js/Linear/DLR.pickle index ae140424..f172c461 100644 --- a/js/Linear/DLR.pickle +++ b/js/Linear/DLR.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'num' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'num' p4 aS'den' p5 aS'graphics' p6 -aS'x' -p7 -aS'model' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/Linear/DLR_f.js b/js/Linear/DLR_f.js index 32bc2559..353d355d 100644 --- a/js/Linear/DLR_f.js +++ b/js/Linear/DLR_f.js @@ -6,7 +6,7 @@ function DLR_f() { var B = 1; var C = 1; var D = 0; - this.exprs = [["1"],["1+z"]]; + var exprs = [["1"],["1+z"]]; this.model = scicos_model(); this.model.sim = new ScilabString(["dsslti"]); this.model.in = new ScilabDouble([1]); @@ -16,8 +16,8 @@ function DLR_f() { this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLR_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2.5,2.5]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLR_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2.5,2.5]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } DLR_f.prototype.details = function DLR_f() { @@ -31,7 +31,7 @@ function DLR_f() { return options; } DLR_f.prototype.set = function DLR_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var x0 = this.model.dstate; var ns = prod(size(x0)); var PREVAR_scicos_context = PREVAR_scicos_context; @@ -55,7 +55,7 @@ function DLR_f() { var B = tmpvar0[1]; var C = tmpvar0[2]; var D = tmpvar0[3]; - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); var tmpvar1 = size(A); var ns1 = tmpvar1[0]; var ns1 = tmpvar1[1]; diff --git a/js/Linear/DLR_f.pickle b/js/Linear/DLR_f.pickle index 308f93d4..17ea79f9 100644 --- a/js/Linear/DLR_f.pickle +++ b/js/Linear/DLR_f.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'num' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'num' p4 aS'den' p5 aS'graphics' p6 -aS'x' -p7 -aS'model' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/Linear/DLSS.js b/js/Linear/DLSS.js index e501d355..1cf4bdb0 100644 --- a/js/Linear/DLSS.js +++ b/js/Linear/DLSS.js @@ -15,9 +15,9 @@ function DLSS() { 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 = new ScilabBoolean([false,false]); - this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLSS\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + 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 = new ScilabString(["xstringb(orig(1),orig(2),\"DLSS\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } DLSS.prototype.details = function DLSS() { @@ -34,9 +34,9 @@ function DLSS() { return options; } DLSS.prototype.set = function DLSS() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")==7) { - this.exprs = this.exprs[[1:4,7]-1]; + var exprs = this.graphics.exprs; + if (size(exprs,"*")==7) { + var exprs = exprs[[1:4,7]-1]; } while (true) { var ok = true; @@ -78,7 +78,7 @@ function DLSS() { this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; if (this.D.length!=0) { if (norm(this.D,1)!=0) { diff --git a/js/Linear/DLSS.pickle b/js/Linear/DLSS.pickle index b2842dad..f7d148b7 100644 --- a/js/Linear/DLSS.pickle +++ b/js/Linear/DLSS.pickle @@ -10,20 +10,16 @@ aS'B' p4 aS'D' p5 -aS'exprs' -p6 -aS'gr_i' -p7 aS'graphics' -p8 +p6 aS'x' -p9 +p7 aS'model' -p10 +p8 aS'x0' -p11 -atp12 -Rp13 +p9 +atp10 +Rp11 .(dp0 S'model.dstate' p1 diff --git a/js/Linear/DLSS_f.js b/js/Linear/DLSS_f.js index 45b81b78..c64892fd 100644 --- a/js/Linear/DLSS_f.js +++ b/js/Linear/DLSS_f.js @@ -15,9 +15,9 @@ function DLSS_f() { 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 = new ScilabBoolean([false,false]); - this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLSS_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + 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 = new ScilabString(["xstringb(orig(1),orig(2),\"DLSS_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } DLSS_f.prototype.details = function DLSS_f() { @@ -34,9 +34,9 @@ function DLSS_f() { return options; } DLSS_f.prototype.set = function DLSS_f() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")==7) { - this.exprs = this.exprs[[1:4,7]-1]; + var exprs = this.graphics.exprs; + if (size(exprs,"*")==7) { + var exprs = exprs[[1:4,7]-1]; } while (true) { var ok = true; @@ -68,7 +68,7 @@ function DLSS_f() { this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; if (this.D.length!=0) { if (norm(this.D,1)!=0) { diff --git a/js/Linear/DLSS_f.pickle b/js/Linear/DLSS_f.pickle index a754a23a..34b37f6f 100644 --- a/js/Linear/DLSS_f.pickle +++ b/js/Linear/DLSS_f.pickle @@ -10,20 +10,16 @@ aS'B' p4 aS'D' p5 -aS'exprs' -p6 -aS'gr_i' -p7 aS'graphics' -p8 +p6 aS'x' -p9 +p7 aS'model' -p10 +p8 aS'x0' -p11 -atp12 -Rp13 +p9 +atp10 +Rp11 .(dp0 S'model.dstate' p1 diff --git a/js/Linear/DOLLAR.js b/js/Linear/DOLLAR.js index ef6ba02c..4ee741b9 100644 --- a/js/Linear/DOLLAR.js +++ b/js/Linear/DOLLAR.js @@ -4,7 +4,7 @@ function DOLLAR() { var z = 0; this.inh = 0; var in1 = 1; - this.exprs = string([[z],[this.inh]]); + var exprs = string([[z],[this.inh]]); this.model = scicos_model(); this.model.sim = list(new ScilabString(["dollar4"]), new ScilabDouble([4])); this.model.in = new ScilabDouble([in1]); @@ -13,8 +13,8 @@ function DOLLAR() { this.model.dstate = new ScilabDouble([z]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([exprs]),gr_i); return new BasicBlock(this.x); } DOLLAR.prototype.details = function DOLLAR() { @@ -28,9 +28,9 @@ function DOLLAR() { return options; } DOLLAR.prototype.set = function DOLLAR() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")<2) { - this.exprs[2-1] = "0"; + var exprs = this.graphics.exprs; + if (size(exprs,"*")<2) { + exprs[2-1] = "0"; } while (true) { var ok = true; @@ -90,7 +90,7 @@ function DOLLAR() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; diff --git a/js/Linear/DOLLAR.pickle b/js/Linear/DOLLAR.pickle index 9722d530..f41de5a7 100644 --- a/js/Linear/DOLLAR.pickle +++ b/js/Linear/DOLLAR.pickle @@ -4,22 +4,18 @@ p0 ((lp1 S'a' p2 -aS'exprs' -p3 -aS'gr_i' -p4 aS'inh' -p5 +p3 aS'graphics' -p6 +p4 aS'x' -p7 +p5 aS'model' -p8 +p6 aS'type' -p9 -atp10 -Rp11 +p7 +atp8 +Rp9 .(dp0 S'model.odstate' p1 diff --git a/js/Linear/DOLLAR_f.js b/js/Linear/DOLLAR_f.js index c78aafb7..489b831b 100644 --- a/js/Linear/DOLLAR_f.js +++ b/js/Linear/DOLLAR_f.js @@ -4,7 +4,7 @@ function DOLLAR_f() { var z = 0; this.inh = 0; var in1 = 1; - this.exprs = string([[z],[this.inh]]); + var exprs = string([[z],[this.inh]]); this.model = scicos_model(); this.model.sim = new ScilabString(["dollar"]); this.model.in = new ScilabDouble([in1]); @@ -13,8 +13,8 @@ function DOLLAR_f() { this.model.dstate = new ScilabDouble([z]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([exprs]),gr_i); return new BasicBlock(this.x); } DOLLAR_f.prototype.details = function DOLLAR_f() { @@ -28,9 +28,9 @@ function DOLLAR_f() { return options; } DOLLAR_f.prototype.set = function DOLLAR_f() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")<2) { - this.exprs[2-1] = "0"; + var exprs = this.graphics.exprs; + if (size(exprs,"*")<2) { + exprs[2-1] = "0"; } while (true) { var ok = true; @@ -51,7 +51,7 @@ function DOLLAR_f() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.dstate = new ScilabDouble([this.a]); this.model.in = new ScilabDouble(in1); this.model.out = new ScilabDouble(out); diff --git a/js/Linear/DOLLAR_f.pickle b/js/Linear/DOLLAR_f.pickle index 1a4e2da9..e9c6d0a6 100644 --- a/js/Linear/DOLLAR_f.pickle +++ b/js/Linear/DOLLAR_f.pickle @@ -4,20 +4,16 @@ p0 ((lp1 S'a' p2 -aS'exprs' +aS'x' p3 -aS'gr_i' +aS'model' p4 aS'inh' p5 aS'graphics' p6 -aS'x' -p7 -aS'model' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/Linear/DOLLAR_m.js b/js/Linear/DOLLAR_m.js index e2095ec3..b595cc33 100644 --- a/js/Linear/DOLLAR_m.js +++ b/js/Linear/DOLLAR_m.js @@ -4,7 +4,7 @@ function DOLLAR_m() { var z = 0; this.inh = 0; var in1 = 1; - this.exprs = string([[z],[this.inh]]); + var exprs = string([[z],[this.inh]]); this.model = scicos_model(); this.model.sim = list(new ScilabString(["dollar4"]), new ScilabDouble([4])); this.model.in = new ScilabDouble([in1]); @@ -13,8 +13,8 @@ function DOLLAR_m() { this.model.dstate = new ScilabDouble([z]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR_m\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([exprs]),gr_i); return new BasicBlock(this.x); } DOLLAR_m.prototype.details = function DOLLAR_m() { @@ -28,9 +28,9 @@ function DOLLAR_m() { return options; } DOLLAR_m.prototype.set = function DOLLAR_m() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")<2) { - this.exprs[2-1] = "0"; + var exprs = this.graphics.exprs; + if (size(exprs,"*")<2) { + exprs[2-1] = "0"; } while (true) { var ok = true; @@ -90,7 +90,7 @@ function DOLLAR_m() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; diff --git a/js/Linear/DOLLAR_m.pickle b/js/Linear/DOLLAR_m.pickle index 9722d530..f41de5a7 100644 --- a/js/Linear/DOLLAR_m.pickle +++ b/js/Linear/DOLLAR_m.pickle @@ -4,22 +4,18 @@ p0 ((lp1 S'a' p2 -aS'exprs' -p3 -aS'gr_i' -p4 aS'inh' -p5 +p3 aS'graphics' -p6 +p4 aS'x' -p7 +p5 aS'model' -p8 +p6 aS'type' -p9 -atp10 -Rp11 +p7 +atp8 +Rp9 .(dp0 S'model.odstate' p1 diff --git a/js/Linear/GAINBLK.js b/js/Linear/GAINBLK.js index 4397bb55..e34577c8 100644 --- a/js/Linear/GAINBLK.js +++ b/js/Linear/GAINBLK.js @@ -15,9 +15,9 @@ function GAINBLK() { this.model.rpar = new ScilabDouble([this.gain]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [strcat(sci2exp(this.gain))]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAINBLK\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [strcat(sci2exp(this.gain))]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAINBLK\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } GAINBLK.prototype.details = function GAINBLK() { @@ -31,9 +31,9 @@ function GAINBLK() { return options; } GAINBLK.prototype.set = function GAINBLK() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")==1) { - this.exprs = [[this.exprs],[sci2exp(0)]]; + var exprs = this.graphics.exprs; + if (size(exprs,"*")==1) { + var exprs = [[exprs],[sci2exp(0)]]; } while (true) { var ok = true; @@ -156,7 +156,7 @@ function GAINBLK() { } } if (ok) { - this.graphics.exprs = new ScilabDouble(this.exprs); + this.graphics.exprs = new ScilabDouble(exprs); this.x.graphics = this.graphics; this.x.model = this.model; break; diff --git a/js/Linear/GAINBLK.pickle b/js/Linear/GAINBLK.pickle index 7da48052..bd892ea0 100644 --- a/js/Linear/GAINBLK.pickle +++ b/js/Linear/GAINBLK.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'over' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'over' p4 aS'gain' p5 aS'graphics' p6 -aS'x' -p7 -aS'model' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/Linear/GAINBLK_f.js b/js/Linear/GAINBLK_f.js index 93dced8d..7b850053 100644 --- a/js/Linear/GAINBLK_f.js +++ b/js/Linear/GAINBLK_f.js @@ -11,9 +11,9 @@ function GAINBLK_f() { this.model.rpar = new ScilabDouble([this.gain]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [strcat(sci2exp(this.gain))]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAINBLK_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [strcat(sci2exp(this.gain))]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAINBLK_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } GAINBLK_f.prototype.details = function GAINBLK_f() { @@ -26,7 +26,7 @@ function GAINBLK_f() { return options; } GAINBLK_f.prototype.set = function GAINBLK_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.gain = parseFloat(arguments[0]["gain"]); @@ -45,7 +45,7 @@ function GAINBLK_f() { this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble(this.gain.slice()); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Linear/GAINBLK_f.pickle b/js/Linear/GAINBLK_f.pickle index 8cc5fe17..2244e195 100644 --- a/js/Linear/GAINBLK_f.pickle +++ b/js/Linear/GAINBLK_f.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'x' p2 -aS'gr_i' +aS'model' p3 aS'gain' p4 aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Linear/GAIN_f.js b/js/Linear/GAIN_f.js index c9a8aaed..a4035f12 100644 --- a/js/Linear/GAIN_f.js +++ b/js/Linear/GAIN_f.js @@ -11,9 +11,9 @@ function GAIN_f() { this.model.rpar = new ScilabDouble([this.gain]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[strcat(sci2exp(this.gain))],[strcat(sci2exp(in1))],[strcat(sci2exp(out))]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAIN_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[strcat(sci2exp(this.gain))],[strcat(sci2exp(in1))],[strcat(sci2exp(out))]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAIN_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } GAIN_f.prototype.details = function GAIN_f() { @@ -26,7 +26,7 @@ function GAIN_f() { return options; } GAIN_f.prototype.set = function GAIN_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.gain = parseFloat(arguments[0]["gain"]); @@ -45,7 +45,7 @@ function GAIN_f() { this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble(this.gain.slice()); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Linear/GAIN_f.pickle b/js/Linear/GAIN_f.pickle index 06f61c9b..eba9f529 100644 --- a/js/Linear/GAIN_f.pickle +++ b/js/Linear/GAIN_f.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'x' p2 -aS'gr_i' +aS'model' p3 aS'gain' p4 aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Linear/INTEGRAL.js b/js/Linear/INTEGRAL.js index e10e8c60..622a10d1 100644 --- a/js/Linear/INTEGRAL.js +++ b/js/Linear/INTEGRAL.js @@ -12,9 +12,9 @@ function INTEGRAL() { this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.exprs = string([[0],[0],[0],[this.maxp],[minp]]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = string([[0],[0],[0],[this.maxp],[minp]]); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([exprs]),gr_i); this.x.graphics.id = "1/s"; return new BasicBlock(this.x); } @@ -32,7 +32,7 @@ function INTEGRAL() { return options; } INTEGRAL.prototype.set = function INTEGRAL() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.x0 = inverse(arguments[0]["x0"]); @@ -88,7 +88,7 @@ function INTEGRAL() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; diff --git a/js/Linear/INTEGRAL.pickle b/js/Linear/INTEGRAL.pickle index 9a75a132..d583d7d8 100644 --- a/js/Linear/INTEGRAL.pickle +++ b/js/Linear/INTEGRAL.pickle @@ -6,24 +6,20 @@ S'maxp' p2 aS'reinit' p3 -aS'exprs' -p4 -aS'gr_i' -p5 aS'satur' -p6 +p4 aS'lowp' -p7 +p5 aS'graphics' -p8 +p6 aS'x' -p9 +p7 aS'model' -p10 +p8 aS'x0' -p11 -atp12 -Rp13 +p9 +atp10 +Rp11 .(dp0 S'model.in' p1 diff --git a/js/Linear/INTEGRAL_f.js b/js/Linear/INTEGRAL_f.js index 160d3620..8a543977 100644 --- a/js/Linear/INTEGRAL_f.js +++ b/js/Linear/INTEGRAL_f.js @@ -9,9 +9,9 @@ function INTEGRAL_f() { this.model.state = new ScilabDouble([this.x0]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.exprs = strcat(sci2exp(this.x0)); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([this.exprs]),this.gr_i); + var exprs = strcat(sci2exp(this.x0)); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([exprs]),gr_i); return new BasicBlock(this.x); } INTEGRAL_f.prototype.details = function INTEGRAL_f() { @@ -24,14 +24,14 @@ function INTEGRAL_f() { return options; } INTEGRAL_f.prototype.set = function INTEGRAL_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.x0 = parseFloat(arguments[0]["x0"]); if (!ok) { break; } - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.state = new ScilabDouble([this.x0]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Linear/INTEGRAL_f.pickle b/js/Linear/INTEGRAL_f.pickle index e935bbf7..1ca01f73 100644 --- a/js/Linear/INTEGRAL_f.pickle +++ b/js/Linear/INTEGRAL_f.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'x' p2 -aS'gr_i' +aS'model' p3 -aS'graphics' +aS'x0' p4 -aS'x' +aS'graphics' p5 -aS'model' -p6 -aS'x0' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Linear/INTEGRAL_m.js b/js/Linear/INTEGRAL_m.js index 272db68a..13be3c60 100644 --- a/js/Linear/INTEGRAL_m.js +++ b/js/Linear/INTEGRAL_m.js @@ -14,9 +14,9 @@ function INTEGRAL_m() { this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.exprs = string([[0],[0],[0],[this.maxp],[minp]]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = string([[0],[0],[0],[this.maxp],[minp]]); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL_m\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([exprs]),gr_i); return new BasicBlock(this.x); } INTEGRAL_m.prototype.details = function INTEGRAL_m() { @@ -33,7 +33,7 @@ function INTEGRAL_m() { return options; } INTEGRAL_m.prototype.set = function INTEGRAL_m() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.x0 = arguments[0]["x0"]; @@ -135,7 +135,7 @@ function INTEGRAL_m() { } } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; diff --git a/js/Linear/INTEGRAL_m.pickle b/js/Linear/INTEGRAL_m.pickle index 293ff2e4..2671c665 100644 --- a/js/Linear/INTEGRAL_m.pickle +++ b/js/Linear/INTEGRAL_m.pickle @@ -6,24 +6,20 @@ S'maxp' p2 aS'reinit' p3 -aS'exprs' -p4 -aS'gr_i' -p5 aS'satur' -p6 +p4 aS'lowp' -p7 +p5 aS'graphics' -p8 +p6 aS'x' -p9 +p7 aS'model' -p10 +p8 aS'x0' -p11 -atp12 -Rp13 +p9 +atp10 +Rp11 .(dp0 S'model.in' p1 diff --git a/js/Linear/PID.js b/js/Linear/PID.js index 3bb0299f..dbea864e 100644 --- a/js/Linear/PID.js +++ b/js/Linear/PID.js @@ -35,8 +35,8 @@ function PID() { this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabBoolean([false,false]); this.model.rpar = new ScilabDouble([scs_m]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PID\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PID\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),gr_i); return new BasicBlock(this.x); } PID.prototype.details = function PID() { @@ -78,11 +78,11 @@ function PID() { } } var newpar = list(); - this.exprs[1-1] = xx1.graphics.exprs[1-1]; + exprs[1-1] = xx1.graphics.exprs[1-1]; var p_old = xx1.model.rpar; - this.exprs[2-1] = xx2.graphics.exprs[1-1]; + exprs[2-1] = xx2.graphics.exprs[1-1]; var i_old = xx2.model.rpar; - this.exprs[3-1] = xx3.graphics.exprs[1-1]; + exprs[3-1] = xx3.graphics.exprs[1-1]; var d_old = xx3.model.rpar; var y = 0; while (true) { diff --git a/js/Linear/PID.pickle b/js/Linear/PID.pickle index bb17417d..d392dd2d 100644 --- a/js/Linear/PID.pickle +++ b/js/Linear/PID.pickle @@ -4,24 +4,20 @@ p0 ((lp1 S'd' p2 -aS'p' -p3 aS'i' -p4 +p3 aS'exprs0' +p4 +aS'p' p5 -aS'exprs' -p6 -aS'gr_i' -p7 aS'graphics' -p8 +p6 aS'x' -p9 +p7 aS'model' -p10 -atp11 -Rp12 +p8 +atp9 +Rp10 .(dp0 S'xx3' p1 diff --git a/js/Linear/REGISTER.js b/js/Linear/REGISTER.js index a53a86a0..40cf87c7 100644 --- a/js/Linear/REGISTER.js +++ b/js/Linear/REGISTER.js @@ -10,9 +10,9 @@ function REGISTER() { this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = strcat(string(this.z0),";"); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"REGISTER\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([this.exprs]),this.gr_i); + var exprs = strcat(string(this.z0),";"); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"REGISTER\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([exprs]),gr_i); return new BasicBlock(this.x); } REGISTER.prototype.details = function REGISTER() { @@ -26,9 +26,9 @@ function REGISTER() { return options; } REGISTER.prototype.set = function REGISTER() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,1)==1) { - this.exprs = [[this.exprs],[sci2exp(1)]]; + var exprs = this.graphics.exprs; + if (size(exprs,1)==1) { + var exprs = [[exprs],[sci2exp(1)]]; } while (true) { var ok = true; @@ -82,7 +82,7 @@ function REGISTER() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble(this.exprs); + this.graphics.exprs = new ScilabDouble(exprs); this.x.graphics = this.graphics; this.x.model = this.model; break; diff --git a/js/Linear/REGISTER.pickle b/js/Linear/REGISTER.pickle index 8c7cb6dc..701b1ab0 100644 --- a/js/Linear/REGISTER.pickle +++ b/js/Linear/REGISTER.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'it' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'z0' p4 -aS'graphics' +aS'it' p5 -aS'x' +aS'graphics' p6 -aS'model' -p7 -aS'z0' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'model.odstate' p1 diff --git a/js/Linear/REGISTER_f.js b/js/Linear/REGISTER_f.js index 704b372f..237fe2ba 100644 --- a/js/Linear/REGISTER_f.js +++ b/js/Linear/REGISTER_f.js @@ -10,9 +10,9 @@ function REGISTER_f() { this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = strcat(string(this.z0),";"); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"REGISTER_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2.5,2.5]),this.model,new ScilabDouble([this.exprs]),this.gr_i); + var exprs = strcat(string(this.z0),";"); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"REGISTER_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2.5,2.5]),this.model,new ScilabDouble([exprs]),gr_i); return new BasicBlock(this.x); } REGISTER_f.prototype.details = function REGISTER_f() { @@ -25,7 +25,7 @@ function REGISTER_f() { return options; } REGISTER_f.prototype.set = function REGISTER_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.z0 = parseFloat(arguments[0]["z0"]); @@ -38,7 +38,7 @@ function REGISTER_f() { var ok = false; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.dstate = new ScilabDouble([this.z0]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Linear/REGISTER_f.pickle b/js/Linear/REGISTER_f.pickle index f52a8cc3..3f4e04af 100644 --- a/js/Linear/REGISTER_f.pickle +++ b/js/Linear/REGISTER_f.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'x' p2 -aS'gr_i' +aS'model' p3 -aS'graphics' +aS'z0' p4 -aS'x' +aS'graphics' p5 -aS'model' -p6 -aS'z0' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Linear/SAMPHOLD.js b/js/Linear/SAMPHOLD.js index 2ff6cc6c..6340d7cc 100644 --- a/js/Linear/SAMPHOLD.js +++ b/js/Linear/SAMPHOLD.js @@ -9,8 +9,8 @@ function SAMPHOLD() { this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPHOLD\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([" "]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPHOLD\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([" "]),gr_i); return new BasicBlock(this.x); } SAMPHOLD.prototype.details = function SAMPHOLD() { diff --git a/js/Linear/SAMPHOLD.pickle b/js/Linear/SAMPHOLD.pickle index b09e1bf1..d49bc1ed 100644 --- a/js/Linear/SAMPHOLD.pickle +++ b/js/Linear/SAMPHOLD.pickle @@ -6,14 +6,10 @@ S'x' p2 aS'model' p3 -aS'gr_i' -p4 -aS'exprs' -p5 aS'graphics' -p6 -atp7 -Rp8 +p4 +atp5 +Rp6 .(dp0 S'model.sim' p1 diff --git a/js/Linear/SAMPHOLD_m.js b/js/Linear/SAMPHOLD_m.js index 2fca4c97..1cab6cb5 100644 --- a/js/Linear/SAMPHOLD_m.js +++ b/js/Linear/SAMPHOLD_m.js @@ -13,8 +13,8 @@ function SAMPHOLD_m() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPHOLD_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPHOLD_m\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),gr_i); return new BasicBlock(this.x); } SAMPHOLD_m.prototype.details = function SAMPHOLD_m() { @@ -47,7 +47,7 @@ function SAMPHOLD_m() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); break; } } diff --git a/js/Linear/SAMPHOLD_m.pickle b/js/Linear/SAMPHOLD_m.pickle index 67bad104..4124cfbf 100644 --- a/js/Linear/SAMPHOLD_m.pickle +++ b/js/Linear/SAMPHOLD_m.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'it' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'it' p4 aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'arg1' p1 diff --git a/js/Linear/SAMPLEHOLD_f.js b/js/Linear/SAMPLEHOLD_f.js index fd1676da..5fed6721 100644 --- a/js/Linear/SAMPLEHOLD_f.js +++ b/js/Linear/SAMPLEHOLD_f.js @@ -9,8 +9,8 @@ function SAMPLEHOLD_f() { this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPLEHOLD_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([" "]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPLEHOLD_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([" "]),gr_i); return new BasicBlock(this.x); } SAMPLEHOLD_f.prototype.details = function SAMPLEHOLD_f() { diff --git a/js/Linear/SAMPLEHOLD_f.pickle b/js/Linear/SAMPLEHOLD_f.pickle index 418a8f45..e425e3bb 100644 --- a/js/Linear/SAMPLEHOLD_f.pickle +++ b/js/Linear/SAMPLEHOLD_f.pickle @@ -6,14 +6,10 @@ S'x' p2 aS'model' p3 -aS'gr_i' -p4 -aS'exprs' -p5 aS'graphics' -p6 -atp7 -Rp8 +p4 +atp5 +Rp6 .(dp0 S'model.sim' p1 diff --git a/js/Linear/SOM_f.js b/js/Linear/SOM_f.js index d6914626..a025688d 100644 --- a/js/Linear/SOM_f.js +++ b/js/Linear/SOM_f.js @@ -9,9 +9,9 @@ function SOM_f() { this.model.rpar = new ScilabDouble(sgn); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[sci2exp(1)],[sci2exp(sgn)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SOM_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[sci2exp(1)],[sci2exp(sgn)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SOM_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } SOM_f.prototype.details = function SOM_f() { @@ -21,12 +21,12 @@ function SOM_f() { alert("parameters cannot be modified"); } SOM_f.prototype.set = function SOM_f() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")==2) { - this.exprs = this.exprs[2-1]; + var exprs = this.graphics.exprs; + if (size(exprs,"*")==2) { + var exprs = exprs[2-1]; } - if (size(this.exprs,"*")!=3) { - this.exprs = string(this.model.rpar); + if (size(exprs,"*")!=3) { + var exprs = string(this.model.rpar); } if (this.graphics.flip) { var labs = ["down","left","up"]; @@ -34,7 +34,7 @@ function SOM_f() { var labs = ["down","right","up"]; } var str = [["This sum block is obsolete","parameters cannot be modified. Please replace it with new sum block"],["and gain blocks in the linear palette"," ","Input ports are located at up, side and down positions.","Current gains are:"]]; - var str = [[str],[(part(labs.slice(),1,7)+this.exprs.slice())]]; + var str = [[str],[(part(labs.slice(),1,7)+exprs.slice())]]; message(str); throw "user error"; return new BasicBlock(this.x); diff --git a/js/Linear/SOM_f.pickle b/js/Linear/SOM_f.pickle index ff4c1d13..4274b750 100644 --- a/js/Linear/SOM_f.pickle +++ b/js/Linear/SOM_f.pickle @@ -6,14 +6,10 @@ S'x' p2 aS'model' p3 -aS'gr_i' -p4 -aS'exprs' -p5 aS'graphics' -p6 -atp7 -Rp8 +p4 +atp5 +Rp6 .(dp0 S'model.sim' p1 diff --git a/js/Linear/SUMMATION.js b/js/Linear/SUMMATION.js index 6ab823b6..09fee1b2 100644 --- a/js/Linear/SUMMATION.js +++ b/js/Linear/SUMMATION.js @@ -11,9 +11,9 @@ function SUMMATION() { this.model.ipar = new ScilabDouble(this.sgn); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = sci2exp(this.sgn); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUMMATION\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = sci2exp(this.sgn); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUMMATION\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabString([exprs]),gr_i); return new Summation(this.x); } SUMMATION.prototype.details = function SUMMATION() { @@ -28,11 +28,11 @@ function SUMMATION() { return options; } SUMMATION.prototype.set = function SUMMATION() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,1)==1) { - this.exprs = [[sci2exp(1)],[this.exprs],[sci2exp(0)]]; - } else if (size(this.exprs,1)==2) { - this.exprs = [[this.exprs],[sci2exp(0)]]; + var exprs = this.graphics.exprs; + if (size(exprs,1)==1) { + var exprs = [[sci2exp(1)],[exprs],[sci2exp(0)]]; + } else if (size(exprs,1)==2) { + var exprs = [[exprs],[sci2exp(0)]]; } while (true) { var ok = true; @@ -142,7 +142,7 @@ function SUMMATION() { if (ok) { this.model.rpar = new ScilabDouble([this.satur]); this.model.ipar = new ScilabDouble([this.sgn]); - this.graphics.exprs = new ScilabDouble(this.exprs); + this.graphics.exprs = new ScilabDouble(exprs); this.x.graphics = this.graphics; this.x.model = this.model; break; diff --git a/js/Linear/SUMMATION.pickle b/js/Linear/SUMMATION.pickle index 536650a3..39d2bb39 100644 --- a/js/Linear/SUMMATION.pickle +++ b/js/Linear/SUMMATION.pickle @@ -4,22 +4,18 @@ p0 ((lp1 S'Datatype' p2 -aS'sgn' +aS'graphics' p3 -aS'exprs' +aS'satur' p4 -aS'gr_i' +aS'sgn' p5 -aS'satur' -p6 -aS'graphics' -p7 aS'x' -p8 +p6 aS'model' -p9 -atp10 -Rp11 +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/Linear/SUM_f.js b/js/Linear/SUM_f.js index a4c1c57a..289364dd 100644 --- a/js/Linear/SUM_f.js +++ b/js/Linear/SUM_f.js @@ -7,9 +7,9 @@ function SUM_f() { this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUM_f\",sz(1),sz(2));"]); - this.exprs = []; - this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUM_f\",sz(1),sz(2));"]); + var exprs = []; + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } SUM_f.prototype.details = function SUM_f() { diff --git a/js/Linear/SUM_f.pickle b/js/Linear/SUM_f.pickle index 6f8441b4..2d3d0ddc 100644 --- a/js/Linear/SUM_f.pickle +++ b/js/Linear/SUM_f.pickle @@ -6,14 +6,10 @@ S'x' p2 aS'model' p3 -aS'gr_i' -p4 -aS'exprs' -p5 aS'graphics' -p6 -atp7 -Rp8 +p4 +atp5 +Rp6 .(dp0 S'model.sim' p1 diff --git a/js/Linear/TCLSS.js b/js/Linear/TCLSS.js index 73f319ae..bc9af1b3 100644 --- a/js/Linear/TCLSS.js +++ b/js/Linear/TCLSS.js @@ -18,9 +18,9 @@ function TCLSS() { 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 = new ScilabBoolean([false,true]); - this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TCLSS\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + 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 = new ScilabString(["xstringb(orig(1),orig(2),\"TCLSS\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } TCLSS.prototype.details = function TCLSS() { @@ -37,9 +37,9 @@ function TCLSS() { return options; } TCLSS.prototype.set = function TCLSS() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")==7) { - this.exprs = this.exprs[[1:4,7]-1]; + var exprs = this.graphics.exprs; + if (size(exprs,"*")==7) { + var exprs = exprs[[1:4,7]-1]; } while (true) { var ok = true; @@ -71,7 +71,7 @@ function TCLSS() { this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; if (this.D.length!=0) { if (norm(this.D,1)!=0) { diff --git a/js/Linear/TCLSS.pickle b/js/Linear/TCLSS.pickle index c633f755..b0c5bc53 100644 --- a/js/Linear/TCLSS.pickle +++ b/js/Linear/TCLSS.pickle @@ -10,20 +10,16 @@ aS'B' p4 aS'D' p5 -aS'exprs' -p6 -aS'gr_i' -p7 aS'graphics' -p8 +p6 aS'x' -p9 +p7 aS'model' -p10 +p8 aS'x0' -p11 -atp12 -Rp13 +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/Linear/TCLSS_f.js b/js/Linear/TCLSS_f.js index 3003cbcd..5c6f6417 100644 --- a/js/Linear/TCLSS_f.js +++ b/js/Linear/TCLSS_f.js @@ -18,9 +18,9 @@ function TCLSS_f() { 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 = new ScilabBoolean([false,true]); - this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TCLSS_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + 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 = new ScilabString(["xstringb(orig(1),orig(2),\"TCLSS_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } TCLSS_f.prototype.details = function TCLSS_f() { @@ -37,9 +37,9 @@ function TCLSS_f() { return options; } TCLSS_f.prototype.set = function TCLSS_f() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")==7) { - this.exprs = this.exprs[[1:4,7]-1]; + var exprs = this.graphics.exprs; + if (size(exprs,"*")==7) { + var exprs = exprs[[1:4,7]-1]; } while (true) { var ok = true; @@ -71,7 +71,7 @@ function TCLSS_f() { this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; if (this.D.length!=0) { if (norm(this.D,1)!=0) { diff --git a/js/Linear/TCLSS_f.pickle b/js/Linear/TCLSS_f.pickle index c633f755..b0c5bc53 100644 --- a/js/Linear/TCLSS_f.pickle +++ b/js/Linear/TCLSS_f.pickle @@ -10,20 +10,16 @@ aS'B' p4 aS'D' p5 -aS'exprs' -p6 -aS'gr_i' -p7 aS'graphics' -p8 +p6 aS'x' -p9 +p7 aS'model' -p10 +p8 aS'x0' -p11 -atp12 -Rp13 +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/Linear/TIME_DELAY.js b/js/Linear/TIME_DELAY.js index 7abbe110..deaad0f0 100644 --- a/js/Linear/TIME_DELAY.js +++ b/js/Linear/TIME_DELAY.js @@ -13,9 +13,9 @@ function TIME_DELAY() { this.model.ipar = new ScilabDouble([this.N]); this.model.blocktype = new ScilabString(["x"]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.exprs = [[string(this.T)],[string(this.init)],[string(this.N)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TIME_DELAY\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3.5,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[string(this.T)],[string(this.init)],[string(this.N)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TIME_DELAY\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3.5,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } TIME_DELAY.prototype.details = function TIME_DELAY() { @@ -30,7 +30,7 @@ function TIME_DELAY() { return options; } TIME_DELAY.prototype.set = function TIME_DELAY() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var nin = this.model.in[1-1]; while (true) { var ok = true; @@ -57,7 +57,7 @@ function TIME_DELAY() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble([this.T],[this.init]); this.model.ipar = new ScilabDouble([this.N]); this.model.dep_ut = new ScilabBoolean([false,true]); diff --git a/js/Linear/TIME_DELAY.pickle b/js/Linear/TIME_DELAY.pickle index b2bed6a4..5ab7a862 100644 --- a/js/Linear/TIME_DELAY.pickle +++ b/js/Linear/TIME_DELAY.pickle @@ -4,22 +4,18 @@ p0 ((lp1 S'N' p2 -aS'exprs' -p3 aS'init' -p4 -aS'gr_i' -p5 +p3 aS'T' -p6 +p4 aS'graphics' -p7 +p5 aS'x' -p8 +p6 aS'model' -p9 -atp10 -Rp11 +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/Linear/VARIABLE_DELAY.js b/js/Linear/VARIABLE_DELAY.js index 74cd98c6..362cbe20 100644 --- a/js/Linear/VARIABLE_DELAY.js +++ b/js/Linear/VARIABLE_DELAY.js @@ -13,9 +13,9 @@ function VARIABLE_DELAY() { this.model.ipar = new ScilabDouble([this.N]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[string(this.T)],[string(this.init)],[string(this.N)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VARIABLE_DELAY\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[string(this.T)],[string(this.init)],[string(this.N)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VARIABLE_DELAY\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } VARIABLE_DELAY.prototype.details = function VARIABLE_DELAY() { @@ -30,7 +30,7 @@ function VARIABLE_DELAY() { return options; } VARIABLE_DELAY.prototype.set = function VARIABLE_DELAY() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var nin = this.model.in[1-1]; while (true) { var ok = true; @@ -57,7 +57,7 @@ function VARIABLE_DELAY() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble([this.T],[this.init]); this.model.ipar = new ScilabDouble([this.N]); this.x.graphics = this.graphics; diff --git a/js/Linear/VARIABLE_DELAY.pickle b/js/Linear/VARIABLE_DELAY.pickle index 77059d72..cddddfa5 100644 --- a/js/Linear/VARIABLE_DELAY.pickle +++ b/js/Linear/VARIABLE_DELAY.pickle @@ -4,22 +4,18 @@ p0 ((lp1 S'N' p2 -aS'exprs' -p3 aS'init' -p4 -aS'gr_i' -p5 +p3 aS'T' -p6 +p4 aS'graphics' -p7 +p5 aS'x' -p8 +p6 aS'model' -p9 -atp10 -Rp11 +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 |