diff options
Diffstat (limited to 'js/NonLinear')
55 files changed, 304 insertions, 416 deletions
diff --git a/js/NonLinear/ABSBLK_f.js b/js/NonLinear/ABSBLK_f.js index f072dbf0..1413f7cc 100644 --- a/js/NonLinear/ABSBLK_f.js +++ b/js/NonLinear/ABSBLK_f.js @@ -7,8 +7,8 @@ function ABSBLK_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),\"ABSBLK_f\",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),\"ABSBLK_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),gr_i); return new BasicBlock(this.x); } ABSBLK_f.prototype.details = function ABSBLK_f() { diff --git a/js/NonLinear/ABSBLK_f.pickle b/js/NonLinear/ABSBLK_f.pickle index 096b22c4..3e633800 100644 --- a/js/NonLinear/ABSBLK_f.pickle +++ b/js/NonLinear/ABSBLK_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/NonLinear/ABS_VALUE.js b/js/NonLinear/ABS_VALUE.js index aa3633bf..acaca0a4 100644 --- a/js/NonLinear/ABS_VALUE.js +++ b/js/NonLinear/ABS_VALUE.js @@ -10,9 +10,9 @@ function ABS_VALUE() { this.model.nmode = new ScilabDouble([nu]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [string([1])]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ABS_VALUE\",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([1])]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ABS_VALUE\",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); } ABS_VALUE.prototype.details = function ABS_VALUE() { @@ -25,14 +25,14 @@ function ABS_VALUE() { return options; } ABS_VALUE.prototype.set = function ABS_VALUE() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.zcr = arguments[0]["zcr"]; if (!ok) { break; } - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); if (ok) { if (this.zcr!=0) { this.model.nmode = new ScilabDouble([-1]); diff --git a/js/NonLinear/ABS_VALUE.pickle b/js/NonLinear/ABS_VALUE.pickle index 9f75b5bc..06a444d1 100644 --- a/js/NonLinear/ABS_VALUE.pickle +++ b/js/NonLinear/ABS_VALUE.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'x' p2 -aS'gr_i' +aS'model' p3 aS'zcr' p4 aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/NonLinear/COSBLK_f.js b/js/NonLinear/COSBLK_f.js index 51a7c03f..1021f7be 100644 --- a/js/NonLinear/COSBLK_f.js +++ b/js/NonLinear/COSBLK_f.js @@ -8,8 +8,8 @@ function COSBLK_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),\"COSBLK_f\",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),\"COSBLK_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),gr_i); return new BasicBlock(this.x); } COSBLK_f.prototype.details = function COSBLK_f() { diff --git a/js/NonLinear/COSBLK_f.pickle b/js/NonLinear/COSBLK_f.pickle index 2e1f9573..f85c7b4c 100644 --- a/js/NonLinear/COSBLK_f.pickle +++ b/js/NonLinear/COSBLK_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/NonLinear/DLRADAPT_f.js b/js/NonLinear/DLRADAPT_f.js index 8b7d6542..fe120e9a 100644 --- a/js/NonLinear/DLRADAPT_f.js +++ b/js/NonLinear/DLRADAPT_f.js @@ -18,9 +18,9 @@ function DLRADAPT_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[sci2exp(this.p)],[sci2exp(this.rn)],[sci2exp(this.rd,0)],[sci2exp(this.g)],[sci2exp(this.last_u)],[sci2exp(this.last_y)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLRADAPT_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(this.p)],[sci2exp(this.rn)],[sci2exp(this.rd,0)],[sci2exp(this.g)],[sci2exp(this.last_u)],[sci2exp(this.last_y)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLRADAPT_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); } DLRADAPT_f.prototype.details = function DLRADAPT_f() { @@ -38,7 +38,7 @@ function DLRADAPT_f() { return options; } DLRADAPT_f.prototype.set = function DLRADAPT_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.p = inverse(arguments[0]["p"]); @@ -66,7 +66,7 @@ function DLRADAPT_f() { this.model.dstate = new ScilabDouble([this.last_u.slice()],[this.last_y.slice()]); this.model.rpar = new ScilabDouble(rpar); this.model.ipar = new ScilabDouble(ipar); - 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/NonLinear/DLRADAPT_f.pickle b/js/NonLinear/DLRADAPT_f.pickle index 62e07275..e2b9b5ce 100644 --- a/js/NonLinear/DLRADAPT_f.pickle +++ b/js/NonLinear/DLRADAPT_f.pickle @@ -6,26 +6,22 @@ S'last_y' p2 aS'g' p3 -aS'p' -p4 aS'last_u' -p5 +p4 aS'rd' +p5 +aS'p' p6 -aS'exprs' -p7 -aS'gr_i' -p8 aS'graphics' -p9 +p7 aS'x' -p10 +p8 aS'model' -p11 +p9 aS'rn' -p12 -atp13 -Rp14 +p10 +atp11 +Rp12 .(dp0 S'model.dstate' p1 diff --git a/js/NonLinear/EXPBLK_f.js b/js/NonLinear/EXPBLK_f.js index 8d08da66..a6a2529d 100644 --- a/js/NonLinear/EXPBLK_f.js +++ b/js/NonLinear/EXPBLK_f.js @@ -10,9 +10,9 @@ function EXPBLK_f() { this.model.rpar = new ScilabDouble([this.a]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = ["%e"]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXPBLK_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(this.exprs),this.gr_i); + var exprs = ["%e"]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXPBLK_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); } EXPBLK_f.prototype.details = function EXPBLK_f() { @@ -25,9 +25,9 @@ function EXPBLK_f() { return options; } EXPBLK_f.prototype.set = function EXPBLK_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]; } while (true) { var ok = true; @@ -39,7 +39,7 @@ function EXPBLK_f() { message("a^u : a must be positive"); throw "user error"; } else { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble([this.a]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/NonLinear/EXPBLK_f.pickle b/js/NonLinear/EXPBLK_f.pickle index 91a61c0e..702ff276 100644 --- a/js/NonLinear/EXPBLK_f.pickle +++ b/js/NonLinear/EXPBLK_f.pickle @@ -4,18 +4,14 @@ p0 ((lp1 S'a' p2 -aS'exprs' +aS'x' p3 -aS'gr_i' +aS'model' p4 aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'a' p1 diff --git a/js/NonLinear/EXPBLK_m.js b/js/NonLinear/EXPBLK_m.js index df1fc9d3..6fc33d6f 100644 --- a/js/NonLinear/EXPBLK_m.js +++ b/js/NonLinear/EXPBLK_m.js @@ -14,9 +14,9 @@ function EXPBLK_m() { this.model.rpar = new ScilabDouble([this.a]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = ["%e"]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXPBLK_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 = ["%e"]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXPBLK_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); } EXPBLK_m.prototype.details = function EXPBLK_m() { @@ -29,9 +29,9 @@ function EXPBLK_m() { return options; } EXPBLK_m.prototype.set = function EXPBLK_m() { - 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]; } while (true) { var ok = true; @@ -43,7 +43,7 @@ function EXPBLK_m() { message("a^u : a must be positive"); throw "user error"; } else { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble([this.a]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/NonLinear/EXPBLK_m.pickle b/js/NonLinear/EXPBLK_m.pickle index bfef4ca4..9f78c7d8 100644 --- a/js/NonLinear/EXPBLK_m.pickle +++ b/js/NonLinear/EXPBLK_m.pickle @@ -4,18 +4,14 @@ p0 ((lp1 S'a' p2 -aS'exprs' +aS'x' p3 -aS'gr_i' +aS'model' p4 aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'arg1' p1 diff --git a/js/NonLinear/FSV_f.js b/js/NonLinear/FSV_f.js index 91a20d4c..ee841567 100644 --- a/js/NonLinear/FSV_f.js +++ b/js/NonLinear/FSV_f.js @@ -8,9 +8,9 @@ function FSV_f() { this.model.out = new ScilabDouble([in1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = " "; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FSV_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = " "; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FSV_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); } FSV_f.prototype.details = function FSV_f() { diff --git a/js/NonLinear/FSV_f.pickle b/js/NonLinear/FSV_f.pickle index 112c3884..358dd807 100644 --- a/js/NonLinear/FSV_f.pickle +++ b/js/NonLinear/FSV_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/NonLinear/INTRP2BLK_f.js b/js/NonLinear/INTRP2BLK_f.js index c192893c..c4d90729 100644 --- a/js/NonLinear/INTRP2BLK_f.js +++ b/js/NonLinear/INTRP2BLK_f.js @@ -12,9 +12,9 @@ function INTRP2BLK_f() { this.model.ipar = new ScilabDouble([2],[2]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[strcat(sci2exp(this.a))],[strcat(sci2exp(this.b))],[strcat(sci2exp(this.c,0))]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTRP2BLK_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,0))]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTRP2BLK_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); } INTRP2BLK_f.prototype.details = function INTRP2BLK_f() { @@ -29,7 +29,7 @@ function INTRP2BLK_f() { return options; } INTRP2BLK_f.prototype.set = function INTRP2BLK_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.a = inverse(arguments[0]["a"]); @@ -46,7 +46,7 @@ function INTRP2BLK_f() { throw "user error"; } else { if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble([this.a.slice()],[this.b.slice()],[this.c.slice()]); this.model.ipar = new ScilabDouble([size(this.a,"*")],[size(this.b,"*")]); this.x.graphics = this.graphics; diff --git a/js/NonLinear/INTRP2BLK_f.pickle b/js/NonLinear/INTRP2BLK_f.pickle index de096504..6c9cccaa 100644 --- a/js/NonLinear/INTRP2BLK_f.pickle +++ b/js/NonLinear/INTRP2BLK_f.pickle @@ -8,18 +8,14 @@ aS'c' p3 aS'b' p4 -aS'exprs' -p5 -aS'gr_i' -p6 aS'graphics' -p7 +p5 aS'x' -p8 +p6 aS'model' -p9 -atp10 -Rp11 +p7 +atp8 +Rp9 .(dp0 S'a' p1 diff --git a/js/NonLinear/INTRPLBLK_f.js b/js/NonLinear/INTRPLBLK_f.js index 287f2933..81468053 100644 --- a/js/NonLinear/INTRPLBLK_f.js +++ b/js/NonLinear/INTRPLBLK_f.js @@ -10,9 +10,9 @@ function INTRPLBLK_f() { this.model.rpar = new ScilabDouble([this.a],[this.b]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[strcat(sci2exp(this.a))],[strcat(sci2exp(this.b))]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTRPLBLK_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.a))],[strcat(sci2exp(this.b))]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTRPLBLK_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); } INTRPLBLK_f.prototype.details = function INTRPLBLK_f() { @@ -26,7 +26,7 @@ function INTRPLBLK_f() { return options; } INTRPLBLK_f.prototype.set = function INTRPLBLK_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.a = inverse(arguments[0]["a"]); @@ -42,7 +42,7 @@ function INTRPLBLK_f() { throw "user error"; } else { if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble([this.a.slice()],[this.b.slice()]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/NonLinear/INTRPLBLK_f.pickle b/js/NonLinear/INTRPLBLK_f.pickle index 5699e56b..d66b1ec4 100644 --- a/js/NonLinear/INTRPLBLK_f.pickle +++ b/js/NonLinear/INTRPLBLK_f.pickle @@ -4,20 +4,16 @@ p0 ((lp1 S'a' p2 -aS'b' +aS'x' p3 -aS'exprs' +aS'model' p4 -aS'gr_i' +aS'b' p5 aS'graphics' p6 -aS'x' -p7 -aS'model' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'a' p1 diff --git a/js/NonLinear/INVBLK.js b/js/NonLinear/INVBLK.js index 0c3aa215..503ff0ea 100644 --- a/js/NonLinear/INVBLK.js +++ b/js/NonLinear/INVBLK.js @@ -8,9 +8,9 @@ function INVBLK() { this.model.out = new ScilabDouble([in1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = " "; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INVBLK\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = " "; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INVBLK\",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); } INVBLK.prototype.details = function INVBLK() { diff --git a/js/NonLinear/INVBLK.pickle b/js/NonLinear/INVBLK.pickle index 112c3884..358dd807 100644 --- a/js/NonLinear/INVBLK.pickle +++ b/js/NonLinear/INVBLK.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/NonLinear/INVBLK_f.js b/js/NonLinear/INVBLK_f.js index c9106183..e6b9cce5 100644 --- a/js/NonLinear/INVBLK_f.js +++ b/js/NonLinear/INVBLK_f.js @@ -8,9 +8,9 @@ function INVBLK_f() { this.model.out = new ScilabDouble([in1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = " "; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INVBLK_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = " "; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INVBLK_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); } INVBLK_f.prototype.details = function INVBLK_f() { diff --git a/js/NonLinear/INVBLK_f.pickle b/js/NonLinear/INVBLK_f.pickle index 1e6ab305..f7e435f6 100644 --- a/js/NonLinear/INVBLK_f.pickle +++ b/js/NonLinear/INVBLK_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/NonLinear/LOGBLK_f.js b/js/NonLinear/LOGBLK_f.js index aa223ced..61a8a54c 100644 --- a/js/NonLinear/LOGBLK_f.js +++ b/js/NonLinear/LOGBLK_f.js @@ -10,9 +10,9 @@ function LOGBLK_f() { this.model.rpar = new ScilabDouble([this.a]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = "%e"; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOGBLK_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = "%e"; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOGBLK_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); } LOGBLK_f.prototype.details = function LOGBLK_f() { @@ -25,9 +25,9 @@ function LOGBLK_f() { return options; } LOGBLK_f.prototype.set = function LOGBLK_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]; } while (true) { var ok = true; @@ -40,7 +40,7 @@ function LOGBLK_f() { throw "user error"; } else { if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble([this.a]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/NonLinear/LOGBLK_f.pickle b/js/NonLinear/LOGBLK_f.pickle index ebd0f47d..01e4de68 100644 --- a/js/NonLinear/LOGBLK_f.pickle +++ b/js/NonLinear/LOGBLK_f.pickle @@ -4,18 +4,14 @@ p0 ((lp1 S'a' p2 -aS'exprs' +aS'x' p3 -aS'gr_i' +aS'model' p4 aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'a' p1 diff --git a/js/NonLinear/LOOKUP2D.js b/js/NonLinear/LOOKUP2D.js index 082d295b..651f0d9c 100644 --- a/js/NonLinear/LOOKUP2D.js +++ b/js/NonLinear/LOOKUP2D.js @@ -16,9 +16,9 @@ function LOOKUP2D() { this.model.ipar = new ScilabDouble([Nx],[Ny],[this.Method]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = list(strcat(sci2exp(this.xx)),strcat(sci2exp(this.yy)),strcat(sci2exp(this.zz)),sci2exp(this.Method),Graf); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOOKUP2D\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,this.exprs,this.gr_i); + var exprs = list(strcat(sci2exp(this.xx)),strcat(sci2exp(this.yy)),strcat(sci2exp(this.zz)),sci2exp(this.Method),Graf); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOOKUP2D\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,exprs,gr_i); return new BasicBlock(this.x); } LOOKUP2D.prototype.details = function LOOKUP2D() { @@ -35,7 +35,7 @@ function LOOKUP2D() { return options; } LOOKUP2D.prototype.set = function LOOKUP2D() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var ok = false; var SaveExit = false; while (true) { @@ -59,8 +59,8 @@ function LOOKUP2D() { if (this.graf!="y"&&this.graf!="Y") { this.graf = "n"; } - this.exprs[5-1] = "n"; - this.exprs[4-1] = sci2exp(mtd); + exprs[5-1] = "n"; + exprs[4-1] = sci2exp(mtd); var METHOD = getmethod(mtd); if (!Ask_again) { this.xx = this.xx.slice(); @@ -108,7 +108,7 @@ function LOOKUP2D() { } this.model.rpar = new ScilabDouble([this.xx.slice()],[this.yy.slice()],[this.zz.slice()]); this.model.ipar = new ScilabDouble([nx],[ny],[mtd]); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.model = this.model; this.x.graphics = this.graphics; break; diff --git a/js/NonLinear/LOOKUP2D.pickle b/js/NonLinear/LOOKUP2D.pickle index d2caff95..cc6fd1d1 100644 --- a/js/NonLinear/LOOKUP2D.pickle +++ b/js/NonLinear/LOOKUP2D.pickle @@ -6,26 +6,22 @@ S'order' p2 aS'yy' p3 -aS'exprs' -p4 aS'xx' -p5 -aS'gr_i' -p6 +p4 aS'zz' -p7 +p5 aS'graphics' -p8 +p6 aS'x' -p9 +p7 aS'model' -p10 +p8 aS'Method' -p11 +p9 aS'graf' -p12 -atp13 -Rp14 +p10 +atp11 +Rp12 .(dp0 S'exprs[4-1]' p1 diff --git a/js/NonLinear/LOOKUP_c.js b/js/NonLinear/LOOKUP_c.js index 3dcaacb9..03039b15 100644 --- a/js/NonLinear/LOOKUP_c.js +++ b/js/NonLinear/LOOKUP_c.js @@ -21,9 +21,9 @@ function LOOKUP_c() { this.model.evtin = new ScilabDouble([]); this.model.evtout = new ScilabDouble([]); this.model.firing = new ScilabDouble([0]); - this.exprs = [[sci2exp(this.Method)],[sci2exp(this.xx)],[sci2exp(this.yy)],[sci2exp(0)],[Graf]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOOKUP_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 = [[sci2exp(this.Method)],[sci2exp(this.xx)],[sci2exp(this.yy)],[sci2exp(0)],[Graf]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOOKUP_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); } LOOKUP_c.prototype.details = function LOOKUP_c() { @@ -40,7 +40,7 @@ function LOOKUP_c() { return options; } LOOKUP_c.prototype.set = function LOOKUP_c() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var ok = false; var SaveExit = false; while (true) { @@ -94,7 +94,7 @@ function LOOKUP_c() { var tmpvar2 = cleandata(this.xy); this.xy = tmpvar2[0]; var N = size(this.xy,"r"); - this.exprs[5-1] = "n"; + exprs[5-1] = "n"; if (this.graf=="y"||this.graf=="Y") { var ipar = [[N],[mtd],[PO],[this.extrapo]]; var rpar = []; @@ -127,11 +127,11 @@ function LOOKUP_c() { var DChange = true; } if (DChange) { - this.exprs[2-1] = strcat(sci2exp(xy2.slice()[1-1])); - this.exprs[3-1] = strcat(sci2exp(xy2.slice()[2-1])); + exprs[2-1] = strcat(sci2exp(xy2.slice()[1-1])); + exprs[3-1] = strcat(sci2exp(xy2.slice()[2-1])); } - this.exprs[1-1] = sci2exp(New_methhod); - this.exprs[4-1] = sci2exp(oipar[4-1]); + exprs[1-1] = sci2exp(New_methhod); + exprs[4-1] = sci2exp(oipar[4-1]); if (oipar[3-1]==1) { var perop = "y"; } else { @@ -153,7 +153,7 @@ function LOOKUP_c() { var orpar = [[this.xy.slice()[1-1]],[this.xy.slice()[2-1]]]; } } - this.exprs[1-1] = sci2exp(mtd); + exprs[1-1] = sci2exp(mtd); var oipar = [[N],[mtd],[PO],[this.extrapo]]; var SaveExit = true; } @@ -167,7 +167,7 @@ function LOOKUP_c() { } this.model.rpar = new ScilabDouble(orpar); this.model.ipar = new ScilabDouble(oipar); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.model = this.model; this.x.graphics = this.graphics; break; diff --git a/js/NonLinear/LOOKUP_c.pickle b/js/NonLinear/LOOKUP_c.pickle index 0adf7fa7..a1390816 100644 --- a/js/NonLinear/LOOKUP_c.pickle +++ b/js/NonLinear/LOOKUP_c.pickle @@ -10,7 +10,7 @@ aS'inrpar' p4 aS'extrapo' p5 -aS'wp' +aS'graphics' p6 aS'Pd3' p7 @@ -46,110 +46,106 @@ aS'xt' p22 aS'sample5' p23 -aS'sTp2' -p24 aS'Pulse_exprs2' -p25 +p24 aS'Cx' -p26 +p25 aS'filen' +p26 +aS'xa' p27 -aS'sample4' +aS'random_u_exprs2' p28 -aS'xa' +aS'sAmp2' p29 -aS'random_u_exprs2' +aS'zok' p30 -aS'sAmp2' +aS'offset' p31 -aS'zok' +aS'yt' p32 -aS'offset' +aS'sdelay' p33 -aS'yt' +aS'ixy' p34 -aS'sdelay' +aS'seed4' p35 -aS'ixy' +aS'seed5' p36 -aS'seed4' +aS'Sawt2_exprs2' p37 -aS'seed5' +aS'Amp' p38 -aS'Sawt2_exprs2' +aS'sok' p39 -aS'Amp' +aS'var4' p40 -aS'sok' +aS'ymx1' p41 -aS'var4' +aS'Cformat' p42 -aS'ymx1' +aS'ya' p43 -aS'Cformat' +aS'Bias3' p44 -aS'ya' +aS'xls_open' p45 -aS'Bias3' +aS'myans' p46 -aS'xls_open' +aS'xmx1' p47 -aS'myans' +aS'inipar' p48 -aS'xmx1' +aS'xls_read' p49 -aS'inipar' +aS'sTp' p50 -aS'xls_read' +aS'Sin_exprs2' p51 -aS'sTp' +aS'argn' p52 -aS'Sin_exprs2' +aS'wp' p53 -aS'argn' +aS'phase' p54 -aS'graphics' +aS'iipar' p55 -aS'phase' +aS'min5' p56 -aS'iipar' +aS'mok' p57 -aS'min5' +aS'Pw3' p58 -aS'mok' +aS'sheetN' p59 -aS'Pw3' +aS'xgetmouse' p60 -aS'sheetN' +aS'max5' p61 -aS'xgetmouse' +aS'rparin' p62 -aS'max5' +aS'sample4' p63 -aS'rparin' +aS'Cy' p64 -aS'exprs' +aS'sTp2' p65 -aS'Cy' -p66 -aS'gr_i' -p67 aS'yy' -p68 +p66 aS'x' -p69 +p67 aS'model' -p70 +p68 aS'ORDER2' -p71 +p69 aS'irpar' -p72 +p70 aS'graf' -p73 +p71 aS'xye' -p74 -atp75 -Rp76 +p72 +atp73 +Rp74 .(dp0 S'mean4' p1 diff --git a/js/NonLinear/LOOKUP_f.js b/js/NonLinear/LOOKUP_f.js index 635a1fce..1e15bea7 100644 --- a/js/NonLinear/LOOKUP_f.js +++ b/js/NonLinear/LOOKUP_f.js @@ -8,8 +8,8 @@ function LOOKUP_f() { this.model.rpar = new ScilabDouble([-2],[-1],[1],[2],[-1],[1],[-1],[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),\"LOOKUP_f\",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),\"LOOKUP_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),gr_i); return new BasicBlock(this.x); } LOOKUP_f.prototype.details = function LOOKUP_f() { @@ -19,7 +19,7 @@ function LOOKUP_f() { alert("parameters cannot be modified"); } LOOKUP_f.prototype.set = function LOOKUP_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var rpar = this.model.rpar; var n = size(rpar,"*")/2; var xx = rpar.slice(1-1,n); diff --git a/js/NonLinear/LOOKUP_f.pickle b/js/NonLinear/LOOKUP_f.pickle index b166f999..b2970a7b 100644 --- a/js/NonLinear/LOOKUP_f.pickle +++ b/js/NonLinear/LOOKUP_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/NonLinear/MAXMIN.js b/js/NonLinear/MAXMIN.js index 7de281da..3b8a12f2 100644 --- a/js/NonLinear/MAXMIN.js +++ b/js/NonLinear/MAXMIN.js @@ -8,9 +8,9 @@ function MAXMIN() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); this.model.ipar = new ScilabDouble([0]); - this.exprs = [string(transpose([2,1,1]))]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MAXMIN\",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(transpose([2,1,1]))]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MAXMIN\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(exprs),gr_i); this.x.graphics.style = "MAXMIN;displayedLabel=MAX"; return new BasicBlock(this.x); } @@ -26,7 +26,7 @@ function MAXMIN() { return options; } MAXMIN.prototype.set = function MAXMIN() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.mm = parseFloat(arguments[0]["mm"]); @@ -73,7 +73,7 @@ function MAXMIN() { var label = "MAX"; } this.graphics.style = new ScilabString(["MAXMIN;displayedLabel="+label]); - 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/NonLinear/MAXMIN.pickle b/js/NonLinear/MAXMIN.pickle index f4dca3c1..f388d4ff 100644 --- a/js/NonLinear/MAXMIN.pickle +++ b/js/NonLinear/MAXMIN.pickle @@ -6,20 +6,16 @@ S'nin' p2 aS'mm' p3 -aS'exprs' -p4 -aS'gr_i' -p5 aS'zcr' -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/NonLinear/MAX_f.js b/js/NonLinear/MAX_f.js index 8fc66350..7c6811f4 100644 --- a/js/NonLinear/MAX_f.js +++ b/js/NonLinear/MAX_f.js @@ -9,9 +9,9 @@ function MAX_f() { this.model.dstate = new ScilabDouble([0],[0]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = " "; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MAX_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = " "; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MAX_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); } MAX_f.prototype.details = function MAX_f() { diff --git a/js/NonLinear/MAX_f.pickle b/js/NonLinear/MAX_f.pickle index adc1b315..8d1b933b 100644 --- a/js/NonLinear/MAX_f.pickle +++ b/js/NonLinear/MAX_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/NonLinear/MIN_f.js b/js/NonLinear/MIN_f.js index 9f3f872d..8c93a501 100644 --- a/js/NonLinear/MIN_f.js +++ b/js/NonLinear/MIN_f.js @@ -9,9 +9,9 @@ function MIN_f() { this.model.dstate = new ScilabDouble([0],[0]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = sci2exp(in1); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MIN_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = sci2exp(in1); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MIN_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); } MIN_f.prototype.details = function MIN_f() { diff --git a/js/NonLinear/MIN_f.pickle b/js/NonLinear/MIN_f.pickle index adc1b315..8d1b933b 100644 --- a/js/NonLinear/MIN_f.pickle +++ b/js/NonLinear/MIN_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/NonLinear/POWBLK_f.js b/js/NonLinear/POWBLK_f.js index 3d315239..3095c66d 100644 --- a/js/NonLinear/POWBLK_f.js +++ b/js/NonLinear/POWBLK_f.js @@ -10,9 +10,9 @@ function POWBLK_f() { this.model.rpar = new ScilabDouble([this.a]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = string(this.a); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"POWBLK_f\",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(this.a); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"POWBLK_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); } POWBLK_f.prototype.details = function POWBLK_f() { @@ -25,9 +25,9 @@ function POWBLK_f() { return options; } POWBLK_f.prototype.set = function POWBLK_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]; } while (true) { var ok = true; @@ -35,7 +35,7 @@ function POWBLK_f() { if (!ok) { break; } - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); if (this.a==int(this.a)) { this.model.ipar = new ScilabDouble([this.a]); this.model.rpar = new ScilabDouble([]); diff --git a/js/NonLinear/POWBLK_f.pickle b/js/NonLinear/POWBLK_f.pickle index a46390ba..992cb708 100644 --- a/js/NonLinear/POWBLK_f.pickle +++ b/js/NonLinear/POWBLK_f.pickle @@ -4,18 +4,14 @@ p0 ((lp1 S'a' p2 -aS'exprs' +aS'x' p3 -aS'gr_i' +aS'model' p4 aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'a' p1 diff --git a/js/NonLinear/PRODUCT.js b/js/NonLinear/PRODUCT.js index f8d80ab4..f6c0f304 100644 --- a/js/NonLinear/PRODUCT.js +++ b/js/NonLinear/PRODUCT.js @@ -9,9 +9,9 @@ function PRODUCT() { 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),\"PRODUCT\",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),\"PRODUCT\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabString([exprs]),gr_i); return new Product(this.x); } PRODUCT.prototype.details = function PRODUCT() { @@ -24,7 +24,7 @@ function PRODUCT() { return options; } PRODUCT.prototype.set = function PRODUCT() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.sgn = inverse(arguments[0]["sgn"]); @@ -64,7 +64,7 @@ function PRODUCT() { } if (ok) { 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/NonLinear/PRODUCT.pickle b/js/NonLinear/PRODUCT.pickle index 8f36506e..ab6c21a8 100644 --- a/js/NonLinear/PRODUCT.pickle +++ b/js/NonLinear/PRODUCT.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'model.sim' p1 diff --git a/js/NonLinear/PROD_f.pickle b/js/NonLinear/PROD_f.pickle index 691cc0f1..bfa9faa0 100644 --- a/js/NonLinear/PROD_f.pickle +++ b/js/NonLinear/PROD_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/NonLinear/QUANT_f.js b/js/NonLinear/QUANT_f.js index e619bf1c..e36d57df 100644 --- a/js/NonLinear/QUANT_f.js +++ b/js/NonLinear/QUANT_f.js @@ -11,9 +11,9 @@ function QUANT_f() { this.model.ipar = new ScilabDouble([this.meth]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[string(this.pas)],[string(this.meth)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"QUANT_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 = [[string(this.pas)],[string(this.meth)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"QUANT_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); } QUANT_f.prototype.details = function QUANT_f() { @@ -27,7 +27,7 @@ function QUANT_f() { return options; } QUANT_f.prototype.set = function QUANT_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.pas = parseFloat(arguments[0]["pas"]); @@ -52,7 +52,7 @@ function QUANT_f() { case 4: this.model.sim = new ScilabString(["qzcel"]); } - 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/NonLinear/QUANT_f.pickle b/js/NonLinear/QUANT_f.pickle index 07ffc32e..7792c119 100644 --- a/js/NonLinear/QUANT_f.pickle +++ b/js/NonLinear/QUANT_f.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'pas' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'pas' p4 -aS'graphics' +aS'meth' p5 -aS'x' +aS'graphics' p6 -aS'model' -p7 -aS'meth' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/NonLinear/SATURATION.js b/js/NonLinear/SATURATION.js index 172e3235..7d2982de 100644 --- a/js/NonLinear/SATURATION.js +++ b/js/NonLinear/SATURATION.js @@ -13,9 +13,9 @@ function SATURATION() { this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[string(this.maxp)],[string(this.minp)],[string(this.model.nmode)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SATURATION\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[string(this.maxp)],[string(this.minp)],[string(this.model.nmode)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SATURATION\",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); } SATURATION.prototype.details = function SATURATION() { @@ -30,7 +30,7 @@ function SATURATION() { return options; } SATURATION.prototype.set = function SATURATION() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.maxp = parseFloat(arguments[0]["maxp"]); @@ -52,7 +52,7 @@ function SATURATION() { this.model.nzcross = new ScilabDouble([0]); this.model.nmode = new ScilabDouble([0]); } - 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/NonLinear/SATURATION.pickle b/js/NonLinear/SATURATION.pickle index ab8faf42..04dec972 100644 --- a/js/NonLinear/SATURATION.pickle +++ b/js/NonLinear/SATURATION.pickle @@ -6,20 +6,16 @@ S'zeroc' p2 aS'maxp' p3 -aS'exprs' -p4 -aS'gr_i' -p5 aS'graphics' -p6 +p4 aS'minp' -p7 +p5 aS'x' -p8 +p6 aS'model' -p9 -atp10 -Rp11 +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/NonLinear/SAT_f.js b/js/NonLinear/SAT_f.js index 40e3cf08..e9dfb6d0 100644 --- a/js/NonLinear/SAT_f.js +++ b/js/NonLinear/SAT_f.js @@ -13,9 +13,9 @@ function SAT_f() { this.model.rpar = new ScilabDouble([this.minp],[this.maxp],[slope]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[string(this.minp)],[string(this.maxp)],[string(slope)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAT_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 = [[string(this.minp)],[string(this.maxp)],[string(slope)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAT_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); } SAT_f.prototype.details = function SAT_f() { @@ -30,7 +30,7 @@ function SAT_f() { return options; } SAT_f.prototype.set = function SAT_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.minp = parseFloat(arguments[0]["minp"]); @@ -49,7 +49,7 @@ function SAT_f() { var rpar = [[this.minp/this.pente],[this.maxp/this.pente],[this.pente]]; this.model.rpar = new ScilabDouble(rpar); this.model.firing = new ScilabDouble([]); - 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/NonLinear/SAT_f.pickle b/js/NonLinear/SAT_f.pickle index f64e4f77..3472c6df 100644 --- a/js/NonLinear/SAT_f.pickle +++ b/js/NonLinear/SAT_f.pickle @@ -4,22 +4,18 @@ p0 ((lp1 S'maxp' p2 -aS'exprs' -p3 -aS'gr_i' -p4 aS'pente' -p5 +p3 aS'graphics' -p6 +p4 aS'minp' -p7 +p5 aS'x' -p8 +p6 aS'model' -p9 -atp10 -Rp11 +p7 +atp8 +Rp9 .(dp0 S'slope' p1 diff --git a/js/NonLinear/SIGNUM.js b/js/NonLinear/SIGNUM.js index ce8e2e93..7dbe17e7 100644 --- a/js/NonLinear/SIGNUM.js +++ b/js/NonLinear/SIGNUM.js @@ -10,9 +10,9 @@ function SIGNUM() { this.model.nmode = new ScilabDouble([nu]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [string([1])]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SIGNUM\",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([1])]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SIGNUM\",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); } SIGNUM.prototype.details = function SIGNUM() { @@ -25,14 +25,14 @@ function SIGNUM() { return options; } SIGNUM.prototype.set = function SIGNUM() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.zcr = arguments[0]["zcr"]; if (!ok) { break; } - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); if (ok) { if (this.zcr!=0) { this.model.nmode = new ScilabDouble([-1]); diff --git a/js/NonLinear/SIGNUM.pickle b/js/NonLinear/SIGNUM.pickle index 9f75b5bc..06a444d1 100644 --- a/js/NonLinear/SIGNUM.pickle +++ b/js/NonLinear/SIGNUM.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'x' p2 -aS'gr_i' +aS'model' p3 aS'zcr' p4 aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/NonLinear/SINBLK_f.js b/js/NonLinear/SINBLK_f.js index 2312dc22..38d3a6f4 100644 --- a/js/NonLinear/SINBLK_f.js +++ b/js/NonLinear/SINBLK_f.js @@ -7,9 +7,9 @@ function SINBLK_f() { this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = " "; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SINBLK_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = " "; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SINBLK_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); } SINBLK_f.prototype.details = function SINBLK_f() { diff --git a/js/NonLinear/SINBLK_f.pickle b/js/NonLinear/SINBLK_f.pickle index 634bd203..a78b5c10 100644 --- a/js/NonLinear/SINBLK_f.pickle +++ b/js/NonLinear/SINBLK_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/NonLinear/TANBLK_f.js b/js/NonLinear/TANBLK_f.js index 31393cf3..6227e422 100644 --- a/js/NonLinear/TANBLK_f.js +++ b/js/NonLinear/TANBLK_f.js @@ -8,9 +8,9 @@ function TANBLK_f() { this.model.out = new ScilabDouble([in1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = sci2exp(in1); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TANBLK_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = sci2exp(in1); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TANBLK_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); } TANBLK_f.prototype.details = function TANBLK_f() { diff --git a/js/NonLinear/TANBLK_f.pickle b/js/NonLinear/TANBLK_f.pickle index 5fa25f1b..30ec16a1 100644 --- a/js/NonLinear/TANBLK_f.pickle +++ b/js/NonLinear/TANBLK_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/NonLinear/TrigFun.js b/js/NonLinear/TrigFun.js index 827ba815..eb04d66c 100644 --- a/js/NonLinear/TrigFun.js +++ b/js/NonLinear/TrigFun.js @@ -7,9 +7,9 @@ function TrigFun() { this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = "sin"; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TrigFun\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = "sin"; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TrigFun\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabString([exprs]),gr_i); return new BasicBlock(this.x); } TrigFun.prototype.details = function TrigFun() { @@ -22,7 +22,7 @@ function TrigFun() { return options; } TrigFun.prototype.set = function TrigFun() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var PREVAR_FF = [["sin"],["cos"],["tan"],["asin"],["acos"],["atan"],["sinh"],["cosh"],["tanh"],["asinh"],["acosh"],["atanh"]]; var PREVAR_GG = [["Choose among "+strcat(PREVAR_FF.slice(1-1,4),", ")],[strcat(PREVAR_FF.slice(5-1,$),", ")]]; while (true) { @@ -35,7 +35,7 @@ function TrigFun() { message("Sorry but "+this.fun+" is not in the list!"); throw "user error"; } else { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); execstr("model.sim=list(\'"+this.fun+"_blk\',4)"); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/NonLinear/TrigFun.pickle b/js/NonLinear/TrigFun.pickle index 9b3e3964..9170d382 100644 --- a/js/NonLinear/TrigFun.pickle +++ b/js/NonLinear/TrigFun.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'fun' p2 -aS'gr_i' +aS'x' p3 -aS'graphics' +aS'model' p4 -aS'fun' +aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'model.sim' p1 |