diff options
Diffstat (limited to 'js/Misc')
76 files changed, 533 insertions, 693 deletions
diff --git a/js/Misc/AUTOMAT.js b/js/Misc/AUTOMAT.js index 998df738..0125a535 100644 --- a/js/Misc/AUTOMAT.js +++ b/js/Misc/AUTOMAT.js @@ -8,7 +8,7 @@ function AUTOMAT() { this.XP = [[1],[1]]; var C1 = [2]; var C2 = [1]; - this.exprs = [[string(NMode)],[string(this.Minitial)],[string(NX)],[sci2exp(this.X0)],[sci2exp(this.XP)],[sci2exp(C1)],[sci2exp(C2)]]; + var exprs = [[string(NMode)],[string(this.Minitial)],[string(NX)],[sci2exp(this.X0)],[sci2exp(this.XP)],[sci2exp(C1)],[sci2exp(C2)]]; var ipar = [[NMode],[this.Minitial],[NX],[this.XP],[C1],[C2]]; var rpar = [this.X0]; this.model = scicos_model(); @@ -23,8 +23,8 @@ function AUTOMAT() { this.model.dep_ut = new ScilabBoolean([false,true]); this.model.ipar = new ScilabDouble(ipar); this.model.rpar = new ScilabDouble(rpar); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"AUTOMAT\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"AUTOMAT\",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); } AUTOMAT.prototype.details = function AUTOMAT() { @@ -34,7 +34,7 @@ function AUTOMAT() { alert("parameters cannot be modified"); } AUTOMAT.prototype.set = function AUTOMAT() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var ipar = this.model.ipar; var NMode = ipar[1-1]; var NX = ipar[3-1]; @@ -55,14 +55,14 @@ function AUTOMAT() { if (!this.ok) { break; } - var NMode_old = size(this.exprs,"*")-5; + var NMode_old = size(exprs,"*")-5; var ModifEncore = false; if ((NMode_old>NMode)) { - this.exprs.slice(NMode+6-1,NMode_old+5) = []; + exprs.slice(NMode+6-1,NMode_old+5) = []; var ModifEncore = true; } if ((NMode_old<NMode)) { - this.exprs.slice(NMode_old+6-1,NMode+5) = this.exprs[NMode_old+4-1]; + exprs.slice(NMode_old+6-1,NMode+5) = exprs[NMode_old+4-1]; var ModifEncore = true; } if ((NX!=size(this.X0,"*"))) { @@ -96,7 +96,7 @@ function AUTOMAT() { var MaxModes = 1; var nzcross = 0; for (i=1;i<=NMode;i+=1) { - var Ci = evstr(this.exprs[5+i-1]); + var Ci = evstr(exprs[5+i-1]); var ipar = [[ipar],[Ci]]; INP[i-1][1-1] = 2*NX+length(Ci); if ((nzcross<length(Ci))) { @@ -127,7 +127,7 @@ function AUTOMAT() { this.model.nzcross = new ScilabDouble([nzcross]); this.model.state = new ScilabDouble([ones(2*NX,1)]); this.graphics.gr_i[1-1][1-1] = new ScilabString(["txt=[\'Automaton\';\'nM="+string(NMode)+",nX="+string(NX)+"\'];"]); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.model.ipar = new ScilabDouble(ipar); this.model.rpar = new ScilabDouble([rpar]); diff --git a/js/Misc/AUTOMAT.pickle b/js/Misc/AUTOMAT.pickle index 71d0c4df..4af49130 100644 --- a/js/Misc/AUTOMAT.pickle +++ b/js/Misc/AUTOMAT.pickle @@ -4,24 +4,20 @@ p0 ((lp1 S'ok' p2 -aS'XP' +aS'X0' p3 -aS'exprs' +aS'graphics' p4 -aS'gr_i' +aS'x' p5 -aS'graphics' +aS'XP' p6 -aS'x' -p7 aS'model' -p8 -aS'X0' -p9 +p7 aS'Minitial' -p10 -atp11 -Rp12 +p8 +atp9 +Rp10 .(dp0 S'NMode_old' p1 diff --git a/js/Misc/BACKLASH.js b/js/Misc/BACKLASH.js index 95c942e9..c13500ce 100644 --- a/js/Misc/BACKLASH.js +++ b/js/Misc/BACKLASH.js @@ -1,7 +1,7 @@ /* autogenerated from "macros/Misc/BACKLASH.sci" */ function BACKLASH() { BACKLASH.prototype.define = function BACKLASH() { - this.exprs = [["0"],["1"],["1"]]; + var exprs = [["0"],["1"],["1"]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["backlash"]), new ScilabDouble([4])); this.model.in = new ScilabDouble([1]); @@ -10,8 +10,8 @@ function BACKLASH() { this.model.nzcross = new ScilabDouble([2]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BACKLASH\",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),\"BACKLASH\",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); } BACKLASH.prototype.details = function BACKLASH() { @@ -26,7 +26,7 @@ function BACKLASH() { return options; } BACKLASH.prototype.set = function BACKLASH() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var rpar = this.model.rpar; while (true) { var ok = true; @@ -37,7 +37,7 @@ function BACKLASH() { break; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); rpar[1-1] = this.ini; rpar[2-1] = this.gap; if (this.zcr!=0) { diff --git a/js/Misc/BACKLASH.pickle b/js/Misc/BACKLASH.pickle index 25747638..7266a5c9 100644 --- a/js/Misc/BACKLASH.pickle +++ b/js/Misc/BACKLASH.pickle @@ -4,22 +4,18 @@ p0 ((lp1 S'gap' p2 -aS'exprs' -p3 -aS'gr_i' -p4 aS'ini' -p5 +p3 aS'zcr' -p6 +p4 aS'graphics' -p7 +p5 aS'x' -p8 +p6 aS'model' -p9 -atp10 -Rp11 +p7 +atp8 +Rp9 .(dp0 S'model.sim' p1 diff --git a/js/Misc/BOUNCE.js b/js/Misc/BOUNCE.js index cc99a5ad..2b5e2c06 100644 --- a/js/Misc/BOUNCE.js +++ b/js/Misc/BOUNCE.js @@ -33,9 +33,9 @@ function BOUNCE() { this.model.nzcross = new ScilabDouble([n*(n-1)/2+4*n]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.exprs = [[strcat(sci2exp(this.rpar1))],[strcat(sci2exp(this.rpar2))],[strcat(sci2exp(this.walls))],[strcat(sci2exp(this.x))],[strcat(sci2exp(this.xd))],[strcat(sci2exp(this.y))],[strcat(sci2exp(this.yd))]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BOUNCE\",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.rpar1))],[strcat(sci2exp(this.rpar2))],[strcat(sci2exp(this.walls))],[strcat(sci2exp(this.x))],[strcat(sci2exp(this.xd))],[strcat(sci2exp(this.y))],[strcat(sci2exp(this.yd))]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BOUNCE\",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); } BOUNCE.prototype.details = function BOUNCE() { @@ -56,10 +56,10 @@ function BOUNCE() { return options; } BOUNCE.prototype.set = function BOUNCE() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")<9) { - this.exprs[8-1] = "9.81"; - this.exprs[9-1] = "0"; + var exprs = this.graphics.exprs; + if (size(exprs,"*")<9) { + exprs[8-1] = "9.81"; + exprs[9-1] = "0"; } while (true) { var ok = true; @@ -122,7 +122,7 @@ function BOUNCE() { var state = transpose(state); this.model.state = new ScilabDouble(state.slice()); this.model.nzcross = new ScilabDouble([n*(n-1)/2+4*n]); - 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/Misc/BOUNCE.pickle b/js/Misc/BOUNCE.pickle index 07937336..074b11b3 100644 --- a/js/Misc/BOUNCE.pickle +++ b/js/Misc/BOUNCE.pickle @@ -10,28 +10,24 @@ aS'yd' p4 aS'xd' p5 -aS'exprs' -p6 aS'walls' -p7 -aS'gr_i' -p8 +p6 aS'rpar1' -p9 +p7 aS'rpar2' -p10 +p8 aS'graphics' -p11 +p9 aS'y' -p12 +p10 aS'x' -p13 +p11 aS'model' -p14 +p12 aS'xt' -p15 -atp16 -Rp17 +p13 +atp14 +Rp15 .(dp0 S'model.in' p1 diff --git a/js/Misc/BOUNCEXY.js b/js/Misc/BOUNCEXY.js index 8a7bd9f9..56d24cae 100644 --- a/js/Misc/BOUNCEXY.js +++ b/js/Misc/BOUNCEXY.js @@ -30,9 +30,9 @@ function BOUNCEXY() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[strcat(sci2exp(this.clrs))],[strcat(sci2exp(this.siz))],[strcat(sci2exp(this.win))],[strcat(sci2exp(1))],[strcat(sci2exp(this.xmin))],[strcat(sci2exp(this.xmax))],[strcat(sci2exp(this.ymin))],[strcat(sci2exp(this.ymax))]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BOUNCEXY\",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.clrs))],[strcat(sci2exp(this.siz))],[strcat(sci2exp(this.win))],[strcat(sci2exp(1))],[strcat(sci2exp(this.xmin))],[strcat(sci2exp(this.xmax))],[strcat(sci2exp(this.ymin))],[strcat(sci2exp(this.ymax))]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BOUNCEXY\",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); } BOUNCEXY.prototype.details = function BOUNCEXY() { @@ -52,7 +52,7 @@ function BOUNCEXY() { return options; } BOUNCEXY.prototype.set = function BOUNCEXY() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var dstate = this.model.dstate; while (true) { var ok = true; @@ -102,7 +102,7 @@ function BOUNCEXY() { this.model.dstate = new ScilabDouble(z); 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/Misc/BOUNCEXY.pickle b/js/Misc/BOUNCEXY.pickle index b470aa95..e77cb9ed 100644 --- a/js/Misc/BOUNCEXY.pickle +++ b/js/Misc/BOUNCEXY.pickle @@ -8,28 +8,24 @@ aS'imode' p3 aS'ymax' p4 -aS'siz' +aS'win' p5 -aS'exprs' +aS'graphics' p6 -aS'gr_i' -p7 aS'xmax' +p7 +aS'siz' p8 -aS'graphics' -p9 aS'xmin' -p10 +p9 aS'x' -p11 +p10 aS'model' -p12 +p11 aS'ymin' -p13 -aS'win' -p14 -atp15 -Rp16 +p12 +atp13 +Rp14 .(dp0 S'clrs' p1 diff --git a/js/Misc/BPLATFORM.js b/js/Misc/BPLATFORM.js index 0c93f6a8..38230026 100644 --- a/js/Misc/BPLATFORM.js +++ b/js/Misc/BPLATFORM.js @@ -16,9 +16,9 @@ function BPLATFORM() { this.model.rpar = new ScilabDouble([this.plen],[this.csiz],[this.phi],[this.xmin],[this.xmax],[this.ymin],[this.ymax]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = string(this.model.rpar); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BPLATFORM\",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.model.rpar); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BPLATFORM\",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); } BPLATFORM.prototype.details = function BPLATFORM() { @@ -37,7 +37,7 @@ function BPLATFORM() { return options; } BPLATFORM.prototype.set = function BPLATFORM() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var dstate = this.model.dstate; while (true) { var ok = true; @@ -70,7 +70,7 @@ function BPLATFORM() { } else { var rpar = [[this.plen],[this.csiz],[this.phi],[this.xmin],[this.xmax],[this.ymin],[this.ymax]]; this.model.rpar = new ScilabDouble(rpar); - 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/Misc/BPLATFORM.pickle b/js/Misc/BPLATFORM.pickle index b9c99f67..914fc6f8 100644 --- a/js/Misc/BPLATFORM.pickle +++ b/js/Misc/BPLATFORM.pickle @@ -4,30 +4,26 @@ p0 ((lp1 S'phi' p2 -aS'csiz' -p3 aS'ymax' +p3 +aS'csiz' p4 aS'graphics' p5 -aS'exprs' -p6 -aS'gr_i' -p7 aS'xmax' -p8 +p6 aS'plen' -p9 +p7 aS'xmin' -p10 +p8 aS'x' -p11 +p9 aS'model' -p12 +p10 aS'ymin' -p13 -atp14 -Rp15 +p11 +atp12 +Rp13 .(dp0 S'model.dstate' p1 diff --git a/js/Misc/CBLOCK.js b/js/Misc/CBLOCK.js index 1d9bfc55..05401ed7 100644 --- a/js/Misc/CBLOCK.js +++ b/js/Misc/CBLOCK.js @@ -28,8 +28,8 @@ function CBLOCK() { this.model.dep_ut = new ScilabBoolean([true,false]); this.model.nzcross = new ScilabDouble([this.ng]); var label = list(transpose([funam,"n",sci2exp(in1),sci2exp(out),sci2exp(clkin),sci2exp(clkout),sci2exp(x0),sci2exp(0),sci2exp(z0),sci2exp(this.rpar),sci2exp(this.ipar),sci2exp(auto),"y","n"]),[]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CBLOCK\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,label,this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CBLOCK\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,label,gr_i); return new BasicBlock(this.x); } CBLOCK.prototype.details = function CBLOCK() { diff --git a/js/Misc/CBLOCK.pickle b/js/Misc/CBLOCK.pickle index d75a6b82..7fb5b3f6 100644 --- a/js/Misc/CBLOCK.pickle +++ b/js/Misc/CBLOCK.pickle @@ -6,44 +6,40 @@ S'impli' p2 aS'co' p3 -aS'dept' -p4 aS'i' -p5 +p4 aS'auto0' -p6 +p5 aS'ci' -p7 +p6 aS'o' -p8 +p7 aS'ng' -p9 +p8 aS'depu' +p9 +aS'dept' p10 -aS'exprs' -p11 aS'xx' -p12 -aS'gr_i' -p13 +p11 aS'rpar' -p14 +p12 aS'lab' -p15 +p13 aS'ipar' -p16 +p14 aS'graphics' -p17 +p15 aS'x' -p18 +p16 aS'model' -p19 +p17 aS'z' -p20 +p18 aS'function_name' -p21 -atp22 -Rp23 +p19 +atp20 +Rp21 .(dp0 S'ci' p1 diff --git a/js/Misc/CBLOCK4.js b/js/Misc/CBLOCK4.js index 128533b0..1a51633b 100644 --- a/js/Misc/CBLOCK4.js +++ b/js/Misc/CBLOCK4.js @@ -12,8 +12,8 @@ function CBLOCK4() { this.model.outtyp = new ScilabDouble([1]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = list([[funam],["n"],[sci2exp([this.model.in,this.model.in2])],[sci2exp(this.model.intyp)],[sci2exp([this.model.out,this.model.out2])],[sci2exp(this.model.outtyp)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.odstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.opar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]],[]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CBLOCK4\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,label,this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CBLOCK4\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,label,gr_i); return new BasicBlock(this.x); } CBLOCK4.prototype.details = function CBLOCK4() { diff --git a/js/Misc/CBLOCK4.pickle b/js/Misc/CBLOCK4.pickle index 68e12486..e96df717 100644 --- a/js/Misc/CBLOCK4.pickle +++ b/js/Misc/CBLOCK4.pickle @@ -14,46 +14,42 @@ aS'auto0' p6 aS'out' p7 -aS'dept' -p8 aS'function_name' -p9 +p8 aS'in1' -p10 +p9 aS'lab' -p11 +p10 aS'it' -p12 +p11 aS'graphics' -p13 +p12 aS'nmode' -p14 +p13 aS'z' -p15 +p14 aS'xx' -p16 +p15 aS'nzcr' -p17 +p16 aS'depu' +p17 +aS'dept' p18 -aS'exprs' -p19 -aS'gr_i' -p20 aS'opar' -p21 +p19 aS'oz' -p22 +p20 aS'ipar' -p23 +p21 aS'x' -p24 +p22 aS'model' -p25 +p23 aS'ot' -p26 -atp27 -Rp28 +p24 +atp25 +Rp26 .(dp0 S'model.odstate' p1 diff --git a/js/Misc/CONSTRAINT2_c.js b/js/Misc/CONSTRAINT2_c.js index 192d0ab0..01675ac1 100644 --- a/js/Misc/CONSTRAINT2_c.js +++ b/js/Misc/CONSTRAINT2_c.js @@ -12,9 +12,9 @@ function CONSTRAINT2_c() { this.model.ipar = new ScilabDouble(this.id); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.exprs = list(strcat(sci2exp(this.x0)),strcat(sci2exp(this.xd0)),strcat(sci2exp(this.id))); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONSTRAINT2_c\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + var exprs = list(strcat(sci2exp(this.x0)),strcat(sci2exp(this.xd0)),strcat(sci2exp(this.id))); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONSTRAINT2_c\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,exprs,gr_i); return new BasicBlock(this.x); } CONSTRAINT2_c.prototype.details = function CONSTRAINT2_c() { @@ -29,7 +29,7 @@ function CONSTRAINT2_c() { return options; } CONSTRAINT2_c.prototype.set = function CONSTRAINT2_c() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ask_again = false; var ok = true; @@ -67,7 +67,7 @@ function CONSTRAINT2_c() { } } 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],[N]); this.model.in = new ScilabDouble([N]); diff --git a/js/Misc/CONSTRAINT2_c.pickle b/js/Misc/CONSTRAINT2_c.pickle index 01f45833..e0a0e690 100644 --- a/js/Misc/CONSTRAINT2_c.pickle +++ b/js/Misc/CONSTRAINT2_c.pickle @@ -2,24 +2,20 @@ c__builtin__ set p0 ((lp1 -S'xd0' +S'graphics' p2 -aS'id' +aS'x0' p3 -aS'exprs' +aS'xd0' p4 -aS'gr_i' +aS'x' p5 -aS'graphics' +aS'model' p6 -aS'x' +aS'id' p7 -aS'model' -p8 -aS'x0' -p9 -atp10 -Rp11 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/Misc/CONSTRAINT_c.js b/js/Misc/CONSTRAINT_c.js index dc17effd..f48f637e 100644 --- a/js/Misc/CONSTRAINT_c.js +++ b/js/Misc/CONSTRAINT_c.js @@ -10,9 +10,9 @@ function CONSTRAINT_c() { this.model.state = new ScilabDouble(this.x0); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.exprs = "0"; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONSTRAINT_c\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = "0"; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONSTRAINT_c\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString([exprs]),gr_i); return new BasicBlock(this.x); } CONSTRAINT_c.prototype.details = function CONSTRAINT_c() { @@ -25,7 +25,7 @@ function CONSTRAINT_c() { return options; } CONSTRAINT_c.prototype.set = function CONSTRAINT_c() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.x0 = inverse(arguments[0]["x0"]); @@ -43,7 +43,7 @@ function CONSTRAINT_c() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.state = new ScilabDouble([this.x0],[zeros(N,1)]); this.model.out = new ScilabDouble([N]); this.model.in = new ScilabDouble([N]); diff --git a/js/Misc/CONSTRAINT_c.pickle b/js/Misc/CONSTRAINT_c.pickle index 6c45778f..307a9965 100644 --- a/js/Misc/CONSTRAINT_c.pickle +++ b/js/Misc/CONSTRAINT_c.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/Misc/DEADBAND.js b/js/Misc/DEADBAND.js index dfc613c6..a0e06241 100644 --- a/js/Misc/DEADBAND.js +++ b/js/Misc/DEADBAND.js @@ -13,9 +13,9 @@ function DEADBAND() { 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),\"DEADBAND\",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),\"DEADBAND\",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); } DEADBAND.prototype.details = function DEADBAND() { @@ -30,7 +30,7 @@ function DEADBAND() { return options; } DEADBAND.prototype.set = function DEADBAND() { - 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 DEADBAND() { 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/Misc/DEADBAND.pickle b/js/Misc/DEADBAND.pickle index ab8faf42..04dec972 100644 --- a/js/Misc/DEADBAND.pickle +++ b/js/Misc/DEADBAND.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/Misc/DEBUG.js b/js/Misc/DEBUG.js index 3be54709..d1d6a432 100644 --- a/js/Misc/DEBUG.js +++ b/js/Misc/DEBUG.js @@ -4,9 +4,9 @@ function DEBUG() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["%debug_scicos"]), new ScilabDouble([99])); this.model.blocktype = new ScilabString(["d"]); - this.exprs = list("","xcos_debug_gui(flag,block);"); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEBUG\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([8,2]),this.model,this.exprs,this.gr_i); + var exprs = list("","xcos_debug_gui(flag,block);"); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEBUG\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([8,2]),this.model,exprs,gr_i); return new BasicBlock(this.x); } DEBUG.prototype.details = function DEBUG() { @@ -16,8 +16,8 @@ function DEBUG() { alert("parameters cannot be modified"); } DEBUG.prototype.set = function DEBUG() { - this.exprs = this.graphics.exprs; - var textmp = this.exprs[2-1]; + var exprs = this.graphics.exprs; + var textmp = exprs[2-1]; var ok = true; while (1==1) { var tmpvar0 = dialog([["Enter scilab instructions for debugging."],[" Inputs are block and flag, output is block"]],textmp); @@ -29,7 +29,7 @@ function DEBUG() { warning("off"); save(this.TMPDIR+"/debug_scicos",this.debug_scicos); warning(warnMode); - this.exprs[2-1] = txt; + exprs[2-1] = txt; if ((scicos_debug()!=2&&scicos_debug()!=3)) { scicos_debug(2); } @@ -44,7 +44,7 @@ function DEBUG() { } } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; } return new BasicBlock(this.x); diff --git a/js/Misc/DEBUG.pickle b/js/Misc/DEBUG.pickle index 88e6f456..b3bc3cdf 100644 --- a/js/Misc/DEBUG.pickle +++ b/js/Misc/DEBUG.pickle @@ -4,20 +4,16 @@ p0 ((lp1 S'debug_scicos' p2 -aS'exprs' +aS'x' p3 -aS'gr_i' +aS'model' p4 -aS'graphics' +aS'TMPDIR' p5 -aS'x' +aS'graphics' p6 -aS'model' -p7 -aS'TMPDIR' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'exprs[2-1]' p1 diff --git a/js/Misc/DEBUG_SCICOS.pickle b/js/Misc/DEBUG_SCICOS.pickle index c0d8a4c9..6863bb50 100644 --- a/js/Misc/DEBUG_SCICOS.pickle +++ b/js/Misc/DEBUG_SCICOS.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'y' p1 diff --git a/js/Misc/DIFF_f.js b/js/Misc/DIFF_f.js index 0c896904..e5c64927 100644 --- a/js/Misc/DIFF_f.js +++ b/js/Misc/DIFF_f.js @@ -9,9 +9,9 @@ function DIFF_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[1-1]))],[strcat(sci2exp(this.x0[2-1]))]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DIFF_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[1-1]))],[strcat(sci2exp(this.x0[2-1]))]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DIFF_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); } DIFF_f.prototype.details = function DIFF_f() { @@ -25,7 +25,7 @@ function DIFF_f() { return options; } DIFF_f.prototype.set = function DIFF_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.x0 = inverse(arguments[0]["x0"]); @@ -33,7 +33,7 @@ function DIFF_f() { if (!ok) { break; } - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.state = new ScilabDouble([this.x0.slice()],[this.xd0.slice()]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Misc/DIFF_f.pickle b/js/Misc/DIFF_f.pickle index 9d7579af..7676e450 100644 --- a/js/Misc/DIFF_f.pickle +++ b/js/Misc/DIFF_f.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'model.sim' p1 diff --git a/js/Misc/DSUPER.js b/js/Misc/DSUPER.js index 96fc3fc9..ce9ea810 100644 --- a/js/Misc/DSUPER.js +++ b/js/Misc/DSUPER.js @@ -15,7 +15,7 @@ function DSUPER() { if ((length(this.graphics.exprs)==0)) { return; } - this.exprs = this.graphics.exprs[1-1]; + var exprs = this.graphics.exprs[1-1]; var exprs0 = this.graphics.exprs[2-1][1-1]; var btitre = this.graphics.exprs[2-1][2-1][1-1]; var bitems = this.graphics.exprs[2-1][2-1].slice(2-1,$); @@ -44,7 +44,7 @@ function DSUPER() { var needcompile2 = tmpvar1[2]; this.ok = tmpvar1[3]; var y = max(2,this.needcompile,needcompile2); - this.x.graphics.exprs[1-1] = this.exprs; + this.x.graphics.exprs[1-1] = exprs; this.x.model.rpar = sblock; } else { } diff --git a/js/Misc/DSUPER.pickle b/js/Misc/DSUPER.pickle index 8d7d2a76..3b16c414 100644 --- a/js/Misc/DSUPER.pickle +++ b/js/Misc/DSUPER.pickle @@ -4,20 +4,16 @@ p0 ((lp1 S'needcompile' p2 -aS'ok' +aS'x' p3 -aS'exprs' +aS'model' p4 -aS'gr_i' +aS'ok' p5 aS'graphics' p6 -aS'x' -p7 -aS'model' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'bitems' p1 diff --git a/js/Misc/EDGETRIGGER.js b/js/Misc/EDGETRIGGER.js index f5ff7238..cb318610 100644 --- a/js/Misc/EDGETRIGGER.js +++ b/js/Misc/EDGETRIGGER.js @@ -11,9 +11,9 @@ function EDGETRIGGER() { this.model.ipar = new ScilabDouble([sign(this.edge)]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [string(this.edge)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EDGETRIGGER\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(this.exprs),this.gr_i); + var exprs = [string(this.edge)]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EDGETRIGGER\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(exprs),gr_i); return new BasicBlock(this.x); } EDGETRIGGER.prototype.details = function EDGETRIGGER() { @@ -26,7 +26,7 @@ function EDGETRIGGER() { return options; } EDGETRIGGER.prototype.set = function EDGETRIGGER() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.edge = parseFloat(arguments[0]["edge"]); @@ -34,7 +34,7 @@ function EDGETRIGGER() { break; } this.model.ipar = new ScilabDouble([sign(this.edge)]); - 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/Misc/EDGETRIGGER.pickle b/js/Misc/EDGETRIGGER.pickle index 305c6bff..0c1e083d 100644 --- a/js/Misc/EDGETRIGGER.pickle +++ b/js/Misc/EDGETRIGGER.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'edge' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'edge' p4 aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Misc/EDGE_TRIGGER.js b/js/Misc/EDGE_TRIGGER.js index 4d6ece5d..e4cc4f37 100644 --- a/js/Misc/EDGE_TRIGGER.js +++ b/js/Misc/EDGE_TRIGGER.js @@ -77,8 +77,8 @@ function EDGE_TRIGGER() { this.model.in = new ScilabDouble([1]); this.model.evtout = new ScilabDouble([1]); this.model.rpar = scs_m_1; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EDGE_TRIGGER\",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),\"EDGE_TRIGGER\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([]),gr_i); return new BasicBlock(this.x); } EDGE_TRIGGER.prototype.details = function EDGE_TRIGGER() { diff --git a/js/Misc/EDGE_TRIGGER.pickle b/js/Misc/EDGE_TRIGGER.pickle index 82928962..eeee1dd6 100644 --- a/js/Misc/EDGE_TRIGGER.pickle +++ b/js/Misc/EDGE_TRIGGER.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'x' p2 -aS'gr_i' +aS'model' p3 -aS'graphics' +aS'xxn' p4 -aS'x' +aS'graphics' p5 -aS'model' -p6 -aS'xxn' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'lnk.ct' p1 diff --git a/js/Misc/ENDBLK.js b/js/Misc/ENDBLK.js index 58327da8..23ce92be 100644 --- a/js/Misc/ENDBLK.js +++ b/js/Misc/ENDBLK.js @@ -5,8 +5,8 @@ function ENDBLK() { scs_m_1.objs[1-1] = scicos_block(gui="END_c",graphics=scicos_graphics(orig=[272.104,249.11733],sz=[40,40],flip=true,theta=0,exprs="1.000E+08",pin=[],pout=[],pein=2,peout=2,gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim=list("scicosexit",4),in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=1,state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=1.000e+08,dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m_1.objs[2-1] = scicos_link(xx=[[292.104],[292.104],[261.83733],[261.83733],[292.104],[292.104]],yy=[[243.40305],[234.45067],[234.45067],[305.584],[305.584],[294.83162]],id="drawlink",thick=[0,0],ct=[5,-1],from=[1,1,0],to=[1,1,1]); this.model = scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ENDBLK\",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),\"ENDBLK\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),gr_i); return new BasicBlock(this.x); } ENDBLK.prototype.details = function ENDBLK() { diff --git a/js/Misc/ENDBLK.pickle b/js/Misc/ENDBLK.pickle index 832db352..9d7dfbf7 100644 --- a/js/Misc/ENDBLK.pickle +++ b/js/Misc/ENDBLK.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'x' p2 -aS'gr_i' +aS'model' p3 -aS'graphics' +aS'xxn' p4 -aS'x' +aS'graphics' p5 -aS'model' -p6 -aS'xxn' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'ppath' p1 diff --git a/js/Misc/EXPRESSION.pickle b/js/Misc/EXPRESSION.pickle index 29756226..89d93c66 100644 --- a/js/Misc/EXPRESSION.pickle +++ b/js/Misc/EXPRESSION.pickle @@ -2,30 +2,26 @@ c__builtin__ set p0 ((lp1 -S'PREVAR_foo' +S'%nin' p2 -aS'getfield' +aS'PREVAR_foo' p3 -aS'PREVAR_scicos_context' +aS'getfield' p4 -aS'%exx' +aS'PREVAR_scicos_context' p5 -aS'exprs' +aS'%exx' p6 -aS'gr_i' +aS'%usenz' p7 -aS'%nin' -p8 aS'graphics' -p9 +p8 aS'x' -p10 +p9 aS'model' -p11 -aS'%usenz' -p12 -atp13 -Rp14 +p10 +atp11 +Rp12 .(dp0 S'arg1' p1 diff --git a/js/Misc/Extract_Activation.js b/js/Misc/Extract_Activation.js index 878cc276..eea51aaf 100644 --- a/js/Misc/Extract_Activation.js +++ b/js/Misc/Extract_Activation.js @@ -82,8 +82,8 @@ function Extract_Activation() { this.model.in = new ScilabDouble([1]); this.model.evtout = new ScilabDouble([1]); this.model.rpar = scs_m_1; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Extract_Activation\",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),\"Extract_Activation\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([]),gr_i); return new BasicBlock(this.x); } Extract_Activation.prototype.details = function Extract_Activation() { diff --git a/js/Misc/Extract_Activation.pickle b/js/Misc/Extract_Activation.pickle index 32d491ea..2e9976f2 100644 --- a/js/Misc/Extract_Activation.pickle +++ b/js/Misc/Extract_Activation.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'lnk.ct' p1 diff --git a/js/Misc/HYSTHERESIS.js b/js/Misc/HYSTHERESIS.js index e873a36d..1dbed3e8 100644 --- a/js/Misc/HYSTHERESIS.js +++ b/js/Misc/HYSTHERESIS.js @@ -14,9 +14,9 @@ function HYSTHERESIS() { this.model.nmode = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[string(rpar)],[string(sign(this.nzz))]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"HYSTHERESIS\",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(rpar)],[string(sign(this.nzz))]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"HYSTHERESIS\",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); } HYSTHERESIS.prototype.details = function HYSTHERESIS() { @@ -33,7 +33,7 @@ function HYSTHERESIS() { return options; } HYSTHERESIS.prototype.set = function HYSTHERESIS() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.high_lim = arguments[0]["high_lim"]; @@ -48,7 +48,7 @@ function HYSTHERESIS() { message("switch on value must be larger than switch off value"); throw "user error"; } else { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble(transpose([this.high_lim,this.low_lim,this.out_high,this.out_low])); if (this.nzz>0) { this.nzz = 2; diff --git a/js/Misc/HYSTHERESIS.pickle b/js/Misc/HYSTHERESIS.pickle index 0fe608f8..fe034947 100644 --- a/js/Misc/HYSTHERESIS.pickle +++ b/js/Misc/HYSTHERESIS.pickle @@ -2,28 +2,24 @@ c__builtin__ set p0 ((lp1 -S'out_low' +S'low_lim' p2 -aS'low_lim' +aS'out_low' p3 -aS'out_high' -p4 aS'nzz' -p5 +p4 aS'graphics' +p5 +aS'out_high' p6 -aS'exprs' -p7 -aS'gr_i' -p8 aS'high_lim' -p9 +p7 aS'x' -p10 +p8 aS'model' -p11 -atp12 -Rp13 +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/Misc/IMPSPLIT_f.pickle b/js/Misc/IMPSPLIT_f.pickle index a6502f37..a881873a 100644 --- a/js/Misc/IMPSPLIT_f.pickle +++ b/js/Misc/IMPSPLIT_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/Misc/LOGICAL_OP.js b/js/Misc/LOGICAL_OP.js index ea535301..02de4be4 100644 --- a/js/Misc/LOGICAL_OP.js +++ b/js/Misc/LOGICAL_OP.js @@ -11,9 +11,9 @@ function LOGICAL_OP() { this.model.ipar = new ScilabDouble(ipar); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[string(this.nin)],[string(ipar)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOGICAL_OP\",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.nin)],[string(ipar)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOGICAL_OP\",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); } LOGICAL_OP.prototype.details = function LOGICAL_OP() { @@ -29,9 +29,9 @@ function LOGICAL_OP() { return options; } LOGICAL_OP.prototype.set = function LOGICAL_OP() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,1)==2) { - this.exprs = [[this.exprs],[sci2exp(1)],[sci2exp(0)]]; + var exprs = this.graphics.exprs; + if (size(exprs,1)==2) { + var exprs = [[exprs],[sci2exp(1)],[sci2exp(0)]]; } while (true) { var ok = true; @@ -121,7 +121,7 @@ function LOGICAL_OP() { } else if (this.rule==5) { var label = "NOT"; } - this.graphics.exprs = new ScilabDouble(this.exprs); + this.graphics.exprs = new ScilabDouble(exprs); this.graphics.style = new ScilabString(["blockWithLabel;displayedLabel="+label]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Misc/LOGICAL_OP.pickle b/js/Misc/LOGICAL_OP.pickle index 23986b25..8c4bf2c1 100644 --- a/js/Misc/LOGICAL_OP.pickle +++ b/js/Misc/LOGICAL_OP.pickle @@ -8,20 +8,16 @@ aS'Datatype' p3 aS'rule' p4 -aS'exprs' -p5 -aS'gr_i' -p6 aS'tp' -p7 +p5 aS'graphics' -p8 +p6 aS'x' -p9 +p7 aS'model' -p10 -atp11 -Rp12 +p8 +atp9 +Rp10 .(dp0 S'arg1' p1 diff --git a/js/Misc/MBLOCK.js b/js/Misc/MBLOCK.js index 06504708..5612ef4a 100644 --- a/js/Misc/MBLOCK.js +++ b/js/Misc/MBLOCK.js @@ -9,7 +9,7 @@ function MBLOCK() { var paramv = list(0.1,.0001); this.pprop = [[0],[0]]; var nameF = "generic"; - this.exprs = tlist(["MBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],sci2exp(this.in1.slice()),sci2exp(this.intype.slice()),sci2exp(this.out.slice()),sci2exp(this.outtype.slice()),sci2exp(param.slice()),list(string(0.1),string(.0001)),sci2exp(this.pprop.slice()),nameF,[]); + var exprs = tlist(["MBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],sci2exp(this.in1.slice()),sci2exp(this.intype.slice()),sci2exp(this.out.slice()),sci2exp(this.outtype.slice()),sci2exp(param.slice()),list(string(0.1),string(.0001)),sci2exp(this.pprop.slice()),nameF,[]); this.model = scicos_model(); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); @@ -26,8 +26,8 @@ function MBLOCK() { this.model.in = new ScilabDouble([ones(size(mo.inputs,"r"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"r"),1)]); this.model.equations = mo; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MBLOCK\",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),\"MBLOCK\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([exprs]),gr_i); this.x.graphics.in_implicit = this.intype; this.x.graphics.out_implicit = this.outtype; return new BasicBlock(this.x); @@ -48,18 +48,18 @@ function MBLOCK() { return options; } MBLOCK.prototype.set = function MBLOCK() { - this.exprs = this.graphics.exprs; - if (this.type[this.exprs-1]==15) { + var exprs = this.graphics.exprs; + if (this.type[exprs-1]==15) { var paramv = list(); this.pprop = []; for (i=1;i<=size(this.model.rpar,"*");i+=1) { paramv[$+1-1] = string(this.model.rpar[i-1]); this.pprop[$+1-1] = 0; } - this.exprs = tlist(["MBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],this.exprs[1-1][1-1],this.exprs[1-1][2-1],this.exprs[1-1][3-1],this.exprs[1-1][4-1],this.exprs[1-1][5-1],paramv,sci2exp(this.pprop.slice()),this.exprs[1-1][7-1],this.exprs[2-1]); + var exprs = tlist(["MBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],exprs[1-1][1-1],exprs[1-1][2-1],exprs[1-1][3-1],exprs[1-1][4-1],exprs[1-1][5-1],paramv,sci2exp(this.pprop.slice()),exprs[1-1][7-1],exprs[2-1]); } - this.lab_1 = list(this.exprs.in,this.exprs.intype,this.exprs.out,this.exprs.outtype,this.exprs.param,this.exprs.pprop,this.exprs.nameF); - var lab_2 = this.exprs.paramv; + this.lab_1 = list(exprs.in,exprs.intype,exprs.out,exprs.outtype,exprs.param,exprs.pprop,exprs.nameF); + var lab_2 = exprs.paramv; while (true) { var ok = true; this.Tin = arguments[0]["Tin"]; @@ -222,7 +222,7 @@ function MBLOCK() { var getvalue_txt = "[ok,"+lhs_txt+",lab_2]=scicos_getvalue(\'Set parameters values\',["+lab_txt+"],"+"list("+rhs_txt+"),lab_2)"; execstr(getvalue_txt); if (!ok) { - var lab_2 = this.exprs.paramv; + var lab_2 = exprs.paramv; } } } @@ -236,7 +236,7 @@ function MBLOCK() { if (extF==".mo"&&fileinfo(this.funam).length!=0) { var tt = mgetl(this.funam); } else { - var tt = this.exprs.funtxt; + var tt = exprs.funtxt; var mo = this.model.equations; if (mo.model!=nameF) { var tt = []; @@ -265,31 +265,31 @@ function MBLOCK() { this.model.rpar = new ScilabDouble([this.model.rpar],[paramv[i-1].slice()]); } this.model.sim[1-1] = new ScilabDouble([this.funam]); - this.exprs.in = this.lab_1[1-1]; - this.exprs.intype = this.lab_1[2-1]; - this.exprs.out = this.lab_1[3-1]; - this.exprs.outtype = this.lab_1[4-1]; - this.exprs.param = this.lab_1[5-1]; - this.exprs.paramv = list(); + exprs.in = this.lab_1[1-1]; + exprs.intype = this.lab_1[2-1]; + exprs.out = this.lab_1[3-1]; + exprs.outtype = this.lab_1[4-1]; + exprs.param = this.lab_1[5-1]; + exprs.paramv = list(); if (Tparam_sz!=0) { if (this.type[lab_2-1]==15) { for (i=1;i<=lstsize(lab_2);i+=1) { - this.exprs.paramv[i-1] = lab_2[i-1]; + exprs.paramv[i-1] = lab_2[i-1]; } } else { for (i=1;i<=size(lab_2,"*");i+=1) { - this.exprs.paramv[i-1] = lab_2[i-1]; + exprs.paramv[i-1] = lab_2[i-1]; } } } - this.exprs.pprop = this.lab_1[6-1]; - this.exprs.nameF = this.lab_1[7-1]; - this.exprs.funtxt = tt; + exprs.pprop = this.lab_1[6-1]; + exprs.nameF = this.lab_1[7-1]; + exprs.funtxt = tt; this.x.model = this.model; this.graphics.gr_i[1-1][1-1] = new ScilabString(["txt=[\'Modelica\';\' "+nameF+" \'];"]); this.graphics.in_implicit = new ScilabString(this.intype); this.graphics.out_implicit = new ScilabDouble(this.outtype); - this.graphics.exprs = this.exprs; + this.graphics.exprs = exprs; this.x.graphics = this.graphics; break; } diff --git a/js/Misc/MBLOCK.pickle b/js/Misc/MBLOCK.pickle index 398535f8..8c1cc41c 100644 --- a/js/Misc/MBLOCK.pickle +++ b/js/Misc/MBLOCK.pickle @@ -6,42 +6,38 @@ S'Touttype' p2 aS'lab_1' p3 -aS'outtype' -p4 aS'Tparam' -p5 +p4 aS'intype' -p6 +p5 aS'in1' +p6 +aS'Tin' p7 -aS'exprs' +aS'outtype' p8 -aS'Tin' -p9 -aS'gr_i' -p10 aS'Tout' -p11 +p9 aS'pprop' -p12 +p10 aS'graphics' -p13 +p11 aS'funam' -p14 +p12 aS'x' -p15 +p13 aS'model' -p16 +p14 aS'out' -p17 +p15 aS'type' -p18 +p16 aS'Tintype' -p19 +p17 aS'Tfunam' -p20 -atp21 -Rp22 +p18 +atp19 +Rp20 .(dp0 S'rhs_txt' p1 diff --git a/js/Misc/MEMORY_f.js b/js/Misc/MEMORY_f.js index 06169838..8edcc38f 100644 --- a/js/Misc/MEMORY_f.js +++ b/js/Misc/MEMORY_f.js @@ -3,7 +3,7 @@ function MEMORY_f() { MEMORY_f.prototype.define = function MEMORY_f() { var z = 0; var in1 = 1; - this.exprs = [[string(z)],[string(1)]]; + var exprs = [[string(z)],[string(1)]]; this.model = scicos_model(); this.model.sim = new ScilabString(["memo"]); this.model.in = new ScilabDouble([in1]); @@ -13,8 +13,8 @@ function MEMORY_f() { this.model.rpar = new ScilabDouble([z]); this.model.blocktype = new ScilabString(["m"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MEMORY_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MEMORY_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); } MEMORY_f.prototype.details = function MEMORY_f() { @@ -28,7 +28,7 @@ function MEMORY_f() { return options; } MEMORY_f.prototype.set = function MEMORY_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.a = arguments[0]["a"]; @@ -52,7 +52,7 @@ function MEMORY_f() { } var in1 = out; if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble([this.a]); this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([out]); diff --git a/js/Misc/MEMORY_f.pickle b/js/Misc/MEMORY_f.pickle index c9ccb17b..bd4bc5ec 100644 --- a/js/Misc/MEMORY_f.pickle +++ b/js/Misc/MEMORY_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/Misc/MPBLOCK.js b/js/Misc/MPBLOCK.js index f20e0135..1c5aed9b 100644 --- a/js/Misc/MPBLOCK.js +++ b/js/Misc/MPBLOCK.js @@ -9,7 +9,7 @@ function MPBLOCK() { var paramv = list(); var pprop = []; var nameF = "myModel"; - this.exprs = tlist(["MPBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],sci2exp(this.in1.slice()),sci2exp(this.intype.slice()),sci2exp(this.out.slice()),sci2exp(this.outtype.slice()),sci2exp(param.slice()),list(string(0.1),string(.0001)),sci2exp(pprop.slice()),nameF,[]); + var exprs = tlist(["MPBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],sci2exp(this.in1.slice()),sci2exp(this.intype.slice()),sci2exp(this.out.slice()),sci2exp(this.outtype.slice()),sci2exp(param.slice()),list(string(0.1),string(.0001)),sci2exp(pprop.slice()),nameF,[]); this.model = scicos_model(); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,true]); @@ -26,8 +26,8 @@ function MPBLOCK() { this.model.in = new ScilabDouble([ones(size(mo.inputs,"r"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"r"),1)]); this.model.equations = mo; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MPBLOCK\",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),\"MPBLOCK\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([exprs]),gr_i); this.x.graphics.in_implicit = this.intype; this.x.graphics.out_implicit = this.outtype; return new BasicBlock(this.x); @@ -39,18 +39,18 @@ function MPBLOCK() { alert("parameters cannot be modified"); } MPBLOCK.prototype.set = function MPBLOCK() { - this.exprs = this.graphics.exprs; - if (this.type[this.exprs-1]==15) { + var exprs = this.graphics.exprs; + if (this.type[exprs-1]==15) { var paramv = list(); var pprop = []; for (i=1;i<=size(this.model.rpar,"*");i+=1) { paramv[$+1-1] = string(this.model.rpar[i-1]); pprop[$+1-1] = 0; } - this.exprs = tlist(["MPBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],this.exprs[1-1][1-1],this.exprs[1-1][2-1],this.exprs[1-1][3-1],this.exprs[1-1][4-1],this.exprs[1-1][5-1],paramv,sci2exp(pprop.slice()),this.exprs[1-1][7-1],this.exprs[2-1]); + var exprs = tlist(["MPBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],exprs[1-1][1-1],exprs[1-1][2-1],exprs[1-1][3-1],exprs[1-1][4-1],exprs[1-1][5-1],paramv,sci2exp(pprop.slice()),exprs[1-1][7-1],exprs[2-1]); } - var lab_1 = list(this.exprs.in,this.exprs.intype,this.exprs.out,this.exprs.outtype,this.exprs.param,this.exprs.pprop,this.exprs.nameF); - var lab_2 = this.exprs.paramv; + var lab_1 = list(exprs.in,exprs.intype,exprs.out,exprs.outtype,exprs.param,exprs.pprop,exprs.nameF); + var lab_2 = exprs.paramv; while (true) { var tmpvar0 = getvalue("Set Modelica generic block parameters",[["Input variables: "],["Input variables types: "],["Output variables: "],["Output variables types:"],["Parameters in Modelica:"],["Parameters properties: "],["Model name in packages:"]],list("str",-1,"str",-1,"str",-1,"str",-1,"str",-1,"vec",-1,"str",-1),lab_1); var ok = tmpvar0[0]; @@ -188,7 +188,7 @@ function MPBLOCK() { var lab_2_tmp = list(); if (Tparam_sz!=0) { for (i=1;i<=Tparam_sz;i+=1) { - var ee = evstr(this.exprs.param); + var ee = evstr(exprs.param); for (j=1;j<=size(ee,"r");j+=1) { if (ee[j-1]==Tparam_lab[i-1]) { lab_2_tmp[i-1] = lab_2[j-1]; @@ -219,7 +219,7 @@ function MPBLOCK() { var getvalue_txt = "[ok,"+lhs_txt+",lab_2]=scicos_getvalue(\'Set parameters values\',["+lab_txt+"],"+"list("+rhs_txt+"),lab_2)"; execstr(getvalue_txt); if (!ok) { - var lab_2 = this.exprs.paramv; + var lab_2 = exprs.paramv; } } } @@ -247,31 +247,31 @@ function MPBLOCK() { this.model.rpar = new ScilabDouble([this.model.rpar],[double(paramv[i-1].slice())]); } this.model.sim[1-1] = new ScilabDouble([this.funam]); - this.exprs.in = lab_1[1-1]; - this.exprs.intype = lab_1[2-1]; - this.exprs.out = lab_1[3-1]; - this.exprs.outtype = lab_1[4-1]; - this.exprs.param = lab_1[5-1]; - this.exprs.paramv = list(); + exprs.in = lab_1[1-1]; + exprs.intype = lab_1[2-1]; + exprs.out = lab_1[3-1]; + exprs.outtype = lab_1[4-1]; + exprs.param = lab_1[5-1]; + exprs.paramv = list(); if (Tparam_sz!=0) { if (this.type[lab_2-1]==15) { for (i=1;i<=lstsize(lab_2);i+=1) { - this.exprs.paramv[i-1] = lab_2[i-1]; + exprs.paramv[i-1] = lab_2[i-1]; } } else { for (i=1;i<=size(lab_2,"*");i+=1) { - this.exprs.paramv[i-1] = lab_2[i-1]; + exprs.paramv[i-1] = lab_2[i-1]; } } } - this.exprs.pprop = lab_1[6-1]; - this.exprs.nameF = lab_1[7-1]; - this.exprs.funtxt = ""; + exprs.pprop = lab_1[6-1]; + exprs.nameF = lab_1[7-1]; + exprs.funtxt = ""; this.x.model = this.model; this.graphics.gr_i[1-1][1-1] = new ScilabString(["txt=[\' "+nameF+" \'];"]); this.graphics.in_implicit = new ScilabString(this.intype); this.graphics.out_implicit = new ScilabDouble(this.outtype); - this.graphics.exprs = this.exprs; + this.graphics.exprs = exprs; this.x.graphics = this.graphics; break; } diff --git a/js/Misc/MPBLOCK.pickle b/js/Misc/MPBLOCK.pickle index 6eb24584..7e28fde3 100644 --- a/js/Misc/MPBLOCK.pickle +++ b/js/Misc/MPBLOCK.pickle @@ -2,30 +2,26 @@ c__builtin__ set p0 ((lp1 -S'outtype' +S'intype' p2 -aS'intype' -p3 aS'in1' +p3 +aS'outtype' p4 -aS'exprs' -p5 -aS'gr_i' -p6 aS'graphics' -p7 +p5 aS'funam' -p8 +p6 aS'x' -p9 +p7 aS'model' -p10 +p8 aS'type' -p11 +p9 aS'out' -p12 -atp13 -Rp14 +p10 +atp11 +Rp12 .(dp0 S'rhs_txt' p1 diff --git a/js/Misc/PAL_f.js b/js/Misc/PAL_f.js index e9469134..605f3afb 100644 --- a/js/Misc/PAL_f.js +++ b/js/Misc/PAL_f.js @@ -10,8 +10,8 @@ function PAL_f() { this.model.rpar = new ScilabDouble([scs]); this.model.blocktype = new ScilabString(["h"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PAL_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),\"PAL_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),gr_i); this.x.graphics.id = scs.props.title[1-1]; return new BasicBlock(this.x); } diff --git a/js/Misc/PAL_f.pickle b/js/Misc/PAL_f.pickle index ab8787a8..aaa3b9a6 100644 --- a/js/Misc/PAL_f.pickle +++ b/js/Misc/PAL_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/Misc/PENDULUM_ANIM.js b/js/Misc/PENDULUM_ANIM.js index b323351e..36570c2d 100644 --- a/js/Misc/PENDULUM_ANIM.js +++ b/js/Misc/PENDULUM_ANIM.js @@ -16,9 +16,9 @@ function PENDULUM_ANIM() { this.model.rpar = new ScilabDouble([this.plen],[this.csiz],[this.phi],[this.xmin],[this.xmax],[this.ymin],[this.ymax]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = string(this.model.rpar); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PENDULUM_ANIM\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,3]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = string(this.model.rpar); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PENDULUM_ANIM\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,3]),this.model,new ScilabString([exprs]),gr_i); return new BasicBlock(this.x); } PENDULUM_ANIM.prototype.details = function PENDULUM_ANIM() { @@ -37,7 +37,7 @@ function PENDULUM_ANIM() { return options; } PENDULUM_ANIM.prototype.set = function PENDULUM_ANIM() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var dstate = this.model.dstate; while (true) { var ok = true; @@ -70,7 +70,7 @@ function PENDULUM_ANIM() { } else { var rpar = [[this.plen],[this.csiz],[this.phi],[this.xmin],[this.xmax],[this.ymin],[this.ymax]]; this.model.rpar = new ScilabDouble(rpar); - 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/Misc/PENDULUM_ANIM.pickle b/js/Misc/PENDULUM_ANIM.pickle index b9c99f67..914fc6f8 100644 --- a/js/Misc/PENDULUM_ANIM.pickle +++ b/js/Misc/PENDULUM_ANIM.pickle @@ -4,30 +4,26 @@ p0 ((lp1 S'phi' p2 -aS'csiz' -p3 aS'ymax' +p3 +aS'csiz' p4 aS'graphics' p5 -aS'exprs' -p6 -aS'gr_i' -p7 aS'xmax' -p8 +p6 aS'plen' -p9 +p7 aS'xmin' -p10 +p8 aS'x' -p11 +p9 aS'model' -p12 +p10 aS'ymin' -p13 -atp14 -Rp15 +p11 +atp12 +Rp13 .(dp0 S'model.dstate' p1 diff --git a/js/Misc/RATELIMITER.js b/js/Misc/RATELIMITER.js index e3e40ef8..df753c2e 100644 --- a/js/Misc/RATELIMITER.js +++ b/js/Misc/RATELIMITER.js @@ -11,9 +11,9 @@ function RATELIMITER() { 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)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RATELIMITER\",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.maxp)],[string(this.minp)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RATELIMITER\",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); } RATELIMITER.prototype.details = function RATELIMITER() { @@ -27,7 +27,7 @@ function RATELIMITER() { return options; } RATELIMITER.prototype.set = function RATELIMITER() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.maxp = parseFloat(arguments[0]["maxp"]); @@ -41,7 +41,7 @@ function RATELIMITER() { } else { var rpar = [[this.maxp],[this.minp]]; this.model.rpar = new ScilabDouble(rpar); - 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/Misc/RATELIMITER.pickle b/js/Misc/RATELIMITER.pickle index c591b933..14b84a2d 100644 --- a/js/Misc/RATELIMITER.pickle +++ b/js/Misc/RATELIMITER.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'maxp' +S'minp' p2 -aS'exprs' +aS'x' p3 -aS'gr_i' +aS'model' p4 -aS'graphics' +aS'maxp' p5 -aS'minp' +aS'graphics' p6 -aS'x' -p7 -aS'model' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/Misc/RELATIONALOP.js b/js/Misc/RELATIONALOP.js index 8d83d58b..4febec77 100644 --- a/js/Misc/RELATIONALOP.js +++ b/js/Misc/RELATIONALOP.js @@ -10,9 +10,9 @@ function RELATIONALOP() { this.model.ipar = new ScilabDouble(ipar); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[string(ipar)],[string(0)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RELATIONALOP\",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(ipar)],[string(0)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RELATIONALOP\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),gr_i); this.x.graphics.style = ["fontSize=13;fontStyle=1;displayedLabel="+label]; return new BasicBlock(this.x); } @@ -28,9 +28,9 @@ function RELATIONALOP() { return options; } RELATIONALOP.prototype.set = function RELATIONALOP() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,1)==2) { - this.exprs = [[this.exprs],[sci2exp(1)]]; + var exprs = this.graphics.exprs; + if (size(exprs,1)==2) { + var exprs = [[exprs],[sci2exp(1)]]; } while (true) { var ok = true; @@ -92,7 +92,7 @@ function RELATIONALOP() { } else if (this.rule==5) { var label = "≥"; } - this.graphics.exprs = new ScilabDouble(this.exprs); + this.graphics.exprs = new ScilabDouble(exprs); this.graphics.style = new ScilabString(["fontSize=13;fontStyle=1;displayedLabel="+label]); this.model.ipar = new ScilabDouble([this.rule]); this.model.nzcross = new ScilabDouble([this.zcr]); diff --git a/js/Misc/RELATIONALOP.pickle b/js/Misc/RELATIONALOP.pickle index 17357af5..86794c4d 100644 --- a/js/Misc/RELATIONALOP.pickle +++ b/js/Misc/RELATIONALOP.pickle @@ -6,20 +6,16 @@ S'Datatype' p2 aS'rule' 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/Misc/SPLIT_f.pickle b/js/Misc/SPLIT_f.pickle index 56d46243..b9bbde1f 100644 --- a/js/Misc/SPLIT_f.pickle +++ b/js/Misc/SPLIT_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/Misc/SUPER_f.js b/js/Misc/SUPER_f.js index a566e3fa..06795b41 100644 --- a/js/Misc/SUPER_f.js +++ b/js/Misc/SUPER_f.js @@ -18,8 +18,8 @@ function SUPER_f() { this.model.rpar = new ScilabDouble([scs]); this.model.blocktype = new ScilabString(["h"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUPER_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),\"SUPER_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),gr_i); return new SuperBlock(this.x); } SUPER_f.prototype.details = function SUPER_f() { diff --git a/js/Misc/SUPER_f.pickle b/js/Misc/SUPER_f.pickle index 49d8a34f..06680481 100644 --- a/js/Misc/SUPER_f.pickle +++ b/js/Misc/SUPER_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'scs.objs[2-1]' p1 diff --git a/js/Misc/TEXT_f.js b/js/Misc/TEXT_f.js index 2407ff93..36ae5150 100644 --- a/js/Misc/TEXT_f.js +++ b/js/Misc/TEXT_f.js @@ -7,11 +7,11 @@ function TEXT_f() { this.model.sim = new ScilabString(["text"]); this.model.rpar = new ScilabString(["Text"]); this.model.ipar = new ScilabDouble([this.font],[this.siz]); - this.exprs = [["Text"],[string(this.font)],[string(this.siz)]]; + var exprs = [["Text"],[string(this.font)],[string(this.siz)]]; this.graphics = scicos_graphics(); this.graphics.orig = new ScilabDouble([0,0]); this.graphics.sz = new ScilabDouble([2,1]); - this.graphics.exprs = new ScilabDouble(this.exprs); + this.graphics.exprs = new ScilabDouble(exprs); this.x = mlist(["Text","graphics","model","void","gui"],this.graphics,this.model," ","TEXT_f"); return new TextBlock(this.x); } @@ -28,9 +28,9 @@ function TEXT_f() { } TEXT_f.prototype.set = function TEXT_f() { var orig = this.graphics.orig; - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")==1) { - this.exprs = [[this.exprs],["3"],["1"]]; + var exprs = this.graphics.exprs; + if (size(exprs,"*")==1) { + var exprs = [[exprs],["3"],["1"]]; } while (true) { var ok = true; @@ -51,14 +51,14 @@ function TEXT_f() { var ok = false; } if (ok) { - this.graphics.exprs = new ScilabDouble(this.exprs); + this.graphics.exprs = new ScilabDouble(exprs); var gh_winpal = gca(); var default_font_style = gh_winpal.font_style; var default_font_size = gh_winpal.font_size; var default_font_color = gh_winpal.font_color; gh_winpal.font_style = this.font; gh_winpal.font_size = this.siz; - var r = xstringl(0,0,this.exprs[1-1],evstr(this.exprs[2-1]),evstr(this.exprs[3-1])); + var r = xstringl(0,0,exprs[1-1],evstr(exprs[2-1]),evstr(exprs[3-1])); gh_winpal.font_style = default_font_style; gh_winpal.font_size = default_font_size; gh_winpal.font_color = default_font_color; diff --git a/js/Misc/TEXT_f.pickle b/js/Misc/TEXT_f.pickle index 47e16643..b2499d4f 100644 --- a/js/Misc/TEXT_f.pickle +++ b/js/Misc/TEXT_f.pickle @@ -2,24 +2,20 @@ c__builtin__ set p0 ((lp1 -S'font' +S'txt' p2 aS'siz' p3 -aS'exprs' +aS'graphics' p4 -aS'gr_i' +aS'x' p5 -aS'graphics' +aS'model' p6 -aS'x' +aS'font' p7 -aS'model' -p8 -aS'txt' -p9 -atp10 -Rp11 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/Misc/c_block.js b/js/Misc/c_block.js index 37872f1a..f435472c 100644 --- a/js/Misc/c_block.js +++ b/js/Misc/c_block.js @@ -25,8 +25,8 @@ function c_block() { this.model.firing = new ScilabDouble(auto); this.model.dep_ut = new ScilabBoolean([true,false]); var label = list([[sci2exp(in1)],[sci2exp(out)],[strcat(sci2exp(this.rpar))],[this.funam]],list([])); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"c_block\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,label,this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"c_block\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,label,gr_i); return new BasicBlock(this.x); } c_block.prototype.details = function c_block() { diff --git a/js/Misc/c_block.pickle b/js/Misc/c_block.pickle index 13466587..6d9ad356 100644 --- a/js/Misc/c_block.pickle +++ b/js/Misc/c_block.pickle @@ -8,22 +8,18 @@ aS'o' p3 aS'rpar' p4 -aS'exprs' -p5 -aS'gr_i' -p6 aS'lab' -p7 +p5 aS'graphics' -p8 +p6 aS'funam' -p9 +p7 aS'x' -p10 +p8 aS'model' -p11 -atp12 -Rp13 +p9 +atp10 +Rp11 .(dp0 S'label[1-1]' p1 diff --git a/js/Misc/fortran_block.js b/js/Misc/fortran_block.js index a4399fa0..6d282574 100644 --- a/js/Misc/fortran_block.js +++ b/js/Misc/fortran_block.js @@ -16,8 +16,8 @@ function fortran_block() { this.model.dep_ut = new ScilabBoolean([true,false]); this.funam = "forty"; var label = list([[sci2exp(this.model.in)],[sci2exp(this.model.out)],[strcat(sci2exp(this.model.rpar))],[this.funam]],list([])); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"fortran_block\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,label,this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"fortran_block\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,label,gr_i); return new BasicBlock(this.x); } fortran_block.prototype.details = function fortran_block() { diff --git a/js/Misc/fortran_block.pickle b/js/Misc/fortran_block.pickle index 46dede38..291369ef 100644 --- a/js/Misc/fortran_block.pickle +++ b/js/Misc/fortran_block.pickle @@ -8,22 +8,18 @@ aS'o' p3 aS'rpar' p4 -aS'exprs' -p5 -aS'gr_i' -p6 aS'lab' -p7 +p5 aS'graphics' -p8 +p6 aS'funam' -p9 +p7 aS'x' -p10 +p8 aS'model' -p11 -atp12 -Rp13 +p9 +atp10 +Rp11 .(dp0 S'label[1-1]' p1 diff --git a/js/Misc/func_block.js b/js/Misc/func_block.js index 51696162..fba85e3e 100644 --- a/js/Misc/func_block.js +++ b/js/Misc/func_block.js @@ -7,9 +7,9 @@ function func_block() { this.model.out = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = "v=sin(u);y=u*v"; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"func_block\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = "v=sin(u);y=u*v"; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"func_block\",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); } func_block.prototype.details = function func_block() { @@ -19,15 +19,15 @@ function func_block() { alert("parameters cannot be modified"); } func_block.prototype.set = function func_block() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; this.model = this.x.model; - var tmpvar0 = genfunc(this.exprs); + var tmpvar0 = genfunc(exprs); var ok = tmpvar0[0]; var mac = tmpvar0[1]; - this.exprs = tmpvar0[2]; + var exprs = tmpvar0[2]; if (ok) { this.model.sim = new ScilabDouble([mac]); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.model = this.model; this.x.graphics = this.graphics; } diff --git a/js/Misc/func_block.pickle b/js/Misc/func_block.pickle index 319aa2a4..05fc1648 100644 --- a/js/Misc/func_block.pickle +++ b/js/Misc/func_block.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/Misc/generic_block.js b/js/Misc/generic_block.js index 12e9bfcf..233f653a 100644 --- a/js/Misc/generic_block.js +++ b/js/Misc/generic_block.js @@ -17,8 +17,8 @@ function generic_block() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp(this.model.in)],[sci2exp(this.model.out)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.firing)],["y"],["n"]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(label),gr_i); return new BasicBlock(this.x); } generic_block.prototype.details = function generic_block() { diff --git a/js/Misc/generic_block.pickle b/js/Misc/generic_block.pickle index 513f1e77..c26a1290 100644 --- a/js/Misc/generic_block.pickle +++ b/js/Misc/generic_block.pickle @@ -6,42 +6,38 @@ S'ci' p2 aS'co' p3 -aS'dept' -p4 aS'i' -p5 +p4 aS'auto0' -p6 +p5 aS'o' -p7 +p6 aS'rpar' -p8 +p7 aS'depu' +p8 +aS'dept' p9 -aS'exprs' -p10 aS'xx' -p11 -aS'gr_i' -p12 +p10 aS'funtyp' -p13 +p11 aS'lab' -p14 +p12 aS'ipar' -p15 +p13 aS'graphics' -p16 +p14 aS'x' -p17 +p15 aS'model' -p18 +p16 aS'z' -p19 +p17 aS'function_name' -p20 -atp21 -Rp22 +p18 +atp19 +Rp20 .(dp0 S'ci' p1 diff --git a/js/Misc/generic_block2.js b/js/Misc/generic_block2.js index 91a33aab..98432b66 100644 --- a/js/Misc/generic_block2.js +++ b/js/Misc/generic_block2.js @@ -17,8 +17,8 @@ function generic_block2() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp(this.model.in)],[sci2exp(this.model.out)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block2\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block2\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(label),gr_i); return new BasicBlock(this.x); } generic_block2.prototype.details = function generic_block2() { diff --git a/js/Misc/generic_block2.pickle b/js/Misc/generic_block2.pickle index bb97a8e9..8023e025 100644 --- a/js/Misc/generic_block2.pickle +++ b/js/Misc/generic_block2.pickle @@ -4,48 +4,44 @@ p0 ((lp1 S'ci' p2 -aS'nzcr' -p3 aS'co' +p3 +aS'i' p4 -aS'dept' +aS'auto0' p5 -aS'i' +aS'o' p6 -aS'auto0' +aS'rpar' p7 -aS'o' +aS'depu' p8 -aS'rpar' +aS'dept' p9 -aS'depu' +aS'xx' p10 -aS'exprs' +aS'nzcr' p11 -aS'xx' -p12 -aS'gr_i' -p13 aS'funtyp' -p14 +p12 aS'lab' -p15 +p13 aS'ipar' -p16 +p14 aS'graphics' -p17 +p15 aS'x' -p18 +p16 aS'model' -p19 +p17 aS'z' -p20 +p18 aS'nmode' -p21 +p19 aS'function_name' -p22 -atp23 -Rp24 +p20 +atp21 +Rp22 .(dp0 S'ci' p1 diff --git a/js/Misc/generic_block3.js b/js/Misc/generic_block3.js index 68ea054a..d5728743 100644 --- a/js/Misc/generic_block3.js +++ b/js/Misc/generic_block3.js @@ -13,8 +13,8 @@ function generic_block3() { this.model.outtyp = new ScilabDouble([1]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp([this.model.in,this.model.in2])],[sci2exp(this.model.intyp)],[sci2exp([this.model.out,this.model.out2]),sci2exp(this.model.outtyp)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.odstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.opar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block3\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block3\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(label),gr_i); return new BasicBlock(this.x); } generic_block3.prototype.details = function generic_block3() { diff --git a/js/Misc/generic_block3.pickle b/js/Misc/generic_block3.pickle index fd3f0643..9a802844 100644 --- a/js/Misc/generic_block3.pickle +++ b/js/Misc/generic_block3.pickle @@ -16,46 +16,42 @@ aS'funtyp' p7 aS'out' p8 -aS'dept' -p9 aS'type' -p10 +p9 aS'function_name' -p11 +p10 aS'in1' -p12 +p11 aS'lab' -p13 +p12 aS'graphics' -p14 +p13 aS'nmode' -p15 +p14 aS'z' -p16 +p15 aS'xx' -p17 +p16 aS'nzcr' -p18 +p17 aS'depu' +p18 +aS'dept' p19 -aS'exprs' -p20 -aS'gr_i' -p21 aS'opar' -p22 +p20 aS'oz' -p23 +p21 aS'ipar' -p24 +p22 aS'x' -p25 +p23 aS'model' -p26 +p24 aS'ot' -p27 -atp28 -Rp29 +p25 +atp26 +Rp27 .(dp0 S'model.odstate' p1 diff --git a/js/Misc/scifunc_block.js b/js/Misc/scifunc_block.js index 04ae319a..ec4e6ef3 100644 --- a/js/Misc/scifunc_block.js +++ b/js/Misc/scifunc_block.js @@ -24,9 +24,9 @@ function scifunc_block() { this.model.blocktype = new ScilabString([typ]); this.model.firing = new ScilabDouble(auto); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = list([[sci2exp(in1)],[sci2exp(out)],[sci2exp(clkin)],[sci2exp(clkout)],[strcat(sci2exp(x0))],[strcat(sci2exp(z0))],[strcat(sci2exp(this.rpar))],[sci2exp(auto)]],list("y1=sin(u1)"," "," ","y1=sin(u1)"," "," "," ")); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"scifunc_block\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + var exprs = list([[sci2exp(in1)],[sci2exp(out)],[sci2exp(clkin)],[sci2exp(clkout)],[strcat(sci2exp(x0))],[strcat(sci2exp(z0))],[strcat(sci2exp(this.rpar))],[sci2exp(auto)]],list("y1=sin(u1)"," "," ","y1=sin(u1)"," "," "," ")); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"scifunc_block\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,exprs,gr_i); return new BasicBlock(this.x); } scifunc_block.prototype.details = function scifunc_block() { @@ -48,9 +48,9 @@ function scifunc_block() { } scifunc_block.prototype.set = function scifunc_block() { var needcompile = 0; - this.exprs = this.graphics.exprs; - if (size(this.exprs[1-1],"*")==8) { - this.exprs[1-1][9-1] = "0"; + var exprs = this.graphics.exprs; + if (size(exprs[1-1],"*")==8) { + exprs[1-1][9-1] = "0"; } while (true) { var ok = true; @@ -67,7 +67,7 @@ function scifunc_block() { if (!ok) { break; } - this.exprs[1-1] = this.lab; + exprs[1-1] = this.lab; this.xx = this.xx.slice(); this.z = this.z.slice(); this.rpar = this.rpar.slice(); @@ -80,7 +80,7 @@ function scifunc_block() { var nci = size(this.ci,1); this.co = int(this.co.slice()); var nco = size(this.co,1); - var tmpvar0 = genfunc1(this.exprs[2-1],this.i,this.o,nci,nco,size(this.xx,1),size(this.z,1),nrp,"c"); + var tmpvar0 = genfunc1(exprs[2-1],this.i,this.o,nci,nco,size(this.xx,1),size(this.z,1),nrp,"c"); var ok = tmpvar0[0]; var tt = tmpvar0[1]; var dep_ut = tmpvar0[2]; @@ -108,8 +108,8 @@ function scifunc_block() { this.model.firing = new ScilabDouble([auto]); this.model.dep_ut = new ScilabDouble([dep_ut]); this.x.model = this.model; - this.exprs[2-1] = tt; - this.graphics.exprs = new ScilabDouble([this.exprs]); + exprs[2-1] = tt; + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; break; } diff --git a/js/Misc/scifunc_block.pickle b/js/Misc/scifunc_block.pickle index a210afd7..4a6e19c2 100644 --- a/js/Misc/scifunc_block.pickle +++ b/js/Misc/scifunc_block.pickle @@ -16,24 +16,20 @@ aS'o' p7 aS'rpar' p8 -aS'exprs' -p9 aS'xx' -p10 -aS'gr_i' -p11 +p9 aS'lab' -p12 +p10 aS'graphics' -p13 +p11 aS'x' -p14 +p12 aS'model' -p15 +p13 aS'z' -p16 -atp17 -Rp18 +p14 +atp15 +Rp16 .(dp0 S'exprs[1-1]' p1 diff --git a/js/Misc/scifunc_block_m.js b/js/Misc/scifunc_block_m.js index 554d97ba..a93fb549 100644 --- a/js/Misc/scifunc_block_m.js +++ b/js/Misc/scifunc_block_m.js @@ -29,9 +29,9 @@ function scifunc_block_m() { this.model.blocktype = new ScilabString([typ]); this.model.firing = new ScilabDouble(auto); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = list([[sci2exp([in1,in1])],[sci2exp([out,out])],[sci2exp(clkin)],[sci2exp(clkout)],[strcat(sci2exp(x0))],[strcat(sci2exp(z0))],[strcat(sci2exp(this.rpar))],[sci2exp(auto)],[sci2exp(0)]],list("y1=sin(u1)"," "," ","y1=sin(u1)"," "," "," ")); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"scifunc_block_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); + var exprs = list([[sci2exp([in1,in1])],[sci2exp([out,out])],[sci2exp(clkin)],[sci2exp(clkout)],[strcat(sci2exp(x0))],[strcat(sci2exp(z0))],[strcat(sci2exp(this.rpar))],[sci2exp(auto)],[sci2exp(0)]],list("y1=sin(u1)"," "," ","y1=sin(u1)"," "," "," ")); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"scifunc_block_m\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,exprs,gr_i); return new BasicBlock(this.x); } scifunc_block_m.prototype.details = function scifunc_block_m() { @@ -53,7 +53,7 @@ function scifunc_block_m() { } scifunc_block_m.prototype.set = function scifunc_block_m() { var needcompile = 0; - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.i = arguments[0]["i"]; @@ -69,7 +69,7 @@ function scifunc_block_m() { if (!ok) { break; } - this.exprs[1-1] = this.lab; + exprs[1-1] = this.lab; this.xx = this.xx.slice(); this.z = this.z.slice(); this.rpar = this.rpar.slice(); @@ -82,7 +82,7 @@ function scifunc_block_m() { var nci = size(this.ci,1); this.co = int(this.co.slice()); var nco = size(this.co,1); - var tmpvar0 = genfunc2(this.exprs[2-1],this.i,this.o,nci,nco,size(this.xx,1),size(this.z,1),nrp,"c"); + var tmpvar0 = genfunc2(exprs[2-1],this.i,this.o,nci,nco,size(this.xx,1),size(this.z,1),nrp,"c"); var ok = tmpvar0[0]; var tt = tmpvar0[1]; var dep_ut = tmpvar0[2]; @@ -110,8 +110,8 @@ function scifunc_block_m() { this.model.firing = new ScilabDouble([auto]); this.model.dep_ut = new ScilabDouble([dep_ut]); this.x.model = this.model; - this.exprs[2-1] = tt; - this.graphics.exprs = new ScilabDouble([this.exprs]); + exprs[2-1] = tt; + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; break; } diff --git a/js/Misc/scifunc_block_m.pickle b/js/Misc/scifunc_block_m.pickle index fcb53d49..87763930 100644 --- a/js/Misc/scifunc_block_m.pickle +++ b/js/Misc/scifunc_block_m.pickle @@ -16,24 +16,20 @@ aS'o' p7 aS'rpar' p8 -aS'exprs' -p9 aS'xx' -p10 -aS'gr_i' -p11 +p9 aS'lab' -p12 +p10 aS'graphics' -p13 +p11 aS'x' -p14 +p12 aS'model' -p15 +p13 aS'z' -p16 -atp17 -Rp18 +p14 +atp15 +Rp16 .(dp0 S'exprs[1-1]' p1 |