diff options
| author | Sunil Shetye | 2018-08-24 11:46:02 +0530 |
|---|---|---|
| committer | Sunil Shetye | 2018-08-27 16:43:40 +0530 |
| commit | 3386d0d537a498adce65f313aacb7ca4a147a4d2 (patch) | |
| tree | dc8b98c70c10cec2c9f3f37b5858e1afd6554698 | |
| parent | 9fee9bd7e5e356e872c7a539d4a6cfa89cae593c (diff) | |
| download | sci2js-3386d0d537a498adce65f313aacb7ca4a147a4d2.tar.gz sci2js-3386d0d537a498adce65f313aacb7ca4a147a4d2.tar.bz2 sci2js-3386d0d537a498adce65f313aacb7ca4a147a4d2.zip | |
remove exprs and gr_i from default global list
542 files changed, 4318 insertions, 5416 deletions
diff --git a/combined.js b/combined.js index 5c0442fa..4db00945 100644 --- a/combined.js +++ b/combined.js @@ -8,8 +8,8 @@ function CLKFROM() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = "A"; - this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabString([this.exprs])," "); + var exprs = "A"; + this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabString([exprs])," "); this.x.graphics.id = "From"; return new BasicBlock(this.x); } @@ -23,7 +23,7 @@ function CLKFROM() { return options; } CLKFROM.prototype.set = function CLKFROM() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.tag = arguments[0]["tag"]; @@ -37,7 +37,7 @@ function CLKFROM() { this.model.opar = list(new ScilabDouble([this.tag])); this.model.evtout = new ScilabDouble([1]); this.model.firing = new ScilabDouble([-1]); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -57,8 +57,8 @@ function CLKGOTO() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [["A"],[sci2exp(1)]]; - this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabDouble(this.exprs)," "); + var exprs = [["A"],[sci2exp(1)]]; + this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabDouble(exprs)," "); this.x.graphics.id = "Goto"; return new BasicBlock(this.x); } @@ -73,7 +73,7 @@ function CLKGOTO() { return options; } CLKGOTO.prototype.set = function CLKGOTO() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.tag = arguments[0]["tag"]; @@ -96,7 +96,7 @@ function CLKGOTO() { this.model.ipar = new ScilabDouble([this.tagvis]); this.model.evtin = new ScilabDouble([1]); this.model.firing = new ScilabDouble([-1]); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -122,9 +122,9 @@ function CLKGotoTagVisibility() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = "A"; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKGotoTagVisibility\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = "A"; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKGotoTagVisibility\",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); } CLKGotoTagVisibility.prototype.details = function CLKGotoTagVisibility() { @@ -137,7 +137,7 @@ function CLKGotoTagVisibility() { return options; } CLKGotoTagVisibility.prototype.set = function CLKGotoTagVisibility() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.tag = arguments[0]["tag"]; @@ -149,7 +149,7 @@ function CLKGotoTagVisibility() { var needcompile = 4; var y = needcompile; } - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.opar = list(new ScilabDouble([this.tag])); this.x.graphics = this.graphics; this.x.model = this.model; @@ -172,9 +172,9 @@ function DEMUX() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = string(this.out); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEMUX\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([.5,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = string(this.out); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEMUX\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([.5,2]),this.model,new ScilabString([exprs]),gr_i); return new BasicBlock(this.x); } DEMUX.prototype.details = function DEMUX() { @@ -187,7 +187,7 @@ function DEMUX() { return options; } DEMUX.prototype.set = function DEMUX() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.out = parseFloat(arguments[0]["out"]); @@ -226,7 +226,7 @@ function DEMUX() { } } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.ipar = new ScilabDouble([this.out]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -248,9 +248,9 @@ function DEMUX_f() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = string(this.out); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEMUX_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([.5,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = string(this.out); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEMUX_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([.5,2]),this.model,new ScilabString([exprs]),gr_i); return new BasicBlock(this.x); } DEMUX_f.prototype.details = function DEMUX_f() { @@ -263,7 +263,7 @@ function DEMUX_f() { return options; } DEMUX_f.prototype.set = function DEMUX_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.out = parseFloat(arguments[0]["out"]); @@ -302,7 +302,7 @@ function DEMUX_f() { } } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.ipar = new ScilabDouble([this.out]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -328,9 +328,9 @@ function ESELECT_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.model.nmode = new ScilabDouble([0]); this.model.nzcross = new ScilabDouble([0]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ESELECT_f\",sz(1),sz(2));"]); - this.exprs = [[string(this.out)],[string(1)],[string(this.model.nmode)]]; - 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),\"ESELECT_f\",sz(1),sz(2));"]); + var exprs = [[string(this.out)],[string(1)],[string(this.model.nmode)]]; + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } ESELECT_f.prototype.details = function ESELECT_f() { @@ -345,12 +345,12 @@ function ESELECT_f() { return options; } ESELECT_f.prototype.set = function ESELECT_f() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")==1) { - this.exprs[2-1] = string(1); + var exprs = this.graphics.exprs; + if (size(exprs,"*")==1) { + exprs[2-1] = string(1); } - if (size(this.exprs,"*")==2) { - this.exprs[3-1] = string(0); + if (size(exprs,"*")==2) { + exprs[3-1] = string(0); } while (true) { var ok = true; @@ -378,7 +378,7 @@ function ESELECT_f() { 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.evtout = new ScilabDouble([ones(this.out,1)]); this.model.firing = new ScilabDouble([-ones(this.out,1)]); this.x.graphics = this.graphics; @@ -403,9 +403,9 @@ function EXTRACTOR() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); this.model.ipar = new ScilabDouble([this.ind]); - this.exprs = [sci2exp(this.ind)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACTOR\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(this.exprs),this.gr_i); + var exprs = [sci2exp(this.ind)]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACTOR\",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); } EXTRACTOR.prototype.details = function EXTRACTOR() { @@ -418,7 +418,7 @@ function EXTRACTOR() { return options; } EXTRACTOR.prototype.set = function EXTRACTOR() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.ind = parseFloat(arguments[0]["ind"]); @@ -433,7 +433,7 @@ function EXTRACTOR() { var ok = tmpvar0[2]; if (ok) { this.model.ipar = new ScilabDouble(this.ind); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -457,9 +457,9 @@ function FROM() { this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = ["A"]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROM\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabString(this.exprs),this.gr_i); + var exprs = ["A"]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROM\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabString(exprs),gr_i); this.x.graphics.id = "From"; return new BasicBlock(this.x); } @@ -473,7 +473,7 @@ function FROM() { return options; } FROM.prototype.set = function FROM() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.tag = arguments[0]["tag"]; @@ -485,7 +485,7 @@ function FROM() { var needcompile = 4; var y = needcompile; } - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.opar = list(new ScilabDouble([this.tag])); this.x.model = this.model; this.x.graphics = this.graphics; @@ -514,9 +514,9 @@ function FROMMO() { var mo = modelica(); mo.model = "frommo"; mo.outputs = "n"; - this.exprs = ["A"]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMMO\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabString(this.exprs),this.gr_i); + var exprs = ["A"]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMMO\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabString(exprs),gr_i); this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); } @@ -530,7 +530,7 @@ function FROMMO() { return options; } FROMMO.prototype.set = function FROMMO() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.tag = arguments[0]["tag"]; @@ -542,7 +542,7 @@ function FROMMO() { var needcompile = 4; var y = needcompile; } - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.opar = list(new ScilabDouble([this.tag])); this.x.model = this.model; this.x.graphics = this.graphics; @@ -568,9 +568,9 @@ function GOTO() { this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [["A"],[sci2exp(1)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GOTO\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [["A"],[sci2exp(1)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GOTO\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabDouble(exprs),gr_i); this.x.graphics.id = "Goto"; return new BasicBlock(this.x); } @@ -585,7 +585,7 @@ function GOTO() { return options; } GOTO.prototype.set = function GOTO() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.tag = arguments[0]["tag"]; @@ -604,7 +604,7 @@ function GOTO() { var needcompile = 4; var y = needcompile; } - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.opar = list(new ScilabDouble([this.tag])); this.model.ipar = new ScilabDouble([this.tagvis]); this.x.model = this.model; @@ -634,9 +634,9 @@ function GOTOMO() { var mo = modelica(); mo.model = "gotomo"; mo.inputs = "p"; - this.exprs = [["A"],[sci2exp(1)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GOTOMO\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [["A"],[sci2exp(1)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GOTOMO\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabDouble(exprs),gr_i); this.x.graphics.in_implicit = ["I"]; return new BasicBlock(this.x); } @@ -651,7 +651,7 @@ function GOTOMO() { return options; } GOTOMO.prototype.set = function GOTOMO() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.tag = arguments[0]["tag"]; @@ -670,7 +670,7 @@ function GOTOMO() { var needcompile = 4; var y = needcompile; } - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.opar = list(new ScilabDouble([this.tag])); this.model.ipar = new ScilabDouble([this.tagvis]); this.x.model = this.model; @@ -698,9 +698,9 @@ function GotoTagVisibility() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = "A"; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GotoTagVisibility\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = "A"; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GotoTagVisibility\",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); } GotoTagVisibility.prototype.details = function GotoTagVisibility() { @@ -713,7 +713,7 @@ function GotoTagVisibility() { return options; } GotoTagVisibility.prototype.set = function GotoTagVisibility() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.tag = arguments[0]["tag"]; @@ -725,7 +725,7 @@ function GotoTagVisibility() { var needcompile = 4; var y = needcompile; } - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.opar = list(new ScilabDouble([this.tag])); this.x.graphics = this.graphics; this.x.model = this.model; @@ -752,9 +752,9 @@ function GotoTagVisibilityMO() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = "A"; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GotoTagVisibilityMO\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = "A"; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GotoTagVisibilityMO\",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); } GotoTagVisibilityMO.prototype.details = function GotoTagVisibilityMO() { @@ -767,7 +767,7 @@ function GotoTagVisibilityMO() { return options; } GotoTagVisibilityMO.prototype.set = function GotoTagVisibilityMO() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.tag = arguments[0]["tag"]; @@ -779,7 +779,7 @@ function GotoTagVisibilityMO() { var needcompile = 4; var y = needcompile; } - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.opar = list(new ScilabDouble([this.tag])); this.x.graphics = this.graphics; this.x.model = this.model; @@ -804,9 +804,9 @@ function ISELECT_f() { this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[string(this.nout)],[string(this.z0+1)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ISELECT_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.nout)],[string(this.z0+1)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ISELECT_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); } ISELECT_f.prototype.details = function ISELECT_f() { @@ -820,7 +820,7 @@ function ISELECT_f() { return options; } ISELECT_f.prototype.set = function ISELECT_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.nout = parseFloat(arguments[0]["nout"]); @@ -837,7 +837,7 @@ function ISELECT_f() { 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.dstate = new ScilabDouble([this.z0-1]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -870,9 +870,9 @@ function ISELECT_m() { this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[sci2exp(1)],[sci2exp(this.nout)],[sci2exp(this.z0)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ISELECT_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[sci2exp(1)],[sci2exp(this.nout)],[sci2exp(this.z0)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ISELECT_m\",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); } ISELECT_m.prototype.details = function ISELECT_m() { @@ -887,7 +887,7 @@ function ISELECT_m() { return options; } ISELECT_m.prototype.set = function ISELECT_m() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.typ = inverse(arguments[0]["typ"]); @@ -914,7 +914,7 @@ function ISELECT_m() { 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.dstate = new ScilabDouble([this.z0]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -937,9 +937,9 @@ function MUX() { this.model.ipar = new ScilabDouble([this.in1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = string(this.in1); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MUX\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([.5,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = string(this.in1); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MUX\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([.5,2]),this.model,new ScilabString([exprs]),gr_i); return new BasicBlock(this.x); } MUX.prototype.details = function MUX() { @@ -952,7 +952,7 @@ function MUX() { return options; } MUX.prototype.set = function MUX() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.in1 = parseFloat(arguments[0]["in1"]); @@ -991,7 +991,7 @@ function MUX() { } } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.ipar = new ScilabDouble([this.in1]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -1012,9 +1012,9 @@ function MUX_f() { this.model.ipar = new ScilabDouble([this.in1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = string(this.in1); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MUX_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([0.5,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = string(this.in1); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MUX_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([0.5,2]),this.model,new ScilabString([exprs]),gr_i); return new BasicBlock(this.x); } MUX_f.prototype.details = function MUX_f() { @@ -1027,7 +1027,7 @@ function MUX_f() { return options; } MUX_f.prototype.set = function MUX_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.in1 = parseFloat(arguments[0]["in1"]); @@ -1066,7 +1066,7 @@ function MUX_f() { } } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.ipar = new ScilabDouble([this.in1]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -1089,9 +1089,9 @@ function M_SWITCH() { 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),\"M_SWITCH\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2.5,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),\"M_SWITCH\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } M_SWITCH.prototype.details = function M_SWITCH() { @@ -1106,7 +1106,7 @@ function M_SWITCH() { return options; } M_SWITCH.prototype.set = function M_SWITCH() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.nin = parseFloat(arguments[0]["nin"]); @@ -1143,7 +1143,7 @@ function M_SWITCH() { 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.ipar = new ScilabDouble([this.base],[this.rule]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -1165,9 +1165,9 @@ function NRMSOM_f() { this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [string(this.nin)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NRMSOM_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.nin)]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NRMSOM_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); } NRMSOM_f.prototype.details = function NRMSOM_f() { @@ -1180,7 +1180,7 @@ function NRMSOM_f() { return options; } NRMSOM_f.prototype.set = function NRMSOM_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.nin = parseFloat(arguments[0]["nin"]); @@ -1192,7 +1192,7 @@ function NRMSOM_f() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -1216,9 +1216,9 @@ function RELAY_f() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,true]); - this.exprs = [[string(this.nin)],[string(i0+1)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RELAY_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.nin)],[string(i0+1)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RELAY_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); } RELAY_f.prototype.details = function RELAY_f() { @@ -1232,7 +1232,7 @@ function RELAY_f() { return options; } RELAY_f.prototype.set = function RELAY_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var ipar = this.model.ipar; while (true) { var ok = true; @@ -1250,7 +1250,7 @@ function RELAY_f() { 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.dstate = new ScilabString([this.z0-1]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -1271,9 +1271,9 @@ function SCALAR2VECTOR() { this.model.in = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [string([this.nout])]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SCALAR2VECTOR\",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.nout])]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SCALAR2VECTOR\",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); } SCALAR2VECTOR.prototype.details = function SCALAR2VECTOR() { @@ -1286,7 +1286,7 @@ function SCALAR2VECTOR() { return options; } SCALAR2VECTOR.prototype.set = function SCALAR2VECTOR() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.nout = parseFloat(arguments[0]["nout"]); @@ -1306,7 +1306,7 @@ function SCALAR2VECTOR() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -1329,9 +1329,9 @@ function SELECT_f() { this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[string(this.nin)],[string(this.z0+1)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SELECT_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.nin)],[string(this.z0+1)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SELECT_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); } SELECT_f.prototype.details = function SELECT_f() { @@ -1345,7 +1345,7 @@ function SELECT_f() { return options; } SELECT_f.prototype.set = function SELECT_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.nin = parseFloat(arguments[0]["nin"]); @@ -1362,7 +1362,7 @@ function SELECT_f() { 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.dstate = new ScilabDouble([this.z0-1]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -1395,9 +1395,9 @@ function SELECT_m() { this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[sci2exp(1)],[sci2exp(this.nin)],[sci2exp(this.z0)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SELECT_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[sci2exp(1)],[sci2exp(this.nin)],[sci2exp(this.z0)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SELECT_m\",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); } SELECT_m.prototype.details = function SELECT_m() { @@ -1412,7 +1412,7 @@ function SELECT_m() { return options; } SELECT_m.prototype.set = function SELECT_m() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.typ = inverse(arguments[0]["typ"]); @@ -1439,7 +1439,7 @@ function SELECT_m() { 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.dstate = new ScilabDouble([this.z0]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -1512,9 +1512,9 @@ function SWITCH2() { this.model.nmode = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[string(ipar)],[string(rpar)],[string(this.nzz)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SWITCH2\",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(rpar)],[string(this.nzz)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SWITCH2\",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); } SWITCH2.prototype.details = function SWITCH2() { @@ -1529,7 +1529,7 @@ function SWITCH2() { return options; } SWITCH2.prototype.set = function SWITCH2() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.rule = parseFloat(arguments[0]["rule"]); @@ -1545,7 +1545,7 @@ function SWITCH2() { if ((this.rule>2)) { this.rule = 2; } - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.ipar = new ScilabDouble([this.rule]); this.model.rpar = new ScilabDouble([this.thra]); if (this.nzz!=0) { @@ -1582,9 +1582,9 @@ function SWITCH2_m() { this.model.nmode = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[sci2exp(1)],[string(ipar)],[string(rpar)],[string(this.nzz)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SWITCH2_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[sci2exp(1)],[string(ipar)],[string(rpar)],[string(this.nzz)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SWITCH2_m\",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); } SWITCH2_m.prototype.details = function SWITCH2_m() { @@ -1600,7 +1600,7 @@ function SWITCH2_m() { return options; } SWITCH2_m.prototype.set = function SWITCH2_m() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.ot = arguments[0]["ot"]; @@ -1617,7 +1617,7 @@ function SWITCH2_m() { if ((this.rule>2)) { this.rule = 2; } - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.ipar = new ScilabDouble([this.rule]); this.model.rpar = new ScilabDouble([this.thra]); if (this.nzz!=0) { @@ -1666,9 +1666,9 @@ function SWITCH_f() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,true]); - this.exprs = [[string(this.nin)],[string(i0+1)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SWITCH_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.nin)],[string(i0+1)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SWITCH_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); } SWITCH_f.prototype.details = function SWITCH_f() { @@ -1682,7 +1682,7 @@ function SWITCH_f() { return options; } SWITCH_f.prototype.set = function SWITCH_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var ipar = this.model.ipar; while (true) { var ok = true; @@ -1700,7 +1700,7 @@ function SWITCH_f() { 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.ipar = new ScilabString([this.z0-1]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -1749,15 +1749,15 @@ function CCS() { mo.outputs = MO; this.model.rpar = new ScilabDouble(PrametersValue); mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName)); - this.exprs = []; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CCS\",sz(1),sz(2));"]); + var exprs = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CCS\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = new standard_define(new ScilabDouble([2.1,3]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2.1,3]),this.model,new ScilabDouble(exprs),list(gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); @@ -1769,7 +1769,7 @@ function CCS() { alert("parameters cannot be modified"); } CCS.prototype.set = function CCS() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; return new BasicBlock(this.x); } } @@ -1811,15 +1811,15 @@ function CVS() { mo.outputs = MO; this.model.rpar = new ScilabDouble(PrametersValue); mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName)); - this.exprs = []; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CVS\",sz(1),sz(2));"]); + var exprs = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CVS\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = new standard_define(new ScilabDouble([2.1,3]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2.1,3]),this.model,new ScilabDouble(exprs),list(gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); @@ -1831,7 +1831,7 @@ function CVS() { alert("parameters cannot be modified"); } CVS.prototype.set = function CVS() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; return new BasicBlock(this.x); } } @@ -1853,9 +1853,9 @@ function Capacitor() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); - this.exprs = string([[this.C],[this.v]]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Capacitor\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,1.1]),this.model,new ScilabString([this.exprs]),list(this.gr_i,0)); + var exprs = string([[this.C],[this.v]]); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Capacitor\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,1.1]),this.model,new ScilabString([exprs]),list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -1871,7 +1871,7 @@ function Capacitor() { return options; } Capacitor.prototype.set = function Capacitor() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.C = parseFloat(arguments[0]["C"]); @@ -1881,7 +1881,7 @@ function Capacitor() { } this.model.rpar = new ScilabDouble([this.C]); this.model.equations.parameters[2-1] = list(new ScilabDouble([this.C]), new ScilabDouble([this.v])); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -1906,9 +1906,9 @@ function ConstantVoltage() { mo.outputs = "n"; mo.parameters = list("V",list(this.V)); this.model.equations = new ScilabDouble([mo]); - this.exprs = string(this.V); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ConstantVoltage\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([1.5,1.1]),this.model,new ScilabString([this.exprs]),list(this.gr_i,0)); + var exprs = string(this.V); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ConstantVoltage\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([1.5,1.1]),this.model,new ScilabString([exprs]),list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -1923,7 +1923,7 @@ function ConstantVoltage() { return options; } ConstantVoltage.prototype.set = function ConstantVoltage() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.V = parseFloat(arguments[0]["V"]); @@ -1932,7 +1932,7 @@ function ConstantVoltage() { } this.model.rpar = new ScilabDouble([this.V]); this.model.equations.parameters[2-1] = list(new ScilabDouble([this.V])); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -1954,9 +1954,9 @@ function CurrentSensor() { mo.inputs = "p"; mo.outputs = [["n"],["i"]]; this.model.equations = new ScilabDouble([mo]); - this.exprs = []; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CurrentSensor\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); + var exprs = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CurrentSensor\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["E"]]; return new BasicBlock(this.x); @@ -1991,9 +1991,9 @@ function Diode() { mo.outputs = "n"; mo.parameters = list(["Ids","Vt","Maxexp","R"],list(this.Ids,this.Vt,this.Maxexp,this.R)); this.model.equations = new ScilabDouble([mo]); - this.exprs = string([[this.Ids],[this.Vt],[this.Maxexp],[this.R]]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Diode\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabString([this.exprs]),list(this.gr_i,0)); + var exprs = string([[this.Ids],[this.Vt],[this.Maxexp],[this.R]]); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Diode\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabString([exprs]),list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -2011,7 +2011,7 @@ function Diode() { return options; } Diode.prototype.set = function Diode() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.Ids = parseFloat(arguments[0]["Ids"]); @@ -2023,7 +2023,7 @@ function Diode() { } this.model.rpar = new ScilabDouble([this.Ids],[this.Vt],[this.Maxexp],[this.R]); this.model.equations.parameters = list(new ScilabDouble([["Ids","Vt","Maxexp","R"]]),list(this.Ids,this.Vt,this.Maxexp,this.R)); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -2044,9 +2044,9 @@ function Ground() { mo.model = "Ground"; mo.inputs = "p"; this.model.equations = new ScilabDouble([mo]); - this.exprs = ""; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Ground\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs]),list(this.gr_i,0)); + var exprs = ""; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Ground\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([exprs]),list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new GroundBlock(this.x); @@ -2099,15 +2099,15 @@ function Gyrator() { mo.outputs = MO; this.model.rpar = new ScilabDouble(PrametersValue); mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName)); - this.exprs = [["1"],["1"]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Gyrator\",sz(1),sz(2));"]); + var exprs = [["1"],["1"]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Gyrator\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),list(gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); @@ -2123,8 +2123,8 @@ function Gyrator() { return options; } Gyrator.prototype.set = function Gyrator() { - this.exprs = this.graphics.exprs; - this.exprs = this.x.graphics.exprs; + var exprs = this.graphics.exprs; + var exprs = this.x.graphics.exprs; while (true) { var ok = true; this.G1 = arguments[0]["G1"]; @@ -2133,7 +2133,7 @@ function Gyrator() { break; } this.x.model.equations.parameters[2-1] = list(this.G1,this.G2); - this.x.graphics.exprs = this.exprs; + this.x.graphics.exprs = exprs; break; } return new BasicBlock(this.x); @@ -2177,15 +2177,15 @@ function IdealTransformer() { mo.outputs = MO; this.model.rpar = new ScilabDouble(PrametersValue); mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName)); - this.exprs = ["1"]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IdealTransformer\",sz(1),sz(2));"]); + var exprs = ["1"]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IdealTransformer\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(this.exprs),list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(exprs),list(gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); @@ -2200,8 +2200,8 @@ function IdealTransformer() { return options; } IdealTransformer.prototype.set = function IdealTransformer() { - this.exprs = this.graphics.exprs; - this.exprs = this.x.graphics.exprs; + var exprs = this.graphics.exprs; + var exprs = this.x.graphics.exprs; while (true) { var ok = true; this.N = arguments[0]["N"]; @@ -2209,7 +2209,7 @@ function IdealTransformer() { break; } this.x.model.equations.parameters[2-1] = list(this.N); - this.x.graphics.exprs = this.exprs; + this.x.graphics.exprs = exprs; break; } return new BasicBlock(this.x); @@ -2232,9 +2232,9 @@ function Inductor() { mo.outputs = "n"; mo.parameters = list("L",list(this.L)); this.model.equations = new ScilabDouble([mo]); - this.exprs = string(this.L); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Inductor\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,0.9]),this.model,new ScilabString([this.exprs]),list(this.gr_i,0)); + var exprs = string(this.L); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Inductor\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,0.9]),this.model,new ScilabString([exprs]),list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -2249,7 +2249,7 @@ function Inductor() { return options; } Inductor.prototype.set = function Inductor() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.L = parseFloat(arguments[0]["L"]); @@ -2258,7 +2258,7 @@ function Inductor() { } this.model.rpar = new ScilabDouble([this.L]); this.model.equations.parameters[2-1] = list(new ScilabDouble([this.L])); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -2275,9 +2275,9 @@ function MOTOR() { this.model.sim = new ScilabString(["motor"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MOTOR\",sz(1),sz(2));"]); - this.exprs = ""; - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MOTOR\",sz(1),sz(2));"]); + var exprs = ""; + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([exprs]),gr_i); this.x.graphics.out_implicit = [["I"],["I"]]; this.x.graphics.in_implicit = ["I"]; return new BasicBlock(this.x); @@ -2316,9 +2316,9 @@ function NMOS() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); - this.exprs = [[string(this.W)],[string(this.L)],[string(this.Beta)],[string(this.Vt)],[string(this.K2)],[string(this.K5)],[string(this.dW)],[string(this.dL)],[string(this.RDS)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NMOS\",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.W)],[string(this.L)],[string(this.Beta)],[string(this.Vt)],[string(this.K2)],[string(this.K5)],[string(this.dW)],[string(this.dL)],[string(this.RDS)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NMOS\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),gr_i); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["I"],["I"]]; return new BasicBlock(this.x); @@ -2341,7 +2341,7 @@ function NMOS() { return options; } NMOS.prototype.set = function NMOS() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.W = parseFloat(arguments[0]["W"]); @@ -2357,7 +2357,7 @@ function NMOS() { break; } this.model.equations.parameters[2-1] = list(new ScilabDouble([this.W]), new ScilabDouble([this.L]), new ScilabDouble([this.Beta]), new ScilabDouble([this.Vt]), new ScilabDouble([this.K2]), new ScilabDouble([this.K5]), new ScilabDouble([this.dW]), new ScilabDouble([this.dL]), new ScilabDouble([this.RDS])); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -2403,15 +2403,15 @@ function NPN() { mo.outputs = MO; this.model.rpar = new ScilabDouble(PrametersValue); mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName)); - this.exprs = [["50"],["0.1"],["1.e-16"],["0.02"],["0.12e-9"],["5e-9"],["1e-12"],["0.4e-12"],["0.5e-12"],["0.8"],["0.4"],["0.8"],["0.333"],["1e-15"],["1e-15"],["0.02585"],["40"]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NPN\",sz(1),sz(2));"]); + var exprs = [["50"],["0.1"],["1.e-16"],["0.02"],["0.12e-9"],["5e-9"],["1e-12"],["0.4e-12"],["0.5e-12"],["0.8"],["0.4"],["0.8"],["0.333"],["1e-15"],["1e-15"],["0.02585"],["40"]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NPN\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),list(gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); @@ -2442,8 +2442,8 @@ function NPN() { return options; } NPN.prototype.set = function NPN() { - this.exprs = this.graphics.exprs; - this.exprs = this.x.graphics.exprs; + var exprs = this.graphics.exprs; + var exprs = this.x.graphics.exprs; while (true) { var ok = true; this.Bf = arguments[0]["Bf"]; @@ -2467,7 +2467,7 @@ function NPN() { break; } this.x.model.equations.parameters[2-1] = list(this.Bf,this.Br,this.Is,this.Vak,this.Tauf,this.Taur,this.Ccs,this.Cje,this.Cjc,this.Phie,this.Me,this.Phic,this.Mc,this.Gbc,this.Gbe,this.Vt,this.EMinMax); - this.x.graphics.exprs = this.exprs; + this.x.graphics.exprs = exprs; break; } return new BasicBlock(this.x); @@ -2491,9 +2491,9 @@ function OpAmp() { this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.model.rpar = new ScilabDouble(Z); - this.exprs = string(Z); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OpAmp\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,5]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = string(Z); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OpAmp\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,5]),this.model,new ScilabString([exprs]),gr_i); this.x.graphics.in_implicit = [["I"],["I"]]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -2510,7 +2510,7 @@ function OpAmp() { return options; } OpAmp.prototype.set = function OpAmp() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (false) { var ok = true; this.OLGain = arguments[0]["OLGain"]; @@ -2520,7 +2520,7 @@ function OpAmp() { break; } this.model.equations.parameters[2-1] = list(new ScilabDouble([this.OLGain]), new ScilabDouble([this.SatH]), new ScilabDouble([this.SatL])); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -2552,9 +2552,9 @@ function PMOS() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); - this.exprs = [[string(this.W)],[string(this.L)],[string(this.Beta)],[string(this.Vt)],[string(this.K2)],[string(this.K5)],[string(this.dW)],[string(this.dL)],[string(this.RDS)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PMOS\",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.W)],[string(this.L)],[string(this.Beta)],[string(this.Vt)],[string(this.K2)],[string(this.K5)],[string(this.dW)],[string(this.dL)],[string(this.RDS)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PMOS\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),gr_i); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["I"],["I"]]; return new BasicBlock(this.x); @@ -2577,7 +2577,7 @@ function PMOS() { return options; } PMOS.prototype.set = function PMOS() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.W = parseFloat(arguments[0]["W"]); @@ -2593,7 +2593,7 @@ function PMOS() { break; } this.model.equations.parameters[2-1] = list(new ScilabDouble([this.W]), new ScilabDouble([this.L]), new ScilabDouble([this.Beta]), new ScilabDouble([this.Vt]), new ScilabDouble([this.K2]), new ScilabDouble([this.K5]), new ScilabDouble([this.dW]), new ScilabDouble([this.dL]), new ScilabDouble([this.RDS])); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -2639,15 +2639,15 @@ function PNP() { mo.outputs = MO; this.model.rpar = new ScilabDouble(PrametersValue); mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName)); - this.exprs = [["50"],["0.1"],["1.e-16"],["0.02"],["0.12e-9"],["5e-9"],["1e-12"],["0.4e-12"],["0.5e-12"],["0.8"],["0.4"],["0.8"],["0.333"],["1e-15"],["1e-15"],["0.02585"],["40"]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PNP\",sz(1),sz(2));"]); + var exprs = [["50"],["0.1"],["1.e-16"],["0.02"],["0.12e-9"],["5e-9"],["1e-12"],["0.4e-12"],["0.5e-12"],["0.8"],["0.4"],["0.8"],["0.333"],["1e-15"],["1e-15"],["0.02585"],["40"]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PNP\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),list(gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); @@ -2678,8 +2678,8 @@ function PNP() { return options; } PNP.prototype.set = function PNP() { - this.exprs = this.graphics.exprs; - this.exprs = this.x.graphics.exprs; + var exprs = this.graphics.exprs; + var exprs = this.x.graphics.exprs; while (true) { var ok = true; this.Bf = arguments[0]["Bf"]; @@ -2703,7 +2703,7 @@ function PNP() { break; } this.x.model.equations.parameters[2-1] = list(this.Bf,this.Br,this.Is,this.Vak,this.Tauf,this.Taur,this.Ccs,this.Cje,this.Cjc,this.Phie,this.Me,this.Phic,this.Mc,this.Gbc,this.Gbe,this.Vt,this.EMinMax); - this.x.graphics.exprs = this.exprs; + this.x.graphics.exprs = exprs; break; } return new BasicBlock(this.x); @@ -2724,8 +2724,8 @@ function PotentialSensor() { mo.inputs = "p"; mo.outputs = ["v"]; this.model.equations = new ScilabDouble([mo]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PotentialSensor\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([""]),list(this.gr_i,0)); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PotentialSensor\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([""]),list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["E"]; return new BasicBlock(this.x); @@ -2757,9 +2757,9 @@ function Resistor() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); - this.exprs = string(this.R); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Resistor\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabString([this.exprs]),list(this.gr_i,0)); + var exprs = string(this.R); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Resistor\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabString([exprs]),list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -2774,7 +2774,7 @@ function Resistor() { return options; } Resistor.prototype.set = function Resistor() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.R = parseFloat(arguments[0]["R"]); @@ -2783,7 +2783,7 @@ function Resistor() { } this.model.rpar = new ScilabDouble([this.R]); this.model.equations.parameters[2-1] = list(new ScilabDouble([this.R])); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -2812,9 +2812,9 @@ function SineVoltage() { mo.outputs = "n"; mo.parameters = list([["V"],["phase"],["freqHz"],["offset"],["startTime"]],list(this.V,this.ph,this.frq,this.offset,this.start)); this.model.equations = new ScilabDouble([mo]); - this.exprs = [[string(this.V)],[string(this.ph)],[string(this.frq)],[string(this.offset)],[string(this.start)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SineVoltage\",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.V)],[string(this.ph)],[string(this.frq)],[string(this.offset)],[string(this.start)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SineVoltage\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),gr_i); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -2833,7 +2833,7 @@ function SineVoltage() { return options; } SineVoltage.prototype.set = function SineVoltage() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.V = parseFloat(arguments[0]["V"]); @@ -2846,7 +2846,7 @@ function SineVoltage() { } this.model.rpar = new ScilabDouble([this.V],[this.ph],[this.frq],[this.offset],[this.start]); this.model.equations.parameters[2-1] = list(new ScilabDouble([this.V]), new ScilabDouble([this.ph]), new ScilabDouble([this.frq]), new ScilabDouble([this.offset]), new ScilabDouble([this.start])); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -2874,9 +2874,9 @@ function Switch() { this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.model.rpar = new ScilabDouble([Z]); - this.exprs = string(Z); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Switch\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),list(this.gr_i,0)); + var exprs = string(Z); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Switch\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([exprs]),list(gr_i,0)); this.x.graphics.in_implicit = [["I"],["E"]]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -2892,7 +2892,7 @@ function Switch() { return options; } Switch.prototype.set = function Switch() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.Ron = parseFloat(arguments[0]["Ron"]); @@ -2901,7 +2901,7 @@ function Switch() { break; } this.model.equations.parameters[2-1] = list(new ScilabDouble([this.Ron]), new ScilabDouble([this.Roff])); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -2927,9 +2927,9 @@ function VVsourceAC() { mo.outputs = "n"; mo.parameters = list(["f"],list(this.FR)); this.model.equations = new ScilabDouble([mo]); - this.exprs = [string(this.FR)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VVsourceAC\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(this.exprs),list(this.gr_i,0)); + var exprs = [string(this.FR)]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VVsourceAC\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(exprs),list(gr_i,0)); this.x.graphics.in_implicit = ["I","E"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -2944,7 +2944,7 @@ function VVsourceAC() { return options; } VVsourceAC.prototype.set = function VVsourceAC() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.FR = parseFloat(arguments[0]["FR"]); @@ -2953,7 +2953,7 @@ function VVsourceAC() { } this.model.rpar = new ScilabDouble([this.FR]); this.model.equations.parameters[2-1] = list(new ScilabDouble([this.FR])); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -2975,9 +2975,9 @@ function VariableResistor() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); - this.exprs = []; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VariableResistor\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); + var exprs = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VariableResistor\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),list(gr_i,0)); this.x.graphics.in_implicit = ["I","E"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -3006,9 +3006,9 @@ function VoltageSensor() { mo.inputs = "p"; mo.outputs = [["n"],["v"]]; this.model.equations = new ScilabDouble([mo]); - this.exprs = []; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VoltageSensor\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); + var exprs = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VoltageSensor\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["E"]]; return new VoltageSensorBlock(this.x); @@ -3041,9 +3041,9 @@ function VsourceAC() { mo.outputs = "n"; mo.parameters = list([["VA"],["f"]],list(this.VA,this.FR)); this.model.equations = new ScilabDouble([mo]); - this.exprs = [[string(this.VA)],[string(this.FR)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VsourceAC\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); + var exprs = [[string(this.VA)],[string(this.FR)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VsourceAC\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -3059,7 +3059,7 @@ function VsourceAC() { return options; } VsourceAC.prototype.set = function VsourceAC() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.VA = parseFloat(arguments[0]["VA"]); @@ -3069,7 +3069,7 @@ function VsourceAC() { } this.model.rpar = new ScilabDouble([this.VA],[this.FR]); this.model.equations.parameters[2-1] = list(new ScilabDouble([this.VA]), new ScilabDouble([this.FR])); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -3166,8 +3166,8 @@ function ANDLOG_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ANDLOG_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,3]),this.model,new ScilabDouble([]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ANDLOG_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,3]),this.model,new ScilabDouble([]),gr_i); return new BasicBlock(this.x); } ANDLOG_f.prototype.details = function ANDLOG_f() { @@ -3190,8 +3190,8 @@ function CLKSOMV_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKSOMV_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),\"CLKSOMV_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); } CLKSOMV_f.prototype.details = function CLKSOMV_f() { @@ -3214,8 +3214,8 @@ function CLKSOM_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKSOM_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabDouble([]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKSOM_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabDouble([]),gr_i); return new BasicBlock(this.x); } CLKSOM_f.prototype.details = function CLKSOM_f() { @@ -3262,9 +3262,9 @@ function END_c() { this.model.firing = new ScilabDouble([this.tf]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = string(this.tf); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"END_c\",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.tf); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"END_c\",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); } END_c.prototype.details = function END_c() { @@ -3277,7 +3277,7 @@ function END_c() { return options; } END_c.prototype.set = function END_c() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.tf = parseFloat(arguments[0]["tf"]); @@ -3285,7 +3285,7 @@ function END_c() { break; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.firing = new ScilabDouble([this.tf]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -3308,9 +3308,9 @@ function EVTDLY_c() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([this.ff]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[string(this.dt)],[sci2exp(this.ff)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTDLY_c\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[string(this.dt)],[sci2exp(this.ff)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTDLY_c\",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); } EVTDLY_c.prototype.details = function EVTDLY_c() { @@ -3324,7 +3324,7 @@ function EVTDLY_c() { return options; } EVTDLY_c.prototype.set = function EVTDLY_c() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.dt = parseFloat(arguments[0]["dt"]); @@ -3338,7 +3338,7 @@ function EVTDLY_c() { var ok = false; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble([this.dt],[this.ff]); this.model.firing = new ScilabDouble([this.ff]); this.x.graphics = this.graphics; @@ -3362,9 +3362,9 @@ function EVTDLY_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([this.ff]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[string(this.dt)],[sci2exp(this.ff)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTDLY_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.dt)],[sci2exp(this.ff)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTDLY_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); } EVTDLY_f.prototype.details = function EVTDLY_f() { @@ -3378,7 +3378,7 @@ function EVTDLY_f() { return options; } EVTDLY_f.prototype.set = function EVTDLY_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.dt = parseFloat(arguments[0]["dt"]); @@ -3392,7 +3392,7 @@ function EVTDLY_f() { var ok = false; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble([this.dt]); this.model.firing = new ScilabDouble([this.ff]); this.x.graphics = this.graphics; @@ -3413,9 +3413,9 @@ function EVTGEN_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([this.tt]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = string(this.tt); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTGEN_f\",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.tt); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTGEN_f\",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); } EVTGEN_f.prototype.details = function EVTGEN_f() { @@ -3428,14 +3428,14 @@ function EVTGEN_f() { return options; } EVTGEN_f.prototype.set = function EVTGEN_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.tt = parseFloat(arguments[0]["tt"]); if (!ok) { break; } - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); if (this.model.firing!=this.tt) { this.model.firing = new ScilabDouble([this.tt]); } @@ -3458,9 +3458,9 @@ function EVTVARDLY() { this.model.firing = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = string(this.model.firing); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTVARDLY\",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.firing); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTVARDLY\",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); } EVTVARDLY.prototype.details = function EVTVARDLY() { @@ -3473,14 +3473,14 @@ function EVTVARDLY() { return options; } EVTVARDLY.prototype.set = function EVTVARDLY() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.fir = arguments[0]["fir"]; if (!ok) { break; } - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.firing = new ScilabDouble([this.fir]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -3500,9 +3500,9 @@ function HALT_f() { this.model.ipar = new ScilabDouble([0]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = string(this.n); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"HALT_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.n); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"HALT_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); } HALT_f.prototype.details = function HALT_f() { @@ -3515,7 +3515,7 @@ function HALT_f() { return options; } HALT_f.prototype.set = function HALT_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.n = parseFloat(arguments[0]["n"]); @@ -3523,7 +3523,7 @@ function HALT_f() { break; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.ipar = new ScilabDouble([this.n]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -3548,9 +3548,9 @@ function IFTHEL_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.model.nmode = new ScilabDouble([1]); this.model.nzcross = new ScilabDouble([1]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IFTHEL_f\",sz(1),sz(2));"]); - this.exprs = [[string(this.model.in)],[string(this.model.nmode)]]; - this.x = new standard_define(new ScilabDouble([3,3]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IFTHEL_f\",sz(1),sz(2));"]); + var exprs = [[string(this.model.in)],[string(this.model.nmode)]]; + this.x = new standard_define(new ScilabDouble([3,3]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } IFTHEL_f.prototype.details = function IFTHEL_f() { @@ -3564,12 +3564,12 @@ function IFTHEL_f() { return options; } IFTHEL_f.prototype.set = function IFTHEL_f() { - this.exprs = this.graphics.exprs; - if (this.exprs.length==0) { - this.exprs = string(1); + var exprs = this.graphics.exprs; + if (exprs.length==0) { + var exprs = string(1); } - if (size(this.exprs,"*")==1) { - this.exprs[2-1] = string(1); + if (size(exprs,"*")==1) { + exprs[2-1] = string(1); } while (true) { var ok = true; @@ -3590,7 +3590,7 @@ function IFTHEL_f() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabString([this.exprs]); + this.graphics.exprs = new ScilabString([exprs]); this.model.evtin = new ScilabDouble(this.inh); this.model.sim[2-1] = new ScilabDouble([-1]); this.model.nmode = new ScilabDouble([this.nmod]); @@ -3608,12 +3608,12 @@ function MCLOCK_f() { MCLOCK_f.prototype.define = function MCLOCK_f() { var nn = 2; var dt = 0.1; - this.exprs = [[string(dt)],[string(nn)]]; + var exprs = [[string(dt)],[string(nn)]]; var mfclck = MFCLCK_f("define"); mfclck.graphics.orig = [334,199]; mfclck.graphics.sz = [40,40]; mfclck.graphics.flip = true; - mfclck.graphics.exprs = this.exprs; + mfclck.graphics.exprs = exprs; mfclck.graphics.pein = 12; mfclck.graphics.peout = [[4],[3]]; mfclck.model.rpar = 0.1; @@ -3648,7 +3648,7 @@ function MCLOCK_f() { split2.graphics.orig = [[482.45315],[169.33333]]; split2.graphics.pein = 5; split2.graphics.peout = [[12],[13]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MCLOCK_f\",sz(1),sz(2));"]); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MCLOCK_f\",sz(1),sz(2));"]); var diagram = scicos_diagram(); diagram.objs[1-1] = mfclck; diagram.objs[2-1] = clksom; @@ -3666,7 +3666,7 @@ function MCLOCK_f() { this.x = scicos_block(); this.x.gui = "MCLOCK_f"; this.x.graphics.sz = [3,2]; - this.x.graphics.gr_i = this.gr_i; + this.x.graphics.gr_i = gr_i; this.x.model.sim = "csuper"; this.x.model.evtout = [[1],[1]]; this.x.model.blocktype = "h"; @@ -3712,9 +3712,9 @@ function MFCLCK_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1,0]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[string(this.dt)],[string(this.nn)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MFCLCK_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[string(this.dt)],[string(this.nn)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MFCLCK_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); } MFCLCK_f.prototype.details = function MFCLCK_f() { @@ -3728,7 +3728,7 @@ function MFCLCK_f() { return options; } MFCLCK_f.prototype.set = function MFCLCK_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var ok = true; this.dt = parseFloat(arguments[0]["dt"]); this.nn = parseFloat(arguments[0]["nn"]); @@ -3738,7 +3738,7 @@ function MFCLCK_f() { var hh = this.model.firing; hh[2-1] = 0; this.model.firing = new ScilabDouble(hh); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; } @@ -3757,9 +3757,9 @@ function M_freq() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([0,-1,-1]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[sci2exp([[1],[2]])],[sci2exp([[0],[0]])]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"M_freq\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[sci2exp([[1],[2]])],[sci2exp([[0],[0]])]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"M_freq\",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); } M_freq.prototype.details = function M_freq() { @@ -3773,7 +3773,7 @@ function M_freq() { return options; } M_freq.prototype.set = function M_freq() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.frequ = inverse(arguments[0]["frequ"]); @@ -3821,7 +3821,7 @@ function M_freq() { this.graphics.sz = new ScilabDouble([50,40]); } this.model.firing = new ScilabDouble([fir]); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -3841,8 +3841,8 @@ function VirtualCLK0() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = []; - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs)," "); + var exprs = []; + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs)," "); return new BasicBlock(this.x); } VirtualCLK0.prototype.details = function VirtualCLK0() { @@ -3960,8 +3960,8 @@ function freq_div() { this.model.evtin = 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),\"freq_div\",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),\"freq_div\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([]),gr_i); return new BasicBlock(this.x); } freq_div.prototype.details = function freq_div() { @@ -3989,7 +3989,7 @@ function freq_div() { spath[$+1-1] = path; var xxn = xx; this.graphics = xx.graphics; - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; this.model = xx.model; while (true) { var ok = true; @@ -4006,7 +4006,7 @@ function freq_div() { if (%ph>%df-1) { %ph = %df-1; } - this.graphics.exprs = new ScilabDouble(this.exprs); + this.graphics.exprs = new ScilabDouble(exprs); this.model.ipar = new ScilabDouble([%df]); this.model.dstate = new ScilabDouble([%ph]); xxn.graphics = this.graphics; @@ -4087,9 +4087,9 @@ function Bache() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); - this.exprs = [[string(this.Patm)],[string(this.A)],[string(this.ze1)],[string(this.ze2)],[string(this.zs1)],[string(this.zs2)],[string(this.z0)],[string(this.T0)],[string(this.p_rho)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Bache\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); + var exprs = [[string(this.Patm)],[string(this.A)],[string(this.ze1)],[string(this.ze2)],[string(this.zs1)],[string(this.zs2)],[string(this.z0)],[string(this.T0)],[string(this.p_rho)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Bache\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),list(gr_i,0)); this.x.graphics.in_implicit = [["I"],["I"]]; this.x.graphics.out_implicit = [["I"],["I"],["E"]]; return new BasicBlock(this.x); @@ -4112,7 +4112,7 @@ function Bache() { return options; } Bache.prototype.set = function Bache() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.Patm = parseFloat(arguments[0]["Patm"]); @@ -4129,7 +4129,7 @@ function Bache() { } this.model.rpar = new ScilabDouble([this.Patm],[this.A],[this.ze1],[this.ze2],[this.zs1],[this.zs2],[this.z0],[this.T0],[this.p_rho]); this.model.equations.parameters[2-1] = list(new ScilabDouble([this.Patm]), new ScilabDouble([this.A]), new ScilabDouble([this.ze1]), new ScilabDouble([this.ze2]), new ScilabDouble([this.zs1]), new ScilabDouble([this.zs2]), new ScilabDouble([this.z0]), new ScilabDouble([this.T0]), new ScilabDouble([this.p_rho])); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -4175,15 +4175,15 @@ function Flowmeter() { mo.outputs = MO; this.model.rpar = new ScilabDouble([PrametersValue]); mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName)); - this.exprs = "1"; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Flowmeter\",sz(1),sz(2));"]); + var exprs = "1"; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Flowmeter\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([exprs]),list(gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); @@ -4198,8 +4198,8 @@ function Flowmeter() { return options; } Flowmeter.prototype.set = function Flowmeter() { - this.exprs = this.graphics.exprs; - this.exprs = this.x.graphics.exprs; + var exprs = this.graphics.exprs; + var exprs = this.x.graphics.exprs; while (false) { var ok = true; this.Qini = arguments[0]["Qini"]; @@ -4207,7 +4207,7 @@ function Flowmeter() { break; } this.x.model.equations.parameters[2-1] = list(this.Qini); - this.x.graphics.exprs = this.exprs; + this.x.graphics.exprs = exprs; break; } return new BasicBlock(this.x); @@ -4237,9 +4237,9 @@ function PerteDP() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); - this.exprs = [[string(this.L)],[string(this.D)],[string(this.lambda)],[string(this.z1)],[string(this.z2)],[string(this.p_rho)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PerteDP\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); + var exprs = [[string(this.L)],[string(this.D)],[string(this.lambda)],[string(this.z1)],[string(this.z2)],[string(this.p_rho)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PerteDP\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabDouble(exprs),list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -4259,7 +4259,7 @@ function PerteDP() { return options; } PerteDP.prototype.set = function PerteDP() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.L = parseFloat(arguments[0]["L"]); @@ -4273,7 +4273,7 @@ function PerteDP() { } this.model.rpar = new ScilabDouble([this.L],[this.D],[this.lambda],[this.z1],[this.z2],[this.p_rho]); this.model.equations.parameters[2-1] = list(new ScilabDouble([this.L]), new ScilabDouble([this.D]), new ScilabDouble([this.lambda]), new ScilabDouble([this.z1]), new ScilabDouble([this.z2]), new ScilabDouble([this.p_rho])); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -4299,9 +4299,9 @@ function PuitsP() { mo.parameters = list([["P0"],["T0"],["H0"],["option_temperature"]],[[this.P0],[this.T0],[this.H0],[this.option_temperature]]); this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); - this.exprs = [[string(this.P0)],[string(this.T0)],[string(this.H0)],[string(this.option_temperature)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PuitsP\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); + var exprs = [[string(this.P0)],[string(this.T0)],[string(this.H0)],[string(this.option_temperature)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PuitsP\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,new ScilabDouble(exprs),list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; return new BasicBlock(this.x); } @@ -4318,7 +4318,7 @@ function PuitsP() { return options; } PuitsP.prototype.set = function PuitsP() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.P0 = parseFloat(arguments[0]["P0"]); @@ -4330,7 +4330,7 @@ function PuitsP() { } this.model.rpar = new ScilabDouble([this.P0],[this.T0],[this.H0],[this.option_temperature]); this.model.equations.parameters[2-1] = list(new ScilabDouble([this.P0]), new ScilabDouble([this.T0]), new ScilabDouble([this.H0]), new ScilabDouble([this.option_temperature])); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -4358,9 +4358,9 @@ function SourceP() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); - this.exprs = [[string(this.P0)],[string(this.T0)],[string(this.H0)],[string(this.option_temperature)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SourceP\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); + var exprs = [[string(this.P0)],[string(this.T0)],[string(this.H0)],[string(this.option_temperature)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SourceP\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,new ScilabDouble(exprs),list(gr_i,0)); this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); } @@ -4377,7 +4377,7 @@ function SourceP() { return options; } SourceP.prototype.set = function SourceP() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.P0 = parseFloat(arguments[0]["P0"]); @@ -4389,7 +4389,7 @@ function SourceP() { } this.model.rpar = new ScilabDouble([this.P0],[this.T0],[this.H0],[this.option_temperature]); this.model.equations.parameters[2-1] = list(new ScilabDouble([this.P0]), new ScilabDouble([this.T0]), new ScilabDouble([this.H0]), new ScilabDouble([this.option_temperature])); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -4417,9 +4417,9 @@ function VanneReglante() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); - this.exprs = [[string(this.Cvmax)],[string(this.p_rho)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VanneReglante\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); + var exprs = [[string(this.Cvmax)],[string(this.p_rho)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VanneReglante\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),list(gr_i,0)); this.x.graphics.in_implicit = [["I"],["E"]]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -4435,7 +4435,7 @@ function VanneReglante() { return options; } VanneReglante.prototype.set = function VanneReglante() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.Cvmax = parseFloat(arguments[0]["Cvmax"]); @@ -4445,7 +4445,7 @@ function VanneReglante() { } this.model.rpar = new ScilabDouble([this.Cvmax],[this.p_rho]); this.model.equations.parameters[2-1] = list(new ScilabDouble([this.Cvmax]), new ScilabDouble([this.p_rho])); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -4467,9 +4467,9 @@ function BITCLEAR() { this.model.opar = list(new ScilabDouble([int32(0)])); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[sci2exp(3)],[sci2exp(0)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BITCLEAR\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[sci2exp(3)],[sci2exp(0)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BITCLEAR\",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); } BITCLEAR.prototype.details = function BITCLEAR() { @@ -4483,7 +4483,7 @@ function BITCLEAR() { return options; } BITCLEAR.prototype.set = function BITCLEAR() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.Datatype = arguments[0]["Datatype"]; @@ -4539,7 +4539,7 @@ function BITCLEAR() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.opar = list(new ScilabDouble([n])); this.x.graphics = this.graphics; this.x.model = this.model; @@ -4563,9 +4563,9 @@ function BITSET() { this.model.opar = list(new ScilabDouble([uint32(0)])); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[sci2exp(3)],[sci2exp(0)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BITSET\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[sci2exp(3)],[sci2exp(0)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BITSET\",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); } BITSET.prototype.details = function BITSET() { @@ -4579,7 +4579,7 @@ function BITSET() { return options; } BITSET.prototype.set = function BITSET() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.Datatype = arguments[0]["Datatype"]; @@ -4633,7 +4633,7 @@ function BITSET() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.opar = list(new ScilabDouble([n])); this.x.graphics = this.graphics; this.x.model = this.model; @@ -4659,9 +4659,9 @@ function CONVERT() { this.model.ipar = new ScilabDouble([sgn]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[sci2exp(1)],[sci2exp(3)],[sci2exp(0)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONVERT\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[sci2exp(1)],[sci2exp(3)],[sci2exp(0)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONVERT\",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); } CONVERT.prototype.details = function CONVERT() { @@ -4676,7 +4676,7 @@ function CONVERT() { return options; } CONVERT.prototype.set = function CONVERT() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.it = parseFloat(arguments[0]["it"]); @@ -5016,7 +5016,7 @@ function CONVERT() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -5115,8 +5115,8 @@ function DFLIPFLOP() { this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabBoolean([true,false]); this.model.rpar = new ScilabDouble([scs_m]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DFLIPFLOP\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabDouble([]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DFLIPFLOP\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabDouble([]),gr_i); return new BasicBlock(this.x); } DFLIPFLOP.prototype.details = function DFLIPFLOP() { @@ -5164,8 +5164,8 @@ function DLATCH() { this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabBoolean([true,false]); this.model.rpar = new ScilabDouble([scs_m]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLATCH\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabDouble([]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLATCH\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabDouble([]),gr_i); return new BasicBlock(this.x); } DLATCH.prototype.details = function DLATCH() { @@ -5193,9 +5193,9 @@ function EXTRACTBITS() { this.model.ipar = new ScilabDouble([0,numb]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[sci2exp(3)],[sci2exp(1)],[sci2exp(0)],[sci2exp(0)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACTBITS\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[sci2exp(3)],[sci2exp(1)],[sci2exp(0)],[sci2exp(0)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACTBITS\",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); } EXTRACTBITS.prototype.details = function EXTRACTBITS() { @@ -5211,7 +5211,7 @@ function EXTRACTBITS() { return options; } EXTRACTBITS.prototype.set = function EXTRACTBITS() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.Datatype = arguments[0]["Datatype"]; @@ -5411,7 +5411,7 @@ function EXTRACTBITS() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.ipar = new ScilabDouble([int(this.bit.slice())],[int(numb.slice())]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -5437,9 +5437,9 @@ function INTMUL() { this.model.ipar = new ScilabDouble([sgn]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[sci2exp(3)],[sci2exp(0)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTMUL\",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(3)],[sci2exp(0)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTMUL\",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); } INTMUL.prototype.details = function INTMUL() { @@ -5453,7 +5453,7 @@ function INTMUL() { return options; } INTMUL.prototype.set = function INTMUL() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.Datatype = arguments[0]["Datatype"]; @@ -5528,7 +5528,7 @@ function INTMUL() { } if (ok) { this.model.ipar = new ScilabDouble([this.np]); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -5583,8 +5583,8 @@ function JKFLIPFLOP() { this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabBoolean([true,false]); this.model.rpar = new ScilabDouble([scs_m]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"JKFLIPFLOP\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabDouble([]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"JKFLIPFLOP\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabDouble([]),gr_i); return new BasicBlock(this.x); } JKFLIPFLOP.prototype.details = function JKFLIPFLOP() { @@ -5603,7 +5603,7 @@ function JKFLIPFLOP() { } } var newpar = list(); - this.exprs = xx.graphics.exprs[1-1]; + var exprs = xx.graphics.exprs[1-1]; this.model = xx.model; var init_old = this.model.odstate[1-1]; while (true) { @@ -5652,9 +5652,9 @@ function LOGIC() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[sci2exp(this.mat)],[sci2exp(0)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOGIC\",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.mat)],[sci2exp(0)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOGIC\",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); } LOGIC.prototype.details = function LOGIC() { @@ -5668,7 +5668,7 @@ function LOGIC() { return options; } LOGIC.prototype.set = function LOGIC() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.mat = inverse(arguments[0]["mat"]); @@ -5700,7 +5700,7 @@ function LOGIC() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.mat = int8(this.mat); this.model.opar = list(new ScilabDouble([this.mat])); this.x.graphics = this.graphics; @@ -5728,9 +5728,9 @@ function SHIFT() { this.model.ipar = new ScilabDouble(sgn); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[sci2exp(3)],[sci2exp(0)],[sci2exp(0)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SHIFT\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[sci2exp(3)],[sci2exp(0)],[sci2exp(0)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SHIFT\",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); } SHIFT.prototype.details = function SHIFT() { @@ -5745,7 +5745,7 @@ function SHIFT() { return options; } SHIFT.prototype.set = function SHIFT() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.Datatype = arguments[0]["Datatype"]; @@ -5835,7 +5835,7 @@ function SHIFT() { } if (ok) { this.model.ipar = new ScilabDouble([this.nb]); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -5874,8 +5874,8 @@ function SRFLIPFLOP() { this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabBoolean([true,false]); this.model.rpar = new ScilabDouble([scs_m]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SRFLIPFLOP\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabDouble([]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SRFLIPFLOP\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabDouble([]),gr_i); return new BasicBlock(this.x); } SRFLIPFLOP.prototype.details = function SRFLIPFLOP() { @@ -5894,7 +5894,7 @@ function SRFLIPFLOP() { } } var newpar = list(); - this.exprs = xx.graphics.exprs[1-1]; + var exprs = xx.graphics.exprs[1-1]; this.model = xx.model; var init_old = this.model.odstate[1-1]; while (true) { @@ -5937,9 +5937,9 @@ function BIGSOM_f() { this.model.rpar = new ScilabDouble(this.sgn); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = sci2exp(this.sgn); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BIGSOM_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = sci2exp(this.sgn); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BIGSOM_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabString([exprs]),gr_i); return new BigSom(this.x); } BIGSOM_f.prototype.details = function BIGSOM_f() { @@ -5952,7 +5952,7 @@ function BIGSOM_f() { return options; } BIGSOM_f.prototype.set = function BIGSOM_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.sgn = inverse(arguments[0]["sgn"]); @@ -5966,7 +5966,7 @@ function BIGSOM_f() { var ok = tmpvar0[2]; if (ok) { this.model.rpar = new ScilabDouble(this.sgn.slice()); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -5985,8 +5985,8 @@ function CLINDUMMY_f() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLINDUMMY_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLINDUMMY_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([]),gr_i); return new BasicBlock(this.x); } CLINDUMMY_f.prototype.details = function CLINDUMMY_f() { @@ -6007,7 +6007,7 @@ function CLR() { var B = 1; var C = 1; var D = 0; - this.exprs = [["1"],["1+s"]]; + var exprs = [["1"],["1+s"]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["csslti4"]), new ScilabDouble([4])); this.model.in = new ScilabDouble([1]); @@ -6016,8 +6016,8 @@ function CLR() { this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLR\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLR\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } CLR.prototype.details = function CLR() { @@ -6031,7 +6031,7 @@ function CLR() { return options; } CLR.prototype.set = function CLR() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var x0 = this.model.state; var rpar = this.model.rpar; var ns = prod(size(x0)); @@ -6058,7 +6058,7 @@ function CLR() { var B = tmpvar0[1]; var C = tmpvar0[2]; var D = tmpvar0[3]; - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); var tmpvar1 = size(A); var ns1 = tmpvar1[0]; var ns1 = tmpvar1[1]; @@ -6094,7 +6094,7 @@ function CLR_f() { var B = 1; var C = 1; var D = 0; - this.exprs = [["1"],["1+s"]]; + var exprs = [["1"],["1+s"]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["csslti"]), new ScilabDouble([1])); this.model.in = new ScilabDouble([1]); @@ -6103,8 +6103,8 @@ function CLR_f() { this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLR_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2.5,2.5]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLR_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2.5,2.5]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } CLR_f.prototype.details = function CLR_f() { @@ -6118,7 +6118,7 @@ function CLR_f() { return options; } CLR_f.prototype.set = function CLR_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var x0 = this.model.state; var rpar = this.model.rpar; var ns = prod(size(x0)); @@ -6145,7 +6145,7 @@ function CLR_f() { var B = tmpvar0[1]; var C = tmpvar0[2]; var D = tmpvar0[3]; - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); var tmpvar1 = size(A); var ns1 = tmpvar1[0]; var ns1 = tmpvar1[1]; @@ -6191,9 +6191,9 @@ function CLSS() { this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLSS\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLSS\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } CLSS.prototype.details = function CLSS() { @@ -6210,9 +6210,9 @@ function CLSS() { return options; } CLSS.prototype.set = function CLSS() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")==7) { - this.exprs = this.exprs[[1:4,7]-1]; + var exprs = this.graphics.exprs; + if (size(exprs,"*")==7) { + var exprs = exprs[[1:4,7]-1]; } while (true) { var ok = true; @@ -6254,7 +6254,7 @@ function CLSS() { this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; if (this.D.length!=0) { if (norm(this.D,1)!=0) { @@ -6297,9 +6297,9 @@ function CLSS_f() { this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLSS_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLSS_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } CLSS_f.prototype.details = function CLSS_f() { @@ -6316,9 +6316,9 @@ function CLSS_f() { return options; } CLSS_f.prototype.set = function CLSS_f() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")==7) { - this.exprs = this.exprs[[1:4,7]-1]; + var exprs = this.graphics.exprs; + if (size(exprs,"*")==7) { + var exprs = exprs[[1:4,7]-1]; } while (true) { var ok = true; @@ -6350,7 +6350,7 @@ function CLSS_f() { this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; if (this.D.length!=0) { if (norm(this.D,1)!=0) { @@ -6393,9 +6393,9 @@ function DELAYV_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([0,-1]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[string(this.nin)],[strcat(string(z0.slice(1-1,$-1)),";")],[string(this.T)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DELAYV_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[string(this.nin)],[strcat(string(z0.slice(1-1,$-1)),";")],[string(this.T)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DELAYV_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } DELAYV_f.prototype.details = function DELAYV_f() { @@ -6410,7 +6410,7 @@ function DELAYV_f() { return options; } DELAYV_f.prototype.set = function DELAYV_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; this.nin = this.model.in[1-1]; var z0 = this.model.dstate; this.zz0 = z0.slice(1-1,$-1); @@ -6440,7 +6440,7 @@ function DELAYV_f() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.dstate = new ScilabDouble([this.zz0.slice()],[told]); this.model.rpar = new ScilabDouble([this.T/(size(this.zz0,"*"))]); this.x.graphics = this.graphics; @@ -6545,7 +6545,7 @@ function DELAY_f() { var evtdly = this.x.model.rpar.objs[ppath[2-1]-1]; var register_exprs = register.graphics.exprs; var evtdly_exprs = evtdly.graphics.exprs; - this.exprs = [[evtdly_exprs[1-1]],[register_exprs]]; + var exprs = [[evtdly_exprs[1-1]],[register_exprs]]; while (true) { var ok = true; this.dt = arguments[0]["dt"]; @@ -6566,13 +6566,13 @@ function DELAY_f() { message(mess); throw "user error"; } else { - evtdly.graphics.exprs[1-1] = this.exprs[1-1]; + evtdly.graphics.exprs[1-1] = exprs[1-1]; if (evtdly.model.rpar!=this.dt) { evtdly.model.rpar = this.dt; newpar[$+1-1] = ppath[2-1]; } this.x.model.rpar.objs[ppath[2-1]-1] = evtdly; - register.graphics.exprs = this.exprs[2-1]; + register.graphics.exprs = exprs[2-1]; if (or(register.model.dstate!=this.z0.slice())) { register.model.dstate = this.z0.slice(); newpar[$+1-1] = ppath[1-1]; @@ -6596,9 +6596,9 @@ function DERIV() { this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["x"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = []; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DERIV\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DERIV\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } DERIV.prototype.details = function DERIV() { @@ -6622,9 +6622,9 @@ function DIFF_c() { this.model.state = new ScilabDouble(this.x0); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.exprs = [[strcat(sci2exp(this.x0[1-1]))],[strcat(sci2exp(this.x0[2-1]))]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DIFF_c\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[strcat(sci2exp(this.x0[1-1]))],[strcat(sci2exp(this.x0[2-1]))]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DIFF_c\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } DIFF_c.prototype.details = function DIFF_c() { @@ -6638,7 +6638,7 @@ function DIFF_c() { return options; } DIFF_c.prototype.set = function DIFF_c() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ask_again = false; var ok = true; @@ -6661,7 +6661,7 @@ function DIFF_c() { var ask_again = true; } if (!ask_again) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.state = new ScilabDouble([this.x0],[this.xd0]); this.model.out = new ScilabDouble([N]); this.model.in = new ScilabDouble([N]); @@ -6682,7 +6682,7 @@ function DLR() { var B = 1; var C = 1; var D = 0; - this.exprs = [["1"],["1+z"]]; + var exprs = [["1"],["1+z"]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["dsslti4"]), new ScilabDouble([4])); this.model.in = new ScilabDouble([1]); @@ -6692,8 +6692,8 @@ function DLR() { this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLR\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLR\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } DLR.prototype.details = function DLR() { @@ -6707,7 +6707,7 @@ function DLR() { return options; } DLR.prototype.set = function DLR() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var x0 = this.model.dstate; var ns = prod(size(x0)); var PREVAR_scicos_context = PREVAR_scicos_context; @@ -6731,7 +6731,7 @@ function DLR() { var B = tmpvar0[1]; var C = tmpvar0[2]; var D = tmpvar0[3]; - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); var tmpvar1 = size(A); var ns1 = tmpvar1[0]; var ns1 = tmpvar1[1]; @@ -6768,7 +6768,7 @@ function DLR_f() { var B = 1; var C = 1; var D = 0; - this.exprs = [["1"],["1+z"]]; + var exprs = [["1"],["1+z"]]; this.model = scicos_model(); this.model.sim = new ScilabString(["dsslti"]); this.model.in = new ScilabDouble([1]); @@ -6778,8 +6778,8 @@ function DLR_f() { this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLR_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2.5,2.5]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLR_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2.5,2.5]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } DLR_f.prototype.details = function DLR_f() { @@ -6793,7 +6793,7 @@ function DLR_f() { return options; } DLR_f.prototype.set = function DLR_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var x0 = this.model.dstate; var ns = prod(size(x0)); var PREVAR_scicos_context = PREVAR_scicos_context; @@ -6817,7 +6817,7 @@ function DLR_f() { var B = tmpvar0[1]; var C = tmpvar0[2]; var D = tmpvar0[3]; - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); var tmpvar1 = size(A); var ns1 = tmpvar1[0]; var ns1 = tmpvar1[1]; @@ -6863,9 +6863,9 @@ function DLSS() { this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLSS\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLSS\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } DLSS.prototype.details = function DLSS() { @@ -6882,9 +6882,9 @@ function DLSS() { return options; } DLSS.prototype.set = function DLSS() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")==7) { - this.exprs = this.exprs[[1:4,7]-1]; + var exprs = this.graphics.exprs; + if (size(exprs,"*")==7) { + var exprs = exprs[[1:4,7]-1]; } while (true) { var ok = true; @@ -6926,7 +6926,7 @@ function DLSS() { this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; if (this.D.length!=0) { if (norm(this.D,1)!=0) { @@ -6968,9 +6968,9 @@ function DLSS_f() { this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLSS_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLSS_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } DLSS_f.prototype.details = function DLSS_f() { @@ -6987,9 +6987,9 @@ function DLSS_f() { return options; } DLSS_f.prototype.set = function DLSS_f() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")==7) { - this.exprs = this.exprs[[1:4,7]-1]; + var exprs = this.graphics.exprs; + if (size(exprs,"*")==7) { + var exprs = exprs[[1:4,7]-1]; } while (true) { var ok = true; @@ -7021,7 +7021,7 @@ function DLSS_f() { this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; if (this.D.length!=0) { if (norm(this.D,1)!=0) { @@ -7052,7 +7052,7 @@ function DOLLAR() { var z = 0; this.inh = 0; var in1 = 1; - this.exprs = string([[z],[this.inh]]); + var exprs = string([[z],[this.inh]]); this.model = scicos_model(); this.model.sim = list(new ScilabString(["dollar4"]), new ScilabDouble([4])); this.model.in = new ScilabDouble([in1]); @@ -7061,8 +7061,8 @@ function DOLLAR() { this.model.dstate = new ScilabDouble([z]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([exprs]),gr_i); return new BasicBlock(this.x); } DOLLAR.prototype.details = function DOLLAR() { @@ -7076,9 +7076,9 @@ function DOLLAR() { return options; } DOLLAR.prototype.set = function DOLLAR() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")<2) { - this.exprs[2-1] = "0"; + var exprs = this.graphics.exprs; + if (size(exprs,"*")<2) { + exprs[2-1] = "0"; } while (true) { var ok = true; @@ -7138,7 +7138,7 @@ function DOLLAR() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -7153,7 +7153,7 @@ function DOLLAR_f() { var z = 0; this.inh = 0; var in1 = 1; - this.exprs = string([[z],[this.inh]]); + var exprs = string([[z],[this.inh]]); this.model = scicos_model(); this.model.sim = new ScilabString(["dollar"]); this.model.in = new ScilabDouble([in1]); @@ -7162,8 +7162,8 @@ function DOLLAR_f() { this.model.dstate = new ScilabDouble([z]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([exprs]),gr_i); return new BasicBlock(this.x); } DOLLAR_f.prototype.details = function DOLLAR_f() { @@ -7177,9 +7177,9 @@ function DOLLAR_f() { return options; } DOLLAR_f.prototype.set = function DOLLAR_f() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")<2) { - this.exprs[2-1] = "0"; + var exprs = this.graphics.exprs; + if (size(exprs,"*")<2) { + exprs[2-1] = "0"; } while (true) { var ok = true; @@ -7200,7 +7200,7 @@ function DOLLAR_f() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.dstate = new ScilabDouble([this.a]); this.model.in = new ScilabDouble(in1); this.model.out = new ScilabDouble(out); @@ -7218,7 +7218,7 @@ function DOLLAR_m() { var z = 0; this.inh = 0; var in1 = 1; - this.exprs = string([[z],[this.inh]]); + var exprs = string([[z],[this.inh]]); this.model = scicos_model(); this.model.sim = list(new ScilabString(["dollar4"]), new ScilabDouble([4])); this.model.in = new ScilabDouble([in1]); @@ -7227,8 +7227,8 @@ function DOLLAR_m() { this.model.dstate = new ScilabDouble([z]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR_m\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([exprs]),gr_i); return new BasicBlock(this.x); } DOLLAR_m.prototype.details = function DOLLAR_m() { @@ -7242,9 +7242,9 @@ function DOLLAR_m() { return options; } DOLLAR_m.prototype.set = function DOLLAR_m() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")<2) { - this.exprs[2-1] = "0"; + var exprs = this.graphics.exprs; + if (size(exprs,"*")<2) { + exprs[2-1] = "0"; } while (true) { var ok = true; @@ -7304,7 +7304,7 @@ function DOLLAR_m() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -7330,9 +7330,9 @@ function GAINBLK() { this.model.rpar = new ScilabDouble([this.gain]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [strcat(sci2exp(this.gain))]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAINBLK\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [strcat(sci2exp(this.gain))]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAINBLK\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } GAINBLK.prototype.details = function GAINBLK() { @@ -7346,9 +7346,9 @@ function GAINBLK() { return options; } GAINBLK.prototype.set = function GAINBLK() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")==1) { - this.exprs = [[this.exprs],[sci2exp(0)]]; + var exprs = this.graphics.exprs; + if (size(exprs,"*")==1) { + var exprs = [[exprs],[sci2exp(0)]]; } while (true) { var ok = true; @@ -7471,7 +7471,7 @@ function GAINBLK() { } } if (ok) { - this.graphics.exprs = new ScilabDouble(this.exprs); + this.graphics.exprs = new ScilabDouble(exprs); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -7494,9 +7494,9 @@ function GAINBLK_f() { this.model.rpar = new ScilabDouble([this.gain]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [strcat(sci2exp(this.gain))]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAINBLK_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [strcat(sci2exp(this.gain))]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAINBLK_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } GAINBLK_f.prototype.details = function GAINBLK_f() { @@ -7509,7 +7509,7 @@ function GAINBLK_f() { return options; } GAINBLK_f.prototype.set = function GAINBLK_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.gain = parseFloat(arguments[0]["gain"]); @@ -7528,7 +7528,7 @@ function GAINBLK_f() { this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble(this.gain.slice()); this.x.graphics = this.graphics; this.x.model = this.model; @@ -7552,9 +7552,9 @@ function GAIN_f() { this.model.rpar = new ScilabDouble([this.gain]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[strcat(sci2exp(this.gain))],[strcat(sci2exp(in1))],[strcat(sci2exp(out))]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAIN_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[strcat(sci2exp(this.gain))],[strcat(sci2exp(in1))],[strcat(sci2exp(out))]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAIN_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } GAIN_f.prototype.details = function GAIN_f() { @@ -7567,7 +7567,7 @@ function GAIN_f() { return options; } GAIN_f.prototype.set = function GAIN_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.gain = parseFloat(arguments[0]["gain"]); @@ -7586,7 +7586,7 @@ function GAIN_f() { this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble(this.gain.slice()); this.x.graphics = this.graphics; this.x.model = this.model; @@ -7611,9 +7611,9 @@ function INTEGRAL() { this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.exprs = string([[0],[0],[0],[this.maxp],[minp]]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = string([[0],[0],[0],[this.maxp],[minp]]); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([exprs]),gr_i); this.x.graphics.id = "1/s"; return new BasicBlock(this.x); } @@ -7631,7 +7631,7 @@ function INTEGRAL() { return options; } INTEGRAL.prototype.set = function INTEGRAL() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.x0 = inverse(arguments[0]["x0"]); @@ -7687,7 +7687,7 @@ function INTEGRAL() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -7707,9 +7707,9 @@ function INTEGRAL_f() { this.model.state = new ScilabDouble([this.x0]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.exprs = strcat(sci2exp(this.x0)); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([this.exprs]),this.gr_i); + var exprs = strcat(sci2exp(this.x0)); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([exprs]),gr_i); return new BasicBlock(this.x); } INTEGRAL_f.prototype.details = function INTEGRAL_f() { @@ -7722,14 +7722,14 @@ function INTEGRAL_f() { return options; } INTEGRAL_f.prototype.set = function INTEGRAL_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.x0 = parseFloat(arguments[0]["x0"]); if (!ok) { break; } - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.state = new ScilabDouble([this.x0]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -7755,9 +7755,9 @@ function INTEGRAL_m() { this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.exprs = string([[0],[0],[0],[this.maxp],[minp]]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = string([[0],[0],[0],[this.maxp],[minp]]); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL_m\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([exprs]),gr_i); return new BasicBlock(this.x); } INTEGRAL_m.prototype.details = function INTEGRAL_m() { @@ -7774,7 +7774,7 @@ function INTEGRAL_m() { return options; } INTEGRAL_m.prototype.set = function INTEGRAL_m() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.x0 = arguments[0]["x0"]; @@ -7876,7 +7876,7 @@ function INTEGRAL_m() { } } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -7922,8 +7922,8 @@ function PID() { this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabBoolean([false,false]); this.model.rpar = new ScilabDouble([scs_m]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PID\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PID\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),gr_i); return new BasicBlock(this.x); } PID.prototype.details = function PID() { @@ -7965,11 +7965,11 @@ function PID() { } } var newpar = list(); - this.exprs[1-1] = xx1.graphics.exprs[1-1]; + exprs[1-1] = xx1.graphics.exprs[1-1]; var p_old = xx1.model.rpar; - this.exprs[2-1] = xx2.graphics.exprs[1-1]; + exprs[2-1] = xx2.graphics.exprs[1-1]; var i_old = xx2.model.rpar; - this.exprs[3-1] = xx3.graphics.exprs[1-1]; + exprs[3-1] = xx3.graphics.exprs[1-1]; var d_old = xx3.model.rpar; var y = 0; while (true) { @@ -8015,9 +8015,9 @@ function REGISTER() { this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = strcat(string(this.z0),";"); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"REGISTER\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([this.exprs]),this.gr_i); + var exprs = strcat(string(this.z0),";"); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"REGISTER\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([exprs]),gr_i); return new BasicBlock(this.x); } REGISTER.prototype.details = function REGISTER() { @@ -8031,9 +8031,9 @@ function REGISTER() { return options; } REGISTER.prototype.set = function REGISTER() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,1)==1) { - this.exprs = [[this.exprs],[sci2exp(1)]]; + var exprs = this.graphics.exprs; + if (size(exprs,1)==1) { + var exprs = [[exprs],[sci2exp(1)]]; } while (true) { var ok = true; @@ -8087,7 +8087,7 @@ function REGISTER() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble(this.exprs); + this.graphics.exprs = new ScilabDouble(exprs); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -8108,9 +8108,9 @@ function REGISTER_f() { this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = strcat(string(this.z0),";"); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"REGISTER_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2.5,2.5]),this.model,new ScilabDouble([this.exprs]),this.gr_i); + var exprs = strcat(string(this.z0),";"); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"REGISTER_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2.5,2.5]),this.model,new ScilabDouble([exprs]),gr_i); return new BasicBlock(this.x); } REGISTER_f.prototype.details = function REGISTER_f() { @@ -8123,7 +8123,7 @@ function REGISTER_f() { return options; } REGISTER_f.prototype.set = function REGISTER_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.z0 = parseFloat(arguments[0]["z0"]); @@ -8136,7 +8136,7 @@ function REGISTER_f() { var ok = false; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.dstate = new ScilabDouble([this.z0]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -8157,8 +8157,8 @@ function SAMPHOLD() { this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPHOLD\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([" "]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPHOLD\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([" "]),gr_i); return new BasicBlock(this.x); } SAMPHOLD.prototype.details = function SAMPHOLD() { @@ -8187,8 +8187,8 @@ function SAMPHOLD_m() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPHOLD_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPHOLD_m\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),gr_i); return new BasicBlock(this.x); } SAMPHOLD_m.prototype.details = function SAMPHOLD_m() { @@ -8221,7 +8221,7 @@ function SAMPHOLD_m() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); break; } } @@ -8240,8 +8240,8 @@ function SAMPLEHOLD_f() { this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPLEHOLD_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([" "]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPLEHOLD_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([" "]),gr_i); return new BasicBlock(this.x); } SAMPLEHOLD_f.prototype.details = function SAMPLEHOLD_f() { @@ -8266,9 +8266,9 @@ function SOM_f() { this.model.rpar = new ScilabDouble(sgn); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[sci2exp(1)],[sci2exp(sgn)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SOM_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[sci2exp(1)],[sci2exp(sgn)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SOM_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } SOM_f.prototype.details = function SOM_f() { @@ -8278,12 +8278,12 @@ function SOM_f() { alert("parameters cannot be modified"); } SOM_f.prototype.set = function SOM_f() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")==2) { - this.exprs = this.exprs[2-1]; + var exprs = this.graphics.exprs; + if (size(exprs,"*")==2) { + var exprs = exprs[2-1]; } - if (size(this.exprs,"*")!=3) { - this.exprs = string(this.model.rpar); + if (size(exprs,"*")!=3) { + var exprs = string(this.model.rpar); } if (this.graphics.flip) { var labs = ["down","left","up"]; @@ -8291,7 +8291,7 @@ function SOM_f() { var labs = ["down","right","up"]; } var str = [["This sum block is obsolete","parameters cannot be modified. Please replace it with new sum block"],["and gain blocks in the linear palette"," ","Input ports are located at up, side and down positions.","Current gains are:"]]; - var str = [[str],[(part(labs.slice(),1,7)+this.exprs.slice())]]; + var str = [[str],[(part(labs.slice(),1,7)+exprs.slice())]]; message(str); throw "user error"; return new BasicBlock(this.x); @@ -8310,9 +8310,9 @@ function SUMMATION() { this.model.ipar = new ScilabDouble(this.sgn); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = sci2exp(this.sgn); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUMMATION\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = sci2exp(this.sgn); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUMMATION\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabString([exprs]),gr_i); return new Summation(this.x); } SUMMATION.prototype.details = function SUMMATION() { @@ -8327,11 +8327,11 @@ function SUMMATION() { return options; } SUMMATION.prototype.set = function SUMMATION() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,1)==1) { - this.exprs = [[sci2exp(1)],[this.exprs],[sci2exp(0)]]; - } else if (size(this.exprs,1)==2) { - this.exprs = [[this.exprs],[sci2exp(0)]]; + var exprs = this.graphics.exprs; + if (size(exprs,1)==1) { + var exprs = [[sci2exp(1)],[exprs],[sci2exp(0)]]; + } else if (size(exprs,1)==2) { + var exprs = [[exprs],[sci2exp(0)]]; } while (true) { var ok = true; @@ -8441,7 +8441,7 @@ function SUMMATION() { if (ok) { this.model.rpar = new ScilabDouble([this.satur]); this.model.ipar = new ScilabDouble([this.sgn]); - this.graphics.exprs = new ScilabDouble(this.exprs); + this.graphics.exprs = new ScilabDouble(exprs); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -8459,9 +8459,9 @@ function SUM_f() { this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUM_f\",sz(1),sz(2));"]); - this.exprs = []; - this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUM_f\",sz(1),sz(2));"]); + var exprs = []; + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } SUM_f.prototype.details = function SUM_f() { @@ -8494,9 +8494,9 @@ function TCLSS() { this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TCLSS\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TCLSS\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } TCLSS.prototype.details = function TCLSS() { @@ -8513,9 +8513,9 @@ function TCLSS() { return options; } TCLSS.prototype.set = function TCLSS() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")==7) { - this.exprs = this.exprs[[1:4,7]-1]; + var exprs = this.graphics.exprs; + if (size(exprs,"*")==7) { + var exprs = exprs[[1:4,7]-1]; } while (true) { var ok = true; @@ -8547,7 +8547,7 @@ function TCLSS() { this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; if (this.D.length!=0) { if (norm(this.D,1)!=0) { @@ -8597,9 +8597,9 @@ function TCLSS_f() { this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TCLSS_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TCLSS_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } TCLSS_f.prototype.details = function TCLSS_f() { @@ -8616,9 +8616,9 @@ function TCLSS_f() { return options; } TCLSS_f.prototype.set = function TCLSS_f() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")==7) { - this.exprs = this.exprs[[1:4,7]-1]; + var exprs = this.graphics.exprs; + if (size(exprs,"*")==7) { + var exprs = exprs[[1:4,7]-1]; } while (true) { var ok = true; @@ -8650,7 +8650,7 @@ function TCLSS_f() { this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; if (this.D.length!=0) { if (norm(this.D,1)!=0) { @@ -8695,9 +8695,9 @@ function TIME_DELAY() { this.model.ipar = new ScilabDouble([this.N]); this.model.blocktype = new ScilabString(["x"]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.exprs = [[string(this.T)],[string(this.init)],[string(this.N)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TIME_DELAY\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3.5,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[string(this.T)],[string(this.init)],[string(this.N)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TIME_DELAY\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3.5,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } TIME_DELAY.prototype.details = function TIME_DELAY() { @@ -8712,7 +8712,7 @@ function TIME_DELAY() { return options; } TIME_DELAY.prototype.set = function TIME_DELAY() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var nin = this.model.in[1-1]; while (true) { var ok = true; @@ -8739,7 +8739,7 @@ function TIME_DELAY() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble([this.T],[this.init]); this.model.ipar = new ScilabDouble([this.N]); this.model.dep_ut = new ScilabBoolean([false,true]); @@ -8766,9 +8766,9 @@ function VARIABLE_DELAY() { this.model.ipar = new ScilabDouble([this.N]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[string(this.T)],[string(this.init)],[string(this.N)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VARIABLE_DELAY\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[string(this.T)],[string(this.init)],[string(this.N)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VARIABLE_DELAY\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } VARIABLE_DELAY.prototype.details = function VARIABLE_DELAY() { @@ -8783,7 +8783,7 @@ function VARIABLE_DELAY() { return options; } VARIABLE_DELAY.prototype.set = function VARIABLE_DELAY() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var nin = this.model.in[1-1]; while (true) { var ok = true; @@ -8810,7 +8810,7 @@ function VARIABLE_DELAY() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble([this.T],[this.init]); this.model.ipar = new ScilabDouble([this.N]); this.x.graphics = this.graphics; @@ -8844,8 +8844,8 @@ function CUMSUM() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[sci2exp(1)],[sci2exp(0)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CUMSUM\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CUMSUM\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),gr_i); return new BasicBlock(this.x); } CUMSUM.prototype.details = function CUMSUM() { @@ -8949,8 +8949,8 @@ function EXTRACT() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[sci2exp(1)],[sci2exp([1])],[sci2exp([1])]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACT\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACT\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),gr_i); return new BasicBlock(this.x); } EXTRACT.prototype.details = function EXTRACT() { @@ -9018,7 +9018,7 @@ function EXTRACT() { var out = [ma,mb]; var funtyp = 4; if (ok) { - var label = this.exprs; + var label = exprs; var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; @@ -9054,8 +9054,8 @@ function EXTTRI() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTTRI\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTTRI\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),gr_i); return new BasicBlock(this.x); } EXTTRI.prototype.details = function EXTTRI() { @@ -9156,8 +9156,8 @@ function MATBKSL() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATBKSL\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATBKSL\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),gr_i); return new BasicBlock(this.x); } MATBKSL.prototype.details = function MATBKSL() { @@ -9197,7 +9197,7 @@ function MATBKSL() { var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { - var label = this.exprs; + var label = exprs; var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; @@ -9233,8 +9233,8 @@ function MATCATH() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(2)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATCATH\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabString(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATCATH\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabString(label),gr_i); return new BasicBlock(this.x); } MATCATH.prototype.details = function MATCATH() { @@ -9301,8 +9301,8 @@ function MATCATV() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(2)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATCATV\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabString(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATCATV\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabString(label),gr_i); return new BasicBlock(this.x); } MATCATV.prototype.details = function MATCATV() { @@ -9368,8 +9368,8 @@ function MATDET() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDET\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDET\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),gr_i); return new BasicBlock(this.x); } MATDET.prototype.details = function MATDET() { @@ -9409,7 +9409,7 @@ function MATDET() { var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { - var label = this.exprs; + var label = exprs; var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; @@ -9445,8 +9445,8 @@ function MATDIAG() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDIAG\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDIAG\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),gr_i); return new BasicBlock(this.x); } MATDIAG.prototype.details = function MATDIAG() { @@ -9486,7 +9486,7 @@ function MATDIAG() { var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { - var label = this.exprs; + var label = exprs; var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; @@ -9522,8 +9522,8 @@ function MATDIV() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDIV\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDIV\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),gr_i); return new BasicBlock(this.x); } MATDIV.prototype.details = function MATDIV() { @@ -9563,7 +9563,7 @@ function MATDIV() { var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { - var label = this.exprs; + var label = exprs; var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; @@ -9599,8 +9599,8 @@ function MATEIG() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATEIG\",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),\"MATEIG\",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); } MATEIG.prototype.details = function MATEIG() { @@ -9702,8 +9702,8 @@ function MATEXPM() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATEXPM\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATEXPM\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),gr_i); return new BasicBlock(this.x); } MATEXPM.prototype.details = function MATEXPM() { @@ -9743,7 +9743,7 @@ function MATEXPM() { var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { - var label = this.exprs; + var label = exprs; var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; @@ -9779,8 +9779,8 @@ function MATINV() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATINV\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATINV\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),gr_i); return new BasicBlock(this.x); } MATINV.prototype.details = function MATINV() { @@ -9820,7 +9820,7 @@ function MATINV() { var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { - var label = this.exprs; + var label = exprs; var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; @@ -9856,8 +9856,8 @@ function MATLU() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = sci2exp(1); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATLU\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([label]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATLU\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([label]),gr_i); return new BasicBlock(this.x); } MATLU.prototype.details = function MATLU() { @@ -9935,8 +9935,8 @@ function MATMAGPHI() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATMAGPHI\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATMAGPHI\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(label),gr_i); return new BasicBlock(this.x); } MATMAGPHI.prototype.details = function MATMAGPHI() { @@ -10006,8 +10006,8 @@ function MATMUL() { this.model.dep_ut = new ScilabBoolean([true,false]); this.model.ipar = new ScilabDouble([1]); var label = [sci2exp(this.model.ipar)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATMUL\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATMUL\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(label),gr_i); return new BasicBlock(this.x); } MATMUL.prototype.details = function MATMUL() { @@ -10148,7 +10148,7 @@ function MATMUL() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - var label = this.exprs; + var label = exprs; this.model.ipar = new ScilabDouble([this.rule]); this.model.rpar = new ScilabDouble([kmin],[kmax]); this.graphics.exprs = new ScilabDouble([label]); @@ -10183,8 +10183,8 @@ function MATPINV() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATPINV\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATPINV\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),gr_i); return new BasicBlock(this.x); } MATPINV.prototype.details = function MATPINV() { @@ -10224,7 +10224,7 @@ function MATPINV() { var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { - var label = this.exprs; + var label = exprs; var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; @@ -10260,8 +10260,8 @@ function MATRESH() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[sci2exp(1)],[sci2exp([1,1])],[sci2exp([1,1])]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATRESH\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATRESH\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),gr_i); return new BasicBlock(this.x); } MATRESH.prototype.details = function MATRESH() { @@ -10372,8 +10372,8 @@ function MATSING() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATSING\",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),\"MATSING\",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); } MATSING.prototype.details = function MATSING() { @@ -10478,8 +10478,8 @@ function MATSUM() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[sci2exp(1)],[sci2exp(0)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATSUM\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATSUM\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),gr_i); return new BasicBlock(this.x); } MATSUM.prototype.details = function MATSUM() { @@ -10573,8 +10573,8 @@ function MATTRAN() { this.model.out2 = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATTRAN\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATTRAN\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(label),gr_i); return new BasicBlock(this.x); } MATTRAN.prototype.details = function MATTRAN() { @@ -10620,7 +10620,7 @@ function MATTRAN() { var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { - var label = this.exprs; + var label = exprs; var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; @@ -10656,8 +10656,8 @@ function MATZCONJ() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = []; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATZCONJ\",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),\"MATZCONJ\",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); } MATZCONJ.prototype.details = function MATZCONJ() { @@ -10693,8 +10693,8 @@ function MATZREIM() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = sci2exp(1); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATZREIM\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString([label]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATZREIM\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString([label]),gr_i); return new BasicBlock(this.x); } MATZREIM.prototype.details = function MATZREIM() { @@ -10775,8 +10775,8 @@ function RICC() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RICC\",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),\"RICC\",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); } RICC.prototype.details = function RICC() { @@ -10805,7 +10805,7 @@ function RICC() { var out = [this.model.out,this.model.out2]; var it = [1,1,1]; var ot = 1; - var label = this.exprs; + var label = exprs; var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; @@ -10842,8 +10842,8 @@ function ROOTCOEF() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ROOTCOEF\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ROOTCOEF\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),gr_i); return new BasicBlock(this.x); } ROOTCOEF.prototype.details = function ROOTCOEF() { @@ -10885,7 +10885,7 @@ function ROOTCOEF() { var out = [this.inp+1,this.model.out2]; var funtyp = 4; if (ok) { - var label = this.exprs; + var label = exprs; var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; @@ -10911,8 +10911,8 @@ function SQRT() { this.model.out2 = new ScilabDouble([-2]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SQRT\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SQRT\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),gr_i); return new BasicBlock(this.x); } SQRT.prototype.details = function SQRT() { @@ -10947,7 +10947,7 @@ function SQRT() { var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { - var label = this.exprs; + var label = exprs; var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; @@ -10983,8 +10983,8 @@ function SUBMAT() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[sci2exp(1)],[sci2exp(1)],[sci2exp(1)],[sci2exp(1)],[sci2exp(1)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUBMAT\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,new ScilabDouble(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUBMAT\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,new ScilabDouble(label),gr_i); return new BasicBlock(this.x); } SUBMAT.prototype.details = function SUBMAT() { @@ -11059,7 +11059,7 @@ function SUBMAT() { var in1 = [this.inp[1-1],this.inp[2-1]]; var out = [(this.b-this.a)+1,(this.d-this.c)+1]; var funtyp = 4; - var label = this.exprs; + var label = exprs; if (ok) { var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); this.model = tmpvar0[0]; @@ -11083,7 +11083,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(); @@ -11098,8 +11098,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() { @@ -11109,7 +11109,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]; @@ -11130,14 +11130,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,"*"))) { @@ -11171,7 +11171,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))) { @@ -11202,7 +11202,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]); @@ -11216,7 +11216,7 @@ function AUTOMAT() { /* 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]); @@ -11225,8 +11225,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() { @@ -11241,7 +11241,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; @@ -11252,7 +11252,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) { @@ -11304,9 +11304,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() { @@ -11327,10 +11327,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; @@ -11393,7 +11393,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; @@ -11434,9 +11434,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() { @@ -11456,7 +11456,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; @@ -11506,7 +11506,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; @@ -11533,9 +11533,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() { @@ -11554,7 +11554,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; @@ -11587,7 +11587,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; @@ -11626,8 +11626,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() { @@ -11777,8 +11777,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() { @@ -11936,9 +11936,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() { @@ -11953,7 +11953,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; @@ -11991,7 +11991,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]); @@ -12016,9 +12016,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() { @@ -12031,7 +12031,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"]); @@ -12049,7 +12049,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]); @@ -12078,9 +12078,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() { @@ -12095,7 +12095,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"]); @@ -12117,7 +12117,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; @@ -12132,9 +12132,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() { @@ -12144,8 +12144,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); @@ -12157,7 +12157,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); } @@ -12172,7 +12172,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); @@ -12208,9 +12208,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() { @@ -12224,7 +12224,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"]); @@ -12232,7 +12232,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; @@ -12259,7 +12259,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,$); @@ -12288,7 +12288,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 { } @@ -12308,9 +12308,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() { @@ -12323,7 +12323,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"]); @@ -12331,7 +12331,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; @@ -12418,8 +12418,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() { @@ -12501,8 +12501,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() { @@ -12661,8 +12661,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() { @@ -12691,9 +12691,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() { @@ -12710,7 +12710,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"]; @@ -12725,7 +12725,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; @@ -12779,9 +12779,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() { @@ -12797,9 +12797,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; @@ -12889,7 +12889,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; @@ -12911,7 +12911,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]); @@ -12928,8 +12928,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); @@ -12950,18 +12950,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"]; @@ -13124,7 +13124,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; } } } @@ -13138,7 +13138,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 = []; @@ -13167,31 +13167,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; } @@ -13204,7 +13204,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]); @@ -13214,8 +13214,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() { @@ -13229,7 +13229,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"]; @@ -13253,7 +13253,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]); @@ -13276,7 +13276,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]); @@ -13293,8 +13293,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); @@ -13306,18 +13306,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]; @@ -13455,7 +13455,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]; @@ -13486,7 +13486,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; } } } @@ -13514,31 +13514,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; } @@ -13558,8 +13558,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); } @@ -13598,9 +13598,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() { @@ -13619,7 +13619,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; @@ -13652,7 +13652,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; @@ -13674,9 +13674,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() { @@ -13690,7 +13690,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"]); @@ -13704,7 +13704,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; @@ -13725,9 +13725,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); } @@ -13743,9 +13743,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; @@ -13807,7 +13807,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]); @@ -13862,8 +13862,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() { @@ -13885,11 +13885,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); } @@ -13906,9 +13906,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; @@ -13929,14 +13929,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; @@ -13980,8 +13980,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() { @@ -14062,8 +14062,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() { @@ -14135,9 +14135,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() { @@ -14147,15 +14147,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; } @@ -14181,8 +14181,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() { @@ -14310,8 +14310,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() { @@ -14441,8 +14441,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() { @@ -14601,9 +14601,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() { @@ -14625,9 +14625,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; @@ -14644,7 +14644,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(); @@ -14657,7 +14657,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]; @@ -14685,8 +14685,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; } @@ -14726,9 +14726,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() { @@ -14750,7 +14750,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"]; @@ -14766,7 +14766,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(); @@ -14779,7 +14779,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]; @@ -14807,8 +14807,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; } @@ -14826,8 +14826,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() { @@ -14852,9 +14852,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() { @@ -14867,14 +14867,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]); @@ -14901,8 +14901,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() { @@ -14935,9 +14935,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() { @@ -14955,7 +14955,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"]); @@ -14983,7 +14983,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; @@ -15004,9 +15004,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() { @@ -15019,9 +15019,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; @@ -15033,7 +15033,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; @@ -15059,9 +15059,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() { @@ -15074,9 +15074,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; @@ -15088,7 +15088,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; @@ -15108,9 +15108,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() { @@ -15137,9 +15137,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() { @@ -15154,7 +15154,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"]); @@ -15171,7 +15171,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; @@ -15195,9 +15195,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() { @@ -15211,7 +15211,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"]); @@ -15227,7 +15227,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; @@ -15248,9 +15248,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() { @@ -15273,9 +15273,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() { @@ -15300,9 +15300,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() { @@ -15315,9 +15315,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; @@ -15330,7 +15330,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; @@ -15359,9 +15359,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() { @@ -15378,7 +15378,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) { @@ -15402,8 +15402,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(); @@ -15451,7 +15451,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; @@ -15483,9 +15483,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() { @@ -15502,7 +15502,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) { @@ -15556,7 +15556,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 = []; @@ -15589,11 +15589,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 { @@ -15615,7 +15615,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; } @@ -15629,7 +15629,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; @@ -15648,8 +15648,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() { @@ -15659,7 +15659,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); @@ -15704,9 +15704,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); } @@ -15722,7 +15722,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"]); @@ -15769,7 +15769,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; @@ -15789,9 +15789,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() { @@ -15815,9 +15815,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() { @@ -15842,9 +15842,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() { @@ -15857,9 +15857,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; @@ -15867,7 +15867,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([]); @@ -15894,9 +15894,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() { @@ -15909,7 +15909,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"]); @@ -15949,7 +15949,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; @@ -15993,9 +15993,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() { @@ -16009,7 +16009,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"]); @@ -16034,7 +16034,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; @@ -16058,9 +16058,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() { @@ -16075,7 +16075,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"]); @@ -16097,7 +16097,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; @@ -16121,9 +16121,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() { @@ -16138,7 +16138,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"]); @@ -16157,7 +16157,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; @@ -16178,9 +16178,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() { @@ -16193,14 +16193,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]); @@ -16226,9 +16226,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() { @@ -16251,9 +16251,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() { @@ -16276,9 +16276,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() { @@ -16291,7 +16291,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) { @@ -16304,7 +16304,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; @@ -16326,8 +16326,8 @@ function PDE() { this.model.dep_ut = new ScilabBoolean([false,true]); var params_pde = tlist([["paramspde"],["a"],["b"],["txt_exp"],["check_op1"],["a1"],["b1"],["check_op2"],["a2"],["b2"],["check_op3"],["a3"],["b3"],["check_op4"],["a4"],["b4"],["check_op5"],["a5"],["b5"],["check_op6"],["a6"],["b6"],["check_op7"],["a7"],["b7"],["discr_cst"],["discr_non_cst"],["signe"],["rad_automatique"],["rad_manuel"],["methode"],["ord1"],["ord2"],["ord3"],["degre"],["nnode"],["txt_pas"],["CI"],["dCI"],["CLa"],["CLa_exp"],["CLb"],["CLb_exp"],["points"]],"","","","0","","IN_EDP1(t)","0","","IN_EDP2(t)","0","","IN_EDP3(t)","0","","IN_EDP4(t)","0","","IN_EDP5(t)","0","","IN_EDP6(t)","0","","IN_EDP7(t)","0","0","0","0","0","0","","","","","","","","","0","IN_CL1(t)","0","IN_CL2(t)",""); var label = list(params_pde,[],""); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PDE\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,3]),this.model,label,this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PDE\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,3]),this.model,label,gr_i); return new BasicBlock(this.x); } PDE.prototype.details = function PDE() { @@ -16547,9 +16547,9 @@ function AFFICH_m() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); this.model.label = new ScilabString([""]); - this.exprs = [[sci2exp([this.model.in,this.model.in2])],[string(this.font)],[string(this.fontsize)],[string(this.colr)],[string(this.nt)],[string(this.nd)],[string(0)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"AFFICH_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[sci2exp([this.model.in,this.model.in2])],[string(this.font)],[string(this.fontsize)],[string(this.colr)],[string(this.nt)],[string(this.nd)],[string(0)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"AFFICH_m\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(exprs),gr_i); return new AfficheBlock(this.x); } AFFICH_m.prototype.details = function AFFICH_m() { @@ -16568,7 +16568,7 @@ function AFFICH_m() { return options; } AFFICH_m.prototype.set = function AFFICH_m() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.in1 = inverse(arguments[0]["in1"]); @@ -16620,7 +16620,7 @@ function AFFICH_m() { this.model.ipar = new ScilabDouble([this.font],[this.fontsize],[this.colr],[this.nt],[this.nd],[this.in1[1-1][1-1]]); this.model.dstate = new ScilabDouble([-1],[0],[0],[1],[1],[0],[zeros(this.in1[1-1][1-1]*this.in1[1-1][2-1],1)]); this.model.evtin = new ScilabDouble([ones(1-this.herit,1)]); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -16666,7 +16666,7 @@ function BARXY() { return options; } BARXY.prototype.set = function BARXY() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.xmin = parseFloat(arguments[0]["xmin"]); @@ -16696,7 +16696,7 @@ function BARXY() { } else { this.model.rpar = new ScilabDouble([this.xmin],[this.xmax],[this.ymin],[this.ymax]); this.model.ipar = new ScilabDouble([this.thickness]); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -16730,9 +16730,9 @@ function CANIMXY() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[string(this.nbr_curves)],[string(this.clrs)],[string(this.siz)],[string(this.win)],["[]"],["[]"],[string(this.xmin)],[string(this.xmax)],[string(this.ymin)],[string(this.ymax)],[string(this.N)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CANIMXY\",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.nbr_curves)],[string(this.clrs)],[string(this.siz)],[string(this.win)],["[]"],["[]"],[string(this.xmin)],[string(this.xmax)],[string(this.ymin)],[string(this.ymax)],[string(this.N)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CANIMXY\",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); } CANIMXY.prototype.details = function CANIMXY() { @@ -16755,7 +16755,7 @@ function CANIMXY() { return options; } CANIMXY.prototype.set = function CANIMXY() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.nbr_curves = parseFloat(arguments[0]["nbr_curves"]); @@ -16825,7 +16825,7 @@ function CANIMXY() { var ipar = [[this.win],[1],[this.N],[this.clrs],[this.siz],[0],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]]; 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; @@ -16859,9 +16859,9 @@ function CANIMXY3D() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[string(this.nbr_curves)],[strcat(string(this.clrs)," ")],[strcat(string(this.siz)," ")],[string(this.win)],["[]"],["[]"],[strcat(string(this.vec_x)," ")],[strcat(string(this.vec_y)," ")],[strcat(string(this.vec_z)," ")],[strcat(string(this.param3ds)," ")],[string(this.N)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CANIMXY3D\",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.nbr_curves)],[strcat(string(this.clrs)," ")],[strcat(string(this.siz)," ")],[string(this.win)],["[]"],["[]"],[strcat(string(this.vec_x)," ")],[strcat(string(this.vec_y)," ")],[strcat(string(this.vec_z)," ")],[strcat(string(this.param3ds)," ")],[string(this.N)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CANIMXY3D\",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); } CANIMXY3D.prototype.details = function CANIMXY3D() { @@ -16884,7 +16884,7 @@ function CANIMXY3D() { return options; } CANIMXY3D.prototype.set = function CANIMXY3D() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.nbr_curves = parseFloat(arguments[0]["nbr_curves"]); @@ -16971,7 +16971,7 @@ function CANIMXY3D() { var ipar = [[this.win],[size_siz],[this.N],[this.clrs.slice()],[this.siz.slice()],[1],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]]; 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; @@ -16996,9 +16996,9 @@ function CEVENTSCOPE() { this.model.ipar = new ScilabDouble([this.win],[1],[this.clrs[this.nclock-1]],[this.wpos.slice()],[this.wdim.slice()]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[sci2exp(this.nclock)],[strcat(sci2exp(this.clrs[this.nclock-1])," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.per)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CEVENTSCOPE\",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.nclock)],[strcat(sci2exp(this.clrs[this.nclock-1])," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.per)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CEVENTSCOPE\",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); } CEVENTSCOPE.prototype.details = function CEVENTSCOPE() { @@ -17016,7 +17016,7 @@ function CEVENTSCOPE() { return options; } CEVENTSCOPE.prototype.set = function CEVENTSCOPE() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.nclock = parseFloat(arguments[0]["nclock"]); @@ -17076,7 +17076,7 @@ function CEVENTSCOPE() { var ipar = [[this.win],[1],[this.clrs.slice()],[this.wpos.slice()],[this.wdim.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; @@ -17103,9 +17103,9 @@ function CFSCOPE() { this.model.ipar = new ScilabDouble([this.win],[1],[this.N],[this.clrs],[this.wpos],[this.wdim],[1],[1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[strcat(string(this.clrs)," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.ymin)],[string(this.ymax)],[string(this.per)],[string(this.N)],[string([1])]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CFSCOPE\",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(string(this.clrs)," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.ymin)],[string(this.ymax)],[string(this.per)],[string(this.N)],[string([1])]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CFSCOPE\",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); } CFSCOPE.prototype.details = function CFSCOPE() { @@ -17126,7 +17126,7 @@ function CFSCOPE() { return options; } CFSCOPE.prototype.set = function CFSCOPE() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.clrs = inverse(arguments[0]["clrs"]); @@ -17193,7 +17193,7 @@ function CFSCOPE() { this.model.ipar = new ScilabDouble(ipar); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -17213,8 +17213,8 @@ function CLKOUTV_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = string(this.prt); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs])," "); + var exprs = string(this.prt); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([exprs])," "); return new EventOutBlock(this.x); } CLKOUTV_f.prototype.details = function CLKOUTV_f() { @@ -17227,7 +17227,7 @@ function CLKOUTV_f() { return options; } CLKOUTV_f.prototype.set = function CLKOUTV_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.prt = arguments[0]["prt"]; @@ -17240,7 +17240,7 @@ function CLKOUTV_f() { } else { this.model.ipar = new ScilabDouble([this.prt]); this.model.evtin = new ScilabDouble([1]); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -17273,8 +17273,8 @@ function CLKOUTV_f() { var y = orig[2-1]+sz[2-1]*[[0],[1/3],[1],[1],[1/3]]; var xo = orig[1-1]; var yo = orig[2-1]+sz[2-1]/3; - if (this.type[this.gr_i-1]==15) { - var coli = this.gr_i[2-1]; + if (this.type[gr_i-1]==15) { + var coli = gr_i[2-1]; var pcoli = xget("pattern"); xfpolys(this.x,y,coli); xset("pattern",coli); @@ -17313,8 +17313,8 @@ function CLKOUT_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = string(this.prt); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs])," "); + var exprs = string(this.prt); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([exprs])," "); return new BasicBlock(this.x); } CLKOUT_f.prototype.details = function CLKOUT_f() { @@ -17327,8 +17327,8 @@ function CLKOUT_f() { return options; } CLKOUT_f.prototype.set = function CLKOUT_f() { - this.exprs = this.graphics.exprs; - this.exprs = this.exprs[1-1]; + var exprs = this.graphics.exprs; + var exprs = exprs[1-1]; while (true) { var ok = true; this.prt = parseFloat(arguments[0]["prt"]); @@ -17343,7 +17343,7 @@ function CLKOUT_f() { this.model.ipar = new ScilabDouble([this.prt]); this.model.evtin = new ScilabDouble([1]); 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; @@ -17373,9 +17373,9 @@ function CMAT3D() { this.model.rpar = new ScilabDouble([this.colormap.slice()],[this.x],[y]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[strcat(string(this.x)," ")],[strcat(string(y)," ")],[string("jetcolormap(25)")],[string(this.cmin)],[string(this.cmax)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CMAT3D\",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(string(this.x)," ")],[strcat(string(y)," ")],[string("jetcolormap(25)")],[string(this.cmin)],[string(this.cmax)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CMAT3D\",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); } CMAT3D.prototype.details = function CMAT3D() { @@ -17392,7 +17392,7 @@ function CMAT3D() { return options; } CMAT3D.prototype.set = function CMAT3D() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.vec_x = arguments[0]["vec_x"]; @@ -17423,7 +17423,7 @@ function CMAT3D() { var rpar = [[this.colormap.slice()],[this.vec_x.slice()],[this.vec_y.slice()]]; this.model.ipar = new ScilabDouble(ipar); 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; @@ -17451,9 +17451,9 @@ function CMATVIEW() { this.model.rpar = new ScilabDouble([alpha_c],[beta_c],[this.colormap.slice()]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[string("jetcolormap(25)")],[string(this.cmin)],[string(this.cmax)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CMATVIEW\",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("jetcolormap(25)")],[string(this.cmin)],[string(this.cmax)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CMATVIEW\",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); } CMATVIEW.prototype.details = function CMATVIEW() { @@ -17468,7 +17468,7 @@ function CMATVIEW() { return options; } CMATVIEW.prototype.set = function CMATVIEW() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.colormap = parseFloat(arguments[0]["colormap"]); @@ -17495,7 +17495,7 @@ function CMATVIEW() { var rpar = [[alpha_c],[beta_c],[this.colormap.slice()]]; this.model.ipar = new ScilabDouble(ipar); 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; @@ -17528,9 +17528,9 @@ function CMSCOPE() { this.model.ipar = new ScilabDouble([this.win],[size(this.in1,"*")],[this.N],[this.wpos.slice()],[this.wdim.slice()],[this.in1.slice()],[this.clrs.slice(1-1,sum(this.in1))]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[strcat(string(this.in1)," ")],[strcat(string(this.clrs)," ")],[string(this.win)],[sci2exp([])],[sci2exp([])],[strcat(string(this.ymin)," ")],[strcat(string(this.ymax)," ")],[strcat(string(this.per)," ")],[string(this.N)],[string(0)],[emptystr()]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CMSCOPE\",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(string(this.in1)," ")],[strcat(string(this.clrs)," ")],[string(this.win)],[sci2exp([])],[sci2exp([])],[strcat(string(this.ymin)," ")],[strcat(string(this.ymax)," ")],[strcat(string(this.per)," ")],[string(this.N)],[string(0)],[emptystr()]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CMSCOPE\",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); } CMSCOPE.prototype.details = function CMSCOPE() { @@ -17553,7 +17553,7 @@ function CMSCOPE() { return options; } CMSCOPE.prototype.set = function CMSCOPE() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.in1 = inverse(arguments[0]["in1"]); @@ -17649,7 +17649,7 @@ function CMSCOPE() { this.model.ipar = new ScilabDouble(ipar); this.model.label = new ScilabDouble([this.nom]); this.graphics.id = new ScilabDouble([this.nom]); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -17679,9 +17679,9 @@ function CSCOPE() { this.model.ipar = new ScilabDouble([this.win],[1],[this.N],[this.clrs],[this.wpos],[this.wdim]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[strcat(string(this.clrs)," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.ymin)],[string(this.ymax)],[string(this.per)],[string(this.N)],[transpose(string(0))],[emptystr()]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CSCOPE\",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(string(this.clrs)," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.ymin)],[string(this.ymax)],[string(this.per)],[string(this.N)],[transpose(string(0))],[emptystr()]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CSCOPE\",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); } CSCOPE.prototype.details = function CSCOPE() { @@ -17703,7 +17703,7 @@ function CSCOPE() { return options; } CSCOPE.prototype.set = function CSCOPE() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.clrs = inverse(arguments[0]["clrs"]); @@ -17772,7 +17772,7 @@ function CSCOPE() { this.model.evtin = new ScilabDouble([ones(1-this.heritance,1)]); this.model.label = new ScilabDouble([this.nom]); this.graphics.id = new ScilabDouble([this.nom]); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -17805,9 +17805,9 @@ function CSCOPXY() { this.model.ipar = new ScilabDouble([this.win],[1],[this.N],[this.clrs],[this.siz],[1],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[string(this.nbr_curves)],[sci2exp(this.clrs)],[sci2exp(this.siz)],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.xmin)],[string(this.xmax)],[string(this.ymin)],[string(this.ymax)],[string(this.N)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CSCOPXY\",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.nbr_curves)],[sci2exp(this.clrs)],[sci2exp(this.siz)],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.xmin)],[string(this.xmax)],[string(this.ymin)],[string(this.ymax)],[string(this.N)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CSCOPXY\",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); } CSCOPXY.prototype.details = function CSCOPXY() { @@ -17830,7 +17830,7 @@ function CSCOPXY() { return options; } CSCOPXY.prototype.set = function CSCOPXY() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.nbr_curves = parseFloat(arguments[0]["nbr_curves"]); @@ -17900,7 +17900,7 @@ function CSCOPXY() { var ipar = [[this.win],[1],[this.N],[this.clrs],[this.siz],[1],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]]; 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; @@ -17933,9 +17933,9 @@ function CSCOPXY3D() { this.model.ipar = new ScilabDouble([this.win],[8],[this.N],[this.clrs.slice()],[this.siz.slice()],[8],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[string(this.nbr_curves)],[strcat(string(this.clrs)," ")],[strcat(string(this.siz)," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[strcat(string(this.vec_x)," ")],[strcat(string(this.vec_y)," ")],[strcat(string(this.vec_z)," ")],[strcat(string(this.param3ds)," ")],[string(this.N)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CSCOPXY3D\",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.nbr_curves)],[strcat(string(this.clrs)," ")],[strcat(string(this.siz)," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[strcat(string(this.vec_x)," ")],[strcat(string(this.vec_y)," ")],[strcat(string(this.vec_z)," ")],[strcat(string(this.param3ds)," ")],[string(this.N)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CSCOPXY3D\",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); } CSCOPXY3D.prototype.details = function CSCOPXY3D() { @@ -17958,7 +17958,7 @@ function CSCOPXY3D() { return options; } CSCOPXY3D.prototype.set = function CSCOPXY3D() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.nbr_curves = parseFloat(arguments[0]["nbr_curves"]); @@ -18038,7 +18038,7 @@ function CSCOPXY3D() { var ipar = [[this.win],[size_siz],[this.N],[this.clrs.slice()],[this.siz.slice()],[1],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]]; 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; @@ -18065,9 +18065,9 @@ function OUTIMPL_f() { mo.model = "PORT"; mo.inputs = "n"; this.model.equations = new ScilabDouble([mo]); - this.exprs = "1"; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OUTIMPL_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = "1"; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OUTIMPL_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([exprs]),gr_i); this.x.graphics.in_implicit = ["I"]; return new ImplicitOutBlock(this.x); } @@ -18081,9 +18081,9 @@ function OUTIMPL_f() { return options; } OUTIMPL_f.prototype.set = function OUTIMPL_f() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")==2) { - this.exprs = this.exprs[1-1]; + var exprs = this.graphics.exprs; + if (size(exprs,"*")==2) { + var exprs = exprs[1-1]; } while (true) { var ok = true; @@ -18100,7 +18100,7 @@ function OUTIMPL_f() { var y = needcompile; } this.model.ipar = new ScilabDouble([this.prt]); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -18122,9 +18122,9 @@ function OUT_f() { this.model.ipar = new ScilabDouble([this.prt]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = string(this.prt); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OUT_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = string(this.prt); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OUT_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([exprs]),gr_i); return new ExplicitOutBlock(this.x); } OUT_f.prototype.details = function OUT_f() { @@ -18137,9 +18137,9 @@ function OUT_f() { return options; } OUT_f.prototype.set = function OUT_f() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")==2) { - this.exprs = this.exprs[1-1]; + var exprs = this.graphics.exprs; + if (size(exprs,"*")==2) { + var exprs = exprs[1-1]; } while (true) { var ok = true; @@ -18152,7 +18152,7 @@ function OUT_f() { block_parameter_error(msprintf("Wrong value for \'Port Number\' parameter: %d.",this.prt),"Strictly positive integer expected."); } else { this.model.ipar = new ScilabDouble([this.prt]); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -18181,9 +18181,9 @@ function TOWS_c() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TOWS_c\",sz(1),sz(2));"]); - this.exprs = [[string(this.nz)],[string(this.varnam)],[string(this.herit)]]; - 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),\"TOWS_c\",sz(1),sz(2));"]); + var exprs = [[string(this.nz)],[string(this.varnam)],[string(this.herit)]]; + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } TOWS_c.prototype.details = function TOWS_c() { @@ -18198,7 +18198,7 @@ function TOWS_c() { return options; } TOWS_c.prototype.set = function TOWS_c() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.nz = parseFloat(arguments[0]["nz"]); @@ -18231,7 +18231,7 @@ function TOWS_c() { this.model.blocktype = new ScilabString(["d"]); } this.model.ipar = new ScilabDouble([this.nz],[length(this.varnam)],[transpose(this.ascii[this.varnam-1])]); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -18250,9 +18250,9 @@ function TRASH_f() { this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = " "; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TRASH_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),\"TRASH_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); } TRASH_f.prototype.details = function TRASH_f() { @@ -18282,9 +18282,9 @@ function WFILE_f() { this.model.ipar = new ScilabDouble([length(fname)],[length(frmt)],[0],[this.N],[this._str2code[fname-1]],[this._str2code[frmt-1]]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[sci2exp(this.in1)],[fname],[frmt],[string(this.N)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"WFILE_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 = [[sci2exp(this.in1)],[fname],[frmt],[string(this.N)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"WFILE_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); } WFILE_f.prototype.details = function WFILE_f() { @@ -18304,11 +18304,11 @@ function WFILE_f() { var warnMessage = msprintf("Feature %s is obsolete.","WFILE_f"); var warnAdvise = msprintf("Please use %s instead.","WRITEC_f"); var warnXcosMessage = msprintf("%s %s",warnMessage,warnAdvise); - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var dstate = this.model.dstate; var lunit = dstate[2-1]; - var fname = this.exprs[2-1]; - var frmt = this.exprs[3-1]; + var fname = exprs[2-1]; + var frmt = exprs[3-1]; while (true) { var ok = true; this.in1 = parseFloat(arguments[0]["in1"]); @@ -18359,7 +18359,7 @@ function WFILE_f() { this.model.dstate = new ScilabDouble(dstate); this.model.ipar = new ScilabDouble(ipar); this.model.dep_ut = new ScilabBoolean([true,false]); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -18386,9 +18386,9 @@ function WRITEAU_f() { this.model.ipar = new ScilabDouble([length(fname)],[this._str2code[frmt-1]],[this.N],[this.swap],[this._str2code[fname-1]]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [string(this.N),string(this.swap)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"WRITEAU_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabString(this.exprs),this.gr_i); + var exprs = [string(this.N),string(this.swap)]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"WRITEAU_f\",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); } WRITEAU_f.prototype.details = function WRITEAU_f() { @@ -18402,7 +18402,7 @@ function WRITEAU_f() { return options; } WRITEAU_f.prototype.set = function WRITEAU_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var ipar = this.model.ipar; var dstate = this.model.dstate; var lunit = dstate[2-1]; @@ -18435,7 +18435,7 @@ function WRITEAU_f() { this.model.in = new ScilabDouble([1]); this.model.dstate = new ScilabDouble(dstate); 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; @@ -18462,9 +18462,9 @@ function WRITEC_f() { this.model.ipar = new ScilabDouble([length(fname)],[this._str2code[frmt-1]],[this.N],[this.swap],[this._str2code[fname-1]]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[sci2exp(this.in1)],[fname],[frmt],[string(this.N),string(this.swap)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"WRITEC_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[sci2exp(this.in1)],[fname],[frmt],[string(this.N),string(this.swap)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"WRITEC_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } WRITEC_f.prototype.details = function WRITEC_f() { @@ -18481,12 +18481,12 @@ function WRITEC_f() { return options; } WRITEC_f.prototype.set = function WRITEC_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var ipar = this.model.ipar; var dstate = this.model.dstate; var lunit = dstate[2-1]; - var fname = this.exprs[2-1]; - var frmt = this.exprs[3-1]; + var fname = exprs[2-1]; + var frmt = exprs[3-1]; while (true) { var ok = true; this.in1 = parseFloat(arguments[0]["in1"]); @@ -18541,7 +18541,7 @@ function WRITEC_f() { this.model.in = new ScilabDouble([nin]); this.model.dstate = new ScilabDouble(dstate); 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; @@ -18561,9 +18561,9 @@ function CLKINV_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = string(this.prt); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKINV_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = string(this.prt); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKINV_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([exprs]),gr_i); return new EventInBlock(this.x); } CLKINV_f.prototype.details = function CLKINV_f() { @@ -18576,8 +18576,8 @@ function CLKINV_f() { return options; } CLKINV_f.prototype.set = function CLKINV_f() { - this.exprs = this.graphics.exprs; - this.exprs = this.exprs[1-1]; + var exprs = this.graphics.exprs; + var exprs = exprs[1-1]; while (true) { var ok = true; this.prt = parseFloat(arguments[0]["prt"]); @@ -18591,7 +18591,7 @@ function CLKINV_f() { this.model.ipar = new ScilabDouble([this.prt]); this.model.evtout = new ScilabDouble([1]); this.model.firing = new ScilabDouble([-1]); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -18611,8 +18611,8 @@ function CLKIN_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = string(this.prt); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs])," "); + var exprs = string(this.prt); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([exprs])," "); return new BasicBlock(this.x); } CLKIN_f.prototype.details = function CLKIN_f() { @@ -18625,8 +18625,8 @@ function CLKIN_f() { return options; } CLKIN_f.prototype.set = function CLKIN_f() { - this.exprs = this.graphics.exprs; - this.exprs = this.exprs[1-1]; + var exprs = this.graphics.exprs; + var exprs = exprs[1-1]; while (true) { var ok = true; this.prt = parseFloat(arguments[0]["prt"]); @@ -18641,7 +18641,7 @@ function CLKIN_f() { this.model.ipar = new ScilabDouble([this.prt]); this.model.evtout = new ScilabDouble([1]); this.model.firing = new ScilabDouble([-1]); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -18673,7 +18673,7 @@ function CLOCK_c() { split.graphics.orig = [[380.71066],[172]]; split.graphics.pein = 3; split.graphics.peout = [[5],[6]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLOCK_c\",sz(1),sz(2));"]); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLOCK_c\",sz(1),sz(2));"]); var diagram = scicos_diagram(); diagram.objs[1-1] = output_port; diagram.objs[2-1] = evtdly; @@ -18684,7 +18684,7 @@ function CLOCK_c() { this.x = scicos_block(); this.x.gui = "CLOCK_c"; this.x.graphics.sz = [2,2]; - this.x.graphics.gr_i = this.gr_i; + this.x.graphics.gr_i = gr_i; this.x.graphics.peout = 0; this.x.model.sim = "csuper"; this.x.model.evtout = 1; @@ -18711,7 +18711,7 @@ function CLOCK_c() { } } var newpar = list(); - this.exprs = xx.graphics.exprs; + var exprs = xx.graphics.exprs; this.model = xx.model; var t0_old = this.model.firing; var dt_old = this.model.rpar[1-1]; @@ -18772,7 +18772,7 @@ function CLOCK_f() { split.graphics.orig = [[380.71066],[172]]; split.graphics.pein = 3; split.graphics.peout = [[5],[6]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLOCK_f\",sz(1),sz(2));"]); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLOCK_f\",sz(1),sz(2));"]); var diagram = scicos_diagram(); diagram.objs[1-1] = output_port; diagram.objs[2-1] = evtdly; @@ -18783,7 +18783,7 @@ function CLOCK_f() { this.x = scicos_block(); this.x.gui = "CLOCK_f"; this.x.graphics.sz = [2,2]; - this.x.graphics.gr_i = this.gr_i; + this.x.graphics.gr_i = gr_i; this.x.graphics.peout = 0; this.x.model.sim = "csuper"; this.x.model.evtout = 1; @@ -18810,7 +18810,7 @@ function CLOCK_f() { } } var newpar = list(); - this.exprs = xx.graphics.exprs; + var exprs = xx.graphics.exprs; this.model = xx.model; var t0_old = this.model.firing; var dt_old = this.model.rpar; @@ -18836,7 +18836,7 @@ function CLOCK_f() { break; } } - if (!and([t0_old,dt_old]==[this.t0,this.dt])||!and(this.exprs0==this.exprs)) { + if (!and([t0_old,dt_old]==[this.t0,this.dt])||!and(this.exprs0==exprs)) { newpar[size(newpar)+1-1] = path; } if (t0_old!=this.t0) { @@ -18860,9 +18860,9 @@ function CONST() { this.model.rpar = new ScilabDouble([this.C]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = strcat(sci2exp(this.C)); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST\",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.C)); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST\",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); } CONST.prototype.details = function CONST() { @@ -18875,7 +18875,7 @@ function CONST() { return options; } CONST.prototype.set = function CONST() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.C = parseFloat(arguments[0]["C"]); @@ -18893,7 +18893,7 @@ function CONST() { } else { this.model.rpar = new ScilabDouble(this.C.slice()); this.model.out = new ScilabDouble([nout]); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -18913,9 +18913,9 @@ function CONST_f() { this.model.rpar = new ScilabDouble([this.C]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = strcat(sci2exp(this.C)); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST_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.C)); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST_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); } CONST_f.prototype.details = function CONST_f() { @@ -18928,7 +18928,7 @@ function CONST_f() { return options; } CONST_f.prototype.set = function CONST_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.C = parseFloat(arguments[0]["C"]); @@ -18942,7 +18942,7 @@ function CONST_f() { } else { this.model.rpar = new ScilabDouble(this.C.slice()); this.model.out = new ScilabDouble([nout]); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -18965,9 +18965,9 @@ function CONST_m() { this.model.opar = list(); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = sci2exp(this.C); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST_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 = sci2exp(this.C); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST_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); } CONST_m.prototype.details = function CONST_m() { @@ -18980,7 +18980,7 @@ function CONST_m() { return options; } CONST_m.prototype.set = function CONST_m() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.C = inverse(arguments[0]["C"]); @@ -19021,7 +19021,7 @@ function CONST_m() { this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -19051,9 +19051,9 @@ function CURVE_c() { this.model.evtin = new ScilabDouble([1]); this.model.evtout = new ScilabDouble([1]); this.model.firing = new ScilabDouble([0]); - this.exprs = [[sci2exp(this.Method)],[sci2exp(this.xx)],[sci2exp(this.yy)],[this.PeriodicOption],[Graf]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CURVE_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)],[this.PeriodicOption],[Graf]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CURVE_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); } CURVE_c.prototype.details = function CURVE_c() { @@ -19070,7 +19070,7 @@ function CURVE_c() { return options; } CURVE_c.prototype.set = function CURVE_c() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var ok = false; var SaveExit = false; while (true) { @@ -19087,7 +19087,7 @@ function CURVE_c() { if (this.PeriodicOption=="y"||this.PeriodicOption=="Y") { var PO = 1; } else { - this.exprs[4-1] = "n"; + exprs[4-1] = "n"; var PO = 0; } var mtd = int(this.Method); @@ -19117,7 +19117,7 @@ function CURVE_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]]; var rpar = []; @@ -19148,16 +19148,16 @@ function CURVE_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); + exprs[1-1] = sci2exp(New_methhod); if (oipar[3-1]==1) { var perop = "y"; } else { var perop = "n"; } - this.exprs[4-1] = perop; + exprs[4-1] = perop; var SaveExit = true; } else { var tmpvar4 = Do_Spline(N,mtd,this.xy.slice()[1-1],this.xy.slice()[2-1]); @@ -19174,7 +19174,7 @@ function CURVE_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]]; var SaveExit = true; } @@ -19188,7 +19188,7 @@ function CURVE_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; @@ -19214,8 +19214,8 @@ function CURV_f() { this.model.ipar = new ScilabDouble([size(xx,1)],[axisdata.slice()]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CURV_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),\"CURV_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); } CURV_f.prototype.details = function CURV_f() { @@ -19281,9 +19281,9 @@ function Counter() { this.model.ipar = new ScilabDouble([this.rule],[this.maxim],[this.minim]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[string(this.minim)],[string(this.maxim)],[string(this.rule)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Counter\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[string(this.minim)],[string(this.maxim)],[string(this.rule)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Counter\",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); } Counter.prototype.details = function Counter() { @@ -19298,7 +19298,7 @@ function Counter() { return options; } Counter.prototype.set = function Counter() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.minim = parseFloat(arguments[0]["minim"]); @@ -19314,7 +19314,7 @@ function Counter() { } else if ((this.rule!=1&&this.rule!=2)) { block_parameter_error(msprintf("Wrong value for \'Rule\' parameter: %d",this.rule),msprintf("Must be in the interval %s.","[1,2]")); } else { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.dstate = new ScilabDouble([0]); this.model.ipar = new ScilabDouble([this.rule],[this.maxim],[this.minim]); this.x.graphics = this.graphics; @@ -19334,8 +19334,8 @@ function FROMWSB() { scs_m_1.objs[3-1] = scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[358.9421,271.584],sz=[20,20],flip=true,theta=0,exprs="1",pin=4,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=-2,intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m_1.objs[4-1] = scicos_link(xx=[[338.9421],[358.9421]],yy=[[281.584],[281.584]],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[3,1,1]); this.model = scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=-1,out2=-2,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),\"FROMWSB\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([5,2]),this.model,new ScilabDouble([]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMWSB\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([5,2]),this.model,new ScilabDouble([]),gr_i); return new BasicBlock(this.x); } FROMWSB.prototype.details = function FROMWSB() { @@ -19428,9 +19428,9 @@ function FROMWS_c() { this.model.firing = new ScilabDouble([0]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMWS_c\",sz(1),sz(2));"]); - this.exprs = [[string(this.varnam)],[string(this.Method)],[string(this.ZC)],[string(this.OutEnd)]]; - this.x = new standard_define(new ScilabDouble([3.5,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMWS_c\",sz(1),sz(2));"]); + var exprs = [[string(this.varnam)],[string(this.Method)],[string(this.ZC)],[string(this.OutEnd)]]; + this.x = new standard_define(new ScilabDouble([3.5,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } FROMWS_c.prototype.details = function FROMWS_c() { @@ -19446,7 +19446,7 @@ function FROMWS_c() { return options; } FROMWS_c.prototype.set = function FROMWS_c() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.varnam = arguments[0]["varnam"]; @@ -19485,7 +19485,7 @@ function FROMWS_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.x.graphics = this.graphics; this.x.model = this.model; break; @@ -19508,9 +19508,9 @@ function GENSIN_f() { this.model.rpar = new ScilabDouble([1],[1],[0]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.exprs = [[string(rpar[1-1])],[string(rpar[2-1])],[string(rpar[3-1])]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GENSIN_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[string(rpar[1-1])],[string(rpar[2-1])],[string(rpar[3-1])]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GENSIN_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); } GENSIN_f.prototype.details = function GENSIN_f() { @@ -19525,7 +19525,7 @@ function GENSIN_f() { return options; } GENSIN_f.prototype.set = function GENSIN_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.M = arguments[0]["M"]; @@ -19546,7 +19546,7 @@ function GENSIN_f() { this.model.rpar = new ScilabDouble([this.M],[this.F],[this.P]); this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -19568,9 +19568,9 @@ function GENSQR_f() { this.model.dstate = new ScilabDouble([this.Amplitude]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = string(this.Amplitude); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GENSQR_f\",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.Amplitude); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GENSQR_f\",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); } GENSQR_f.prototype.details = function GENSQR_f() { @@ -19583,9 +19583,9 @@ function GENSQR_f() { return options; } GENSQR_f.prototype.set = function GENSQR_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; @@ -19593,7 +19593,7 @@ function GENSQR_f() { if (!ok) { break; } - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.dstate = new ScilabDouble([this.Amplitude]); this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); @@ -19651,9 +19651,9 @@ function GEN_SQR() { var Amax = 1; var rule = 1; var F = 1; - this.exprs = [sci2exp(Amin),sci2exp(Amax),sci2exp(rule),sci2exp(F)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GEN_SQR\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(this.exprs),this.gr_i); + var exprs = [sci2exp(Amin),sci2exp(Amax),sci2exp(rule),sci2exp(F)]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GEN_SQR\",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); } GEN_SQR.prototype.details = function GEN_SQR() { @@ -19671,7 +19671,7 @@ function GEN_SQR() { GEN_SQR.prototype.set = function GEN_SQR() { var y = this.needcompile; var typ = list(); - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var Btitre = "Set GEN_SQR parameters"; var Exprs0 = [["Amin"],["Amax"],["rule"],["F"]]; this.Bitems = [["Minimum Value"],["Maximum Value"],["Initial Value( 1= Minimum Value 2= Maximum Value)"],["Period (sec)"]]; @@ -19700,7 +19700,7 @@ function GEN_SQR() { var ok = tmpvar1[3]; if (ok) { var y = max(2,this.needcompile,needcompile2); - this.x.graphics.exprs = this.exprs; + this.x.graphics.exprs = exprs; this.x.model.rpar = sblock; break; } @@ -19728,9 +19728,9 @@ function Ground_g() { this.model.opar = list(C); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = []; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Ground_g\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Ground_g\",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); } Ground_g.prototype.details = function Ground_g() { @@ -19758,9 +19758,9 @@ function INIMPL_f() { mo.outputs = "n"; this.model.equations = new ScilabDouble([mo]); this.prt = 1; - this.exprs = "1"; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INIMPL_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = "1"; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INIMPL_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([exprs]),gr_i); this.x.graphics.out_implicit = ["I"]; return new ImplicitInBlock(this.x); } @@ -19774,9 +19774,9 @@ function INIMPL_f() { return options; } INIMPL_f.prototype.set = function INIMPL_f() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")==2) { - this.exprs = this.exprs[1-1]; + var exprs = this.graphics.exprs; + if (size(exprs,"*")==2) { + var exprs = exprs[1-1]; } while (true) { var ok = true; @@ -19793,7 +19793,7 @@ function INIMPL_f() { var y = needcompile; } this.model.ipar = new ScilabDouble([this.prt]); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -19814,9 +19814,9 @@ function IN_f() { this.model.ipar = new ScilabDouble([prt]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = sci2exp(prt); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IN_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = sci2exp(prt); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IN_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([exprs]),gr_i); return new ExplicitInBlock(this.x); } IN_f.prototype.details = function IN_f() { @@ -19826,20 +19826,20 @@ function IN_f() { alert("parameters cannot be modified"); } IN_f.prototype.set = function IN_f() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")==2) { - this.exprs = this.exprs[1-1]; + var exprs = this.graphics.exprs; + if (size(exprs,"*")==2) { + var exprs = exprs[1-1]; } - if (size(this.exprs,"*")==1) { - this.exprs = [[this.exprs[1-1]],["[-1 -2]"],["-1"]]; + if (size(exprs,"*")==1) { + var exprs = [[exprs[1-1]],["[-1 -2]"],["-1"]]; } while (true) { - var tmpvar0 = getvalue("Set Input block parameters",[["Port number"],["Outport size ([-1 -2] for inherit)"],["Outport Type (-1 for inherit)"]],list("vec",1,"vec",-1,"vec",1),this.exprs); + var tmpvar0 = getvalue("Set Input block parameters",[["Port number"],["Outport size ([-1 -2] for inherit)"],["Outport Type (-1 for inherit)"]],list("vec",1,"vec",-1,"vec",1),exprs); var ok = tmpvar0[0]; var prt = tmpvar0[1]; var otsz = tmpvar0[2]; var ot = tmpvar0[3]; - this.exprs = tmpvar0[4]; + var exprs = tmpvar0[4]; if (!ok) { break; } @@ -19863,7 +19863,7 @@ function IN_f() { this.model.out = new ScilabDouble([otsz[1-1]]); this.model.out2 = new ScilabDouble([otsz[2-1]]); this.model.outtyp = new ScilabDouble([ot]); - this.graphics.exprs = new ScilabDouble(this.exprs); + this.graphics.exprs = new ScilabDouble(exprs); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -19885,9 +19885,9 @@ function Modulo_Count() { this.model.ipar = new ScilabDouble([this.base]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[string(this.ini_c)],[string(this.base)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Modulo_Count\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[string(this.ini_c)],[string(this.base)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Modulo_Count\",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); } Modulo_Count.prototype.details = function Modulo_Count() { @@ -19901,7 +19901,7 @@ function Modulo_Count() { return options; } Modulo_Count.prototype.set = function Modulo_Count() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.ini_c = parseFloat(arguments[0]["ini_c"]); @@ -19916,7 +19916,7 @@ function Modulo_Count() { } else if (this.base<=0) { block_parameter_error(msprintf("Wrong values for \'Upper Limit\' parameter: %d.",this.base),"Strictly positive integer expected."); } else { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.ipar = new ScilabDouble([this.base]); this.model.dstate = new ScilabDouble([this.ini_c]); this.x.graphics = this.graphics; @@ -19969,9 +19969,9 @@ function PULSE_SC() { var W = 30; var F = 1; var A = 1; - this.exprs = [sci2exp(E),sci2exp(W),sci2exp(F),sci2exp(A)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PULSE_SC\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(this.exprs),this.gr_i); + var exprs = [sci2exp(E),sci2exp(W),sci2exp(F),sci2exp(A)]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PULSE_SC\",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); } PULSE_SC.prototype.details = function PULSE_SC() { @@ -19989,7 +19989,7 @@ function PULSE_SC() { PULSE_SC.prototype.set = function PULSE_SC() { var y = this.needcompile; var typ = list(); - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var Btitre = "Set Pulse Generator parameters"; var Exprs0 = [["E"],["W"],["F"],["A"]]; this.Bitems = [["Phase delay (secs):"],["Pulse Width (% of period):"],["Period (secs):"],["Amplitude:"]]; @@ -20018,7 +20018,7 @@ function PULSE_SC() { var ok = tmpvar1[3]; if (ok) { var y = max(2,this.needcompile,needcompile2); - this.x.graphics.exprs = this.exprs; + this.x.graphics.exprs = exprs; this.x.model.rpar = sblock; break; } @@ -20048,9 +20048,9 @@ function RAMP() { this.model.nmode = new ScilabDouble([1]); this.model.nzcross = new ScilabDouble([1]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.exprs = [string(rpar)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAMP\",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(rpar)]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAMP\",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); } RAMP.prototype.details = function RAMP() { @@ -20065,7 +20065,7 @@ function RAMP() { return options; } RAMP.prototype.set = function RAMP() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.slope = parseFloat(arguments[0]["slope"]); @@ -20078,7 +20078,7 @@ function RAMP() { block_parameter_error(msprintf("Wrong value for \'Start Time\' parameter: %e.",this.stt),"Null or positive integer expected."); } else { this.model.rpar = new ScilabDouble([this.slope],[this.stt],[this.iout]); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -20104,9 +20104,9 @@ function RAND_f() { this.model.ipar = new ScilabDouble([this.flag]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[string(this.flag)],[sci2exp(this.a.slice())],[sci2exp(this.b.slice())],[string(this.model.dstate[1-1])]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAND_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[string(this.flag)],[sci2exp(this.a.slice())],[sci2exp(this.b.slice())],[string(this.model.dstate[1-1])]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAND_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); } RAND_f.prototype.details = function RAND_f() { @@ -20122,12 +20122,12 @@ function RAND_f() { return options; } RAND_f.prototype.set = function RAND_f() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")==5) { - this.exprs = this.exprs.slice(1-1,3); + var exprs = this.graphics.exprs; + if (size(exprs,"*")==5) { + var exprs = exprs.slice(1-1,3); } - if (size(this.exprs,"*")==3) { - this.exprs = [[this.exprs],[string(this.model.dstate[1-1])]]; + if (size(exprs,"*")==3) { + var exprs = [[exprs],[string(this.model.dstate[1-1])]]; } while (true) { var ok = true; @@ -20143,7 +20143,7 @@ function RAND_f() { throw "user error"; } else { var nout = size(this.a,"*"); - this.graphics.exprs = new ScilabDouble(this.exprs); + this.graphics.exprs = new ScilabDouble(exprs); this.model.out = new ScilabDouble([nout]); this.model.ipar = new ScilabDouble([this.flag]); this.model.rpar = new ScilabDouble([this.a.slice()],[this.b.slice()]); @@ -20182,9 +20182,9 @@ function RAND_m() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[sci2exp(1)],[string(this.flag)],[sci2exp([this.a])],[sci2exp([this.b])],[sci2exp([this.model.dstate[1-1],int(rand()*(10^7-1))])]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAND_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[sci2exp(1)],[string(this.flag)],[sci2exp([this.a])],[sci2exp([this.b])],[sci2exp([this.model.dstate[1-1],int(rand()*(10^7-1))])]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAND_m\",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); } RAND_m.prototype.details = function RAND_m() { @@ -20201,9 +20201,9 @@ function RAND_m() { return options; } RAND_m.prototype.set = function RAND_m() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")==14) { - this.exprs[9-1] = []; + var exprs = this.graphics.exprs; + if (size(exprs,"*")==14) { + exprs[9-1] = []; } while (true) { var ok = true; @@ -20242,7 +20242,7 @@ function RAND_m() { var ok = tmpvar0[2]; if (ok) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([4])); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.ipar = new ScilabDouble([this.flag]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -20276,9 +20276,9 @@ function READAU_f() { this.model.ipar = new ScilabDouble([length(fname)],[this._str2code[frmt-1]],[ievt],[this.N],[M],[this.swap],[offset],[this._str2code[fname-1]],[tmask],[outmask]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[fname],[string(this.N)],[string(this.swap)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"READAU_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([5,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[fname],[string(this.N)],[string(this.swap)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"READAU_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([5,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } READAU_f.prototype.details = function READAU_f() { @@ -20293,14 +20293,14 @@ function READAU_f() { return options; } READAU_f.prototype.set = function READAU_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var out = this.model.out; var dstate = this.model.dstate; var ipar = this.model.ipar; var imask = 9+ipar[1-1]; var tmask = ipar[imask-1]; var lunit = dstate[3-1]; - var fname = this.exprs[1-1]; + var fname = exprs[1-1]; while (true) { var ok = true; this.fname1 = parseFloat(arguments[0]["fname1"]); @@ -20339,7 +20339,7 @@ function READAU_f() { } this.model.dstate = new ScilabDouble(dstate); 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; @@ -20375,9 +20375,9 @@ function READC_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [["[]"],[sci2exp(this.outmask)],[fname],[frmt],[string(this.M)],[string(this.N)],[string(this.offset)],[string(this.swap)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"READC_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [["[]"],[sci2exp(this.outmask)],[fname],[frmt],[string(this.M)],[string(this.N)],[string(this.offset)],[string(this.swap)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"READC_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } READC_f.prototype.details = function READC_f() { @@ -20398,15 +20398,15 @@ function READC_f() { } READC_f.prototype.set = function READC_f() { this.model = this.x.model; - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var out = this.model.out; var dstate = this.model.dstate; var ipar = this.model.ipar; var imask = 9+ipar[1-1]; var tmask = ipar[imask-1]; var lunit = dstate[3-1]; - var fname = this.exprs[3-1]; - var frmt = this.exprs[4-1]; + var fname = exprs[3-1]; + var frmt = exprs[4-1]; while (true) { var ok = true; this.tmask1 = parseFloat(arguments[0]["tmask1"]); @@ -20479,7 +20479,7 @@ function READC_f() { } this.model.dstate = new ScilabDouble(dstate); 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; @@ -20511,9 +20511,9 @@ function RFILE_f() { this.model.ipar = new ScilabDouble([length(fname)],[length(frmt)],[0],[this.N],[this._str2code[fname-1]],[this._str2code[frmt-1]],[tmask],[this.outmask]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[sci2exp([])],[sci2exp(this.outmask)],[fname],[frmt],[string(this.N)],[sci2exp(out)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RFILE_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 = [[sci2exp([])],[sci2exp(this.outmask)],[fname],[frmt],[string(this.N)],[sci2exp(out)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RFILE_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); } RFILE_f.prototype.details = function RFILE_f() { @@ -20530,7 +20530,7 @@ function RFILE_f() { return options; } RFILE_f.prototype.set = function RFILE_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var dstate = this.model.dstate; var ipar = this.model.ipar; var ievt = ipar[3-1]; @@ -20538,10 +20538,10 @@ function RFILE_f() { var imask = 5+ipar[1-1]+ipar[2-1]; var tmask = ipar[imask-1]; var lunit = dstate[3-1]; - var fname = this.exprs[3-1]; - var frmt = this.exprs[4-1]; - if (size(this.exprs,"*")>5) { - this.exprs[6-1] = []; + var fname = exprs[3-1]; + var frmt = exprs[4-1]; + if (size(exprs,"*")>5) { + exprs[6-1] = []; } while (true) { var ok = true; @@ -20601,7 +20601,7 @@ function RFILE_f() { } this.model.dstate = new ScilabDouble(dstate); 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; @@ -20621,9 +20621,9 @@ function SAWTOOTH_f() { this.model.dstate = new ScilabDouble([0]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.exprs = " "; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAWTOOTH_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = " "; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAWTOOTH_f\",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); } SAWTOOTH_f.prototype.details = function SAWTOOTH_f() { @@ -20651,9 +20651,9 @@ function STEP() { this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[string(1)],[string(rpar)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"STEP\",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(1)],[string(rpar)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"STEP\",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); } STEP.prototype.details = function STEP() { @@ -20668,7 +20668,7 @@ function STEP() { return options; } STEP.prototype.set = function STEP() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.temps = arguments[0]["temps"]; @@ -20705,7 +20705,7 @@ function STEP() { var rpar = [[this.in1],[this.fi]]; } 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; @@ -20763,8 +20763,8 @@ function STEP_FUNCTION() { this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); this.model.rpar = scs_m_1; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"STEP_FUNCTION\",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),\"STEP_FUNCTION\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),gr_i); return new BasicBlock(this.x); } STEP_FUNCTION.prototype.details = function STEP_FUNCTION() { @@ -20845,8 +20845,8 @@ function SampleCLK() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[sci2exp(1)],[sci2exp(0)]]; - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs)," "); + var exprs = [[sci2exp(1)],[sci2exp(0)]]; + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs)," "); return new BasicBlock(this.x); } SampleCLK.prototype.details = function SampleCLK() { @@ -20860,7 +20860,7 @@ function SampleCLK() { return options; } SampleCLK.prototype.set = function SampleCLK() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.frequ = arguments[0]["frequ"]; @@ -20886,7 +20886,7 @@ function SampleCLK() { this.model.rpar = new ScilabDouble([this.frequ],[this.offset]); this.model.evtout = new ScilabDouble([1]); this.model.firing = new ScilabDouble([-1]); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -20909,8 +20909,8 @@ function Sigbuilder() { scs_m_1.objs[7-1] = scicos_block(gui="CLKOUTV_f",graphics=scicos_graphics(orig=[339.49528,505.10704],sz=[20,30],flip=true,theta=0,exprs="1",pin=[],pout=[],pein=8,peout=[],gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="output",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="d",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m_1.objs[8-1] = scicos_link(xx=[[349.49528],[349.49528]],yy=[[565.10704],[535.10704]],id="drawlink",thick=[0,0],ct=[5,-1],from=[3,1,0],to=[7,1,1]); this.model = scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=1,evtin=[],evtout=1,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),\"Sigbuilder\",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),\"Sigbuilder\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([]),gr_i); return new BasicBlock(this.x); } Sigbuilder.prototype.details = function Sigbuilder() { @@ -20994,8 +20994,8 @@ function TIME_f() { this.model.out = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TIME_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),\"TIME_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); } TIME_f.prototype.details = function TIME_f() { @@ -21021,9 +21021,9 @@ function TKSCALE() { this.model.rpar = new ScilabDouble([this.a],[this.b],[this.f]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[sci2exp(this.a)],[sci2exp(this.b)],[sci2exp(this.f)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TKSCALE\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[sci2exp(this.a)],[sci2exp(this.b)],[sci2exp(this.f)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TKSCALE\",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); } TKSCALE.prototype.details = function TKSCALE() { @@ -21038,13 +21038,13 @@ function TKSCALE() { return options; } TKSCALE.prototype.set = function TKSCALE() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var ok = true; this.a = parseFloat(arguments[0]["a"]); this.b = parseFloat(arguments[0]["b"]); this.f = parseFloat(arguments[0]["f"]); if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble([this.a],[this.b],[this.f]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -21067,9 +21067,9 @@ function GENERAL_f() { this.model.blocktype = new ScilabString(["z"]); this.model.firing = new ScilabDouble([-ones(this.out,1)]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[strcat(sci2exp(this.in1))],[strcat(sci2exp(this.out))]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GENERAL_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.in1))],[strcat(sci2exp(this.out))]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GENERAL_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); } GENERAL_f.prototype.details = function GENERAL_f() { @@ -21083,7 +21083,7 @@ function GENERAL_f() { return options; } GENERAL_f.prototype.set = function GENERAL_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var rpar = this.model.rpar; this.in1 = this.model.in; this.out = this.model.evtout; @@ -21112,7 +21112,7 @@ function GENERAL_f() { this.model.nzcross = new ScilabDouble([this.in1]); this.model.rpar = new ScilabDouble(rp.slice()); this.model.firing = new ScilabDouble([-ones(this.out,1)]); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; } @@ -21133,8 +21133,8 @@ function NEGTOPOS_f() { this.model.blocktype = new ScilabString(["z"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NEGTOPOS_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),\"NEGTOPOS_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); } NEGTOPOS_f.prototype.details = function NEGTOPOS_f() { @@ -21161,8 +21161,8 @@ function POSTONEG_f() { this.model.blocktype = new ScilabString(["z"]); this.model.dep_ut = new ScilabBoolean([true,false]); this.model.firing = new ScilabDouble([-1]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"POSTONEG_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),\"POSTONEG_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); } POSTONEG_f.prototype.details = function POSTONEG_f() { @@ -21190,9 +21190,9 @@ function ZCROSS_f() { this.model.blocktype = new ScilabString(["z"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = strcat(sci2exp(this.in1)); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ZCROSS_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.in1)); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ZCROSS_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); } ZCROSS_f.prototype.details = function ZCROSS_f() { @@ -21205,7 +21205,7 @@ function ZCROSS_f() { return options; } ZCROSS_f.prototype.set = function ZCROSS_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.in1 = parseFloat(arguments[0]["in1"]); @@ -21222,7 +21222,7 @@ function ZCROSS_f() { var kk = kk+2^(this.in1+jj-1); } this.model.rpar = new ScilabDouble([-ones(kk,1)],[zeros(2^(2*this.in1)-kk,1)]); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.in = new ScilabDouble([this.in1]); this.model.nzcross = new ScilabDouble([this.in1]); this.model.firing = new ScilabDouble([-1]); diff --git a/js/Branching/CLKFROM.js b/js/Branching/CLKFROM.js index 11e79e17..017fff42 100644 --- a/js/Branching/CLKFROM.js +++ b/js/Branching/CLKFROM.js @@ -8,8 +8,8 @@ function CLKFROM() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = "A"; - this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabString([this.exprs])," "); + var exprs = "A"; + this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabString([exprs])," "); this.x.graphics.id = "From"; return new BasicBlock(this.x); } @@ -23,7 +23,7 @@ function CLKFROM() { return options; } CLKFROM.prototype.set = function CLKFROM() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.tag = arguments[0]["tag"]; @@ -37,7 +37,7 @@ function CLKFROM() { this.model.opar = list(new ScilabDouble([this.tag])); this.model.evtout = new ScilabDouble([1]); this.model.firing = new ScilabDouble([-1]); - 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/Branching/CLKFROM.pickle b/js/Branching/CLKFROM.pickle index 03b08283..c675788f 100644 --- a/js/Branching/CLKFROM.pickle +++ b/js/Branching/CLKFROM.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'gr_i' +S'x' p2 -aS'exprs' +aS'model' p3 aS'tag' p4 aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'needcompile' p1 diff --git a/js/Branching/CLKGOTO.js b/js/Branching/CLKGOTO.js index e336116e..77cb9d81 100644 --- a/js/Branching/CLKGOTO.js +++ b/js/Branching/CLKGOTO.js @@ -9,8 +9,8 @@ function CLKGOTO() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [["A"],[sci2exp(1)]]; - this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabDouble(this.exprs)," "); + var exprs = [["A"],[sci2exp(1)]]; + this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabDouble(exprs)," "); this.x.graphics.id = "Goto"; return new BasicBlock(this.x); } @@ -25,7 +25,7 @@ function CLKGOTO() { return options; } CLKGOTO.prototype.set = function CLKGOTO() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.tag = arguments[0]["tag"]; @@ -48,7 +48,7 @@ function CLKGOTO() { this.model.ipar = new ScilabDouble([this.tagvis]); this.model.evtin = new ScilabDouble([1]); this.model.firing = new ScilabDouble([-1]); - 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/Branching/CLKGOTO.pickle b/js/Branching/CLKGOTO.pickle index 1d8387b8..27b37db4 100644 --- a/js/Branching/CLKGOTO.pickle +++ b/js/Branching/CLKGOTO.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'tagvis' +S'x' p2 -aS'gr_i' +aS'model' p3 -aS'exprs' -p4 aS'tag' +p4 +aS'tagvis' p5 aS'graphics' p6 -aS'x' -p7 -aS'model' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'needcompile' p1 diff --git a/js/Branching/CLKGotoTagVisibility.js b/js/Branching/CLKGotoTagVisibility.js index 910ba6bb..8060884f 100644 --- a/js/Branching/CLKGotoTagVisibility.js +++ b/js/Branching/CLKGotoTagVisibility.js @@ -14,9 +14,9 @@ function CLKGotoTagVisibility() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = "A"; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKGotoTagVisibility\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = "A"; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKGotoTagVisibility\",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); } CLKGotoTagVisibility.prototype.details = function CLKGotoTagVisibility() { @@ -29,7 +29,7 @@ function CLKGotoTagVisibility() { return options; } CLKGotoTagVisibility.prototype.set = function CLKGotoTagVisibility() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.tag = arguments[0]["tag"]; @@ -41,7 +41,7 @@ function CLKGotoTagVisibility() { var needcompile = 4; var y = needcompile; } - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.opar = list(new ScilabDouble([this.tag])); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Branching/CLKGotoTagVisibility.pickle b/js/Branching/CLKGotoTagVisibility.pickle index 8a8a7330..9a033bf0 100644 --- a/js/Branching/CLKGotoTagVisibility.pickle +++ b/js/Branching/CLKGotoTagVisibility.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'gr_i' +S'x' p2 -aS'exprs' +aS'model' p3 aS'tag' p4 aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'arg1' p1 diff --git a/js/Branching/DEMUX.js b/js/Branching/DEMUX.js index 6d1b4fc7..5b2875a2 100644 --- a/js/Branching/DEMUX.js +++ b/js/Branching/DEMUX.js @@ -10,9 +10,9 @@ function DEMUX() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = string(this.out); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEMUX\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([.5,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = string(this.out); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEMUX\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([.5,2]),this.model,new ScilabString([exprs]),gr_i); return new BasicBlock(this.x); } DEMUX.prototype.details = function DEMUX() { @@ -25,7 +25,7 @@ function DEMUX() { return options; } DEMUX.prototype.set = function DEMUX() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.out = parseFloat(arguments[0]["out"]); @@ -64,7 +64,7 @@ function DEMUX() { } } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.ipar = new ScilabDouble([this.out]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Branching/DEMUX.pickle b/js/Branching/DEMUX.pickle index 544bab46..f74e7d0c 100644 --- a/js/Branching/DEMUX.pickle +++ b/js/Branching/DEMUX.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'x' p2 -aS'gr_i' +aS'model' p3 -aS'graphics' +aS'out' p4 -aS'x' +aS'graphics' p5 -aS'model' -p6 -aS'out' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Branching/DEMUX_f.js b/js/Branching/DEMUX_f.js index 4c63f26d..e4ac576e 100644 --- a/js/Branching/DEMUX_f.js +++ b/js/Branching/DEMUX_f.js @@ -10,9 +10,9 @@ function DEMUX_f() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = string(this.out); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEMUX_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([.5,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = string(this.out); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEMUX_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([.5,2]),this.model,new ScilabString([exprs]),gr_i); return new BasicBlock(this.x); } DEMUX_f.prototype.details = function DEMUX_f() { @@ -25,7 +25,7 @@ function DEMUX_f() { return options; } DEMUX_f.prototype.set = function DEMUX_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.out = parseFloat(arguments[0]["out"]); @@ -64,7 +64,7 @@ function DEMUX_f() { } } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.ipar = new ScilabDouble([this.out]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Branching/DEMUX_f.pickle b/js/Branching/DEMUX_f.pickle index 544bab46..f74e7d0c 100644 --- a/js/Branching/DEMUX_f.pickle +++ b/js/Branching/DEMUX_f.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'x' p2 -aS'gr_i' +aS'model' p3 -aS'graphics' +aS'out' p4 -aS'x' +aS'graphics' p5 -aS'model' -p6 -aS'out' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Branching/ESELECT_f.js b/js/Branching/ESELECT_f.js index 094fa043..b3ae4889 100644 --- a/js/Branching/ESELECT_f.js +++ b/js/Branching/ESELECT_f.js @@ -14,9 +14,9 @@ function ESELECT_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.model.nmode = new ScilabDouble([0]); this.model.nzcross = new ScilabDouble([0]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ESELECT_f\",sz(1),sz(2));"]); - this.exprs = [[string(this.out)],[string(1)],[string(this.model.nmode)]]; - 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),\"ESELECT_f\",sz(1),sz(2));"]); + var exprs = [[string(this.out)],[string(1)],[string(this.model.nmode)]]; + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } ESELECT_f.prototype.details = function ESELECT_f() { @@ -31,12 +31,12 @@ function ESELECT_f() { return options; } ESELECT_f.prototype.set = function ESELECT_f() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")==1) { - this.exprs[2-1] = string(1); + var exprs = this.graphics.exprs; + if (size(exprs,"*")==1) { + exprs[2-1] = string(1); } - if (size(this.exprs,"*")==2) { - this.exprs[3-1] = string(0); + if (size(exprs,"*")==2) { + exprs[3-1] = string(0); } while (true) { var ok = true; @@ -64,7 +64,7 @@ function ESELECT_f() { 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.evtout = new ScilabDouble([ones(this.out,1)]); this.model.firing = new ScilabDouble([-ones(this.out,1)]); this.x.graphics = this.graphics; diff --git a/js/Branching/ESELECT_f.pickle b/js/Branching/ESELECT_f.pickle index 56a802e6..3c046923 100644 --- a/js/Branching/ESELECT_f.pickle +++ b/js/Branching/ESELECT_f.pickle @@ -4,22 +4,18 @@ p0 ((lp1 S'nmod' p2 -aS'exprs' -p3 -aS'gr_i' -p4 aS'inh' -p5 +p3 aS'graphics' -p6 +p4 aS'x' -p7 +p5 aS'model' -p8 +p6 aS'out' -p9 -atp10 -Rp11 +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/Branching/EXTRACTOR.js b/js/Branching/EXTRACTOR.js index 8cc0aa26..072f316b 100644 --- a/js/Branching/EXTRACTOR.js +++ b/js/Branching/EXTRACTOR.js @@ -9,9 +9,9 @@ function EXTRACTOR() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); this.model.ipar = new ScilabDouble([this.ind]); - this.exprs = [sci2exp(this.ind)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACTOR\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(this.exprs),this.gr_i); + var exprs = [sci2exp(this.ind)]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACTOR\",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); } EXTRACTOR.prototype.details = function EXTRACTOR() { @@ -24,7 +24,7 @@ function EXTRACTOR() { return options; } EXTRACTOR.prototype.set = function EXTRACTOR() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.ind = parseFloat(arguments[0]["ind"]); @@ -39,7 +39,7 @@ function EXTRACTOR() { var ok = tmpvar0[2]; if (ok) { this.model.ipar = new ScilabDouble(this.ind); - 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/Branching/EXTRACTOR.pickle b/js/Branching/EXTRACTOR.pickle index c334c07e..9d413f74 100644 --- a/js/Branching/EXTRACTOR.pickle +++ b/js/Branching/EXTRACTOR.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'ind' p2 -aS'gr_i' +aS'x' p3 -aS'graphics' +aS'model' p4 -aS'ind' +aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Branching/FROM.js b/js/Branching/FROM.js index fe6f8630..956f778e 100644 --- a/js/Branching/FROM.js +++ b/js/Branching/FROM.js @@ -13,9 +13,9 @@ function FROM() { this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = ["A"]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROM\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabString(this.exprs),this.gr_i); + var exprs = ["A"]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROM\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabString(exprs),gr_i); this.x.graphics.id = "From"; return new BasicBlock(this.x); } @@ -29,7 +29,7 @@ function FROM() { return options; } FROM.prototype.set = function FROM() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.tag = arguments[0]["tag"]; @@ -41,7 +41,7 @@ function FROM() { var needcompile = 4; var y = needcompile; } - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.opar = list(new ScilabDouble([this.tag])); this.x.model = this.model; this.x.graphics = this.graphics; diff --git a/js/Branching/FROM.pickle b/js/Branching/FROM.pickle index b73c9110..81f960b8 100644 --- a/js/Branching/FROM.pickle +++ b/js/Branching/FROM.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'gr_i' +S'x' p2 -aS'exprs' +aS'model' p3 aS'tag' p4 aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'arg1' p1 diff --git a/js/Branching/FROMMO.js b/js/Branching/FROMMO.js index 7f5f526d..e4dc0406 100644 --- a/js/Branching/FROMMO.js +++ b/js/Branching/FROMMO.js @@ -16,9 +16,9 @@ function FROMMO() { var mo = modelica(); mo.model = "frommo"; mo.outputs = "n"; - this.exprs = ["A"]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMMO\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabString(this.exprs),this.gr_i); + var exprs = ["A"]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMMO\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabString(exprs),gr_i); this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); } @@ -32,7 +32,7 @@ function FROMMO() { return options; } FROMMO.prototype.set = function FROMMO() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.tag = arguments[0]["tag"]; @@ -44,7 +44,7 @@ function FROMMO() { var needcompile = 4; var y = needcompile; } - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.opar = list(new ScilabDouble([this.tag])); this.x.model = this.model; this.x.graphics = this.graphics; diff --git a/js/Branching/FROMMO.pickle b/js/Branching/FROMMO.pickle index 1b5e3af9..b2aa3ba6 100644 --- a/js/Branching/FROMMO.pickle +++ b/js/Branching/FROMMO.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'gr_i' +S'x' p2 -aS'exprs' +aS'model' p3 aS'tag' p4 aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'arg1' p1 diff --git a/js/Branching/GOTO.js b/js/Branching/GOTO.js index 8d660d2f..fc85e462 100644 --- a/js/Branching/GOTO.js +++ b/js/Branching/GOTO.js @@ -13,9 +13,9 @@ function GOTO() { this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [["A"],[sci2exp(1)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GOTO\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [["A"],[sci2exp(1)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GOTO\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabDouble(exprs),gr_i); this.x.graphics.id = "Goto"; return new BasicBlock(this.x); } @@ -30,7 +30,7 @@ function GOTO() { return options; } GOTO.prototype.set = function GOTO() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.tag = arguments[0]["tag"]; @@ -49,7 +49,7 @@ function GOTO() { var needcompile = 4; var y = needcompile; } - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.opar = list(new ScilabDouble([this.tag])); this.model.ipar = new ScilabDouble([this.tagvis]); this.x.model = this.model; diff --git a/js/Branching/GOTO.pickle b/js/Branching/GOTO.pickle index 6e20e181..c8813078 100644 --- a/js/Branching/GOTO.pickle +++ b/js/Branching/GOTO.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'tagvis' +S'x' p2 -aS'gr_i' +aS'model' p3 -aS'exprs' -p4 aS'tag' +p4 +aS'tagvis' p5 aS'graphics' p6 -aS'x' -p7 -aS'model' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'tagvis' p1 diff --git a/js/Branching/GOTOMO.js b/js/Branching/GOTOMO.js index 349cc175..61e8134b 100644 --- a/js/Branching/GOTOMO.js +++ b/js/Branching/GOTOMO.js @@ -16,9 +16,9 @@ function GOTOMO() { var mo = modelica(); mo.model = "gotomo"; mo.inputs = "p"; - this.exprs = [["A"],[sci2exp(1)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GOTOMO\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [["A"],[sci2exp(1)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GOTOMO\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabDouble(exprs),gr_i); this.x.graphics.in_implicit = ["I"]; return new BasicBlock(this.x); } @@ -33,7 +33,7 @@ function GOTOMO() { return options; } GOTOMO.prototype.set = function GOTOMO() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.tag = arguments[0]["tag"]; @@ -52,7 +52,7 @@ function GOTOMO() { var needcompile = 4; var y = needcompile; } - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.opar = list(new ScilabDouble([this.tag])); this.model.ipar = new ScilabDouble([this.tagvis]); this.x.model = this.model; diff --git a/js/Branching/GOTOMO.pickle b/js/Branching/GOTOMO.pickle index 2d9330a6..04657ea7 100644 --- a/js/Branching/GOTOMO.pickle +++ b/js/Branching/GOTOMO.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'tagvis' +S'x' p2 -aS'gr_i' +aS'model' p3 -aS'exprs' -p4 aS'tag' +p4 +aS'tagvis' p5 aS'graphics' p6 -aS'x' -p7 -aS'model' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'tagvis' p1 diff --git a/js/Branching/GotoTagVisibility.js b/js/Branching/GotoTagVisibility.js index dbfe9478..42d55824 100644 --- a/js/Branching/GotoTagVisibility.js +++ b/js/Branching/GotoTagVisibility.js @@ -14,9 +14,9 @@ function GotoTagVisibility() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = "A"; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GotoTagVisibility\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = "A"; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GotoTagVisibility\",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); } GotoTagVisibility.prototype.details = function GotoTagVisibility() { @@ -29,7 +29,7 @@ function GotoTagVisibility() { return options; } GotoTagVisibility.prototype.set = function GotoTagVisibility() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.tag = arguments[0]["tag"]; @@ -41,7 +41,7 @@ function GotoTagVisibility() { var needcompile = 4; var y = needcompile; } - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.opar = list(new ScilabDouble([this.tag])); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Branching/GotoTagVisibility.pickle b/js/Branching/GotoTagVisibility.pickle index 8a8a7330..9a033bf0 100644 --- a/js/Branching/GotoTagVisibility.pickle +++ b/js/Branching/GotoTagVisibility.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'gr_i' +S'x' p2 -aS'exprs' +aS'model' p3 aS'tag' p4 aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'arg1' p1 diff --git a/js/Branching/GotoTagVisibilityMO.js b/js/Branching/GotoTagVisibilityMO.js index a3c72751..76183059 100644 --- a/js/Branching/GotoTagVisibilityMO.js +++ b/js/Branching/GotoTagVisibilityMO.js @@ -14,9 +14,9 @@ function GotoTagVisibilityMO() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = "A"; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GotoTagVisibilityMO\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = "A"; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GotoTagVisibilityMO\",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); } GotoTagVisibilityMO.prototype.details = function GotoTagVisibilityMO() { @@ -29,7 +29,7 @@ function GotoTagVisibilityMO() { return options; } GotoTagVisibilityMO.prototype.set = function GotoTagVisibilityMO() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.tag = arguments[0]["tag"]; @@ -41,7 +41,7 @@ function GotoTagVisibilityMO() { var needcompile = 4; var y = needcompile; } - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.opar = list(new ScilabDouble([this.tag])); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Branching/GotoTagVisibilityMO.pickle b/js/Branching/GotoTagVisibilityMO.pickle index 8a8a7330..9a033bf0 100644 --- a/js/Branching/GotoTagVisibilityMO.pickle +++ b/js/Branching/GotoTagVisibilityMO.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'gr_i' +S'x' p2 -aS'exprs' +aS'model' p3 aS'tag' p4 aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'arg1' p1 diff --git a/js/Branching/ISELECT_f.js b/js/Branching/ISELECT_f.js index 72914649..a60340e8 100644 --- a/js/Branching/ISELECT_f.js +++ b/js/Branching/ISELECT_f.js @@ -12,9 +12,9 @@ function ISELECT_f() { this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[string(this.nout)],[string(this.z0+1)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ISELECT_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.nout)],[string(this.z0+1)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ISELECT_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); } ISELECT_f.prototype.details = function ISELECT_f() { @@ -28,7 +28,7 @@ function ISELECT_f() { return options; } ISELECT_f.prototype.set = function ISELECT_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.nout = parseFloat(arguments[0]["nout"]); @@ -45,7 +45,7 @@ function ISELECT_f() { 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.dstate = new ScilabDouble([this.z0-1]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Branching/ISELECT_f.pickle b/js/Branching/ISELECT_f.pickle index 3a73aad5..c2d03a0e 100644 --- a/js/Branching/ISELECT_f.pickle +++ b/js/Branching/ISELECT_f.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'x' p2 -aS'gr_i' +aS'model' p3 -aS'graphics' +aS'z0' p4 -aS'x' +aS'nout' p5 -aS'model' +aS'graphics' p6 -aS'z0' -p7 -aS'nout' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/Branching/ISELECT_m.js b/js/Branching/ISELECT_m.js index db7bb056..da6ac5b0 100644 --- a/js/Branching/ISELECT_m.js +++ b/js/Branching/ISELECT_m.js @@ -20,9 +20,9 @@ function ISELECT_m() { this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[sci2exp(1)],[sci2exp(this.nout)],[sci2exp(this.z0)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ISELECT_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[sci2exp(1)],[sci2exp(this.nout)],[sci2exp(this.z0)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ISELECT_m\",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); } ISELECT_m.prototype.details = function ISELECT_m() { @@ -37,7 +37,7 @@ function ISELECT_m() { return options; } ISELECT_m.prototype.set = function ISELECT_m() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.typ = inverse(arguments[0]["typ"]); @@ -64,7 +64,7 @@ function ISELECT_m() { 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.dstate = new ScilabDouble([this.z0]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Branching/ISELECT_m.pickle b/js/Branching/ISELECT_m.pickle index 696cb0db..cca6bf9f 100644 --- a/js/Branching/ISELECT_m.pickle +++ b/js/Branching/ISELECT_m.pickle @@ -2,24 +2,20 @@ c__builtin__ set p0 ((lp1 -S'z0' +S'typ' p2 -aS'exprs' +aS'graphics' p3 -aS'gr_i' +aS'x' p4 -aS'graphics' +aS'model' p5 -aS'x' +aS'z0' p6 -aS'model' -p7 -aS'typ' -p8 aS'nout' -p9 -atp10 -Rp11 +p7 +atp8 +Rp9 .(dp0 S'model.dstate' p1 diff --git a/js/Branching/MUX.js b/js/Branching/MUX.js index 2aab447c..68a38789 100644 --- a/js/Branching/MUX.js +++ b/js/Branching/MUX.js @@ -9,9 +9,9 @@ function MUX() { this.model.ipar = new ScilabDouble([this.in1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = string(this.in1); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MUX\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([.5,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = string(this.in1); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MUX\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([.5,2]),this.model,new ScilabString([exprs]),gr_i); return new BasicBlock(this.x); } MUX.prototype.details = function MUX() { @@ -24,7 +24,7 @@ function MUX() { return options; } MUX.prototype.set = function MUX() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.in1 = parseFloat(arguments[0]["in1"]); @@ -63,7 +63,7 @@ function MUX() { } } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.ipar = new ScilabDouble([this.in1]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Branching/MUX.pickle b/js/Branching/MUX.pickle index e89840ef..66905226 100644 --- a/js/Branching/MUX.pickle +++ b/js/Branching/MUX.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'in1' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'in1' p4 aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Branching/MUX_f.js b/js/Branching/MUX_f.js index 2a474040..8cdc3ca4 100644 --- a/js/Branching/MUX_f.js +++ b/js/Branching/MUX_f.js @@ -9,9 +9,9 @@ function MUX_f() { this.model.ipar = new ScilabDouble([this.in1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = string(this.in1); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MUX_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([0.5,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = string(this.in1); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MUX_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([0.5,2]),this.model,new ScilabString([exprs]),gr_i); return new BasicBlock(this.x); } MUX_f.prototype.details = function MUX_f() { @@ -24,7 +24,7 @@ function MUX_f() { return options; } MUX_f.prototype.set = function MUX_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.in1 = parseFloat(arguments[0]["in1"]); @@ -63,7 +63,7 @@ function MUX_f() { } } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.ipar = new ScilabDouble([this.in1]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Branching/MUX_f.pickle b/js/Branching/MUX_f.pickle index e89840ef..66905226 100644 --- a/js/Branching/MUX_f.pickle +++ b/js/Branching/MUX_f.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'in1' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'in1' p4 aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Branching/M_SWITCH.js b/js/Branching/M_SWITCH.js index c27ece64..a782d0a9 100644 --- a/js/Branching/M_SWITCH.js +++ b/js/Branching/M_SWITCH.js @@ -11,9 +11,9 @@ function M_SWITCH() { 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),\"M_SWITCH\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2.5,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),\"M_SWITCH\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } M_SWITCH.prototype.details = function M_SWITCH() { @@ -28,7 +28,7 @@ function M_SWITCH() { return options; } M_SWITCH.prototype.set = function M_SWITCH() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.nin = parseFloat(arguments[0]["nin"]); @@ -65,7 +65,7 @@ function M_SWITCH() { 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.ipar = new ScilabDouble([this.base],[this.rule]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Branching/M_SWITCH.pickle b/js/Branching/M_SWITCH.pickle index 9cfd3442..befba602 100644 --- a/js/Branching/M_SWITCH.pickle +++ b/js/Branching/M_SWITCH.pickle @@ -6,20 +6,16 @@ S'nin' p2 aS'rule' p3 -aS'exprs' -p4 -aS'gr_i' -p5 aS'base' -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/Branching/NRMSOM_f.js b/js/Branching/NRMSOM_f.js index 71d1f67a..31bb7df9 100644 --- a/js/Branching/NRMSOM_f.js +++ b/js/Branching/NRMSOM_f.js @@ -9,9 +9,9 @@ function NRMSOM_f() { this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [string(this.nin)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NRMSOM_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.nin)]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NRMSOM_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); } NRMSOM_f.prototype.details = function NRMSOM_f() { @@ -24,7 +24,7 @@ function NRMSOM_f() { return options; } NRMSOM_f.prototype.set = function NRMSOM_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.nin = parseFloat(arguments[0]["nin"]); @@ -36,7 +36,7 @@ function NRMSOM_f() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; diff --git a/js/Branching/NRMSOM_f.pickle b/js/Branching/NRMSOM_f.pickle index 8e2598f6..fc145ca0 100644 --- a/js/Branching/NRMSOM_f.pickle +++ b/js/Branching/NRMSOM_f.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'nin' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'nin' p4 aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Branching/RELAY_f.js b/js/Branching/RELAY_f.js index 801316cf..37c42f29 100644 --- a/js/Branching/RELAY_f.js +++ b/js/Branching/RELAY_f.js @@ -13,9 +13,9 @@ function RELAY_f() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,true]); - this.exprs = [[string(this.nin)],[string(i0+1)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RELAY_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.nin)],[string(i0+1)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RELAY_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); } RELAY_f.prototype.details = function RELAY_f() { @@ -29,7 +29,7 @@ function RELAY_f() { return options; } RELAY_f.prototype.set = function RELAY_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var ipar = this.model.ipar; while (true) { var ok = true; @@ -47,7 +47,7 @@ function RELAY_f() { 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.dstate = new ScilabString([this.z0-1]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Branching/RELAY_f.pickle b/js/Branching/RELAY_f.pickle index ef5f9ec9..b006c1ff 100644 --- a/js/Branching/RELAY_f.pickle +++ b/js/Branching/RELAY_f.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'nin' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'z0' p4 -aS'graphics' +aS'nin' p5 -aS'x' +aS'graphics' p6 -aS'model' -p7 -aS'z0' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/Branching/SCALAR2VECTOR.js b/js/Branching/SCALAR2VECTOR.js index d43edce8..e4394a24 100644 --- a/js/Branching/SCALAR2VECTOR.js +++ b/js/Branching/SCALAR2VECTOR.js @@ -8,9 +8,9 @@ function SCALAR2VECTOR() { this.model.in = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [string([this.nout])]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SCALAR2VECTOR\",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.nout])]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SCALAR2VECTOR\",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); } SCALAR2VECTOR.prototype.details = function SCALAR2VECTOR() { @@ -23,7 +23,7 @@ function SCALAR2VECTOR() { return options; } SCALAR2VECTOR.prototype.set = function SCALAR2VECTOR() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.nout = parseFloat(arguments[0]["nout"]); @@ -43,7 +43,7 @@ function SCALAR2VECTOR() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; diff --git a/js/Branching/SCALAR2VECTOR.pickle b/js/Branching/SCALAR2VECTOR.pickle index 5d98b24d..93cbcbb1 100644 --- a/js/Branching/SCALAR2VECTOR.pickle +++ b/js/Branching/SCALAR2VECTOR.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'x' p2 -aS'gr_i' +aS'model' p3 -aS'graphics' +aS'nout' p4 -aS'x' +aS'graphics' p5 -aS'model' -p6 -aS'nout' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Branching/SELECT_f.js b/js/Branching/SELECT_f.js index e411d498..202df7e4 100644 --- a/js/Branching/SELECT_f.js +++ b/js/Branching/SELECT_f.js @@ -12,9 +12,9 @@ function SELECT_f() { this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[string(this.nin)],[string(this.z0+1)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SELECT_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.nin)],[string(this.z0+1)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SELECT_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); } SELECT_f.prototype.details = function SELECT_f() { @@ -28,7 +28,7 @@ function SELECT_f() { return options; } SELECT_f.prototype.set = function SELECT_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.nin = parseFloat(arguments[0]["nin"]); @@ -45,7 +45,7 @@ function SELECT_f() { 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.dstate = new ScilabDouble([this.z0-1]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Branching/SELECT_f.pickle b/js/Branching/SELECT_f.pickle index b09ecfbf..50df12a5 100644 --- a/js/Branching/SELECT_f.pickle +++ b/js/Branching/SELECT_f.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'nin' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'z0' p4 -aS'graphics' +aS'nin' p5 -aS'x' +aS'graphics' p6 -aS'model' -p7 -aS'z0' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/Branching/SELECT_m.js b/js/Branching/SELECT_m.js index df649088..bf017884 100644 --- a/js/Branching/SELECT_m.js +++ b/js/Branching/SELECT_m.js @@ -20,9 +20,9 @@ function SELECT_m() { this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[sci2exp(1)],[sci2exp(this.nin)],[sci2exp(this.z0)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SELECT_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[sci2exp(1)],[sci2exp(this.nin)],[sci2exp(this.z0)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SELECT_m\",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); } SELECT_m.prototype.details = function SELECT_m() { @@ -37,7 +37,7 @@ function SELECT_m() { return options; } SELECT_m.prototype.set = function SELECT_m() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.typ = inverse(arguments[0]["typ"]); @@ -64,7 +64,7 @@ function SELECT_m() { 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.dstate = new ScilabDouble([this.z0]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Branching/SELECT_m.pickle b/js/Branching/SELECT_m.pickle index e4d06d0c..2599284e 100644 --- a/js/Branching/SELECT_m.pickle +++ b/js/Branching/SELECT_m.pickle @@ -4,22 +4,18 @@ p0 ((lp1 S'nin' p2 -aS'z0' +aS'typ' p3 -aS'exprs' +aS'graphics' p4 -aS'gr_i' +aS'x' p5 -aS'graphics' +aS'model' p6 -aS'x' +aS'z0' p7 -aS'model' -p8 -aS'typ' -p9 -atp10 -Rp11 +atp8 +Rp9 .(dp0 S'model.dstate' p1 diff --git a/js/Branching/SELF_SWITCH.pickle b/js/Branching/SELF_SWITCH.pickle index 5ec17e33..10fb8415 100644 --- a/js/Branching/SELF_SWITCH.pickle +++ b/js/Branching/SELF_SWITCH.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'stateOpen' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'stateOpen' p4 aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'diagram.objs[1-1]' p1 diff --git a/js/Branching/SWITCH2.js b/js/Branching/SWITCH2.js index bdd18b4a..afa83e4c 100644 --- a/js/Branching/SWITCH2.js +++ b/js/Branching/SWITCH2.js @@ -15,9 +15,9 @@ function SWITCH2() { this.model.nmode = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[string(ipar)],[string(rpar)],[string(this.nzz)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SWITCH2\",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(rpar)],[string(this.nzz)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SWITCH2\",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); } SWITCH2.prototype.details = function SWITCH2() { @@ -32,7 +32,7 @@ function SWITCH2() { return options; } SWITCH2.prototype.set = function SWITCH2() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.rule = parseFloat(arguments[0]["rule"]); @@ -48,7 +48,7 @@ function SWITCH2() { if ((this.rule>2)) { this.rule = 2; } - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.ipar = new ScilabDouble([this.rule]); this.model.rpar = new ScilabDouble([this.thra]); if (this.nzz!=0) { diff --git a/js/Branching/SWITCH2.pickle b/js/Branching/SWITCH2.pickle index 4f8888b6..e221f43d 100644 --- a/js/Branching/SWITCH2.pickle +++ b/js/Branching/SWITCH2.pickle @@ -8,18 +8,14 @@ aS'rule' p3 aS'thra' 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'arg1' p1 diff --git a/js/Branching/SWITCH2_m.js b/js/Branching/SWITCH2_m.js index cade952d..5f8aca10 100644 --- a/js/Branching/SWITCH2_m.js +++ b/js/Branching/SWITCH2_m.js @@ -18,9 +18,9 @@ function SWITCH2_m() { this.model.nmode = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[sci2exp(1)],[string(ipar)],[string(rpar)],[string(this.nzz)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SWITCH2_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[sci2exp(1)],[string(ipar)],[string(rpar)],[string(this.nzz)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SWITCH2_m\",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); } SWITCH2_m.prototype.details = function SWITCH2_m() { @@ -36,7 +36,7 @@ function SWITCH2_m() { return options; } SWITCH2_m.prototype.set = function SWITCH2_m() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.ot = arguments[0]["ot"]; @@ -53,7 +53,7 @@ function SWITCH2_m() { if ((this.rule>2)) { this.rule = 2; } - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.ipar = new ScilabDouble([this.rule]); this.model.rpar = new ScilabDouble([this.thra]); if (this.nzz!=0) { diff --git a/js/Branching/SWITCH2_m.pickle b/js/Branching/SWITCH2_m.pickle index 686b6898..7beb95f0 100644 --- a/js/Branching/SWITCH2_m.pickle +++ b/js/Branching/SWITCH2_m.pickle @@ -8,20 +8,16 @@ aS'rule' p3 aS'thra' p4 -aS'exprs' -p5 -aS'gr_i' -p6 aS'graphics' -p7 +p5 aS'x' -p8 +p6 aS'model' -p9 +p7 aS'ot' -p10 -atp11 -Rp12 +p8 +atp9 +Rp10 .(dp0 S'arg1' p1 diff --git a/js/Branching/SWITCH_f.js b/js/Branching/SWITCH_f.js index fd7a2526..654afc01 100644 --- a/js/Branching/SWITCH_f.js +++ b/js/Branching/SWITCH_f.js @@ -12,9 +12,9 @@ function SWITCH_f() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,true]); - this.exprs = [[string(this.nin)],[string(i0+1)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SWITCH_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.nin)],[string(i0+1)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SWITCH_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); } SWITCH_f.prototype.details = function SWITCH_f() { @@ -28,7 +28,7 @@ function SWITCH_f() { return options; } SWITCH_f.prototype.set = function SWITCH_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var ipar = this.model.ipar; while (true) { var ok = true; @@ -46,7 +46,7 @@ function SWITCH_f() { 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.ipar = new ScilabString([this.z0-1]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Branching/SWITCH_f.pickle b/js/Branching/SWITCH_f.pickle index e9f05526..506bf9f1 100644 --- a/js/Branching/SWITCH_f.pickle +++ b/js/Branching/SWITCH_f.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'nin' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'z0' p4 -aS'graphics' +aS'nin' p5 -aS'x' +aS'graphics' p6 -aS'model' -p7 -aS'z0' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/Electrical/CCS.js b/js/Electrical/CCS.js index bcbd2fb2..6cad5711 100644 --- a/js/Electrical/CCS.js +++ b/js/Electrical/CCS.js @@ -36,15 +36,15 @@ function CCS() { mo.outputs = MO; this.model.rpar = new ScilabDouble(PrametersValue); mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName)); - this.exprs = []; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CCS\",sz(1),sz(2));"]); + var exprs = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CCS\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = new standard_define(new ScilabDouble([2.1,3]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2.1,3]),this.model,new ScilabDouble(exprs),list(gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); @@ -56,7 +56,7 @@ function CCS() { alert("parameters cannot be modified"); } CCS.prototype.set = function CCS() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; return new BasicBlock(this.x); } } diff --git a/js/Electrical/CCS.pickle b/js/Electrical/CCS.pickle index e4144780..6299aed9 100644 --- a/js/Electrical/CCS.pickle +++ b/js/Electrical/CCS.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'arg1' p1 diff --git a/js/Electrical/CVS.js b/js/Electrical/CVS.js index cdac5393..8e535c69 100644 --- a/js/Electrical/CVS.js +++ b/js/Electrical/CVS.js @@ -36,15 +36,15 @@ function CVS() { mo.outputs = MO; this.model.rpar = new ScilabDouble(PrametersValue); mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName)); - this.exprs = []; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CVS\",sz(1),sz(2));"]); + var exprs = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CVS\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = new standard_define(new ScilabDouble([2.1,3]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2.1,3]),this.model,new ScilabDouble(exprs),list(gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); @@ -56,7 +56,7 @@ function CVS() { alert("parameters cannot be modified"); } CVS.prototype.set = function CVS() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; return new BasicBlock(this.x); } } diff --git a/js/Electrical/CVS.pickle b/js/Electrical/CVS.pickle index e4144780..6299aed9 100644 --- a/js/Electrical/CVS.pickle +++ b/js/Electrical/CVS.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'arg1' p1 diff --git a/js/Electrical/Capacitor.js b/js/Electrical/Capacitor.js index 574a584f..2344fab7 100644 --- a/js/Electrical/Capacitor.js +++ b/js/Electrical/Capacitor.js @@ -16,9 +16,9 @@ function Capacitor() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); - this.exprs = string([[this.C],[this.v]]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Capacitor\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,1.1]),this.model,new ScilabString([this.exprs]),list(this.gr_i,0)); + var exprs = string([[this.C],[this.v]]); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Capacitor\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,1.1]),this.model,new ScilabString([exprs]),list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -34,7 +34,7 @@ function Capacitor() { return options; } Capacitor.prototype.set = function Capacitor() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.C = parseFloat(arguments[0]["C"]); @@ -44,7 +44,7 @@ function Capacitor() { } this.model.rpar = new ScilabDouble([this.C]); this.model.equations.parameters[2-1] = list(new ScilabDouble([this.C]), new ScilabDouble([this.v])); - 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/Electrical/Capacitor.pickle b/js/Electrical/Capacitor.pickle index 8fa9dc59..b94675b8 100644 --- a/js/Electrical/Capacitor.pickle +++ b/js/Electrical/Capacitor.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'C' +S'x' p2 -aS'v' +aS'model' p3 -aS'exprs' +aS'v' p4 -aS'gr_i' +aS'C' p5 aS'graphics' p6 -aS'x' -p7 -aS'model' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/Electrical/ConstantVoltage.js b/js/Electrical/ConstantVoltage.js index a0b070cf..86be0b91 100644 --- a/js/Electrical/ConstantVoltage.js +++ b/js/Electrical/ConstantVoltage.js @@ -15,9 +15,9 @@ function ConstantVoltage() { mo.outputs = "n"; mo.parameters = list("V",list(this.V)); this.model.equations = new ScilabDouble([mo]); - this.exprs = string(this.V); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ConstantVoltage\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([1.5,1.1]),this.model,new ScilabString([this.exprs]),list(this.gr_i,0)); + var exprs = string(this.V); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ConstantVoltage\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([1.5,1.1]),this.model,new ScilabString([exprs]),list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -32,7 +32,7 @@ function ConstantVoltage() { return options; } ConstantVoltage.prototype.set = function ConstantVoltage() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.V = parseFloat(arguments[0]["V"]); @@ -41,7 +41,7 @@ function ConstantVoltage() { } this.model.rpar = new ScilabDouble([this.V]); this.model.equations.parameters[2-1] = list(new ScilabDouble([this.V])); - 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/Electrical/ConstantVoltage.pickle b/js/Electrical/ConstantVoltage.pickle index 7e2fbca9..8733d94b 100644 --- a/js/Electrical/ConstantVoltage.pickle +++ b/js/Electrical/ConstantVoltage.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'V' +p4 +aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'arg1' p1 diff --git a/js/Electrical/CurrentSensor.js b/js/Electrical/CurrentSensor.js index f70e369b..0c16c782 100644 --- a/js/Electrical/CurrentSensor.js +++ b/js/Electrical/CurrentSensor.js @@ -12,9 +12,9 @@ function CurrentSensor() { mo.inputs = "p"; mo.outputs = [["n"],["i"]]; this.model.equations = new ScilabDouble([mo]); - this.exprs = []; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CurrentSensor\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); + var exprs = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CurrentSensor\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["E"]]; return new BasicBlock(this.x); diff --git a/js/Electrical/CurrentSensor.pickle b/js/Electrical/CurrentSensor.pickle index c2c5913a..4363fe88 100644 --- a/js/Electrical/CurrentSensor.pickle +++ b/js/Electrical/CurrentSensor.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/Electrical/Diode.js b/js/Electrical/Diode.js index 4fd8353f..36080edd 100644 --- a/js/Electrical/Diode.js +++ b/js/Electrical/Diode.js @@ -18,9 +18,9 @@ function Diode() { mo.outputs = "n"; mo.parameters = list(["Ids","Vt","Maxexp","R"],list(this.Ids,this.Vt,this.Maxexp,this.R)); this.model.equations = new ScilabDouble([mo]); - this.exprs = string([[this.Ids],[this.Vt],[this.Maxexp],[this.R]]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Diode\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabString([this.exprs]),list(this.gr_i,0)); + var exprs = string([[this.Ids],[this.Vt],[this.Maxexp],[this.R]]); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Diode\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabString([exprs]),list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -38,7 +38,7 @@ function Diode() { return options; } Diode.prototype.set = function Diode() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.Ids = parseFloat(arguments[0]["Ids"]); @@ -50,7 +50,7 @@ function Diode() { } this.model.rpar = new ScilabDouble([this.Ids],[this.Vt],[this.Maxexp],[this.R]); this.model.equations.parameters = list(new ScilabDouble([["Ids","Vt","Maxexp","R"]]),list(this.Ids,this.Vt,this.Maxexp,this.R)); - 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/Electrical/Diode.pickle b/js/Electrical/Diode.pickle index 41fdba9c..3c753e18 100644 --- a/js/Electrical/Diode.pickle +++ b/js/Electrical/Diode.pickle @@ -2,26 +2,22 @@ c__builtin__ set p0 ((lp1 -S'R' +S'Maxexp' p2 aS'Ids' p3 -aS'Maxexp' +aS'R' p4 -aS'exprs' -p5 -aS'gr_i' -p6 aS'Vt' -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/Electrical/Ground.js b/js/Electrical/Ground.js index 454ea116..492e4b7f 100644 --- a/js/Electrical/Ground.js +++ b/js/Electrical/Ground.js @@ -11,9 +11,9 @@ function Ground() { mo.model = "Ground"; mo.inputs = "p"; this.model.equations = new ScilabDouble([mo]); - this.exprs = ""; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Ground\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs]),list(this.gr_i,0)); + var exprs = ""; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Ground\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([exprs]),list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new GroundBlock(this.x); diff --git a/js/Electrical/Ground.pickle b/js/Electrical/Ground.pickle index 39091ac3..fd3be2f5 100644 --- a/js/Electrical/Ground.pickle +++ b/js/Electrical/Ground.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/Electrical/Gyrator.js b/js/Electrical/Gyrator.js index 28259858..e212c6b6 100644 --- a/js/Electrical/Gyrator.js +++ b/js/Electrical/Gyrator.js @@ -36,15 +36,15 @@ function Gyrator() { mo.outputs = MO; this.model.rpar = new ScilabDouble(PrametersValue); mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName)); - this.exprs = [["1"],["1"]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Gyrator\",sz(1),sz(2));"]); + var exprs = [["1"],["1"]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Gyrator\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),list(gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); @@ -60,8 +60,8 @@ function Gyrator() { return options; } Gyrator.prototype.set = function Gyrator() { - this.exprs = this.graphics.exprs; - this.exprs = this.x.graphics.exprs; + var exprs = this.graphics.exprs; + var exprs = this.x.graphics.exprs; while (true) { var ok = true; this.G1 = arguments[0]["G1"]; @@ -70,7 +70,7 @@ function Gyrator() { break; } this.x.model.equations.parameters[2-1] = list(this.G1,this.G2); - this.x.graphics.exprs = this.exprs; + this.x.graphics.exprs = exprs; break; } return new BasicBlock(this.x); diff --git a/js/Electrical/Gyrator.pickle b/js/Electrical/Gyrator.pickle index 6ae47a7e..202531d4 100644 --- a/js/Electrical/Gyrator.pickle +++ b/js/Electrical/Gyrator.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'G2' +S'x' p2 -aS'G1' +aS'model' p3 -aS'exprs' +aS'G2' p4 -aS'gr_i' +aS'G1' p5 aS'graphics' p6 -aS'x' -p7 -aS'model' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'x.model.equations.parameters[2-1]' p1 diff --git a/js/Electrical/IdealTransformer.js b/js/Electrical/IdealTransformer.js index b04f3cac..4d081dff 100644 --- a/js/Electrical/IdealTransformer.js +++ b/js/Electrical/IdealTransformer.js @@ -36,15 +36,15 @@ function IdealTransformer() { mo.outputs = MO; this.model.rpar = new ScilabDouble(PrametersValue); mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName)); - this.exprs = ["1"]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IdealTransformer\",sz(1),sz(2));"]); + var exprs = ["1"]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IdealTransformer\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(this.exprs),list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(exprs),list(gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); @@ -59,8 +59,8 @@ function IdealTransformer() { return options; } IdealTransformer.prototype.set = function IdealTransformer() { - this.exprs = this.graphics.exprs; - this.exprs = this.x.graphics.exprs; + var exprs = this.graphics.exprs; + var exprs = this.x.graphics.exprs; while (true) { var ok = true; this.N = arguments[0]["N"]; @@ -68,7 +68,7 @@ function IdealTransformer() { break; } this.x.model.equations.parameters[2-1] = list(this.N); - this.x.graphics.exprs = this.exprs; + this.x.graphics.exprs = exprs; break; } return new BasicBlock(this.x); diff --git a/js/Electrical/IdealTransformer.pickle b/js/Electrical/IdealTransformer.pickle index 84cbb61a..4df96f54 100644 --- a/js/Electrical/IdealTransformer.pickle +++ b/js/Electrical/IdealTransformer.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'N' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'N' p4 aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'x.model.equations.parameters[2-1]' p1 diff --git a/js/Electrical/Inductor.js b/js/Electrical/Inductor.js index 0e497d10..f2690705 100644 --- a/js/Electrical/Inductor.js +++ b/js/Electrical/Inductor.js @@ -15,9 +15,9 @@ function Inductor() { mo.outputs = "n"; mo.parameters = list("L",list(this.L)); this.model.equations = new ScilabDouble([mo]); - this.exprs = string(this.L); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Inductor\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,0.9]),this.model,new ScilabString([this.exprs]),list(this.gr_i,0)); + var exprs = string(this.L); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Inductor\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,0.9]),this.model,new ScilabString([exprs]),list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -32,7 +32,7 @@ function Inductor() { return options; } Inductor.prototype.set = function Inductor() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.L = parseFloat(arguments[0]["L"]); @@ -41,7 +41,7 @@ function Inductor() { } this.model.rpar = new ScilabDouble([this.L]); this.model.equations.parameters[2-1] = list(new ScilabDouble([this.L])); - 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/Electrical/Inductor.pickle b/js/Electrical/Inductor.pickle index b2faeed5..f7cb5a1b 100644 --- a/js/Electrical/Inductor.pickle +++ b/js/Electrical/Inductor.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'L' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'L' p4 aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'arg1' p1 diff --git a/js/Electrical/MOTOR.js b/js/Electrical/MOTOR.js index b9dc349b..3aa96510 100644 --- a/js/Electrical/MOTOR.js +++ b/js/Electrical/MOTOR.js @@ -7,9 +7,9 @@ function MOTOR() { this.model.sim = new ScilabString(["motor"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MOTOR\",sz(1),sz(2));"]); - this.exprs = ""; - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MOTOR\",sz(1),sz(2));"]); + var exprs = ""; + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([exprs]),gr_i); this.x.graphics.out_implicit = [["I"],["I"]]; this.x.graphics.in_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Electrical/MOTOR.pickle b/js/Electrical/MOTOR.pickle index 80f82401..babee342 100644 --- a/js/Electrical/MOTOR.pickle +++ b/js/Electrical/MOTOR.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/Electrical/NMOS.js b/js/Electrical/NMOS.js index 1c876dcb..c6d59869 100644 --- a/js/Electrical/NMOS.js +++ b/js/Electrical/NMOS.js @@ -22,9 +22,9 @@ function NMOS() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); - this.exprs = [[string(this.W)],[string(this.L)],[string(this.Beta)],[string(this.Vt)],[string(this.K2)],[string(this.K5)],[string(this.dW)],[string(this.dL)],[string(this.RDS)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NMOS\",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.W)],[string(this.L)],[string(this.Beta)],[string(this.Vt)],[string(this.K2)],[string(this.K5)],[string(this.dW)],[string(this.dL)],[string(this.RDS)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NMOS\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),gr_i); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["I"],["I"]]; return new BasicBlock(this.x); @@ -47,7 +47,7 @@ function NMOS() { return options; } NMOS.prototype.set = function NMOS() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.W = parseFloat(arguments[0]["W"]); @@ -63,7 +63,7 @@ function NMOS() { break; } this.model.equations.parameters[2-1] = list(new ScilabDouble([this.W]), new ScilabDouble([this.L]), new ScilabDouble([this.Beta]), new ScilabDouble([this.Vt]), new ScilabDouble([this.K2]), new ScilabDouble([this.K5]), new ScilabDouble([this.dW]), new ScilabDouble([this.dL]), new ScilabDouble([this.RDS])); - 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/Electrical/NMOS.pickle b/js/Electrical/NMOS.pickle index 78efedcb..13b585be 100644 --- a/js/Electrical/NMOS.pickle +++ b/js/Electrical/NMOS.pickle @@ -8,30 +8,26 @@ aS'K5' p3 aS'RDS' p4 -aS'K2' -p5 aS'L' +p5 +aS'K2' p6 -aS'exprs' -p7 aS'Beta' -p8 -aS'gr_i' -p9 +p7 aS'Vt' -p10 +p8 aS'W' -p11 +p9 aS'graphics' -p12 +p10 aS'x' -p13 +p11 aS'model' -p14 +p12 aS'dW' -p15 -atp16 -Rp17 +p13 +atp14 +Rp15 .(dp0 S'model.in' p1 diff --git a/js/Electrical/NPN.js b/js/Electrical/NPN.js index b7d931ae..3cd75e98 100644 --- a/js/Electrical/NPN.js +++ b/js/Electrical/NPN.js @@ -36,15 +36,15 @@ function NPN() { mo.outputs = MO; this.model.rpar = new ScilabDouble(PrametersValue); mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName)); - this.exprs = [["50"],["0.1"],["1.e-16"],["0.02"],["0.12e-9"],["5e-9"],["1e-12"],["0.4e-12"],["0.5e-12"],["0.8"],["0.4"],["0.8"],["0.333"],["1e-15"],["1e-15"],["0.02585"],["40"]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NPN\",sz(1),sz(2));"]); + var exprs = [["50"],["0.1"],["1.e-16"],["0.02"],["0.12e-9"],["5e-9"],["1e-12"],["0.4e-12"],["0.5e-12"],["0.8"],["0.4"],["0.8"],["0.333"],["1e-15"],["1e-15"],["0.02585"],["40"]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NPN\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),list(gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); @@ -75,8 +75,8 @@ function NPN() { return options; } NPN.prototype.set = function NPN() { - this.exprs = this.graphics.exprs; - this.exprs = this.x.graphics.exprs; + var exprs = this.graphics.exprs; + var exprs = this.x.graphics.exprs; while (true) { var ok = true; this.Bf = arguments[0]["Bf"]; @@ -100,7 +100,7 @@ function NPN() { break; } this.x.model.equations.parameters[2-1] = list(this.Bf,this.Br,this.Is,this.Vak,this.Tauf,this.Taur,this.Ccs,this.Cje,this.Cjc,this.Phie,this.Me,this.Phic,this.Mc,this.Gbc,this.Gbe,this.Vt,this.EMinMax); - this.x.graphics.exprs = this.exprs; + this.x.graphics.exprs = exprs; break; } return new BasicBlock(this.x); diff --git a/js/Electrical/NPN.pickle b/js/Electrical/NPN.pickle index 1fb6d728..8f22f03a 100644 --- a/js/Electrical/NPN.pickle +++ b/js/Electrical/NPN.pickle @@ -2,52 +2,48 @@ c__builtin__ set p0 ((lp1 -S'Vak' +S'Me' p2 -aS'Cjc' +aS'Vak' p3 -aS'Cje' +aS'Bf' p4 -aS'Phic' +aS'Gbe' p5 -aS'Bf' +aS'Tauf' p6 -aS'Br' +aS'Gbc' p7 -aS'Me' +aS'Mc' p8 -aS'Phie' +aS'Phic' p9 -aS'Gbe' +aS'Cjc' p10 -aS'Tauf' +aS'Is' p11 -aS'Gbc' +aS'Phie' p12 -aS'Mc' -p13 aS'Ccs' +p13 +aS'Cje' p14 aS'Taur' p15 -aS'graphics' +aS'Vt' p16 -aS'EMinMax' +aS'Br' p17 -aS'Is' +aS'graphics' p18 -aS'exprs' +aS'EMinMax' p19 -aS'gr_i' -p20 -aS'Vt' -p21 aS'x' -p22 +p20 aS'model' -p23 -atp24 -Rp25 +p21 +atp22 +Rp23 .(dp0 S'x.model.equations.parameters[2-1]' p1 diff --git a/js/Electrical/OpAmp.js b/js/Electrical/OpAmp.js index ef4c0809..23c00bc2 100644 --- a/js/Electrical/OpAmp.js +++ b/js/Electrical/OpAmp.js @@ -16,9 +16,9 @@ function OpAmp() { this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.model.rpar = new ScilabDouble(Z); - this.exprs = string(Z); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OpAmp\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,5]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = string(Z); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OpAmp\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,5]),this.model,new ScilabString([exprs]),gr_i); this.x.graphics.in_implicit = [["I"],["I"]]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -35,7 +35,7 @@ function OpAmp() { return options; } OpAmp.prototype.set = function OpAmp() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (false) { var ok = true; this.OLGain = arguments[0]["OLGain"]; @@ -45,7 +45,7 @@ function OpAmp() { break; } this.model.equations.parameters[2-1] = list(new ScilabDouble([this.OLGain]), new ScilabDouble([this.SatH]), new ScilabDouble([this.SatL])); - 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/Electrical/OpAmp.pickle b/js/Electrical/OpAmp.pickle index c297d124..df313065 100644 --- a/js/Electrical/OpAmp.pickle +++ b/js/Electrical/OpAmp.pickle @@ -4,22 +4,18 @@ p0 ((lp1 S'OLGain' p2 -aS'exprs' -p3 -aS'gr_i' -p4 aS'graphics' -p5 +p3 aS'SatH' -p6 +p4 aS'x' -p7 +p5 aS'model' -p8 +p6 aS'SatL' -p9 -atp10 -Rp11 +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/Electrical/PMOS.js b/js/Electrical/PMOS.js index 9dfe351f..1737d2a2 100644 --- a/js/Electrical/PMOS.js +++ b/js/Electrical/PMOS.js @@ -22,9 +22,9 @@ function PMOS() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); - this.exprs = [[string(this.W)],[string(this.L)],[string(this.Beta)],[string(this.Vt)],[string(this.K2)],[string(this.K5)],[string(this.dW)],[string(this.dL)],[string(this.RDS)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PMOS\",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.W)],[string(this.L)],[string(this.Beta)],[string(this.Vt)],[string(this.K2)],[string(this.K5)],[string(this.dW)],[string(this.dL)],[string(this.RDS)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PMOS\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),gr_i); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["I"],["I"]]; return new BasicBlock(this.x); @@ -47,7 +47,7 @@ function PMOS() { return options; } PMOS.prototype.set = function PMOS() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.W = parseFloat(arguments[0]["W"]); @@ -63,7 +63,7 @@ function PMOS() { break; } this.model.equations.parameters[2-1] = list(new ScilabDouble([this.W]), new ScilabDouble([this.L]), new ScilabDouble([this.Beta]), new ScilabDouble([this.Vt]), new ScilabDouble([this.K2]), new ScilabDouble([this.K5]), new ScilabDouble([this.dW]), new ScilabDouble([this.dL]), new ScilabDouble([this.RDS])); - 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/Electrical/PMOS.pickle b/js/Electrical/PMOS.pickle index 78efedcb..13b585be 100644 --- a/js/Electrical/PMOS.pickle +++ b/js/Electrical/PMOS.pickle @@ -8,30 +8,26 @@ aS'K5' p3 aS'RDS' p4 -aS'K2' -p5 aS'L' +p5 +aS'K2' p6 -aS'exprs' -p7 aS'Beta' -p8 -aS'gr_i' -p9 +p7 aS'Vt' -p10 +p8 aS'W' -p11 +p9 aS'graphics' -p12 +p10 aS'x' -p13 +p11 aS'model' -p14 +p12 aS'dW' -p15 -atp16 -Rp17 +p13 +atp14 +Rp15 .(dp0 S'model.in' p1 diff --git a/js/Electrical/PNP.js b/js/Electrical/PNP.js index 00041ef6..57f66d43 100644 --- a/js/Electrical/PNP.js +++ b/js/Electrical/PNP.js @@ -36,15 +36,15 @@ function PNP() { mo.outputs = MO; this.model.rpar = new ScilabDouble(PrametersValue); mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName)); - this.exprs = [["50"],["0.1"],["1.e-16"],["0.02"],["0.12e-9"],["5e-9"],["1e-12"],["0.4e-12"],["0.5e-12"],["0.8"],["0.4"],["0.8"],["0.333"],["1e-15"],["1e-15"],["0.02585"],["40"]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PNP\",sz(1),sz(2));"]); + var exprs = [["50"],["0.1"],["1.e-16"],["0.02"],["0.12e-9"],["5e-9"],["1e-12"],["0.4e-12"],["0.5e-12"],["0.8"],["0.4"],["0.8"],["0.333"],["1e-15"],["1e-15"],["0.02585"],["40"]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PNP\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),list(gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); @@ -75,8 +75,8 @@ function PNP() { return options; } PNP.prototype.set = function PNP() { - this.exprs = this.graphics.exprs; - this.exprs = this.x.graphics.exprs; + var exprs = this.graphics.exprs; + var exprs = this.x.graphics.exprs; while (true) { var ok = true; this.Bf = arguments[0]["Bf"]; @@ -100,7 +100,7 @@ function PNP() { break; } this.x.model.equations.parameters[2-1] = list(this.Bf,this.Br,this.Is,this.Vak,this.Tauf,this.Taur,this.Ccs,this.Cje,this.Cjc,this.Phie,this.Me,this.Phic,this.Mc,this.Gbc,this.Gbe,this.Vt,this.EMinMax); - this.x.graphics.exprs = this.exprs; + this.x.graphics.exprs = exprs; break; } return new BasicBlock(this.x); diff --git a/js/Electrical/PNP.pickle b/js/Electrical/PNP.pickle index 1fb6d728..8f22f03a 100644 --- a/js/Electrical/PNP.pickle +++ b/js/Electrical/PNP.pickle @@ -2,52 +2,48 @@ c__builtin__ set p0 ((lp1 -S'Vak' +S'Me' p2 -aS'Cjc' +aS'Vak' p3 -aS'Cje' +aS'Bf' p4 -aS'Phic' +aS'Gbe' p5 -aS'Bf' +aS'Tauf' p6 -aS'Br' +aS'Gbc' p7 -aS'Me' +aS'Mc' p8 -aS'Phie' +aS'Phic' p9 -aS'Gbe' +aS'Cjc' p10 -aS'Tauf' +aS'Is' p11 -aS'Gbc' +aS'Phie' p12 -aS'Mc' -p13 aS'Ccs' +p13 +aS'Cje' p14 aS'Taur' p15 -aS'graphics' +aS'Vt' p16 -aS'EMinMax' +aS'Br' p17 -aS'Is' +aS'graphics' p18 -aS'exprs' +aS'EMinMax' p19 -aS'gr_i' -p20 -aS'Vt' -p21 aS'x' -p22 +p20 aS'model' -p23 -atp24 -Rp25 +p21 +atp22 +Rp23 .(dp0 S'x.model.equations.parameters[2-1]' p1 diff --git a/js/Electrical/PotentialSensor.js b/js/Electrical/PotentialSensor.js index 8f114319..301e60c9 100644 --- a/js/Electrical/PotentialSensor.js +++ b/js/Electrical/PotentialSensor.js @@ -13,8 +13,8 @@ function PotentialSensor() { mo.inputs = "p"; mo.outputs = ["v"]; this.model.equations = new ScilabDouble([mo]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PotentialSensor\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([""]),list(this.gr_i,0)); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PotentialSensor\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([""]),list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["E"]; return new BasicBlock(this.x); diff --git a/js/Electrical/PotentialSensor.pickle b/js/Electrical/PotentialSensor.pickle index 7f05e0bf..9d4b0221 100644 --- a/js/Electrical/PotentialSensor.pickle +++ b/js/Electrical/PotentialSensor.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/Electrical/Resistor.js b/js/Electrical/Resistor.js index fc7188de..5a7e80c9 100644 --- a/js/Electrical/Resistor.js +++ b/js/Electrical/Resistor.js @@ -15,9 +15,9 @@ function Resistor() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); - this.exprs = string(this.R); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Resistor\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabString([this.exprs]),list(this.gr_i,0)); + var exprs = string(this.R); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Resistor\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabString([exprs]),list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -32,7 +32,7 @@ function Resistor() { return options; } Resistor.prototype.set = function Resistor() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.R = parseFloat(arguments[0]["R"]); @@ -41,7 +41,7 @@ function Resistor() { } this.model.rpar = new ScilabDouble([this.R]); this.model.equations.parameters[2-1] = list(new ScilabDouble([this.R])); - 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/Electrical/Resistor.pickle b/js/Electrical/Resistor.pickle index b76bb187..f49160e2 100644 --- a/js/Electrical/Resistor.pickle +++ b/js/Electrical/Resistor.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'R' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'R' p4 aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'arg1' p1 diff --git a/js/Electrical/SineVoltage.js b/js/Electrical/SineVoltage.js index 7ea26903..ce87c9ae 100644 --- a/js/Electrical/SineVoltage.js +++ b/js/Electrical/SineVoltage.js @@ -19,9 +19,9 @@ function SineVoltage() { mo.outputs = "n"; mo.parameters = list([["V"],["phase"],["freqHz"],["offset"],["startTime"]],list(this.V,this.ph,this.frq,this.offset,this.start)); this.model.equations = new ScilabDouble([mo]); - this.exprs = [[string(this.V)],[string(this.ph)],[string(this.frq)],[string(this.offset)],[string(this.start)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SineVoltage\",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.V)],[string(this.ph)],[string(this.frq)],[string(this.offset)],[string(this.start)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SineVoltage\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),gr_i); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -40,7 +40,7 @@ function SineVoltage() { return options; } SineVoltage.prototype.set = function SineVoltage() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.V = parseFloat(arguments[0]["V"]); @@ -53,7 +53,7 @@ function SineVoltage() { } this.model.rpar = new ScilabDouble([this.V],[this.ph],[this.frq],[this.offset],[this.start]); this.model.equations.parameters[2-1] = list(new ScilabDouble([this.V]), new ScilabDouble([this.ph]), new ScilabDouble([this.frq]), new ScilabDouble([this.offset]), new ScilabDouble([this.start])); - 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/Electrical/SineVoltage.pickle b/js/Electrical/SineVoltage.pickle index 5f558e59..572e9e0f 100644 --- a/js/Electrical/SineVoltage.pickle +++ b/js/Electrical/SineVoltage.pickle @@ -2,28 +2,24 @@ c__builtin__ set p0 ((lp1 -S'start' +S'graphics' p2 -aS'graphics' -p3 aS'offset' +p3 +aS'start' p4 -aS'exprs' -p5 aS'frq' -p6 -aS'gr_i' -p7 +p5 aS'V' -p8 +p6 aS'x' -p9 +p7 aS'model' -p10 +p8 aS'ph' -p11 -atp12 -Rp13 +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/Electrical/Switch.js b/js/Electrical/Switch.js index 7b44c522..9252c037 100644 --- a/js/Electrical/Switch.js +++ b/js/Electrical/Switch.js @@ -18,9 +18,9 @@ function Switch() { this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.model.rpar = new ScilabDouble([Z]); - this.exprs = string(Z); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Switch\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),list(this.gr_i,0)); + var exprs = string(Z); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Switch\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([exprs]),list(gr_i,0)); this.x.graphics.in_implicit = [["I"],["E"]]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -36,7 +36,7 @@ function Switch() { return options; } Switch.prototype.set = function Switch() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.Ron = parseFloat(arguments[0]["Ron"]); @@ -45,7 +45,7 @@ function Switch() { break; } this.model.equations.parameters[2-1] = list(new ScilabDouble([this.Ron]), new ScilabDouble([this.Roff])); - 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/Electrical/Switch.pickle b/js/Electrical/Switch.pickle index ca3caa79..eca3d4a6 100644 --- a/js/Electrical/Switch.pickle +++ b/js/Electrical/Switch.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'Roff' +S'x' p2 -aS'Ron' +aS'model' p3 -aS'exprs' +aS'Roff' p4 -aS'gr_i' +aS'Ron' p5 aS'graphics' p6 -aS'x' -p7 -aS'model' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/Electrical/VVsourceAC.js b/js/Electrical/VVsourceAC.js index 0699d69c..6ddeff62 100644 --- a/js/Electrical/VVsourceAC.js +++ b/js/Electrical/VVsourceAC.js @@ -16,9 +16,9 @@ function VVsourceAC() { mo.outputs = "n"; mo.parameters = list(["f"],list(this.FR)); this.model.equations = new ScilabDouble([mo]); - this.exprs = [string(this.FR)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VVsourceAC\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(this.exprs),list(this.gr_i,0)); + var exprs = [string(this.FR)]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VVsourceAC\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(exprs),list(gr_i,0)); this.x.graphics.in_implicit = ["I","E"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -33,7 +33,7 @@ function VVsourceAC() { return options; } VVsourceAC.prototype.set = function VVsourceAC() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.FR = parseFloat(arguments[0]["FR"]); @@ -42,7 +42,7 @@ function VVsourceAC() { } this.model.rpar = new ScilabDouble([this.FR]); this.model.equations.parameters[2-1] = list(new ScilabDouble([this.FR])); - 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/Electrical/VVsourceAC.pickle b/js/Electrical/VVsourceAC.pickle index 04d0ae15..9b95fe12 100644 --- a/js/Electrical/VVsourceAC.pickle +++ b/js/Electrical/VVsourceAC.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'FR' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'FR' p4 aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'FR' p1 diff --git a/js/Electrical/VariableResistor.js b/js/Electrical/VariableResistor.js index f9ab9a83..75f36590 100644 --- a/js/Electrical/VariableResistor.js +++ b/js/Electrical/VariableResistor.js @@ -12,9 +12,9 @@ function VariableResistor() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); - this.exprs = []; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VariableResistor\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); + var exprs = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VariableResistor\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),list(gr_i,0)); this.x.graphics.in_implicit = ["I","E"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Electrical/VariableResistor.pickle b/js/Electrical/VariableResistor.pickle index 73a8a892..1fda0aff 100644 --- a/js/Electrical/VariableResistor.pickle +++ b/js/Electrical/VariableResistor.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/Electrical/VoltageSensor.js b/js/Electrical/VoltageSensor.js index 732b29e3..de661de1 100644 --- a/js/Electrical/VoltageSensor.js +++ b/js/Electrical/VoltageSensor.js @@ -12,9 +12,9 @@ function VoltageSensor() { mo.inputs = "p"; mo.outputs = [["n"],["v"]]; this.model.equations = new ScilabDouble([mo]); - this.exprs = []; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VoltageSensor\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); + var exprs = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VoltageSensor\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["E"]]; return new VoltageSensorBlock(this.x); diff --git a/js/Electrical/VoltageSensor.pickle b/js/Electrical/VoltageSensor.pickle index c2c5913a..4363fe88 100644 --- a/js/Electrical/VoltageSensor.pickle +++ b/js/Electrical/VoltageSensor.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/Electrical/VsourceAC.js b/js/Electrical/VsourceAC.js index a1acdac4..b14581f4 100644 --- a/js/Electrical/VsourceAC.js +++ b/js/Electrical/VsourceAC.js @@ -16,9 +16,9 @@ function VsourceAC() { mo.outputs = "n"; mo.parameters = list([["VA"],["f"]],list(this.VA,this.FR)); this.model.equations = new ScilabDouble([mo]); - this.exprs = [[string(this.VA)],[string(this.FR)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VsourceAC\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); + var exprs = [[string(this.VA)],[string(this.FR)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VsourceAC\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -34,7 +34,7 @@ function VsourceAC() { return options; } VsourceAC.prototype.set = function VsourceAC() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.VA = parseFloat(arguments[0]["VA"]); @@ -44,7 +44,7 @@ function VsourceAC() { } this.model.rpar = new ScilabDouble([this.VA],[this.FR]); this.model.equations.parameters[2-1] = list(new ScilabDouble([this.VA]), new ScilabDouble([this.FR])); - 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/Electrical/VsourceAC.pickle b/js/Electrical/VsourceAC.pickle index f0fb4a57..8e5d8fde 100644 --- a/js/Electrical/VsourceAC.pickle +++ b/js/Electrical/VsourceAC.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'VA' +S'x' p2 -aS'FR' +aS'model' p3 -aS'exprs' +aS'VA' p4 -aS'gr_i' +aS'FR' p5 aS'graphics' p6 -aS'x' -p7 -aS'model' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'FR' p1 diff --git a/js/Events/ANDBLK.pickle b/js/Events/ANDBLK.pickle index e00bbee6..a5a6ed4b 100644 --- a/js/Events/ANDBLK.pickle +++ b/js/Events/ANDBLK.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'diagram.objs[1-1]' p1 diff --git a/js/Events/ANDLOG_f.js b/js/Events/ANDLOG_f.js index b6d6671f..3aeaa30d 100644 --- a/js/Events/ANDLOG_f.js +++ b/js/Events/ANDLOG_f.js @@ -8,8 +8,8 @@ function ANDLOG_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ANDLOG_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,3]),this.model,new ScilabDouble([]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ANDLOG_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,3]),this.model,new ScilabDouble([]),gr_i); return new BasicBlock(this.x); } ANDLOG_f.prototype.details = function ANDLOG_f() { diff --git a/js/Events/ANDLOG_f.pickle b/js/Events/ANDLOG_f.pickle index 30d979c2..26374ff6 100644 --- a/js/Events/ANDLOG_f.pickle +++ b/js/Events/ANDLOG_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/Events/CLKSOMV_f.js b/js/Events/CLKSOMV_f.js index e6907d4e..b5a02ef9 100644 --- a/js/Events/CLKSOMV_f.js +++ b/js/Events/CLKSOMV_f.js @@ -8,8 +8,8 @@ function CLKSOMV_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKSOMV_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),\"CLKSOMV_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); } CLKSOMV_f.prototype.details = function CLKSOMV_f() { diff --git a/js/Events/CLKSOMV_f.pickle b/js/Events/CLKSOMV_f.pickle index 13328761..d3cbc906 100644 --- a/js/Events/CLKSOMV_f.pickle +++ b/js/Events/CLKSOMV_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/Events/CLKSOM_f.js b/js/Events/CLKSOM_f.js index 932c979a..1b67fd78 100644 --- a/js/Events/CLKSOM_f.js +++ b/js/Events/CLKSOM_f.js @@ -8,8 +8,8 @@ function CLKSOM_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKSOM_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabDouble([]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKSOM_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabDouble([]),gr_i); return new BasicBlock(this.x); } CLKSOM_f.prototype.details = function CLKSOM_f() { diff --git a/js/Events/CLKSOM_f.pickle b/js/Events/CLKSOM_f.pickle index 13328761..d3cbc906 100644 --- a/js/Events/CLKSOM_f.pickle +++ b/js/Events/CLKSOM_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/Events/CLKSPLIT_f.pickle b/js/Events/CLKSPLIT_f.pickle index 3235bd26..eedc04a1 100644 --- a/js/Events/CLKSPLIT_f.pickle +++ b/js/Events/CLKSPLIT_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/Events/END_c.js b/js/Events/END_c.js index 70af91e8..89478703 100644 --- a/js/Events/END_c.js +++ b/js/Events/END_c.js @@ -9,9 +9,9 @@ function END_c() { this.model.firing = new ScilabDouble([this.tf]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = string(this.tf); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"END_c\",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.tf); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"END_c\",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); } END_c.prototype.details = function END_c() { @@ -24,7 +24,7 @@ function END_c() { return options; } END_c.prototype.set = function END_c() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.tf = parseFloat(arguments[0]["tf"]); @@ -32,7 +32,7 @@ function END_c() { break; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.firing = new ScilabDouble([this.tf]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Events/END_c.pickle b/js/Events/END_c.pickle index d39b4b9d..dbe03e14 100644 --- a/js/Events/END_c.pickle +++ b/js/Events/END_c.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'tf' p2 -aS'gr_i' +aS'x' p3 -aS'graphics' +aS'model' p4 -aS'tf' +aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Events/EVTDLY_c.js b/js/Events/EVTDLY_c.js index b3b35bda..26e11e47 100644 --- a/js/Events/EVTDLY_c.js +++ b/js/Events/EVTDLY_c.js @@ -11,9 +11,9 @@ function EVTDLY_c() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([this.ff]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[string(this.dt)],[sci2exp(this.ff)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTDLY_c\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[string(this.dt)],[sci2exp(this.ff)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTDLY_c\",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); } EVTDLY_c.prototype.details = function EVTDLY_c() { @@ -27,7 +27,7 @@ function EVTDLY_c() { return options; } EVTDLY_c.prototype.set = function EVTDLY_c() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.dt = parseFloat(arguments[0]["dt"]); @@ -41,7 +41,7 @@ function EVTDLY_c() { var ok = false; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble([this.dt],[this.ff]); this.model.firing = new ScilabDouble([this.ff]); this.x.graphics = this.graphics; diff --git a/js/Events/EVTDLY_c.pickle b/js/Events/EVTDLY_c.pickle index d6bbd0fa..e5ee1b5a 100644 --- a/js/Events/EVTDLY_c.pickle +++ b/js/Events/EVTDLY_c.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'x' p2 -aS'gr_i' +aS'model' p3 -aS'ff' +aS'dt' p4 -aS'graphics' +aS'ff' p5 -aS'x' +aS'graphics' p6 -aS'model' -p7 -aS'dt' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/Events/EVTDLY_f.js b/js/Events/EVTDLY_f.js index 244d0e3f..f355fc65 100644 --- a/js/Events/EVTDLY_f.js +++ b/js/Events/EVTDLY_f.js @@ -11,9 +11,9 @@ function EVTDLY_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([this.ff]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[string(this.dt)],[sci2exp(this.ff)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTDLY_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.dt)],[sci2exp(this.ff)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTDLY_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); } EVTDLY_f.prototype.details = function EVTDLY_f() { @@ -27,7 +27,7 @@ function EVTDLY_f() { return options; } EVTDLY_f.prototype.set = function EVTDLY_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.dt = parseFloat(arguments[0]["dt"]); @@ -41,7 +41,7 @@ function EVTDLY_f() { var ok = false; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble([this.dt]); this.model.firing = new ScilabDouble([this.ff]); this.x.graphics = this.graphics; diff --git a/js/Events/EVTDLY_f.pickle b/js/Events/EVTDLY_f.pickle index 8f4831ec..744b403c 100644 --- a/js/Events/EVTDLY_f.pickle +++ b/js/Events/EVTDLY_f.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'x' p2 -aS'gr_i' +aS'model' p3 -aS'ff' +aS'dt' p4 -aS'graphics' +aS'ff' p5 -aS'x' +aS'graphics' p6 -aS'model' -p7 -aS'dt' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/Events/EVTGEN_f.js b/js/Events/EVTGEN_f.js index a0ccfd8a..d651c74d 100644 --- a/js/Events/EVTGEN_f.js +++ b/js/Events/EVTGEN_f.js @@ -8,9 +8,9 @@ function EVTGEN_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([this.tt]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = string(this.tt); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTGEN_f\",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.tt); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTGEN_f\",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); } EVTGEN_f.prototype.details = function EVTGEN_f() { @@ -23,14 +23,14 @@ function EVTGEN_f() { return options; } EVTGEN_f.prototype.set = function EVTGEN_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.tt = parseFloat(arguments[0]["tt"]); if (!ok) { break; } - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); if (this.model.firing!=this.tt) { this.model.firing = new ScilabDouble([this.tt]); } diff --git a/js/Events/EVTGEN_f.pickle b/js/Events/EVTGEN_f.pickle index 2fcdb628..84e3bf23 100644 --- a/js/Events/EVTGEN_f.pickle +++ b/js/Events/EVTGEN_f.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'tt' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'tt' p4 aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Events/EVTVARDLY.js b/js/Events/EVTVARDLY.js index 791714d4..ab7fa3df 100644 --- a/js/Events/EVTVARDLY.js +++ b/js/Events/EVTVARDLY.js @@ -10,9 +10,9 @@ function EVTVARDLY() { this.model.firing = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = string(this.model.firing); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTVARDLY\",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.firing); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTVARDLY\",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); } EVTVARDLY.prototype.details = function EVTVARDLY() { @@ -25,14 +25,14 @@ function EVTVARDLY() { return options; } EVTVARDLY.prototype.set = function EVTVARDLY() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.fir = arguments[0]["fir"]; if (!ok) { break; } - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.firing = new ScilabDouble([this.fir]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Events/EVTVARDLY.pickle b/js/Events/EVTVARDLY.pickle index cf9f65c6..7fbae78f 100644 --- a/js/Events/EVTVARDLY.pickle +++ b/js/Events/EVTVARDLY.pickle @@ -4,18 +4,14 @@ p0 ((lp1 S'fir' 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'model.sim' p1 diff --git a/js/Events/HALT_f.js b/js/Events/HALT_f.js index d11540c7..30073376 100644 --- a/js/Events/HALT_f.js +++ b/js/Events/HALT_f.js @@ -9,9 +9,9 @@ function HALT_f() { this.model.ipar = new ScilabDouble([0]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = string(this.n); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"HALT_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.n); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"HALT_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); } HALT_f.prototype.details = function HALT_f() { @@ -24,7 +24,7 @@ function HALT_f() { return options; } HALT_f.prototype.set = function HALT_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.n = parseFloat(arguments[0]["n"]); @@ -32,7 +32,7 @@ function HALT_f() { break; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.ipar = new ScilabDouble([this.n]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Events/HALT_f.pickle b/js/Events/HALT_f.pickle index eb4ae364..1286a722 100644 --- a/js/Events/HALT_f.pickle +++ b/js/Events/HALT_f.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'n' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'n' p4 aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Events/IFTHEL_f.js b/js/Events/IFTHEL_f.js index 30d8eada..50fe5c53 100644 --- a/js/Events/IFTHEL_f.js +++ b/js/Events/IFTHEL_f.js @@ -13,9 +13,9 @@ function IFTHEL_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.model.nmode = new ScilabDouble([1]); this.model.nzcross = new ScilabDouble([1]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IFTHEL_f\",sz(1),sz(2));"]); - this.exprs = [[string(this.model.in)],[string(this.model.nmode)]]; - this.x = new standard_define(new ScilabDouble([3,3]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IFTHEL_f\",sz(1),sz(2));"]); + var exprs = [[string(this.model.in)],[string(this.model.nmode)]]; + this.x = new standard_define(new ScilabDouble([3,3]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } IFTHEL_f.prototype.details = function IFTHEL_f() { @@ -29,12 +29,12 @@ function IFTHEL_f() { return options; } IFTHEL_f.prototype.set = function IFTHEL_f() { - this.exprs = this.graphics.exprs; - if (this.exprs.length==0) { - this.exprs = string(1); + var exprs = this.graphics.exprs; + if (exprs.length==0) { + var exprs = string(1); } - if (size(this.exprs,"*")==1) { - this.exprs[2-1] = string(1); + if (size(exprs,"*")==1) { + exprs[2-1] = string(1); } while (true) { var ok = true; @@ -55,7 +55,7 @@ function IFTHEL_f() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabString([this.exprs]); + this.graphics.exprs = new ScilabString([exprs]); this.model.evtin = new ScilabDouble(this.inh); this.model.sim[2-1] = new ScilabDouble([-1]); this.model.nmode = new ScilabDouble([this.nmod]); diff --git a/js/Events/IFTHEL_f.pickle b/js/Events/IFTHEL_f.pickle index 77e313b9..b82c9fb3 100644 --- a/js/Events/IFTHEL_f.pickle +++ b/js/Events/IFTHEL_f.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'nmod' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' -p4 aS'inh' +p4 +aS'nmod' p5 aS'graphics' p6 -aS'x' -p7 -aS'model' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/Events/MCLOCK_f.js b/js/Events/MCLOCK_f.js index cdc40601..dfff693a 100644 --- a/js/Events/MCLOCK_f.js +++ b/js/Events/MCLOCK_f.js @@ -3,12 +3,12 @@ function MCLOCK_f() { MCLOCK_f.prototype.define = function MCLOCK_f() { var nn = 2; var dt = 0.1; - this.exprs = [[string(dt)],[string(nn)]]; + var exprs = [[string(dt)],[string(nn)]]; var mfclck = MFCLCK_f("define"); mfclck.graphics.orig = [334,199]; mfclck.graphics.sz = [40,40]; mfclck.graphics.flip = true; - mfclck.graphics.exprs = this.exprs; + mfclck.graphics.exprs = exprs; mfclck.graphics.pein = 12; mfclck.graphics.peout = [[4],[3]]; mfclck.model.rpar = 0.1; @@ -43,7 +43,7 @@ function MCLOCK_f() { split2.graphics.orig = [[482.45315],[169.33333]]; split2.graphics.pein = 5; split2.graphics.peout = [[12],[13]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MCLOCK_f\",sz(1),sz(2));"]); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MCLOCK_f\",sz(1),sz(2));"]); var diagram = scicos_diagram(); diagram.objs[1-1] = mfclck; diagram.objs[2-1] = clksom; @@ -61,7 +61,7 @@ function MCLOCK_f() { this.x = scicos_block(); this.x.gui = "MCLOCK_f"; this.x.graphics.sz = [3,2]; - this.x.graphics.gr_i = this.gr_i; + this.x.graphics.gr_i = gr_i; this.x.model.sim = "csuper"; this.x.model.evtout = [[1],[1]]; this.x.model.blocktype = "h"; diff --git a/js/Events/MCLOCK_f.pickle b/js/Events/MCLOCK_f.pickle index aba4263b..2e6139a4 100644 --- a/js/Events/MCLOCK_f.pickle +++ b/js/Events/MCLOCK_f.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'x' p2 -aS'gr_i' +aS'model' p3 -aS'graphics' +aS'xxn' p4 -aS'x' +aS'graphics' p5 -aS'model' -p6 -aS'xxn' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'output_port1.graphics.exprs' p1 diff --git a/js/Events/MFCLCK_f.js b/js/Events/MFCLCK_f.js index b20c23d7..26f05135 100644 --- a/js/Events/MFCLCK_f.js +++ b/js/Events/MFCLCK_f.js @@ -13,9 +13,9 @@ function MFCLCK_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1,0]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[string(this.dt)],[string(this.nn)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MFCLCK_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[string(this.dt)],[string(this.nn)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MFCLCK_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); } MFCLCK_f.prototype.details = function MFCLCK_f() { @@ -29,7 +29,7 @@ function MFCLCK_f() { return options; } MFCLCK_f.prototype.set = function MFCLCK_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var ok = true; this.dt = parseFloat(arguments[0]["dt"]); this.nn = parseFloat(arguments[0]["nn"]); @@ -39,7 +39,7 @@ function MFCLCK_f() { var hh = this.model.firing; hh[2-1] = 0; this.model.firing = new ScilabDouble(hh); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; } diff --git a/js/Events/MFCLCK_f.pickle b/js/Events/MFCLCK_f.pickle index 9a07850c..6151b4df 100644 --- a/js/Events/MFCLCK_f.pickle +++ b/js/Events/MFCLCK_f.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'nn' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'dt' p4 -aS'graphics' +aS'nn' p5 -aS'x' +aS'graphics' p6 -aS'model' -p7 -aS'dt' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/Events/M_freq.js b/js/Events/M_freq.js index c764176a..f240607e 100644 --- a/js/Events/M_freq.js +++ b/js/Events/M_freq.js @@ -10,9 +10,9 @@ function M_freq() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([0,-1,-1]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[sci2exp([[1],[2]])],[sci2exp([[0],[0]])]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"M_freq\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[sci2exp([[1],[2]])],[sci2exp([[0],[0]])]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"M_freq\",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); } M_freq.prototype.details = function M_freq() { @@ -26,7 +26,7 @@ function M_freq() { return options; } M_freq.prototype.set = function M_freq() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.frequ = inverse(arguments[0]["frequ"]); @@ -74,7 +74,7 @@ function M_freq() { this.graphics.sz = new ScilabDouble([50,40]); } this.model.firing = new ScilabDouble([fir]); - 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/Events/M_freq.pickle b/js/Events/M_freq.pickle index c66a8c64..6d8b6f60 100644 --- a/js/Events/M_freq.pickle +++ b/js/Events/M_freq.pickle @@ -8,20 +8,16 @@ aS'of' p3 aS'frequ' p4 -aS'offset' +aS'graphics' p5 -aS'exprs' +aS'offset' p6 -aS'gr_i' -p7 -aS'graphics' -p8 aS'x' -p9 +p7 aS'model' -p10 -atp11 -Rp12 +p8 +atp9 +Rp10 .(dp0 S'arg1' p1 diff --git a/js/Events/VirtualCLK0.js b/js/Events/VirtualCLK0.js index ea3e7638..ba638920 100644 --- a/js/Events/VirtualCLK0.js +++ b/js/Events/VirtualCLK0.js @@ -9,8 +9,8 @@ function VirtualCLK0() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = []; - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs)," "); + var exprs = []; + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs)," "); return new BasicBlock(this.x); } VirtualCLK0.prototype.details = function VirtualCLK0() { diff --git a/js/Events/VirtualCLK0.pickle b/js/Events/VirtualCLK0.pickle index b44a7f0c..5158c78c 100644 --- a/js/Events/VirtualCLK0.pickle +++ b/js/Events/VirtualCLK0.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/Events/freq_div.js b/js/Events/freq_div.js index 1531f9e7..66b8a2dd 100644 --- a/js/Events/freq_div.js +++ b/js/Events/freq_div.js @@ -103,8 +103,8 @@ function freq_div() { this.model.evtin = 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),\"freq_div\",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),\"freq_div\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([]),gr_i); return new BasicBlock(this.x); } freq_div.prototype.details = function freq_div() { @@ -132,7 +132,7 @@ function freq_div() { spath[$+1-1] = path; var xxn = xx; this.graphics = xx.graphics; - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; this.model = xx.model; while (true) { var ok = true; @@ -149,7 +149,7 @@ function freq_div() { if (%ph>%df-1) { %ph = %df-1; } - this.graphics.exprs = new ScilabDouble(this.exprs); + this.graphics.exprs = new ScilabDouble(exprs); this.model.ipar = new ScilabDouble([%df]); this.model.dstate = new ScilabDouble([%ph]); xxn.graphics = this.graphics; diff --git a/js/Events/freq_div.pickle b/js/Events/freq_div.pickle index 9b2944e4..77101c43 100644 --- a/js/Events/freq_div.pickle +++ b/js/Events/freq_div.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'%df' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'%df' p4 aS'%ph' p5 aS'graphics' p6 -aS'x' -p7 -aS'model' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'lnk.ct' p1 diff --git a/js/Hydraulics/Bache.js b/js/Hydraulics/Bache.js index 493ac9fa..132f80eb 100644 --- a/js/Hydraulics/Bache.js +++ b/js/Hydraulics/Bache.js @@ -27,9 +27,9 @@ function Bache() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); - this.exprs = [[string(this.Patm)],[string(this.A)],[string(this.ze1)],[string(this.ze2)],[string(this.zs1)],[string(this.zs2)],[string(this.z0)],[string(this.T0)],[string(this.p_rho)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Bache\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); + var exprs = [[string(this.Patm)],[string(this.A)],[string(this.ze1)],[string(this.ze2)],[string(this.zs1)],[string(this.zs2)],[string(this.z0)],[string(this.T0)],[string(this.p_rho)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Bache\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),list(gr_i,0)); this.x.graphics.in_implicit = [["I"],["I"]]; this.x.graphics.out_implicit = [["I"],["I"],["E"]]; return new BasicBlock(this.x); @@ -52,7 +52,7 @@ function Bache() { return options; } Bache.prototype.set = function Bache() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.Patm = parseFloat(arguments[0]["Patm"]); @@ -69,7 +69,7 @@ function Bache() { } this.model.rpar = new ScilabDouble([this.Patm],[this.A],[this.ze1],[this.ze2],[this.zs1],[this.zs2],[this.z0],[this.T0],[this.p_rho]); this.model.equations.parameters[2-1] = list(new ScilabDouble([this.Patm]), new ScilabDouble([this.A]), new ScilabDouble([this.ze1]), new ScilabDouble([this.ze2]), new ScilabDouble([this.zs1]), new ScilabDouble([this.zs2]), new ScilabDouble([this.z0]), new ScilabDouble([this.T0]), new ScilabDouble([this.p_rho])); - 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/Hydraulics/Bache.pickle b/js/Hydraulics/Bache.pickle index a30426e7..5d638770 100644 --- a/js/Hydraulics/Bache.pickle +++ b/js/Hydraulics/Bache.pickle @@ -14,24 +14,20 @@ aS'T0' p6 aS'ze2' p7 -aS'exprs' -p8 aS'ze1' -p9 -aS'gr_i' -p10 +p8 aS'p_rho' -p11 +p9 aS'graphics' -p12 +p10 aS'x' -p13 +p11 aS'model' -p14 +p12 aS'Patm' -p15 -atp16 -Rp17 +p13 +atp14 +Rp15 .(dp0 S'arg1' p1 diff --git a/js/Hydraulics/Flowmeter.js b/js/Hydraulics/Flowmeter.js index cb848037..76c64588 100644 --- a/js/Hydraulics/Flowmeter.js +++ b/js/Hydraulics/Flowmeter.js @@ -36,15 +36,15 @@ function Flowmeter() { mo.outputs = MO; this.model.rpar = new ScilabDouble([PrametersValue]); mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName)); - this.exprs = "1"; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Flowmeter\",sz(1),sz(2));"]); + var exprs = "1"; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Flowmeter\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([exprs]),list(gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); @@ -59,8 +59,8 @@ function Flowmeter() { return options; } Flowmeter.prototype.set = function Flowmeter() { - this.exprs = this.graphics.exprs; - this.exprs = this.x.graphics.exprs; + var exprs = this.graphics.exprs; + var exprs = this.x.graphics.exprs; while (false) { var ok = true; this.Qini = arguments[0]["Qini"]; @@ -68,7 +68,7 @@ function Flowmeter() { break; } this.x.model.equations.parameters[2-1] = list(this.Qini); - this.x.graphics.exprs = this.exprs; + this.x.graphics.exprs = exprs; break; } return new BasicBlock(this.x); diff --git a/js/Hydraulics/Flowmeter.pickle b/js/Hydraulics/Flowmeter.pickle index 17e70da6..4de3df34 100644 --- a/js/Hydraulics/Flowmeter.pickle +++ b/js/Hydraulics/Flowmeter.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'Qini' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'Qini' p4 aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'x.model.equations.parameters[2-1]' p1 diff --git a/js/Hydraulics/PerteDP.js b/js/Hydraulics/PerteDP.js index fd909028..f7f741bb 100644 --- a/js/Hydraulics/PerteDP.js +++ b/js/Hydraulics/PerteDP.js @@ -22,9 +22,9 @@ function PerteDP() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); - this.exprs = [[string(this.L)],[string(this.D)],[string(this.lambda)],[string(this.z1)],[string(this.z2)],[string(this.p_rho)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PerteDP\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); + var exprs = [[string(this.L)],[string(this.D)],[string(this.lambda)],[string(this.z1)],[string(this.z2)],[string(this.p_rho)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PerteDP\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabDouble(exprs),list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -44,7 +44,7 @@ function PerteDP() { return options; } PerteDP.prototype.set = function PerteDP() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.L = parseFloat(arguments[0]["L"]); @@ -58,7 +58,7 @@ function PerteDP() { } this.model.rpar = new ScilabDouble([this.L],[this.D],[this.lambda],[this.z1],[this.z2],[this.p_rho]); this.model.equations.parameters[2-1] = list(new ScilabDouble([this.L]), new ScilabDouble([this.D]), new ScilabDouble([this.lambda]), new ScilabDouble([this.z1]), new ScilabDouble([this.z2]), new ScilabDouble([this.p_rho])); - 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/Hydraulics/PerteDP.pickle b/js/Hydraulics/PerteDP.pickle index d72e0b98..df7b6740 100644 --- a/js/Hydraulics/PerteDP.pickle +++ b/js/Hydraulics/PerteDP.pickle @@ -6,26 +6,22 @@ S'D' p2 aS'L' p3 -aS'exprs' -p4 -aS'gr_i' -p5 aS'p_rho' -p6 +p4 aS'graphics' -p7 +p5 aS'x' -p8 +p6 aS'model' -p9 +p7 aS'z1' -p10 +p8 aS'z2' -p11 +p9 aS'lambda' -p12 -atp13 -Rp14 +p10 +atp11 +Rp12 .(dp0 S'arg1' p1 diff --git a/js/Hydraulics/PuitsP.js b/js/Hydraulics/PuitsP.js index be1ed897..601c2094 100644 --- a/js/Hydraulics/PuitsP.js +++ b/js/Hydraulics/PuitsP.js @@ -16,9 +16,9 @@ function PuitsP() { mo.parameters = list([["P0"],["T0"],["H0"],["option_temperature"]],[[this.P0],[this.T0],[this.H0],[this.option_temperature]]); this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); - this.exprs = [[string(this.P0)],[string(this.T0)],[string(this.H0)],[string(this.option_temperature)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PuitsP\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); + var exprs = [[string(this.P0)],[string(this.T0)],[string(this.H0)],[string(this.option_temperature)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PuitsP\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,new ScilabDouble(exprs),list(gr_i,0)); this.x.graphics.in_implicit = ["I"]; return new BasicBlock(this.x); } @@ -35,7 +35,7 @@ function PuitsP() { return options; } PuitsP.prototype.set = function PuitsP() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.P0 = parseFloat(arguments[0]["P0"]); @@ -47,7 +47,7 @@ function PuitsP() { } this.model.rpar = new ScilabDouble([this.P0],[this.T0],[this.H0],[this.option_temperature]); this.model.equations.parameters[2-1] = list(new ScilabDouble([this.P0]), new ScilabDouble([this.T0]), new ScilabDouble([this.H0]), new ScilabDouble([this.option_temperature])); - 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/Hydraulics/PuitsP.pickle b/js/Hydraulics/PuitsP.pickle index 341e98aa..e6ddbda5 100644 --- a/js/Hydraulics/PuitsP.pickle +++ b/js/Hydraulics/PuitsP.pickle @@ -8,20 +8,16 @@ aS'H0' p3 aS'T0' p4 -aS'exprs' -p5 -aS'gr_i' -p6 aS'graphics' -p7 +p5 aS'x' -p8 +p6 aS'model' -p9 +p7 aS'option_temperature' -p10 -atp11 -Rp12 +p8 +atp9 +Rp10 .(dp0 S'arg1' p1 diff --git a/js/Hydraulics/SourceP.js b/js/Hydraulics/SourceP.js index e1d4badb..fa476a33 100644 --- a/js/Hydraulics/SourceP.js +++ b/js/Hydraulics/SourceP.js @@ -18,9 +18,9 @@ function SourceP() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); - this.exprs = [[string(this.P0)],[string(this.T0)],[string(this.H0)],[string(this.option_temperature)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SourceP\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); + var exprs = [[string(this.P0)],[string(this.T0)],[string(this.H0)],[string(this.option_temperature)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SourceP\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,new ScilabDouble(exprs),list(gr_i,0)); this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); } @@ -37,7 +37,7 @@ function SourceP() { return options; } SourceP.prototype.set = function SourceP() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.P0 = parseFloat(arguments[0]["P0"]); @@ -49,7 +49,7 @@ function SourceP() { } this.model.rpar = new ScilabDouble([this.P0],[this.T0],[this.H0],[this.option_temperature]); this.model.equations.parameters[2-1] = list(new ScilabDouble([this.P0]), new ScilabDouble([this.T0]), new ScilabDouble([this.H0]), new ScilabDouble([this.option_temperature])); - 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/Hydraulics/SourceP.pickle b/js/Hydraulics/SourceP.pickle index fe605e44..7d344327 100644 --- a/js/Hydraulics/SourceP.pickle +++ b/js/Hydraulics/SourceP.pickle @@ -8,20 +8,16 @@ aS'H0' p3 aS'T0' p4 -aS'exprs' -p5 -aS'gr_i' -p6 aS'graphics' -p7 +p5 aS'x' -p8 +p6 aS'model' -p9 +p7 aS'option_temperature' -p10 -atp11 -Rp12 +p8 +atp9 +Rp10 .(dp0 S'arg1' p1 diff --git a/js/Hydraulics/VanneReglante.js b/js/Hydraulics/VanneReglante.js index 3ee79187..e17b69b9 100644 --- a/js/Hydraulics/VanneReglante.js +++ b/js/Hydraulics/VanneReglante.js @@ -18,9 +18,9 @@ function VanneReglante() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); - this.exprs = [[string(this.Cvmax)],[string(this.p_rho)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VanneReglante\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); + var exprs = [[string(this.Cvmax)],[string(this.p_rho)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VanneReglante\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),list(gr_i,0)); this.x.graphics.in_implicit = [["I"],["E"]]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -36,7 +36,7 @@ function VanneReglante() { return options; } VanneReglante.prototype.set = function VanneReglante() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.Cvmax = parseFloat(arguments[0]["Cvmax"]); @@ -46,7 +46,7 @@ function VanneReglante() { } this.model.rpar = new ScilabDouble([this.Cvmax],[this.p_rho]); this.model.equations.parameters[2-1] = list(new ScilabDouble([this.Cvmax]), new ScilabDouble([this.p_rho])); - 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/Hydraulics/VanneReglante.pickle b/js/Hydraulics/VanneReglante.pickle index 13a61e27..375f1483 100644 --- a/js/Hydraulics/VanneReglante.pickle +++ b/js/Hydraulics/VanneReglante.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'Cvmax' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' -p4 aS'p_rho' +p4 +aS'Cvmax' p5 aS'graphics' p6 -aS'x' -p7 -aS'model' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/IntegerOp/BITCLEAR.js b/js/IntegerOp/BITCLEAR.js index fe9272b7..bd741b62 100644 --- a/js/IntegerOp/BITCLEAR.js +++ b/js/IntegerOp/BITCLEAR.js @@ -12,9 +12,9 @@ function BITCLEAR() { this.model.opar = list(new ScilabDouble([int32(0)])); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[sci2exp(3)],[sci2exp(0)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BITCLEAR\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[sci2exp(3)],[sci2exp(0)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BITCLEAR\",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); } BITCLEAR.prototype.details = function BITCLEAR() { @@ -28,7 +28,7 @@ function BITCLEAR() { return options; } BITCLEAR.prototype.set = function BITCLEAR() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.Datatype = arguments[0]["Datatype"]; @@ -84,7 +84,7 @@ function BITCLEAR() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.opar = list(new ScilabDouble([n])); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/IntegerOp/BITCLEAR.pickle b/js/IntegerOp/BITCLEAR.pickle index b1c039db..299da3e6 100644 --- a/js/IntegerOp/BITCLEAR.pickle +++ b/js/IntegerOp/BITCLEAR.pickle @@ -4,20 +4,16 @@ p0 ((lp1 S'Datatype' p2 -aS'exprs' +aS'x' p3 -aS'gr_i' +aS'model' p4 -aS'graphics' +aS'bit' p5 -aS'x' +aS'graphics' p6 -aS'model' -p7 -aS'bit' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/IntegerOp/BITSET.js b/js/IntegerOp/BITSET.js index 1c081016..dac0cb40 100644 --- a/js/IntegerOp/BITSET.js +++ b/js/IntegerOp/BITSET.js @@ -12,9 +12,9 @@ function BITSET() { this.model.opar = list(new ScilabDouble([uint32(0)])); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[sci2exp(3)],[sci2exp(0)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BITSET\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[sci2exp(3)],[sci2exp(0)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BITSET\",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); } BITSET.prototype.details = function BITSET() { @@ -28,7 +28,7 @@ function BITSET() { return options; } BITSET.prototype.set = function BITSET() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.Datatype = arguments[0]["Datatype"]; @@ -82,7 +82,7 @@ function BITSET() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.opar = list(new ScilabDouble([n])); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/IntegerOp/BITSET.pickle b/js/IntegerOp/BITSET.pickle index b1c039db..299da3e6 100644 --- a/js/IntegerOp/BITSET.pickle +++ b/js/IntegerOp/BITSET.pickle @@ -4,20 +4,16 @@ p0 ((lp1 S'Datatype' p2 -aS'exprs' +aS'x' p3 -aS'gr_i' +aS'model' p4 -aS'graphics' +aS'bit' p5 -aS'x' +aS'graphics' p6 -aS'model' -p7 -aS'bit' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/IntegerOp/CONVERT.js b/js/IntegerOp/CONVERT.js index 7be0270c..6df2a9c6 100644 --- a/js/IntegerOp/CONVERT.js +++ b/js/IntegerOp/CONVERT.js @@ -14,9 +14,9 @@ function CONVERT() { this.model.ipar = new ScilabDouble([sgn]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[sci2exp(1)],[sci2exp(3)],[sci2exp(0)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONVERT\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[sci2exp(1)],[sci2exp(3)],[sci2exp(0)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONVERT\",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); } CONVERT.prototype.details = function CONVERT() { @@ -31,7 +31,7 @@ function CONVERT() { return options; } CONVERT.prototype.set = function CONVERT() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.it = parseFloat(arguments[0]["it"]); @@ -371,7 +371,7 @@ function CONVERT() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; diff --git a/js/IntegerOp/CONVERT.pickle b/js/IntegerOp/CONVERT.pickle index 094416c8..5f9f7acc 100644 --- a/js/IntegerOp/CONVERT.pickle +++ b/js/IntegerOp/CONVERT.pickle @@ -4,22 +4,18 @@ p0 ((lp1 S'it' p2 -aS'exprs' -p3 -aS'gr_i' -p4 aS'graphics' -p5 +p3 aS'np' -p6 +p4 aS'x' -p7 +p5 aS'model' -p8 +p6 aS'ot' -p9 -atp10 -Rp11 +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/IntegerOp/DFLIPFLOP.js b/js/IntegerOp/DFLIPFLOP.js index 33c1721b..059eb07d 100644 --- a/js/IntegerOp/DFLIPFLOP.js +++ b/js/IntegerOp/DFLIPFLOP.js @@ -88,8 +88,8 @@ function DFLIPFLOP() { this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabBoolean([true,false]); this.model.rpar = new ScilabDouble([scs_m]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DFLIPFLOP\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabDouble([]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DFLIPFLOP\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabDouble([]),gr_i); return new BasicBlock(this.x); } DFLIPFLOP.prototype.details = function DFLIPFLOP() { diff --git a/js/IntegerOp/DFLIPFLOP.pickle b/js/IntegerOp/DFLIPFLOP.pickle index 77edf88d..c14101fa 100644 --- a/js/IntegerOp/DFLIPFLOP.pickle +++ b/js/IntegerOp/DFLIPFLOP.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_m_1.objs[9-1]' p1 diff --git a/js/IntegerOp/DLATCH.js b/js/IntegerOp/DLATCH.js index 2f7a70d9..b089a1c4 100644 --- a/js/IntegerOp/DLATCH.js +++ b/js/IntegerOp/DLATCH.js @@ -33,8 +33,8 @@ function DLATCH() { this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabBoolean([true,false]); this.model.rpar = new ScilabDouble([scs_m]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLATCH\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabDouble([]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLATCH\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabDouble([]),gr_i); return new BasicBlock(this.x); } DLATCH.prototype.details = function DLATCH() { diff --git a/js/IntegerOp/DLATCH.pickle b/js/IntegerOp/DLATCH.pickle index 6f7b6171..960f59fd 100644 --- a/js/IntegerOp/DLATCH.pickle +++ b/js/IntegerOp/DLATCH.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/IntegerOp/EXTRACTBITS.js b/js/IntegerOp/EXTRACTBITS.js index 01d38289..e3bb01e4 100644 --- a/js/IntegerOp/EXTRACTBITS.js +++ b/js/IntegerOp/EXTRACTBITS.js @@ -13,9 +13,9 @@ function EXTRACTBITS() { this.model.ipar = new ScilabDouble([0,numb]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[sci2exp(3)],[sci2exp(1)],[sci2exp(0)],[sci2exp(0)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACTBITS\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[sci2exp(3)],[sci2exp(1)],[sci2exp(0)],[sci2exp(0)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACTBITS\",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); } EXTRACTBITS.prototype.details = function EXTRACTBITS() { @@ -31,7 +31,7 @@ function EXTRACTBITS() { return options; } EXTRACTBITS.prototype.set = function EXTRACTBITS() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.Datatype = arguments[0]["Datatype"]; @@ -231,7 +231,7 @@ function EXTRACTBITS() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.ipar = new ScilabDouble([int(this.bit.slice())],[int(numb.slice())]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/IntegerOp/EXTRACTBITS.pickle b/js/IntegerOp/EXTRACTBITS.pickle index be93e054..47125fd4 100644 --- a/js/IntegerOp/EXTRACTBITS.pickle +++ b/js/IntegerOp/EXTRACTBITS.pickle @@ -8,20 +8,16 @@ aS'Datatype' p3 aS'rule' p4 -aS'exprs' -p5 -aS'gr_i' -p6 aS'graphics' -p7 +p5 aS'x' -p8 +p6 aS'model' -p9 +p7 aS'bit' -p10 -atp11 -Rp12 +p8 +atp9 +Rp10 .(dp0 S'numb' p1 diff --git a/js/IntegerOp/INTMUL.js b/js/IntegerOp/INTMUL.js index 448639c2..826e4ea2 100644 --- a/js/IntegerOp/INTMUL.js +++ b/js/IntegerOp/INTMUL.js @@ -14,9 +14,9 @@ function INTMUL() { this.model.ipar = new ScilabDouble([sgn]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[sci2exp(3)],[sci2exp(0)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTMUL\",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(3)],[sci2exp(0)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTMUL\",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); } INTMUL.prototype.details = function INTMUL() { @@ -30,7 +30,7 @@ function INTMUL() { return options; } INTMUL.prototype.set = function INTMUL() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.Datatype = arguments[0]["Datatype"]; @@ -105,7 +105,7 @@ function INTMUL() { } if (ok) { this.model.ipar = new ScilabDouble([this.np]); - 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/IntegerOp/INTMUL.pickle b/js/IntegerOp/INTMUL.pickle index 1ead3178..2972f496 100644 --- a/js/IntegerOp/INTMUL.pickle +++ b/js/IntegerOp/INTMUL.pickle @@ -4,20 +4,16 @@ p0 ((lp1 S'Datatype' p2 -aS'exprs' +aS'x' p3 -aS'gr_i' +aS'model' p4 -aS'graphics' -p5 aS'np' +p5 +aS'graphics' p6 -aS'x' -p7 -aS'model' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/IntegerOp/JKFLIPFLOP.js b/js/IntegerOp/JKFLIPFLOP.js index 2b4aaead..60bc1c12 100644 --- a/js/IntegerOp/JKFLIPFLOP.js +++ b/js/IntegerOp/JKFLIPFLOP.js @@ -44,8 +44,8 @@ function JKFLIPFLOP() { this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabBoolean([true,false]); this.model.rpar = new ScilabDouble([scs_m]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"JKFLIPFLOP\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabDouble([]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"JKFLIPFLOP\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabDouble([]),gr_i); return new BasicBlock(this.x); } JKFLIPFLOP.prototype.details = function JKFLIPFLOP() { @@ -64,7 +64,7 @@ function JKFLIPFLOP() { } } var newpar = list(); - this.exprs = xx.graphics.exprs[1-1]; + var exprs = xx.graphics.exprs[1-1]; this.model = xx.model; var init_old = this.model.odstate[1-1]; while (true) { diff --git a/js/IntegerOp/JKFLIPFLOP.pickle b/js/IntegerOp/JKFLIPFLOP.pickle index e65a481f..657cb309 100644 --- a/js/IntegerOp/JKFLIPFLOP.pickle +++ b/js/IntegerOp/JKFLIPFLOP.pickle @@ -4,20 +4,16 @@ p0 ((lp1 S'exprs0' p2 -aS'exprs' +aS'x' p3 -aS'init' +aS'model' p4 -aS'gr_i' +aS'init' p5 aS'graphics' p6 -aS'x' -p7 -aS'model' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'xx.model' p1 diff --git a/js/IntegerOp/LOGIC.js b/js/IntegerOp/LOGIC.js index cba94d18..eaba81ed 100644 --- a/js/IntegerOp/LOGIC.js +++ b/js/IntegerOp/LOGIC.js @@ -15,9 +15,9 @@ function LOGIC() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[sci2exp(this.mat)],[sci2exp(0)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOGIC\",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.mat)],[sci2exp(0)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOGIC\",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); } LOGIC.prototype.details = function LOGIC() { @@ -31,7 +31,7 @@ function LOGIC() { return options; } LOGIC.prototype.set = function LOGIC() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.mat = inverse(arguments[0]["mat"]); @@ -63,7 +63,7 @@ function LOGIC() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.mat = int8(this.mat); this.model.opar = list(new ScilabDouble([this.mat])); this.x.graphics = this.graphics; diff --git a/js/IntegerOp/LOGIC.pickle b/js/IntegerOp/LOGIC.pickle index 59a29827..53b62f5f 100644 --- a/js/IntegerOp/LOGIC.pickle +++ b/js/IntegerOp/LOGIC.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'herit' +S'x' p2 -aS'mat' +aS'model' p3 -aS'exprs' +aS'herit' p4 -aS'gr_i' +aS'mat' p5 aS'graphics' p6 -aS'x' -p7 -aS'model' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/IntegerOp/SHIFT.js b/js/IntegerOp/SHIFT.js index 25eead3c..3a1f1b92 100644 --- a/js/IntegerOp/SHIFT.js +++ b/js/IntegerOp/SHIFT.js @@ -15,9 +15,9 @@ function SHIFT() { this.model.ipar = new ScilabDouble(sgn); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[sci2exp(3)],[sci2exp(0)],[sci2exp(0)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SHIFT\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[sci2exp(3)],[sci2exp(0)],[sci2exp(0)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SHIFT\",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); } SHIFT.prototype.details = function SHIFT() { @@ -32,7 +32,7 @@ function SHIFT() { return options; } SHIFT.prototype.set = function SHIFT() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.Datatype = arguments[0]["Datatype"]; @@ -122,7 +122,7 @@ function SHIFT() { } if (ok) { this.model.ipar = new ScilabDouble([this.nb]); - 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/IntegerOp/SHIFT.pickle b/js/IntegerOp/SHIFT.pickle index 61e6ba3a..93e31c3f 100644 --- a/js/IntegerOp/SHIFT.pickle +++ b/js/IntegerOp/SHIFT.pickle @@ -6,20 +6,16 @@ S'Datatype' p2 aS'nb' p3 -aS'exprs' -p4 -aS'gr_i' -p5 aS'graphics' -p6 +p4 aS'np' -p7 +p5 aS'x' -p8 +p6 aS'model' -p9 -atp10 -Rp11 +p7 +atp8 +Rp9 .(dp0 S'OPER' p1 diff --git a/js/IntegerOp/SRFLIPFLOP.js b/js/IntegerOp/SRFLIPFLOP.js index 60c00675..6db198f2 100644 --- a/js/IntegerOp/SRFLIPFLOP.js +++ b/js/IntegerOp/SRFLIPFLOP.js @@ -28,8 +28,8 @@ function SRFLIPFLOP() { this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabBoolean([true,false]); this.model.rpar = new ScilabDouble([scs_m]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SRFLIPFLOP\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabDouble([]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SRFLIPFLOP\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabDouble([]),gr_i); return new BasicBlock(this.x); } SRFLIPFLOP.prototype.details = function SRFLIPFLOP() { @@ -48,7 +48,7 @@ function SRFLIPFLOP() { } } var newpar = list(); - this.exprs = xx.graphics.exprs[1-1]; + var exprs = xx.graphics.exprs[1-1]; this.model = xx.model; var init_old = this.model.odstate[1-1]; while (true) { diff --git a/js/IntegerOp/SRFLIPFLOP.pickle b/js/IntegerOp/SRFLIPFLOP.pickle index a7f8d534..a4f8d716 100644 --- a/js/IntegerOp/SRFLIPFLOP.pickle +++ b/js/IntegerOp/SRFLIPFLOP.pickle @@ -4,20 +4,16 @@ p0 ((lp1 S'exprs0' p2 -aS'exprs' +aS'x' p3 -aS'init' +aS'model' p4 -aS'gr_i' +aS'init' p5 aS'graphics' p6 -aS'x' -p7 -aS'model' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'xx.model' p1 diff --git a/js/Linear/BIGSOM_f.js b/js/Linear/BIGSOM_f.js index 5020005d..56f0180a 100644 --- a/js/Linear/BIGSOM_f.js +++ b/js/Linear/BIGSOM_f.js @@ -9,9 +9,9 @@ function BIGSOM_f() { this.model.rpar = new ScilabDouble(this.sgn); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = sci2exp(this.sgn); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BIGSOM_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = sci2exp(this.sgn); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BIGSOM_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabString([exprs]),gr_i); return new BigSom(this.x); } BIGSOM_f.prototype.details = function BIGSOM_f() { @@ -24,7 +24,7 @@ function BIGSOM_f() { return options; } BIGSOM_f.prototype.set = function BIGSOM_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.sgn = inverse(arguments[0]["sgn"]); @@ -38,7 +38,7 @@ function BIGSOM_f() { var ok = tmpvar0[2]; if (ok) { this.model.rpar = new ScilabDouble(this.sgn.slice()); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; diff --git a/js/Linear/BIGSOM_f.pickle b/js/Linear/BIGSOM_f.pickle index 90662ba0..a1957198 100644 --- a/js/Linear/BIGSOM_f.pickle +++ b/js/Linear/BIGSOM_f.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'graphics' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' -p4 aS'sgn' +p4 +aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'sgn' p1 diff --git a/js/Linear/CLINDUMMY_f.js b/js/Linear/CLINDUMMY_f.js index a635e859..6ad21810 100644 --- a/js/Linear/CLINDUMMY_f.js +++ b/js/Linear/CLINDUMMY_f.js @@ -8,8 +8,8 @@ function CLINDUMMY_f() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLINDUMMY_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLINDUMMY_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([]),gr_i); return new BasicBlock(this.x); } CLINDUMMY_f.prototype.details = function CLINDUMMY_f() { diff --git a/js/Linear/CLINDUMMY_f.pickle b/js/Linear/CLINDUMMY_f.pickle index 2718e79a..51140ca2 100644 --- a/js/Linear/CLINDUMMY_f.pickle +++ b/js/Linear/CLINDUMMY_f.pickle @@ -6,14 +6,10 @@ S'x' p2 aS'model' p3 -aS'gr_i' -p4 -aS'exprs' -p5 aS'graphics' -p6 -atp7 -Rp8 +p4 +atp5 +Rp6 .(dp0 S'model.sim' p1 diff --git a/js/Linear/CLR.js b/js/Linear/CLR.js index b8ae68c6..d321e6cf 100644 --- a/js/Linear/CLR.js +++ b/js/Linear/CLR.js @@ -6,7 +6,7 @@ function CLR() { var B = 1; var C = 1; var D = 0; - this.exprs = [["1"],["1+s"]]; + var exprs = [["1"],["1+s"]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["csslti4"]), new ScilabDouble([4])); this.model.in = new ScilabDouble([1]); @@ -15,8 +15,8 @@ function CLR() { this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLR\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLR\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } CLR.prototype.details = function CLR() { @@ -30,7 +30,7 @@ function CLR() { return options; } CLR.prototype.set = function CLR() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var x0 = this.model.state; var rpar = this.model.rpar; var ns = prod(size(x0)); @@ -57,7 +57,7 @@ function CLR() { var B = tmpvar0[1]; var C = tmpvar0[2]; var D = tmpvar0[3]; - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); var tmpvar1 = size(A); var ns1 = tmpvar1[0]; var ns1 = tmpvar1[1]; diff --git a/js/Linear/CLR.pickle b/js/Linear/CLR.pickle index 7d9eff5b..39082dd4 100644 --- a/js/Linear/CLR.pickle +++ b/js/Linear/CLR.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'num' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'num' p4 aS'den' p5 aS'graphics' p6 -aS'x' -p7 -aS'model' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/Linear/CLR_f.js b/js/Linear/CLR_f.js index dc279d57..93df4407 100644 --- a/js/Linear/CLR_f.js +++ b/js/Linear/CLR_f.js @@ -6,7 +6,7 @@ function CLR_f() { var B = 1; var C = 1; var D = 0; - this.exprs = [["1"],["1+s"]]; + var exprs = [["1"],["1+s"]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["csslti"]), new ScilabDouble([1])); this.model.in = new ScilabDouble([1]); @@ -15,8 +15,8 @@ function CLR_f() { this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLR_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2.5,2.5]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLR_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2.5,2.5]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } CLR_f.prototype.details = function CLR_f() { @@ -30,7 +30,7 @@ function CLR_f() { return options; } CLR_f.prototype.set = function CLR_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var x0 = this.model.state; var rpar = this.model.rpar; var ns = prod(size(x0)); @@ -57,7 +57,7 @@ function CLR_f() { var B = tmpvar0[1]; var C = tmpvar0[2]; var D = tmpvar0[3]; - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); var tmpvar1 = size(A); var ns1 = tmpvar1[0]; var ns1 = tmpvar1[1]; diff --git a/js/Linear/CLR_f.pickle b/js/Linear/CLR_f.pickle index 7d9eff5b..39082dd4 100644 --- a/js/Linear/CLR_f.pickle +++ b/js/Linear/CLR_f.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'num' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'num' p4 aS'den' p5 aS'graphics' p6 -aS'x' -p7 -aS'model' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/Linear/CLSS.js b/js/Linear/CLSS.js index 5208c088..fd96652d 100644 --- a/js/Linear/CLSS.js +++ b/js/Linear/CLSS.js @@ -16,9 +16,9 @@ function CLSS() { this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLSS\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLSS\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } CLSS.prototype.details = function CLSS() { @@ -35,9 +35,9 @@ function CLSS() { return options; } CLSS.prototype.set = function CLSS() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")==7) { - this.exprs = this.exprs[[1:4,7]-1]; + var exprs = this.graphics.exprs; + if (size(exprs,"*")==7) { + var exprs = exprs[[1:4,7]-1]; } while (true) { var ok = true; @@ -79,7 +79,7 @@ function CLSS() { this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; if (this.D.length!=0) { if (norm(this.D,1)!=0) { diff --git a/js/Linear/CLSS.pickle b/js/Linear/CLSS.pickle index 0d6f50f2..582ebfbc 100644 --- a/js/Linear/CLSS.pickle +++ b/js/Linear/CLSS.pickle @@ -10,20 +10,16 @@ aS'B' p4 aS'D' p5 -aS'exprs' -p6 -aS'gr_i' -p7 aS'graphics' -p8 +p6 aS'x' -p9 +p7 aS'model' -p10 +p8 aS'x0' -p11 -atp12 -Rp13 +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/Linear/CLSS_f.js b/js/Linear/CLSS_f.js index 74e9dd5b..9ba6e096 100644 --- a/js/Linear/CLSS_f.js +++ b/js/Linear/CLSS_f.js @@ -16,9 +16,9 @@ function CLSS_f() { this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLSS_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLSS_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } CLSS_f.prototype.details = function CLSS_f() { @@ -35,9 +35,9 @@ function CLSS_f() { return options; } CLSS_f.prototype.set = function CLSS_f() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")==7) { - this.exprs = this.exprs[[1:4,7]-1]; + var exprs = this.graphics.exprs; + if (size(exprs,"*")==7) { + var exprs = exprs[[1:4,7]-1]; } while (true) { var ok = true; @@ -69,7 +69,7 @@ function CLSS_f() { this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; if (this.D.length!=0) { if (norm(this.D,1)!=0) { diff --git a/js/Linear/CLSS_f.pickle b/js/Linear/CLSS_f.pickle index 3dc6c326..7ae568f9 100644 --- a/js/Linear/CLSS_f.pickle +++ b/js/Linear/CLSS_f.pickle @@ -10,20 +10,16 @@ aS'B' p4 aS'D' p5 -aS'exprs' -p6 -aS'gr_i' -p7 aS'graphics' -p8 +p6 aS'x' -p9 +p7 aS'model' -p10 +p8 aS'x0' -p11 -atp12 -Rp13 +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/Linear/DELAYV_f.js b/js/Linear/DELAYV_f.js index 7ecd61f0..44c7740d 100644 --- a/js/Linear/DELAYV_f.js +++ b/js/Linear/DELAYV_f.js @@ -16,9 +16,9 @@ function DELAYV_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([0,-1]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[string(this.nin)],[strcat(string(z0.slice(1-1,$-1)),";")],[string(this.T)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DELAYV_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[string(this.nin)],[strcat(string(z0.slice(1-1,$-1)),";")],[string(this.T)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DELAYV_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } DELAYV_f.prototype.details = function DELAYV_f() { @@ -33,7 +33,7 @@ function DELAYV_f() { return options; } DELAYV_f.prototype.set = function DELAYV_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; this.nin = this.model.in[1-1]; var z0 = this.model.dstate; this.zz0 = z0.slice(1-1,$-1); @@ -63,7 +63,7 @@ function DELAYV_f() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.dstate = new ScilabDouble([this.zz0.slice()],[told]); this.model.rpar = new ScilabDouble([this.T/(size(this.zz0,"*"))]); this.x.graphics = this.graphics; diff --git a/js/Linear/DELAYV_f.pickle b/js/Linear/DELAYV_f.pickle index 81a7bc97..fbf11c3a 100644 --- a/js/Linear/DELAYV_f.pickle +++ b/js/Linear/DELAYV_f.pickle @@ -6,20 +6,16 @@ S'nin' p2 aS'zz0' p3 -aS'exprs' -p4 -aS'gr_i' -p5 aS'T' -p6 +p4 aS'graphics' -p7 +p5 aS'x' -p8 +p6 aS'model' -p9 -atp10 -Rp11 +p7 +atp8 +Rp9 .(dp0 S'model.dstate' p1 diff --git a/js/Linear/DELAY_f.js b/js/Linear/DELAY_f.js index 383db3f2..9fba30db 100644 --- a/js/Linear/DELAY_f.js +++ b/js/Linear/DELAY_f.js @@ -92,7 +92,7 @@ function DELAY_f() { var evtdly = this.x.model.rpar.objs[ppath[2-1]-1]; var register_exprs = register.graphics.exprs; var evtdly_exprs = evtdly.graphics.exprs; - this.exprs = [[evtdly_exprs[1-1]],[register_exprs]]; + var exprs = [[evtdly_exprs[1-1]],[register_exprs]]; while (true) { var ok = true; this.dt = arguments[0]["dt"]; @@ -113,13 +113,13 @@ function DELAY_f() { message(mess); throw "user error"; } else { - evtdly.graphics.exprs[1-1] = this.exprs[1-1]; + evtdly.graphics.exprs[1-1] = exprs[1-1]; if (evtdly.model.rpar!=this.dt) { evtdly.model.rpar = this.dt; newpar[$+1-1] = ppath[2-1]; } this.x.model.rpar.objs[ppath[2-1]-1] = evtdly; - register.graphics.exprs = this.exprs[2-1]; + register.graphics.exprs = exprs[2-1]; if (or(register.model.dstate!=this.z0.slice())) { register.model.dstate = this.z0.slice(); newpar[$+1-1] = ppath[1-1]; diff --git a/js/Linear/DELAY_f.pickle b/js/Linear/DELAY_f.pickle index 3ea3b379..bf1c5cbe 100644 --- a/js/Linear/DELAY_f.pickle +++ b/js/Linear/DELAY_f.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'x' p2 -aS'gr_i' +aS'model' p3 -aS'graphics' +aS'z0' p4 -aS'x' +aS'dt' p5 -aS'model' +aS'graphics' p6 -aS'z0' -p7 -aS'dt' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'diagram.objs[1-1]' p1 diff --git a/js/Linear/DERIV.js b/js/Linear/DERIV.js index 45b2345e..55cc8833 100644 --- a/js/Linear/DERIV.js +++ b/js/Linear/DERIV.js @@ -7,9 +7,9 @@ function DERIV() { this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["x"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = []; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DERIV\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DERIV\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } DERIV.prototype.details = function DERIV() { diff --git a/js/Linear/DERIV.pickle b/js/Linear/DERIV.pickle index f97402c1..cbe22810 100644 --- a/js/Linear/DERIV.pickle +++ b/js/Linear/DERIV.pickle @@ -6,14 +6,10 @@ S'x' p2 aS'model' p3 -aS'gr_i' -p4 -aS'exprs' -p5 aS'graphics' -p6 -atp7 -Rp8 +p4 +atp5 +Rp6 .(dp0 S'model.sim' p1 diff --git a/js/Linear/DIFF_c.js b/js/Linear/DIFF_c.js index 10c440bb..c57690c2 100644 --- a/js/Linear/DIFF_c.js +++ b/js/Linear/DIFF_c.js @@ -9,9 +9,9 @@ function DIFF_c() { this.model.state = new ScilabDouble(this.x0); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.exprs = [[strcat(sci2exp(this.x0[1-1]))],[strcat(sci2exp(this.x0[2-1]))]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DIFF_c\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[strcat(sci2exp(this.x0[1-1]))],[strcat(sci2exp(this.x0[2-1]))]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DIFF_c\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } DIFF_c.prototype.details = function DIFF_c() { @@ -25,7 +25,7 @@ function DIFF_c() { return options; } DIFF_c.prototype.set = function DIFF_c() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ask_again = false; var ok = true; @@ -48,7 +48,7 @@ function DIFF_c() { var ask_again = true; } if (!ask_again) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.state = new ScilabDouble([this.x0],[this.xd0]); this.model.out = new ScilabDouble([N]); this.model.in = new ScilabDouble([N]); diff --git a/js/Linear/DIFF_c.pickle b/js/Linear/DIFF_c.pickle index cf3a2b5f..a0e60696 100644 --- a/js/Linear/DIFF_c.pickle +++ b/js/Linear/DIFF_c.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'xd0' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'xd0' p4 -aS'graphics' +aS'x0' p5 -aS'x' +aS'graphics' p6 -aS'model' -p7 -aS'x0' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/Linear/DLR.js b/js/Linear/DLR.js index 1c248b71..4c37051c 100644 --- a/js/Linear/DLR.js +++ b/js/Linear/DLR.js @@ -6,7 +6,7 @@ function DLR() { var B = 1; var C = 1; var D = 0; - this.exprs = [["1"],["1+z"]]; + var exprs = [["1"],["1+z"]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["dsslti4"]), new ScilabDouble([4])); this.model.in = new ScilabDouble([1]); @@ -16,8 +16,8 @@ function DLR() { this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLR\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLR\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } DLR.prototype.details = function DLR() { @@ -31,7 +31,7 @@ function DLR() { return options; } DLR.prototype.set = function DLR() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var x0 = this.model.dstate; var ns = prod(size(x0)); var PREVAR_scicos_context = PREVAR_scicos_context; @@ -55,7 +55,7 @@ function DLR() { var B = tmpvar0[1]; var C = tmpvar0[2]; var D = tmpvar0[3]; - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); var tmpvar1 = size(A); var ns1 = tmpvar1[0]; var ns1 = tmpvar1[1]; diff --git a/js/Linear/DLR.pickle b/js/Linear/DLR.pickle index ae140424..f172c461 100644 --- a/js/Linear/DLR.pickle +++ b/js/Linear/DLR.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'num' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'num' p4 aS'den' p5 aS'graphics' p6 -aS'x' -p7 -aS'model' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/Linear/DLR_f.js b/js/Linear/DLR_f.js index 32bc2559..353d355d 100644 --- a/js/Linear/DLR_f.js +++ b/js/Linear/DLR_f.js @@ -6,7 +6,7 @@ function DLR_f() { var B = 1; var C = 1; var D = 0; - this.exprs = [["1"],["1+z"]]; + var exprs = [["1"],["1+z"]]; this.model = scicos_model(); this.model.sim = new ScilabString(["dsslti"]); this.model.in = new ScilabDouble([1]); @@ -16,8 +16,8 @@ function DLR_f() { this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLR_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2.5,2.5]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLR_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2.5,2.5]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } DLR_f.prototype.details = function DLR_f() { @@ -31,7 +31,7 @@ function DLR_f() { return options; } DLR_f.prototype.set = function DLR_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var x0 = this.model.dstate; var ns = prod(size(x0)); var PREVAR_scicos_context = PREVAR_scicos_context; @@ -55,7 +55,7 @@ function DLR_f() { var B = tmpvar0[1]; var C = tmpvar0[2]; var D = tmpvar0[3]; - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); var tmpvar1 = size(A); var ns1 = tmpvar1[0]; var ns1 = tmpvar1[1]; diff --git a/js/Linear/DLR_f.pickle b/js/Linear/DLR_f.pickle index 308f93d4..17ea79f9 100644 --- a/js/Linear/DLR_f.pickle +++ b/js/Linear/DLR_f.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'num' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'num' p4 aS'den' p5 aS'graphics' p6 -aS'x' -p7 -aS'model' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/Linear/DLSS.js b/js/Linear/DLSS.js index e501d355..1cf4bdb0 100644 --- a/js/Linear/DLSS.js +++ b/js/Linear/DLSS.js @@ -15,9 +15,9 @@ function DLSS() { this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLSS\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLSS\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } DLSS.prototype.details = function DLSS() { @@ -34,9 +34,9 @@ function DLSS() { return options; } DLSS.prototype.set = function DLSS() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")==7) { - this.exprs = this.exprs[[1:4,7]-1]; + var exprs = this.graphics.exprs; + if (size(exprs,"*")==7) { + var exprs = exprs[[1:4,7]-1]; } while (true) { var ok = true; @@ -78,7 +78,7 @@ function DLSS() { this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; if (this.D.length!=0) { if (norm(this.D,1)!=0) { diff --git a/js/Linear/DLSS.pickle b/js/Linear/DLSS.pickle index b2842dad..f7d148b7 100644 --- a/js/Linear/DLSS.pickle +++ b/js/Linear/DLSS.pickle @@ -10,20 +10,16 @@ aS'B' p4 aS'D' p5 -aS'exprs' -p6 -aS'gr_i' -p7 aS'graphics' -p8 +p6 aS'x' -p9 +p7 aS'model' -p10 +p8 aS'x0' -p11 -atp12 -Rp13 +p9 +atp10 +Rp11 .(dp0 S'model.dstate' p1 diff --git a/js/Linear/DLSS_f.js b/js/Linear/DLSS_f.js index 45b81b78..c64892fd 100644 --- a/js/Linear/DLSS_f.js +++ b/js/Linear/DLSS_f.js @@ -15,9 +15,9 @@ function DLSS_f() { this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLSS_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLSS_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } DLSS_f.prototype.details = function DLSS_f() { @@ -34,9 +34,9 @@ function DLSS_f() { return options; } DLSS_f.prototype.set = function DLSS_f() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")==7) { - this.exprs = this.exprs[[1:4,7]-1]; + var exprs = this.graphics.exprs; + if (size(exprs,"*")==7) { + var exprs = exprs[[1:4,7]-1]; } while (true) { var ok = true; @@ -68,7 +68,7 @@ function DLSS_f() { this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; if (this.D.length!=0) { if (norm(this.D,1)!=0) { diff --git a/js/Linear/DLSS_f.pickle b/js/Linear/DLSS_f.pickle index a754a23a..34b37f6f 100644 --- a/js/Linear/DLSS_f.pickle +++ b/js/Linear/DLSS_f.pickle @@ -10,20 +10,16 @@ aS'B' p4 aS'D' p5 -aS'exprs' -p6 -aS'gr_i' -p7 aS'graphics' -p8 +p6 aS'x' -p9 +p7 aS'model' -p10 +p8 aS'x0' -p11 -atp12 -Rp13 +p9 +atp10 +Rp11 .(dp0 S'model.dstate' p1 diff --git a/js/Linear/DOLLAR.js b/js/Linear/DOLLAR.js index ef6ba02c..4ee741b9 100644 --- a/js/Linear/DOLLAR.js +++ b/js/Linear/DOLLAR.js @@ -4,7 +4,7 @@ function DOLLAR() { var z = 0; this.inh = 0; var in1 = 1; - this.exprs = string([[z],[this.inh]]); + var exprs = string([[z],[this.inh]]); this.model = scicos_model(); this.model.sim = list(new ScilabString(["dollar4"]), new ScilabDouble([4])); this.model.in = new ScilabDouble([in1]); @@ -13,8 +13,8 @@ function DOLLAR() { this.model.dstate = new ScilabDouble([z]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([exprs]),gr_i); return new BasicBlock(this.x); } DOLLAR.prototype.details = function DOLLAR() { @@ -28,9 +28,9 @@ function DOLLAR() { return options; } DOLLAR.prototype.set = function DOLLAR() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")<2) { - this.exprs[2-1] = "0"; + var exprs = this.graphics.exprs; + if (size(exprs,"*")<2) { + exprs[2-1] = "0"; } while (true) { var ok = true; @@ -90,7 +90,7 @@ function DOLLAR() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; diff --git a/js/Linear/DOLLAR.pickle b/js/Linear/DOLLAR.pickle index 9722d530..f41de5a7 100644 --- a/js/Linear/DOLLAR.pickle +++ b/js/Linear/DOLLAR.pickle @@ -4,22 +4,18 @@ p0 ((lp1 S'a' p2 -aS'exprs' -p3 -aS'gr_i' -p4 aS'inh' -p5 +p3 aS'graphics' -p6 +p4 aS'x' -p7 +p5 aS'model' -p8 +p6 aS'type' -p9 -atp10 -Rp11 +p7 +atp8 +Rp9 .(dp0 S'model.odstate' p1 diff --git a/js/Linear/DOLLAR_f.js b/js/Linear/DOLLAR_f.js index c78aafb7..489b831b 100644 --- a/js/Linear/DOLLAR_f.js +++ b/js/Linear/DOLLAR_f.js @@ -4,7 +4,7 @@ function DOLLAR_f() { var z = 0; this.inh = 0; var in1 = 1; - this.exprs = string([[z],[this.inh]]); + var exprs = string([[z],[this.inh]]); this.model = scicos_model(); this.model.sim = new ScilabString(["dollar"]); this.model.in = new ScilabDouble([in1]); @@ -13,8 +13,8 @@ function DOLLAR_f() { this.model.dstate = new ScilabDouble([z]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([exprs]),gr_i); return new BasicBlock(this.x); } DOLLAR_f.prototype.details = function DOLLAR_f() { @@ -28,9 +28,9 @@ function DOLLAR_f() { return options; } DOLLAR_f.prototype.set = function DOLLAR_f() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")<2) { - this.exprs[2-1] = "0"; + var exprs = this.graphics.exprs; + if (size(exprs,"*")<2) { + exprs[2-1] = "0"; } while (true) { var ok = true; @@ -51,7 +51,7 @@ function DOLLAR_f() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.dstate = new ScilabDouble([this.a]); this.model.in = new ScilabDouble(in1); this.model.out = new ScilabDouble(out); diff --git a/js/Linear/DOLLAR_f.pickle b/js/Linear/DOLLAR_f.pickle index 1a4e2da9..e9c6d0a6 100644 --- a/js/Linear/DOLLAR_f.pickle +++ b/js/Linear/DOLLAR_f.pickle @@ -4,20 +4,16 @@ p0 ((lp1 S'a' p2 -aS'exprs' +aS'x' p3 -aS'gr_i' +aS'model' p4 aS'inh' p5 aS'graphics' p6 -aS'x' -p7 -aS'model' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/Linear/DOLLAR_m.js b/js/Linear/DOLLAR_m.js index e2095ec3..b595cc33 100644 --- a/js/Linear/DOLLAR_m.js +++ b/js/Linear/DOLLAR_m.js @@ -4,7 +4,7 @@ function DOLLAR_m() { var z = 0; this.inh = 0; var in1 = 1; - this.exprs = string([[z],[this.inh]]); + var exprs = string([[z],[this.inh]]); this.model = scicos_model(); this.model.sim = list(new ScilabString(["dollar4"]), new ScilabDouble([4])); this.model.in = new ScilabDouble([in1]); @@ -13,8 +13,8 @@ function DOLLAR_m() { this.model.dstate = new ScilabDouble([z]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR_m\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([exprs]),gr_i); return new BasicBlock(this.x); } DOLLAR_m.prototype.details = function DOLLAR_m() { @@ -28,9 +28,9 @@ function DOLLAR_m() { return options; } DOLLAR_m.prototype.set = function DOLLAR_m() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")<2) { - this.exprs[2-1] = "0"; + var exprs = this.graphics.exprs; + if (size(exprs,"*")<2) { + exprs[2-1] = "0"; } while (true) { var ok = true; @@ -90,7 +90,7 @@ function DOLLAR_m() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; diff --git a/js/Linear/DOLLAR_m.pickle b/js/Linear/DOLLAR_m.pickle index 9722d530..f41de5a7 100644 --- a/js/Linear/DOLLAR_m.pickle +++ b/js/Linear/DOLLAR_m.pickle @@ -4,22 +4,18 @@ p0 ((lp1 S'a' p2 -aS'exprs' -p3 -aS'gr_i' -p4 aS'inh' -p5 +p3 aS'graphics' -p6 +p4 aS'x' -p7 +p5 aS'model' -p8 +p6 aS'type' -p9 -atp10 -Rp11 +p7 +atp8 +Rp9 .(dp0 S'model.odstate' p1 diff --git a/js/Linear/GAINBLK.js b/js/Linear/GAINBLK.js index 4397bb55..e34577c8 100644 --- a/js/Linear/GAINBLK.js +++ b/js/Linear/GAINBLK.js @@ -15,9 +15,9 @@ function GAINBLK() { this.model.rpar = new ScilabDouble([this.gain]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [strcat(sci2exp(this.gain))]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAINBLK\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [strcat(sci2exp(this.gain))]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAINBLK\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } GAINBLK.prototype.details = function GAINBLK() { @@ -31,9 +31,9 @@ function GAINBLK() { return options; } GAINBLK.prototype.set = function GAINBLK() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")==1) { - this.exprs = [[this.exprs],[sci2exp(0)]]; + var exprs = this.graphics.exprs; + if (size(exprs,"*")==1) { + var exprs = [[exprs],[sci2exp(0)]]; } while (true) { var ok = true; @@ -156,7 +156,7 @@ function GAINBLK() { } } if (ok) { - this.graphics.exprs = new ScilabDouble(this.exprs); + this.graphics.exprs = new ScilabDouble(exprs); this.x.graphics = this.graphics; this.x.model = this.model; break; diff --git a/js/Linear/GAINBLK.pickle b/js/Linear/GAINBLK.pickle index 7da48052..bd892ea0 100644 --- a/js/Linear/GAINBLK.pickle +++ b/js/Linear/GAINBLK.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'over' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'over' p4 aS'gain' p5 aS'graphics' p6 -aS'x' -p7 -aS'model' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/Linear/GAINBLK_f.js b/js/Linear/GAINBLK_f.js index 93dced8d..7b850053 100644 --- a/js/Linear/GAINBLK_f.js +++ b/js/Linear/GAINBLK_f.js @@ -11,9 +11,9 @@ function GAINBLK_f() { this.model.rpar = new ScilabDouble([this.gain]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [strcat(sci2exp(this.gain))]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAINBLK_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [strcat(sci2exp(this.gain))]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAINBLK_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } GAINBLK_f.prototype.details = function GAINBLK_f() { @@ -26,7 +26,7 @@ function GAINBLK_f() { return options; } GAINBLK_f.prototype.set = function GAINBLK_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.gain = parseFloat(arguments[0]["gain"]); @@ -45,7 +45,7 @@ function GAINBLK_f() { this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble(this.gain.slice()); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Linear/GAINBLK_f.pickle b/js/Linear/GAINBLK_f.pickle index 8cc5fe17..2244e195 100644 --- a/js/Linear/GAINBLK_f.pickle +++ b/js/Linear/GAINBLK_f.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'x' p2 -aS'gr_i' +aS'model' p3 aS'gain' p4 aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Linear/GAIN_f.js b/js/Linear/GAIN_f.js index c9a8aaed..a4035f12 100644 --- a/js/Linear/GAIN_f.js +++ b/js/Linear/GAIN_f.js @@ -11,9 +11,9 @@ function GAIN_f() { this.model.rpar = new ScilabDouble([this.gain]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[strcat(sci2exp(this.gain))],[strcat(sci2exp(in1))],[strcat(sci2exp(out))]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAIN_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[strcat(sci2exp(this.gain))],[strcat(sci2exp(in1))],[strcat(sci2exp(out))]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAIN_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } GAIN_f.prototype.details = function GAIN_f() { @@ -26,7 +26,7 @@ function GAIN_f() { return options; } GAIN_f.prototype.set = function GAIN_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.gain = parseFloat(arguments[0]["gain"]); @@ -45,7 +45,7 @@ function GAIN_f() { this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble(this.gain.slice()); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Linear/GAIN_f.pickle b/js/Linear/GAIN_f.pickle index 06f61c9b..eba9f529 100644 --- a/js/Linear/GAIN_f.pickle +++ b/js/Linear/GAIN_f.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'x' p2 -aS'gr_i' +aS'model' p3 aS'gain' p4 aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Linear/INTEGRAL.js b/js/Linear/INTEGRAL.js index e10e8c60..622a10d1 100644 --- a/js/Linear/INTEGRAL.js +++ b/js/Linear/INTEGRAL.js @@ -12,9 +12,9 @@ function INTEGRAL() { this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.exprs = string([[0],[0],[0],[this.maxp],[minp]]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = string([[0],[0],[0],[this.maxp],[minp]]); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([exprs]),gr_i); this.x.graphics.id = "1/s"; return new BasicBlock(this.x); } @@ -32,7 +32,7 @@ function INTEGRAL() { return options; } INTEGRAL.prototype.set = function INTEGRAL() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.x0 = inverse(arguments[0]["x0"]); @@ -88,7 +88,7 @@ function INTEGRAL() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; diff --git a/js/Linear/INTEGRAL.pickle b/js/Linear/INTEGRAL.pickle index 9a75a132..d583d7d8 100644 --- a/js/Linear/INTEGRAL.pickle +++ b/js/Linear/INTEGRAL.pickle @@ -6,24 +6,20 @@ S'maxp' p2 aS'reinit' p3 -aS'exprs' -p4 -aS'gr_i' -p5 aS'satur' -p6 +p4 aS'lowp' -p7 +p5 aS'graphics' -p8 +p6 aS'x' -p9 +p7 aS'model' -p10 +p8 aS'x0' -p11 -atp12 -Rp13 +p9 +atp10 +Rp11 .(dp0 S'model.in' p1 diff --git a/js/Linear/INTEGRAL_f.js b/js/Linear/INTEGRAL_f.js index 160d3620..8a543977 100644 --- a/js/Linear/INTEGRAL_f.js +++ b/js/Linear/INTEGRAL_f.js @@ -9,9 +9,9 @@ function INTEGRAL_f() { this.model.state = new ScilabDouble([this.x0]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.exprs = strcat(sci2exp(this.x0)); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([this.exprs]),this.gr_i); + var exprs = strcat(sci2exp(this.x0)); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([exprs]),gr_i); return new BasicBlock(this.x); } INTEGRAL_f.prototype.details = function INTEGRAL_f() { @@ -24,14 +24,14 @@ function INTEGRAL_f() { return options; } INTEGRAL_f.prototype.set = function INTEGRAL_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.x0 = parseFloat(arguments[0]["x0"]); if (!ok) { break; } - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.state = new ScilabDouble([this.x0]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Linear/INTEGRAL_f.pickle b/js/Linear/INTEGRAL_f.pickle index e935bbf7..1ca01f73 100644 --- a/js/Linear/INTEGRAL_f.pickle +++ b/js/Linear/INTEGRAL_f.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'x' p2 -aS'gr_i' +aS'model' p3 -aS'graphics' +aS'x0' p4 -aS'x' +aS'graphics' p5 -aS'model' -p6 -aS'x0' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Linear/INTEGRAL_m.js b/js/Linear/INTEGRAL_m.js index 272db68a..13be3c60 100644 --- a/js/Linear/INTEGRAL_m.js +++ b/js/Linear/INTEGRAL_m.js @@ -14,9 +14,9 @@ function INTEGRAL_m() { this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.exprs = string([[0],[0],[0],[this.maxp],[minp]]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = string([[0],[0],[0],[this.maxp],[minp]]); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL_m\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([exprs]),gr_i); return new BasicBlock(this.x); } INTEGRAL_m.prototype.details = function INTEGRAL_m() { @@ -33,7 +33,7 @@ function INTEGRAL_m() { return options; } INTEGRAL_m.prototype.set = function INTEGRAL_m() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.x0 = arguments[0]["x0"]; @@ -135,7 +135,7 @@ function INTEGRAL_m() { } } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; diff --git a/js/Linear/INTEGRAL_m.pickle b/js/Linear/INTEGRAL_m.pickle index 293ff2e4..2671c665 100644 --- a/js/Linear/INTEGRAL_m.pickle +++ b/js/Linear/INTEGRAL_m.pickle @@ -6,24 +6,20 @@ S'maxp' p2 aS'reinit' p3 -aS'exprs' -p4 -aS'gr_i' -p5 aS'satur' -p6 +p4 aS'lowp' -p7 +p5 aS'graphics' -p8 +p6 aS'x' -p9 +p7 aS'model' -p10 +p8 aS'x0' -p11 -atp12 -Rp13 +p9 +atp10 +Rp11 .(dp0 S'model.in' p1 diff --git a/js/Linear/PID.js b/js/Linear/PID.js index 3bb0299f..dbea864e 100644 --- a/js/Linear/PID.js +++ b/js/Linear/PID.js @@ -35,8 +35,8 @@ function PID() { this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabBoolean([false,false]); this.model.rpar = new ScilabDouble([scs_m]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PID\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PID\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),gr_i); return new BasicBlock(this.x); } PID.prototype.details = function PID() { @@ -78,11 +78,11 @@ function PID() { } } var newpar = list(); - this.exprs[1-1] = xx1.graphics.exprs[1-1]; + exprs[1-1] = xx1.graphics.exprs[1-1]; var p_old = xx1.model.rpar; - this.exprs[2-1] = xx2.graphics.exprs[1-1]; + exprs[2-1] = xx2.graphics.exprs[1-1]; var i_old = xx2.model.rpar; - this.exprs[3-1] = xx3.graphics.exprs[1-1]; + exprs[3-1] = xx3.graphics.exprs[1-1]; var d_old = xx3.model.rpar; var y = 0; while (true) { diff --git a/js/Linear/PID.pickle b/js/Linear/PID.pickle index bb17417d..d392dd2d 100644 --- a/js/Linear/PID.pickle +++ b/js/Linear/PID.pickle @@ -4,24 +4,20 @@ p0 ((lp1 S'd' p2 -aS'p' -p3 aS'i' -p4 +p3 aS'exprs0' +p4 +aS'p' p5 -aS'exprs' -p6 -aS'gr_i' -p7 aS'graphics' -p8 +p6 aS'x' -p9 +p7 aS'model' -p10 -atp11 -Rp12 +p8 +atp9 +Rp10 .(dp0 S'xx3' p1 diff --git a/js/Linear/REGISTER.js b/js/Linear/REGISTER.js index a53a86a0..40cf87c7 100644 --- a/js/Linear/REGISTER.js +++ b/js/Linear/REGISTER.js @@ -10,9 +10,9 @@ function REGISTER() { this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = strcat(string(this.z0),";"); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"REGISTER\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([this.exprs]),this.gr_i); + var exprs = strcat(string(this.z0),";"); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"REGISTER\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([exprs]),gr_i); return new BasicBlock(this.x); } REGISTER.prototype.details = function REGISTER() { @@ -26,9 +26,9 @@ function REGISTER() { return options; } REGISTER.prototype.set = function REGISTER() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,1)==1) { - this.exprs = [[this.exprs],[sci2exp(1)]]; + var exprs = this.graphics.exprs; + if (size(exprs,1)==1) { + var exprs = [[exprs],[sci2exp(1)]]; } while (true) { var ok = true; @@ -82,7 +82,7 @@ function REGISTER() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble(this.exprs); + this.graphics.exprs = new ScilabDouble(exprs); this.x.graphics = this.graphics; this.x.model = this.model; break; diff --git a/js/Linear/REGISTER.pickle b/js/Linear/REGISTER.pickle index 8c7cb6dc..701b1ab0 100644 --- a/js/Linear/REGISTER.pickle +++ b/js/Linear/REGISTER.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'it' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'z0' p4 -aS'graphics' +aS'it' p5 -aS'x' +aS'graphics' p6 -aS'model' -p7 -aS'z0' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'model.odstate' p1 diff --git a/js/Linear/REGISTER_f.js b/js/Linear/REGISTER_f.js index 704b372f..237fe2ba 100644 --- a/js/Linear/REGISTER_f.js +++ b/js/Linear/REGISTER_f.js @@ -10,9 +10,9 @@ function REGISTER_f() { this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = strcat(string(this.z0),";"); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"REGISTER_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2.5,2.5]),this.model,new ScilabDouble([this.exprs]),this.gr_i); + var exprs = strcat(string(this.z0),";"); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"REGISTER_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2.5,2.5]),this.model,new ScilabDouble([exprs]),gr_i); return new BasicBlock(this.x); } REGISTER_f.prototype.details = function REGISTER_f() { @@ -25,7 +25,7 @@ function REGISTER_f() { return options; } REGISTER_f.prototype.set = function REGISTER_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.z0 = parseFloat(arguments[0]["z0"]); @@ -38,7 +38,7 @@ function REGISTER_f() { var ok = false; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.dstate = new ScilabDouble([this.z0]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Linear/REGISTER_f.pickle b/js/Linear/REGISTER_f.pickle index f52a8cc3..3f4e04af 100644 --- a/js/Linear/REGISTER_f.pickle +++ b/js/Linear/REGISTER_f.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'x' p2 -aS'gr_i' +aS'model' p3 -aS'graphics' +aS'z0' p4 -aS'x' +aS'graphics' p5 -aS'model' -p6 -aS'z0' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Linear/SAMPHOLD.js b/js/Linear/SAMPHOLD.js index 2ff6cc6c..6340d7cc 100644 --- a/js/Linear/SAMPHOLD.js +++ b/js/Linear/SAMPHOLD.js @@ -9,8 +9,8 @@ function SAMPHOLD() { this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPHOLD\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([" "]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPHOLD\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([" "]),gr_i); return new BasicBlock(this.x); } SAMPHOLD.prototype.details = function SAMPHOLD() { diff --git a/js/Linear/SAMPHOLD.pickle b/js/Linear/SAMPHOLD.pickle index b09e1bf1..d49bc1ed 100644 --- a/js/Linear/SAMPHOLD.pickle +++ b/js/Linear/SAMPHOLD.pickle @@ -6,14 +6,10 @@ S'x' p2 aS'model' p3 -aS'gr_i' -p4 -aS'exprs' -p5 aS'graphics' -p6 -atp7 -Rp8 +p4 +atp5 +Rp6 .(dp0 S'model.sim' p1 diff --git a/js/Linear/SAMPHOLD_m.js b/js/Linear/SAMPHOLD_m.js index 2fca4c97..1cab6cb5 100644 --- a/js/Linear/SAMPHOLD_m.js +++ b/js/Linear/SAMPHOLD_m.js @@ -13,8 +13,8 @@ function SAMPHOLD_m() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPHOLD_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPHOLD_m\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),gr_i); return new BasicBlock(this.x); } SAMPHOLD_m.prototype.details = function SAMPHOLD_m() { @@ -47,7 +47,7 @@ function SAMPHOLD_m() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); break; } } diff --git a/js/Linear/SAMPHOLD_m.pickle b/js/Linear/SAMPHOLD_m.pickle index 67bad104..4124cfbf 100644 --- a/js/Linear/SAMPHOLD_m.pickle +++ b/js/Linear/SAMPHOLD_m.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'it' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'it' p4 aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'arg1' p1 diff --git a/js/Linear/SAMPLEHOLD_f.js b/js/Linear/SAMPLEHOLD_f.js index fd1676da..5fed6721 100644 --- a/js/Linear/SAMPLEHOLD_f.js +++ b/js/Linear/SAMPLEHOLD_f.js @@ -9,8 +9,8 @@ function SAMPLEHOLD_f() { this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPLEHOLD_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([" "]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPLEHOLD_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([" "]),gr_i); return new BasicBlock(this.x); } SAMPLEHOLD_f.prototype.details = function SAMPLEHOLD_f() { diff --git a/js/Linear/SAMPLEHOLD_f.pickle b/js/Linear/SAMPLEHOLD_f.pickle index 418a8f45..e425e3bb 100644 --- a/js/Linear/SAMPLEHOLD_f.pickle +++ b/js/Linear/SAMPLEHOLD_f.pickle @@ -6,14 +6,10 @@ S'x' p2 aS'model' p3 -aS'gr_i' -p4 -aS'exprs' -p5 aS'graphics' -p6 -atp7 -Rp8 +p4 +atp5 +Rp6 .(dp0 S'model.sim' p1 diff --git a/js/Linear/SOM_f.js b/js/Linear/SOM_f.js index d6914626..a025688d 100644 --- a/js/Linear/SOM_f.js +++ b/js/Linear/SOM_f.js @@ -9,9 +9,9 @@ function SOM_f() { this.model.rpar = new ScilabDouble(sgn); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[sci2exp(1)],[sci2exp(sgn)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SOM_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[sci2exp(1)],[sci2exp(sgn)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SOM_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } SOM_f.prototype.details = function SOM_f() { @@ -21,12 +21,12 @@ function SOM_f() { alert("parameters cannot be modified"); } SOM_f.prototype.set = function SOM_f() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")==2) { - this.exprs = this.exprs[2-1]; + var exprs = this.graphics.exprs; + if (size(exprs,"*")==2) { + var exprs = exprs[2-1]; } - if (size(this.exprs,"*")!=3) { - this.exprs = string(this.model.rpar); + if (size(exprs,"*")!=3) { + var exprs = string(this.model.rpar); } if (this.graphics.flip) { var labs = ["down","left","up"]; @@ -34,7 +34,7 @@ function SOM_f() { var labs = ["down","right","up"]; } var str = [["This sum block is obsolete","parameters cannot be modified. Please replace it with new sum block"],["and gain blocks in the linear palette"," ","Input ports are located at up, side and down positions.","Current gains are:"]]; - var str = [[str],[(part(labs.slice(),1,7)+this.exprs.slice())]]; + var str = [[str],[(part(labs.slice(),1,7)+exprs.slice())]]; message(str); throw "user error"; return new BasicBlock(this.x); diff --git a/js/Linear/SOM_f.pickle b/js/Linear/SOM_f.pickle index ff4c1d13..4274b750 100644 --- a/js/Linear/SOM_f.pickle +++ b/js/Linear/SOM_f.pickle @@ -6,14 +6,10 @@ S'x' p2 aS'model' p3 -aS'gr_i' -p4 -aS'exprs' -p5 aS'graphics' -p6 -atp7 -Rp8 +p4 +atp5 +Rp6 .(dp0 S'model.sim' p1 diff --git a/js/Linear/SUMMATION.js b/js/Linear/SUMMATION.js index 6ab823b6..09fee1b2 100644 --- a/js/Linear/SUMMATION.js +++ b/js/Linear/SUMMATION.js @@ -11,9 +11,9 @@ function SUMMATION() { this.model.ipar = new ScilabDouble(this.sgn); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = sci2exp(this.sgn); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUMMATION\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = sci2exp(this.sgn); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUMMATION\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabString([exprs]),gr_i); return new Summation(this.x); } SUMMATION.prototype.details = function SUMMATION() { @@ -28,11 +28,11 @@ function SUMMATION() { return options; } SUMMATION.prototype.set = function SUMMATION() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,1)==1) { - this.exprs = [[sci2exp(1)],[this.exprs],[sci2exp(0)]]; - } else if (size(this.exprs,1)==2) { - this.exprs = [[this.exprs],[sci2exp(0)]]; + var exprs = this.graphics.exprs; + if (size(exprs,1)==1) { + var exprs = [[sci2exp(1)],[exprs],[sci2exp(0)]]; + } else if (size(exprs,1)==2) { + var exprs = [[exprs],[sci2exp(0)]]; } while (true) { var ok = true; @@ -142,7 +142,7 @@ function SUMMATION() { if (ok) { this.model.rpar = new ScilabDouble([this.satur]); this.model.ipar = new ScilabDouble([this.sgn]); - this.graphics.exprs = new ScilabDouble(this.exprs); + this.graphics.exprs = new ScilabDouble(exprs); this.x.graphics = this.graphics; this.x.model = this.model; break; diff --git a/js/Linear/SUMMATION.pickle b/js/Linear/SUMMATION.pickle index 536650a3..39d2bb39 100644 --- a/js/Linear/SUMMATION.pickle +++ b/js/Linear/SUMMATION.pickle @@ -4,22 +4,18 @@ p0 ((lp1 S'Datatype' p2 -aS'sgn' +aS'graphics' p3 -aS'exprs' +aS'satur' p4 -aS'gr_i' +aS'sgn' p5 -aS'satur' -p6 -aS'graphics' -p7 aS'x' -p8 +p6 aS'model' -p9 -atp10 -Rp11 +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/Linear/SUM_f.js b/js/Linear/SUM_f.js index a4c1c57a..289364dd 100644 --- a/js/Linear/SUM_f.js +++ b/js/Linear/SUM_f.js @@ -7,9 +7,9 @@ function SUM_f() { this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUM_f\",sz(1),sz(2));"]); - this.exprs = []; - this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUM_f\",sz(1),sz(2));"]); + var exprs = []; + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } SUM_f.prototype.details = function SUM_f() { diff --git a/js/Linear/SUM_f.pickle b/js/Linear/SUM_f.pickle index 6f8441b4..2d3d0ddc 100644 --- a/js/Linear/SUM_f.pickle +++ b/js/Linear/SUM_f.pickle @@ -6,14 +6,10 @@ S'x' p2 aS'model' p3 -aS'gr_i' -p4 -aS'exprs' -p5 aS'graphics' -p6 -atp7 -Rp8 +p4 +atp5 +Rp6 .(dp0 S'model.sim' p1 diff --git a/js/Linear/TCLSS.js b/js/Linear/TCLSS.js index 73f319ae..bc9af1b3 100644 --- a/js/Linear/TCLSS.js +++ b/js/Linear/TCLSS.js @@ -18,9 +18,9 @@ function TCLSS() { this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TCLSS\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TCLSS\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } TCLSS.prototype.details = function TCLSS() { @@ -37,9 +37,9 @@ function TCLSS() { return options; } TCLSS.prototype.set = function TCLSS() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")==7) { - this.exprs = this.exprs[[1:4,7]-1]; + var exprs = this.graphics.exprs; + if (size(exprs,"*")==7) { + var exprs = exprs[[1:4,7]-1]; } while (true) { var ok = true; @@ -71,7 +71,7 @@ function TCLSS() { this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; if (this.D.length!=0) { if (norm(this.D,1)!=0) { diff --git a/js/Linear/TCLSS.pickle b/js/Linear/TCLSS.pickle index c633f755..b0c5bc53 100644 --- a/js/Linear/TCLSS.pickle +++ b/js/Linear/TCLSS.pickle @@ -10,20 +10,16 @@ aS'B' p4 aS'D' p5 -aS'exprs' -p6 -aS'gr_i' -p7 aS'graphics' -p8 +p6 aS'x' -p9 +p7 aS'model' -p10 +p8 aS'x0' -p11 -atp12 -Rp13 +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/Linear/TCLSS_f.js b/js/Linear/TCLSS_f.js index 3003cbcd..5c6f6417 100644 --- a/js/Linear/TCLSS_f.js +++ b/js/Linear/TCLSS_f.js @@ -18,9 +18,9 @@ function TCLSS_f() { this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TCLSS_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TCLSS_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } TCLSS_f.prototype.details = function TCLSS_f() { @@ -37,9 +37,9 @@ function TCLSS_f() { return options; } TCLSS_f.prototype.set = function TCLSS_f() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")==7) { - this.exprs = this.exprs[[1:4,7]-1]; + var exprs = this.graphics.exprs; + if (size(exprs,"*")==7) { + var exprs = exprs[[1:4,7]-1]; } while (true) { var ok = true; @@ -71,7 +71,7 @@ function TCLSS_f() { this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; if (this.D.length!=0) { if (norm(this.D,1)!=0) { diff --git a/js/Linear/TCLSS_f.pickle b/js/Linear/TCLSS_f.pickle index c633f755..b0c5bc53 100644 --- a/js/Linear/TCLSS_f.pickle +++ b/js/Linear/TCLSS_f.pickle @@ -10,20 +10,16 @@ aS'B' p4 aS'D' p5 -aS'exprs' -p6 -aS'gr_i' -p7 aS'graphics' -p8 +p6 aS'x' -p9 +p7 aS'model' -p10 +p8 aS'x0' -p11 -atp12 -Rp13 +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/Linear/TIME_DELAY.js b/js/Linear/TIME_DELAY.js index 7abbe110..deaad0f0 100644 --- a/js/Linear/TIME_DELAY.js +++ b/js/Linear/TIME_DELAY.js @@ -13,9 +13,9 @@ function TIME_DELAY() { this.model.ipar = new ScilabDouble([this.N]); this.model.blocktype = new ScilabString(["x"]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.exprs = [[string(this.T)],[string(this.init)],[string(this.N)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TIME_DELAY\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3.5,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[string(this.T)],[string(this.init)],[string(this.N)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TIME_DELAY\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3.5,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } TIME_DELAY.prototype.details = function TIME_DELAY() { @@ -30,7 +30,7 @@ function TIME_DELAY() { return options; } TIME_DELAY.prototype.set = function TIME_DELAY() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var nin = this.model.in[1-1]; while (true) { var ok = true; @@ -57,7 +57,7 @@ function TIME_DELAY() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble([this.T],[this.init]); this.model.ipar = new ScilabDouble([this.N]); this.model.dep_ut = new ScilabBoolean([false,true]); diff --git a/js/Linear/TIME_DELAY.pickle b/js/Linear/TIME_DELAY.pickle index b2bed6a4..5ab7a862 100644 --- a/js/Linear/TIME_DELAY.pickle +++ b/js/Linear/TIME_DELAY.pickle @@ -4,22 +4,18 @@ p0 ((lp1 S'N' p2 -aS'exprs' -p3 aS'init' -p4 -aS'gr_i' -p5 +p3 aS'T' -p6 +p4 aS'graphics' -p7 +p5 aS'x' -p8 +p6 aS'model' -p9 -atp10 -Rp11 +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/Linear/VARIABLE_DELAY.js b/js/Linear/VARIABLE_DELAY.js index 74cd98c6..362cbe20 100644 --- a/js/Linear/VARIABLE_DELAY.js +++ b/js/Linear/VARIABLE_DELAY.js @@ -13,9 +13,9 @@ function VARIABLE_DELAY() { this.model.ipar = new ScilabDouble([this.N]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[string(this.T)],[string(this.init)],[string(this.N)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VARIABLE_DELAY\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[string(this.T)],[string(this.init)],[string(this.N)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VARIABLE_DELAY\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } VARIABLE_DELAY.prototype.details = function VARIABLE_DELAY() { @@ -30,7 +30,7 @@ function VARIABLE_DELAY() { return options; } VARIABLE_DELAY.prototype.set = function VARIABLE_DELAY() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var nin = this.model.in[1-1]; while (true) { var ok = true; @@ -57,7 +57,7 @@ function VARIABLE_DELAY() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble([this.T],[this.init]); this.model.ipar = new ScilabDouble([this.N]); this.x.graphics = this.graphics; diff --git a/js/Linear/VARIABLE_DELAY.pickle b/js/Linear/VARIABLE_DELAY.pickle index 77059d72..cddddfa5 100644 --- a/js/Linear/VARIABLE_DELAY.pickle +++ b/js/Linear/VARIABLE_DELAY.pickle @@ -4,22 +4,18 @@ p0 ((lp1 S'N' p2 -aS'exprs' -p3 aS'init' -p4 -aS'gr_i' -p5 +p3 aS'T' -p6 +p4 aS'graphics' -p7 +p5 aS'x' -p8 +p6 aS'model' -p9 -atp10 -Rp11 +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/MatrixOp/CUMSUM.js b/js/MatrixOp/CUMSUM.js index 7a3d634a..9654da9c 100644 --- a/js/MatrixOp/CUMSUM.js +++ b/js/MatrixOp/CUMSUM.js @@ -21,8 +21,8 @@ function CUMSUM() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[sci2exp(1)],[sci2exp(0)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CUMSUM\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CUMSUM\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),gr_i); return new BasicBlock(this.x); } CUMSUM.prototype.details = function CUMSUM() { diff --git a/js/MatrixOp/CUMSUM.pickle b/js/MatrixOp/CUMSUM.pickle index 70090100..f19c81c9 100644 --- a/js/MatrixOp/CUMSUM.pickle +++ b/js/MatrixOp/CUMSUM.pickle @@ -4,22 +4,18 @@ p0 ((lp1 S'lab' p2 -aS'exprs' -p3 -aS'gr_i' -p4 aS'graphics' -p5 +p3 aS'x' -p6 +p4 aS'model' -p7 +p5 aS'typ' -p8 +p6 aS'decomptyp' -p9 -atp10 -Rp11 +p7 +atp8 +Rp9 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/EXTRACT.js b/js/MatrixOp/EXTRACT.js index 31b97eff..c3edb683 100644 --- a/js/MatrixOp/EXTRACT.js +++ b/js/MatrixOp/EXTRACT.js @@ -21,8 +21,8 @@ function EXTRACT() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[sci2exp(1)],[sci2exp([1])],[sci2exp([1])]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACT\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACT\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),gr_i); return new BasicBlock(this.x); } EXTRACT.prototype.details = function EXTRACT() { @@ -90,7 +90,7 @@ function EXTRACT() { var out = [ma,mb]; var funtyp = 4; if (ok) { - var label = this.exprs; + var label = exprs; var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; diff --git a/js/MatrixOp/EXTRACT.pickle b/js/MatrixOp/EXTRACT.pickle index a255e41f..da378f82 100644 --- a/js/MatrixOp/EXTRACT.pickle +++ b/js/MatrixOp/EXTRACT.pickle @@ -6,20 +6,16 @@ S'a' p2 aS'b' p3 -aS'exprs' -p4 -aS'gr_i' -p5 aS'graphics' -p6 +p4 aS'x' -p7 +p5 aS'model' -p8 +p6 aS'typ' -p9 -atp10 -Rp11 +p7 +atp8 +Rp9 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/EXTTRI.js b/js/MatrixOp/EXTTRI.js index d4d77d97..5b0e3c1b 100644 --- a/js/MatrixOp/EXTTRI.js +++ b/js/MatrixOp/EXTTRI.js @@ -21,8 +21,8 @@ function EXTTRI() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTTRI\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTTRI\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),gr_i); return new BasicBlock(this.x); } EXTTRI.prototype.details = function EXTTRI() { diff --git a/js/MatrixOp/EXTTRI.pickle b/js/MatrixOp/EXTTRI.pickle index 70090100..f19c81c9 100644 --- a/js/MatrixOp/EXTTRI.pickle +++ b/js/MatrixOp/EXTTRI.pickle @@ -4,22 +4,18 @@ p0 ((lp1 S'lab' p2 -aS'exprs' -p3 -aS'gr_i' -p4 aS'graphics' -p5 +p3 aS'x' -p6 +p4 aS'model' -p7 +p5 aS'typ' -p8 +p6 aS'decomptyp' -p9 -atp10 -Rp11 +p7 +atp8 +Rp9 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATBKSL.js b/js/MatrixOp/MATBKSL.js index f1608eba..d89eb6d0 100644 --- a/js/MatrixOp/MATBKSL.js +++ b/js/MatrixOp/MATBKSL.js @@ -21,8 +21,8 @@ function MATBKSL() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATBKSL\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATBKSL\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),gr_i); return new BasicBlock(this.x); } MATBKSL.prototype.details = function MATBKSL() { @@ -62,7 +62,7 @@ function MATBKSL() { var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { - var label = this.exprs; + var label = exprs; var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; diff --git a/js/MatrixOp/MATBKSL.pickle b/js/MatrixOp/MATBKSL.pickle index 8f0081ab..d6160ceb 100644 --- a/js/MatrixOp/MATBKSL.pickle +++ b/js/MatrixOp/MATBKSL.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'x' p2 -aS'gr_i' +aS'model' p3 -aS'graphics' +aS'typ' p4 -aS'x' +aS'graphics' p5 -aS'model' -p6 -aS'typ' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATCATH.js b/js/MatrixOp/MATCATH.js index 55112b29..d876e23c 100644 --- a/js/MatrixOp/MATCATH.js +++ b/js/MatrixOp/MATCATH.js @@ -21,8 +21,8 @@ function MATCATH() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(2)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATCATH\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabString(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATCATH\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabString(label),gr_i); return new BasicBlock(this.x); } MATCATH.prototype.details = function MATCATH() { diff --git a/js/MatrixOp/MATCATH.pickle b/js/MatrixOp/MATCATH.pickle index 4bd900cc..068b089c 100644 --- a/js/MatrixOp/MATCATH.pickle +++ b/js/MatrixOp/MATCATH.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'nin' +S'x' p2 -aS'lab' +aS'model' p3 -aS'exprs' +aS'nin' p4 -aS'gr_i' +aS'lab' p5 aS'graphics' p6 -aS'x' -p7 -aS'model' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATCATV.js b/js/MatrixOp/MATCATV.js index 05ce4e0e..67909b7e 100644 --- a/js/MatrixOp/MATCATV.js +++ b/js/MatrixOp/MATCATV.js @@ -22,8 +22,8 @@ function MATCATV() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(2)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATCATV\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabString(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATCATV\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabString(label),gr_i); return new BasicBlock(this.x); } MATCATV.prototype.details = function MATCATV() { diff --git a/js/MatrixOp/MATCATV.pickle b/js/MatrixOp/MATCATV.pickle index fe6d469a..d8deaec0 100644 --- a/js/MatrixOp/MATCATV.pickle +++ b/js/MatrixOp/MATCATV.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'nin' +S'x' p2 -aS'lab' +aS'model' p3 -aS'exprs' +aS'nin' p4 -aS'gr_i' +aS'lab' p5 aS'graphics' p6 -aS'x' -p7 -aS'model' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATDET.js b/js/MatrixOp/MATDET.js index f8959160..9ecae713 100644 --- a/js/MatrixOp/MATDET.js +++ b/js/MatrixOp/MATDET.js @@ -21,8 +21,8 @@ function MATDET() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDET\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDET\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),gr_i); return new BasicBlock(this.x); } MATDET.prototype.details = function MATDET() { @@ -62,7 +62,7 @@ function MATDET() { var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { - var label = this.exprs; + var label = exprs; var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; diff --git a/js/MatrixOp/MATDET.pickle b/js/MatrixOp/MATDET.pickle index 7f950c5b..890da531 100644 --- a/js/MatrixOp/MATDET.pickle +++ b/js/MatrixOp/MATDET.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'x' p2 -aS'gr_i' +aS'model' p3 -aS'graphics' +aS'typ' p4 -aS'x' +aS'graphics' p5 -aS'model' -p6 -aS'typ' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATDIAG.js b/js/MatrixOp/MATDIAG.js index 0b8f6b7b..08d84275 100644 --- a/js/MatrixOp/MATDIAG.js +++ b/js/MatrixOp/MATDIAG.js @@ -21,8 +21,8 @@ function MATDIAG() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDIAG\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDIAG\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),gr_i); return new BasicBlock(this.x); } MATDIAG.prototype.details = function MATDIAG() { @@ -62,7 +62,7 @@ function MATDIAG() { var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { - var label = this.exprs; + var label = exprs; var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; diff --git a/js/MatrixOp/MATDIAG.pickle b/js/MatrixOp/MATDIAG.pickle index 7f950c5b..890da531 100644 --- a/js/MatrixOp/MATDIAG.pickle +++ b/js/MatrixOp/MATDIAG.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'x' p2 -aS'gr_i' +aS'model' p3 -aS'graphics' +aS'typ' p4 -aS'x' +aS'graphics' p5 -aS'model' -p6 -aS'typ' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATDIV.js b/js/MatrixOp/MATDIV.js index 7148a63d..3bb45159 100644 --- a/js/MatrixOp/MATDIV.js +++ b/js/MatrixOp/MATDIV.js @@ -21,8 +21,8 @@ function MATDIV() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDIV\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDIV\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),gr_i); return new BasicBlock(this.x); } MATDIV.prototype.details = function MATDIV() { @@ -62,7 +62,7 @@ function MATDIV() { var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { - var label = this.exprs; + var label = exprs; var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; diff --git a/js/MatrixOp/MATDIV.pickle b/js/MatrixOp/MATDIV.pickle index 8f0081ab..d6160ceb 100644 --- a/js/MatrixOp/MATDIV.pickle +++ b/js/MatrixOp/MATDIV.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'x' p2 -aS'gr_i' +aS'model' p3 -aS'graphics' +aS'typ' p4 -aS'x' +aS'graphics' p5 -aS'model' -p6 -aS'typ' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATEIG.js b/js/MatrixOp/MATEIG.js index de5ac8f8..466ef853 100644 --- a/js/MatrixOp/MATEIG.js +++ b/js/MatrixOp/MATEIG.js @@ -21,8 +21,8 @@ function MATEIG() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATEIG\",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),\"MATEIG\",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); } MATEIG.prototype.details = function MATEIG() { diff --git a/js/MatrixOp/MATEIG.pickle b/js/MatrixOp/MATEIG.pickle index 480fe405..3e10a26a 100644 --- a/js/MatrixOp/MATEIG.pickle +++ b/js/MatrixOp/MATEIG.pickle @@ -4,22 +4,18 @@ p0 ((lp1 S'lab' p2 -aS'exprs' -p3 -aS'gr_i' -p4 aS'graphics' -p5 +p3 aS'x' -p6 +p4 aS'model' -p7 +p5 aS'typ' -p8 +p6 aS'decomptyp' -p9 -atp10 -Rp11 +p7 +atp8 +Rp9 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATEXPM.js b/js/MatrixOp/MATEXPM.js index b304bd0d..017796e2 100644 --- a/js/MatrixOp/MATEXPM.js +++ b/js/MatrixOp/MATEXPM.js @@ -21,8 +21,8 @@ function MATEXPM() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATEXPM\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATEXPM\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),gr_i); return new BasicBlock(this.x); } MATEXPM.prototype.details = function MATEXPM() { @@ -62,7 +62,7 @@ function MATEXPM() { var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { - var label = this.exprs; + var label = exprs; var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; diff --git a/js/MatrixOp/MATEXPM.pickle b/js/MatrixOp/MATEXPM.pickle index 7f950c5b..890da531 100644 --- a/js/MatrixOp/MATEXPM.pickle +++ b/js/MatrixOp/MATEXPM.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'x' p2 -aS'gr_i' +aS'model' p3 -aS'graphics' +aS'typ' p4 -aS'x' +aS'graphics' p5 -aS'model' -p6 -aS'typ' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATINV.js b/js/MatrixOp/MATINV.js index 277f14ca..254adea9 100644 --- a/js/MatrixOp/MATINV.js +++ b/js/MatrixOp/MATINV.js @@ -21,8 +21,8 @@ function MATINV() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATINV\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATINV\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),gr_i); return new BasicBlock(this.x); } MATINV.prototype.details = function MATINV() { @@ -62,7 +62,7 @@ function MATINV() { var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { - var label = this.exprs; + var label = exprs; var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; diff --git a/js/MatrixOp/MATINV.pickle b/js/MatrixOp/MATINV.pickle index 7f950c5b..890da531 100644 --- a/js/MatrixOp/MATINV.pickle +++ b/js/MatrixOp/MATINV.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'x' p2 -aS'gr_i' +aS'model' p3 -aS'graphics' +aS'typ' p4 -aS'x' +aS'graphics' p5 -aS'model' -p6 -aS'typ' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATLU.js b/js/MatrixOp/MATLU.js index ee1fe41d..060423da 100644 --- a/js/MatrixOp/MATLU.js +++ b/js/MatrixOp/MATLU.js @@ -21,8 +21,8 @@ function MATLU() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = sci2exp(1); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATLU\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([label]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATLU\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([label]),gr_i); return new BasicBlock(this.x); } MATLU.prototype.details = function MATLU() { diff --git a/js/MatrixOp/MATLU.pickle b/js/MatrixOp/MATLU.pickle index c3b97374..5a0336fa 100644 --- a/js/MatrixOp/MATLU.pickle +++ b/js/MatrixOp/MATLU.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'lab' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'typ' p4 -aS'graphics' +aS'lab' p5 -aS'x' +aS'graphics' p6 -aS'model' -p7 -aS'typ' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATMAGPHI.js b/js/MatrixOp/MATMAGPHI.js index c3b97dee..6f0affc5 100644 --- a/js/MatrixOp/MATMAGPHI.js +++ b/js/MatrixOp/MATMAGPHI.js @@ -21,8 +21,8 @@ function MATMAGPHI() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATMAGPHI\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATMAGPHI\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(label),gr_i); return new BasicBlock(this.x); } MATMAGPHI.prototype.details = function MATMAGPHI() { diff --git a/js/MatrixOp/MATMAGPHI.pickle b/js/MatrixOp/MATMAGPHI.pickle index 349daa3a..0c3d145e 100644 --- a/js/MatrixOp/MATMAGPHI.pickle +++ b/js/MatrixOp/MATMAGPHI.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'lab' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'lab' p4 -aS'graphics' +aS'decomptyp' p5 -aS'x' +aS'graphics' p6 -aS'model' -p7 -aS'decomptyp' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATMUL.js b/js/MatrixOp/MATMUL.js index 1766bd00..6546d7a0 100644 --- a/js/MatrixOp/MATMUL.js +++ b/js/MatrixOp/MATMUL.js @@ -10,8 +10,8 @@ function MATMUL() { this.model.dep_ut = new ScilabBoolean([true,false]); this.model.ipar = new ScilabDouble([1]); var label = [sci2exp(this.model.ipar)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATMUL\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATMUL\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(label),gr_i); return new BasicBlock(this.x); } MATMUL.prototype.details = function MATMUL() { @@ -152,7 +152,7 @@ function MATMUL() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - var label = this.exprs; + var label = exprs; this.model.ipar = new ScilabDouble([this.rule]); this.model.rpar = new ScilabDouble([kmin],[kmax]); this.graphics.exprs = new ScilabDouble([label]); diff --git a/js/MatrixOp/MATMUL.pickle b/js/MatrixOp/MATMUL.pickle index 13121ca7..ec887713 100644 --- a/js/MatrixOp/MATMUL.pickle +++ b/js/MatrixOp/MATMUL.pickle @@ -6,20 +6,16 @@ S'dtype' p2 aS'rule' p3 -aS'exprs' -p4 -aS'gr_i' -p5 aS'graphics' -p6 +p4 aS'np' -p7 +p5 aS'x' -p8 +p6 aS'model' -p9 -atp10 -Rp11 +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/MatrixOp/MATPINV.js b/js/MatrixOp/MATPINV.js index 9caab8a1..3ef26d08 100644 --- a/js/MatrixOp/MATPINV.js +++ b/js/MatrixOp/MATPINV.js @@ -21,8 +21,8 @@ function MATPINV() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATPINV\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATPINV\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),gr_i); return new BasicBlock(this.x); } MATPINV.prototype.details = function MATPINV() { @@ -62,7 +62,7 @@ function MATPINV() { var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { - var label = this.exprs; + var label = exprs; var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; diff --git a/js/MatrixOp/MATPINV.pickle b/js/MatrixOp/MATPINV.pickle index 7f950c5b..890da531 100644 --- a/js/MatrixOp/MATPINV.pickle +++ b/js/MatrixOp/MATPINV.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'x' p2 -aS'gr_i' +aS'model' p3 -aS'graphics' +aS'typ' p4 -aS'x' +aS'graphics' p5 -aS'model' -p6 -aS'typ' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATRESH.js b/js/MatrixOp/MATRESH.js index 9e43baf7..5a95d422 100644 --- a/js/MatrixOp/MATRESH.js +++ b/js/MatrixOp/MATRESH.js @@ -21,8 +21,8 @@ function MATRESH() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[sci2exp(1)],[sci2exp([1,1])],[sci2exp([1,1])]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATRESH\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATRESH\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),gr_i); return new BasicBlock(this.x); } MATRESH.prototype.details = function MATRESH() { diff --git a/js/MatrixOp/MATRESH.pickle b/js/MatrixOp/MATRESH.pickle index 726570e8..bfab0438 100644 --- a/js/MatrixOp/MATRESH.pickle +++ b/js/MatrixOp/MATRESH.pickle @@ -2,26 +2,22 @@ c__builtin__ set p0 ((lp1 -S'l1' +S'graphics' p2 aS'lab' p3 -aS'exprs' +aS'l1' p4 -aS'gr_i' -p5 -aS'graphics' -p6 aS'x' -p7 +p5 aS'model' -p8 +p6 aS'typ' -p9 +p7 aS'out' -p10 -atp11 -Rp12 +p8 +atp9 +Rp10 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATSING.js b/js/MatrixOp/MATSING.js index ca9e64c0..e2ea33f1 100644 --- a/js/MatrixOp/MATSING.js +++ b/js/MatrixOp/MATSING.js @@ -21,8 +21,8 @@ function MATSING() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATSING\",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),\"MATSING\",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); } MATSING.prototype.details = function MATSING() { diff --git a/js/MatrixOp/MATSING.pickle b/js/MatrixOp/MATSING.pickle index 480fe405..3e10a26a 100644 --- a/js/MatrixOp/MATSING.pickle +++ b/js/MatrixOp/MATSING.pickle @@ -4,22 +4,18 @@ p0 ((lp1 S'lab' p2 -aS'exprs' -p3 -aS'gr_i' -p4 aS'graphics' -p5 +p3 aS'x' -p6 +p4 aS'model' -p7 +p5 aS'typ' -p8 +p6 aS'decomptyp' -p9 -atp10 -Rp11 +p7 +atp8 +Rp9 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATSUM.js b/js/MatrixOp/MATSUM.js index 3af2e47d..3036d6af 100644 --- a/js/MatrixOp/MATSUM.js +++ b/js/MatrixOp/MATSUM.js @@ -21,8 +21,8 @@ function MATSUM() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[sci2exp(1)],[sci2exp(0)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATSUM\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATSUM\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),gr_i); return new BasicBlock(this.x); } MATSUM.prototype.details = function MATSUM() { diff --git a/js/MatrixOp/MATSUM.pickle b/js/MatrixOp/MATSUM.pickle index 70090100..f19c81c9 100644 --- a/js/MatrixOp/MATSUM.pickle +++ b/js/MatrixOp/MATSUM.pickle @@ -4,22 +4,18 @@ p0 ((lp1 S'lab' p2 -aS'exprs' -p3 -aS'gr_i' -p4 aS'graphics' -p5 +p3 aS'x' -p6 +p4 aS'model' -p7 +p5 aS'typ' -p8 +p6 aS'decomptyp' -p9 -atp10 -Rp11 +p7 +atp8 +Rp9 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATTRAN.js b/js/MatrixOp/MATTRAN.js index b9603d9c..92472204 100644 --- a/js/MatrixOp/MATTRAN.js +++ b/js/MatrixOp/MATTRAN.js @@ -9,8 +9,8 @@ function MATTRAN() { this.model.out2 = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATTRAN\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATTRAN\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(label),gr_i); return new BasicBlock(this.x); } MATTRAN.prototype.details = function MATTRAN() { @@ -56,7 +56,7 @@ function MATTRAN() { var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { - var label = this.exprs; + var label = exprs; var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; diff --git a/js/MatrixOp/MATTRAN.pickle b/js/MatrixOp/MATTRAN.pickle index d1a9c67e..1fa943b2 100644 --- a/js/MatrixOp/MATTRAN.pickle +++ b/js/MatrixOp/MATTRAN.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'rule' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'typ' p4 -aS'graphics' +aS'rule' p5 -aS'x' +aS'graphics' p6 -aS'model' -p7 -aS'typ' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/MatrixOp/MATZCONJ.js b/js/MatrixOp/MATZCONJ.js index 12728a13..0a565ca9 100644 --- a/js/MatrixOp/MATZCONJ.js +++ b/js/MatrixOp/MATZCONJ.js @@ -21,8 +21,8 @@ function MATZCONJ() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = []; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATZCONJ\",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),\"MATZCONJ\",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); } MATZCONJ.prototype.details = function MATZCONJ() { diff --git a/js/MatrixOp/MATZCONJ.pickle b/js/MatrixOp/MATZCONJ.pickle index 93781b9f..566ecfbf 100644 --- a/js/MatrixOp/MATZCONJ.pickle +++ b/js/MatrixOp/MATZCONJ.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.dstate' p1 diff --git a/js/MatrixOp/MATZREIM.js b/js/MatrixOp/MATZREIM.js index a96c36d8..d9af3dce 100644 --- a/js/MatrixOp/MATZREIM.js +++ b/js/MatrixOp/MATZREIM.js @@ -21,8 +21,8 @@ function MATZREIM() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = sci2exp(1); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATZREIM\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString([label]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATZREIM\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString([label]),gr_i); return new BasicBlock(this.x); } MATZREIM.prototype.details = function MATZREIM() { diff --git a/js/MatrixOp/MATZREIM.pickle b/js/MatrixOp/MATZREIM.pickle index 4f289b33..27ed69f0 100644 --- a/js/MatrixOp/MATZREIM.pickle +++ b/js/MatrixOp/MATZREIM.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'lab' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'lab' p4 -aS'graphics' +aS'decomptyp' p5 -aS'x' +aS'graphics' p6 -aS'model' -p7 -aS'decomptyp' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/RICC.js b/js/MatrixOp/RICC.js index 45e4ddb9..434970f8 100644 --- a/js/MatrixOp/RICC.js +++ b/js/MatrixOp/RICC.js @@ -21,8 +21,8 @@ function RICC() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RICC\",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),\"RICC\",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); } RICC.prototype.details = function RICC() { @@ -51,7 +51,7 @@ function RICC() { var out = [this.model.out,this.model.out2]; var it = [1,1,1]; var ot = 1; - var label = this.exprs; + var label = exprs; var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; diff --git a/js/MatrixOp/RICC.pickle b/js/MatrixOp/RICC.pickle index 41b5c094..7f123ded 100644 --- a/js/MatrixOp/RICC.pickle +++ b/js/MatrixOp/RICC.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'tpe' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'mod' p4 -aS'graphics' +aS'tpe' p5 -aS'x' +aS'graphics' p6 -aS'model' -p7 -aS'mod' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/ROOTCOEF.js b/js/MatrixOp/ROOTCOEF.js index db5a7a8a..453b075b 100644 --- a/js/MatrixOp/ROOTCOEF.js +++ b/js/MatrixOp/ROOTCOEF.js @@ -21,8 +21,8 @@ function ROOTCOEF() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ROOTCOEF\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ROOTCOEF\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),gr_i); return new BasicBlock(this.x); } ROOTCOEF.prototype.details = function ROOTCOEF() { @@ -64,7 +64,7 @@ function ROOTCOEF() { var out = [this.inp+1,this.model.out2]; var funtyp = 4; if (ok) { - var label = this.exprs; + var label = exprs; var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; diff --git a/js/MatrixOp/ROOTCOEF.pickle b/js/MatrixOp/ROOTCOEF.pickle index f930a815..83a0494e 100644 --- a/js/MatrixOp/ROOTCOEF.pickle +++ b/js/MatrixOp/ROOTCOEF.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'inp' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'typ' p4 -aS'graphics' +aS'inp' p5 -aS'x' +aS'graphics' p6 -aS'model' -p7 -aS'typ' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/SQRT.js b/js/MatrixOp/SQRT.js index dfe08a5b..2053045f 100644 --- a/js/MatrixOp/SQRT.js +++ b/js/MatrixOp/SQRT.js @@ -11,8 +11,8 @@ function SQRT() { this.model.out2 = new ScilabDouble([-2]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SQRT\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SQRT\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),gr_i); return new BasicBlock(this.x); } SQRT.prototype.details = function SQRT() { @@ -47,7 +47,7 @@ function SQRT() { var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { - var label = this.exprs; + var label = exprs; var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; diff --git a/js/MatrixOp/SQRT.pickle b/js/MatrixOp/SQRT.pickle index 6db85eec..b0a3ef9c 100644 --- a/js/MatrixOp/SQRT.pickle +++ b/js/MatrixOp/SQRT.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'x' p2 -aS'gr_i' +aS'model' p3 -aS'graphics' +aS'typ' p4 -aS'x' +aS'graphics' p5 -aS'model' -p6 -aS'typ' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'arg1' p1 diff --git a/js/MatrixOp/SUBMAT.js b/js/MatrixOp/SUBMAT.js index 118c8b9f..39700035 100644 --- a/js/MatrixOp/SUBMAT.js +++ b/js/MatrixOp/SUBMAT.js @@ -21,8 +21,8 @@ function SUBMAT() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[sci2exp(1)],[sci2exp(1)],[sci2exp(1)],[sci2exp(1)],[sci2exp(1)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUBMAT\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,new ScilabDouble(label),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUBMAT\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,new ScilabDouble(label),gr_i); return new BasicBlock(this.x); } SUBMAT.prototype.details = function SUBMAT() { @@ -97,7 +97,7 @@ function SUBMAT() { var in1 = [this.inp[1-1],this.inp[2-1]]; var out = [(this.b-this.a)+1,(this.d-this.c)+1]; var funtyp = 4; - var label = this.exprs; + var label = exprs; if (ok) { var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); this.model = tmpvar0[0]; diff --git a/js/MatrixOp/SUBMAT.pickle b/js/MatrixOp/SUBMAT.pickle index f4755cc8..3255b4a3 100644 --- a/js/MatrixOp/SUBMAT.pickle +++ b/js/MatrixOp/SUBMAT.pickle @@ -12,20 +12,16 @@ aS'd' p5 aS'inp' p6 -aS'exprs' -p7 -aS'gr_i' -p8 aS'graphics' -p9 +p7 aS'x' -p10 +p8 aS'model' -p11 +p9 aS'typ' -p12 -atp13 -Rp14 +p10 +atp11 +Rp12 .(dp0 S'model.dstate' p1 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 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 diff --git a/js/PDE/PDE.js b/js/PDE/PDE.js index c9339a90..9811b0d9 100644 --- a/js/PDE/PDE.js +++ b/js/PDE/PDE.js @@ -10,8 +10,8 @@ function PDE() { this.model.dep_ut = new ScilabBoolean([false,true]); var params_pde = tlist([["paramspde"],["a"],["b"],["txt_exp"],["check_op1"],["a1"],["b1"],["check_op2"],["a2"],["b2"],["check_op3"],["a3"],["b3"],["check_op4"],["a4"],["b4"],["check_op5"],["a5"],["b5"],["check_op6"],["a6"],["b6"],["check_op7"],["a7"],["b7"],["discr_cst"],["discr_non_cst"],["signe"],["rad_automatique"],["rad_manuel"],["methode"],["ord1"],["ord2"],["ord3"],["degre"],["nnode"],["txt_pas"],["CI"],["dCI"],["CLa"],["CLa_exp"],["CLb"],["CLb_exp"],["points"]],"","","","0","","IN_EDP1(t)","0","","IN_EDP2(t)","0","","IN_EDP3(t)","0","","IN_EDP4(t)","0","","IN_EDP5(t)","0","","IN_EDP6(t)","0","","IN_EDP7(t)","0","0","0","0","0","0","","","","","","","","","0","IN_CL1(t)","0","IN_CL2(t)",""); var label = list(params_pde,[],""); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PDE\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,3]),this.model,label,this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PDE\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,3]),this.model,label,gr_i); return new BasicBlock(this.x); } PDE.prototype.details = function PDE() { diff --git a/js/PDE/PDE.pickle b/js/PDE/PDE.pickle index 5051ab11..3c750d90 100644 --- a/js/PDE/PDE.pickle +++ b/js/PDE/PDE.pickle @@ -2,24 +2,20 @@ c__builtin__ set p0 ((lp1 -S'lab' +S'okk' p2 -aS'rdnom' +aS'lab' p3 -aS'exprs' +aS'graphics' p4 -aS'gr_i' +aS'x' p5 -aS'graphics' +aS'model' p6 -aS'x' +aS'rdnom' p7 -aS'model' -p8 -aS'okk' -p9 -atp10 -Rp11 +atp8 +Rp9 .(dp0 S'params_pde' p1 diff --git a/js/Sinks/AFFICH_m.js b/js/Sinks/AFFICH_m.js index a71d6f4b..54e87f82 100644 --- a/js/Sinks/AFFICH_m.js +++ b/js/Sinks/AFFICH_m.js @@ -18,9 +18,9 @@ function AFFICH_m() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); this.model.label = new ScilabString([""]); - this.exprs = [[sci2exp([this.model.in,this.model.in2])],[string(this.font)],[string(this.fontsize)],[string(this.colr)],[string(this.nt)],[string(this.nd)],[string(0)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"AFFICH_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[sci2exp([this.model.in,this.model.in2])],[string(this.font)],[string(this.fontsize)],[string(this.colr)],[string(this.nt)],[string(this.nd)],[string(0)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"AFFICH_m\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(exprs),gr_i); return new AfficheBlock(this.x); } AFFICH_m.prototype.details = function AFFICH_m() { @@ -39,7 +39,7 @@ function AFFICH_m() { return options; } AFFICH_m.prototype.set = function AFFICH_m() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.in1 = inverse(arguments[0]["in1"]); @@ -91,7 +91,7 @@ function AFFICH_m() { this.model.ipar = new ScilabDouble([this.font],[this.fontsize],[this.colr],[this.nt],[this.nd],[this.in1[1-1][1-1]]); this.model.dstate = new ScilabDouble([-1],[0],[0],[1],[1],[0],[zeros(this.in1[1-1][1-1]*this.in1[1-1][2-1],1)]); this.model.evtin = new ScilabDouble([ones(1-this.herit,1)]); - 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/Sinks/AFFICH_m.pickle b/js/Sinks/AFFICH_m.pickle index 028cca3a..a85fbe77 100644 --- a/js/Sinks/AFFICH_m.pickle +++ b/js/Sinks/AFFICH_m.pickle @@ -10,24 +10,20 @@ aS'colr' p4 aS'in1' p5 -aS'exprs' -p6 -aS'gr_i' -p7 aS'fontsize' -p8 +p6 aS'graphics' -p9 +p7 aS'x' -p10 +p8 aS'model' -p11 +p9 aS'font' -p12 +p10 aS'nt' -p13 -atp14 -Rp15 +p11 +atp12 +Rp13 .(dp0 S'model.dstate' p1 diff --git a/js/Sinks/BARXY.js b/js/Sinks/BARXY.js index 286427e9..bb576420 100644 --- a/js/Sinks/BARXY.js +++ b/js/Sinks/BARXY.js @@ -35,7 +35,7 @@ function BARXY() { return options; } BARXY.prototype.set = function BARXY() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.xmin = parseFloat(arguments[0]["xmin"]); @@ -65,7 +65,7 @@ function BARXY() { } else { this.model.rpar = new ScilabDouble([this.xmin],[this.xmax],[this.ymin],[this.ymax]); this.model.ipar = new ScilabDouble([this.thickness]); - 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/Sinks/BARXY.pickle b/js/Sinks/BARXY.pickle index 2af2eb77..ddc2b822 100644 --- a/js/Sinks/BARXY.pickle +++ b/js/Sinks/BARXY.pickle @@ -6,24 +6,20 @@ S'ymax' p2 aS'thickness' p3 -aS'exprs' -p4 -aS'gr_i' -p5 aS'xmax' -p6 +p4 aS'graphics' -p7 +p5 aS'xmin' -p8 +p6 aS'x' -p9 +p7 aS'model' -p10 +p8 aS'ymin' -p11 -atp12 -Rp13 +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/Sinks/CANIMXY.js b/js/Sinks/CANIMXY.js index b98165fe..4625e975 100644 --- a/js/Sinks/CANIMXY.js +++ b/js/Sinks/CANIMXY.js @@ -23,9 +23,9 @@ function CANIMXY() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[string(this.nbr_curves)],[string(this.clrs)],[string(this.siz)],[string(this.win)],["[]"],["[]"],[string(this.xmin)],[string(this.xmax)],[string(this.ymin)],[string(this.ymax)],[string(this.N)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CANIMXY\",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.nbr_curves)],[string(this.clrs)],[string(this.siz)],[string(this.win)],["[]"],["[]"],[string(this.xmin)],[string(this.xmax)],[string(this.ymin)],[string(this.ymax)],[string(this.N)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CANIMXY\",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); } CANIMXY.prototype.details = function CANIMXY() { @@ -48,7 +48,7 @@ function CANIMXY() { return options; } CANIMXY.prototype.set = function CANIMXY() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.nbr_curves = parseFloat(arguments[0]["nbr_curves"]); @@ -118,7 +118,7 @@ function CANIMXY() { var ipar = [[this.win],[1],[this.N],[this.clrs],[this.siz],[0],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]]; 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/Sinks/CANIMXY.pickle b/js/Sinks/CANIMXY.pickle index 4890b7d6..c70d7cab 100644 --- a/js/Sinks/CANIMXY.pickle +++ b/js/Sinks/CANIMXY.pickle @@ -16,26 +16,22 @@ aS'wdim' p7 aS'N' p8 -aS'exprs' -p9 -aS'gr_i' -p10 aS'xmax' -p11 +p9 aS'graphics' -p12 +p10 aS'xmin' -p13 +p11 aS'x' -p14 +p12 aS'model' -p15 +p13 aS'nbr_curves' -p16 +p14 aS'win' -p17 -atp18 -Rp19 +p15 +atp16 +Rp17 .(dp0 S'clrs' p1 diff --git a/js/Sinks/CANIMXY3D.js b/js/Sinks/CANIMXY3D.js index 9ff328e5..af4757f1 100644 --- a/js/Sinks/CANIMXY3D.js +++ b/js/Sinks/CANIMXY3D.js @@ -23,9 +23,9 @@ function CANIMXY3D() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[string(this.nbr_curves)],[strcat(string(this.clrs)," ")],[strcat(string(this.siz)," ")],[string(this.win)],["[]"],["[]"],[strcat(string(this.vec_x)," ")],[strcat(string(this.vec_y)," ")],[strcat(string(this.vec_z)," ")],[strcat(string(this.param3ds)," ")],[string(this.N)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CANIMXY3D\",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.nbr_curves)],[strcat(string(this.clrs)," ")],[strcat(string(this.siz)," ")],[string(this.win)],["[]"],["[]"],[strcat(string(this.vec_x)," ")],[strcat(string(this.vec_y)," ")],[strcat(string(this.vec_z)," ")],[strcat(string(this.param3ds)," ")],[string(this.N)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CANIMXY3D\",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); } CANIMXY3D.prototype.details = function CANIMXY3D() { @@ -48,7 +48,7 @@ function CANIMXY3D() { return options; } CANIMXY3D.prototype.set = function CANIMXY3D() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.nbr_curves = parseFloat(arguments[0]["nbr_curves"]); @@ -135,7 +135,7 @@ function CANIMXY3D() { var ipar = [[this.win],[size_siz],[this.N],[this.clrs.slice()],[this.siz.slice()],[1],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]]; 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/Sinks/CANIMXY3D.pickle b/js/Sinks/CANIMXY3D.pickle index eb4cb122..96d8b9f3 100644 --- a/js/Sinks/CANIMXY3D.pickle +++ b/js/Sinks/CANIMXY3D.pickle @@ -20,22 +20,18 @@ aS'param3ds' p9 aS'N' p10 -aS'exprs' -p11 -aS'gr_i' -p12 aS'graphics' -p13 +p11 aS'x' -p14 +p12 aS'model' -p15 +p13 aS'nbr_curves' -p16 +p14 aS'win' -p17 -atp18 -Rp19 +p15 +atp16 +Rp17 .(dp0 S'clrs' p1 diff --git a/js/Sinks/CEVENTSCOPE.js b/js/Sinks/CEVENTSCOPE.js index 13e18eb5..8e3bebbb 100644 --- a/js/Sinks/CEVENTSCOPE.js +++ b/js/Sinks/CEVENTSCOPE.js @@ -14,9 +14,9 @@ function CEVENTSCOPE() { this.model.ipar = new ScilabDouble([this.win],[1],[this.clrs[this.nclock-1]],[this.wpos.slice()],[this.wdim.slice()]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[sci2exp(this.nclock)],[strcat(sci2exp(this.clrs[this.nclock-1])," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.per)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CEVENTSCOPE\",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.nclock)],[strcat(sci2exp(this.clrs[this.nclock-1])," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.per)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CEVENTSCOPE\",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); } CEVENTSCOPE.prototype.details = function CEVENTSCOPE() { @@ -34,7 +34,7 @@ function CEVENTSCOPE() { return options; } CEVENTSCOPE.prototype.set = function CEVENTSCOPE() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.nclock = parseFloat(arguments[0]["nclock"]); @@ -94,7 +94,7 @@ function CEVENTSCOPE() { var ipar = [[this.win],[1],[this.clrs.slice()],[this.wpos.slice()],[this.wdim.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/Sinks/CEVENTSCOPE.pickle b/js/Sinks/CEVENTSCOPE.pickle index 848fca4f..28384e9a 100644 --- a/js/Sinks/CEVENTSCOPE.pickle +++ b/js/Sinks/CEVENTSCOPE.pickle @@ -12,20 +12,16 @@ aS'wdim' p5 aS'per' p6 -aS'exprs' -p7 -aS'gr_i' -p8 aS'graphics' -p9 +p7 aS'x' -p10 +p8 aS'model' -p11 +p9 aS'nclock' -p12 -atp13 -Rp14 +p10 +atp11 +Rp12 .(dp0 S'clrs' p1 diff --git a/js/Sinks/CFSCOPE.js b/js/Sinks/CFSCOPE.js index 928fb538..6fe9167c 100644 --- a/js/Sinks/CFSCOPE.js +++ b/js/Sinks/CFSCOPE.js @@ -16,9 +16,9 @@ function CFSCOPE() { this.model.ipar = new ScilabDouble([this.win],[1],[this.N],[this.clrs],[this.wpos],[this.wdim],[1],[1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[strcat(string(this.clrs)," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.ymin)],[string(this.ymax)],[string(this.per)],[string(this.N)],[string([1])]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CFSCOPE\",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(string(this.clrs)," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.ymin)],[string(this.ymax)],[string(this.per)],[string(this.N)],[string([1])]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CFSCOPE\",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); } CFSCOPE.prototype.details = function CFSCOPE() { @@ -39,7 +39,7 @@ function CFSCOPE() { return options; } CFSCOPE.prototype.set = function CFSCOPE() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.clrs = inverse(arguments[0]["clrs"]); @@ -106,7 +106,7 @@ function CFSCOPE() { this.model.ipar = new ScilabDouble(ipar); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); - 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/Sinks/CFSCOPE.pickle b/js/Sinks/CFSCOPE.pickle index 2995c739..ee50f7b9 100644 --- a/js/Sinks/CFSCOPE.pickle +++ b/js/Sinks/CFSCOPE.pickle @@ -16,22 +16,18 @@ aS'per' p7 aS'N' p8 -aS'exprs' -p9 aS'wu' -p10 -aS'gr_i' -p11 +p9 aS'graphics' -p12 +p10 aS'x' -p13 +p11 aS'model' -p14 +p12 aS'ymin' -p15 -atp16 -Rp17 +p13 +atp14 +Rp15 .(dp0 S'clrs' p1 diff --git a/js/Sinks/CLKOUTV_f.js b/js/Sinks/CLKOUTV_f.js index ecf86c06..653e2633 100644 --- a/js/Sinks/CLKOUTV_f.js +++ b/js/Sinks/CLKOUTV_f.js @@ -9,8 +9,8 @@ function CLKOUTV_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = string(this.prt); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs])," "); + var exprs = string(this.prt); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([exprs])," "); return new EventOutBlock(this.x); } CLKOUTV_f.prototype.details = function CLKOUTV_f() { @@ -23,7 +23,7 @@ function CLKOUTV_f() { return options; } CLKOUTV_f.prototype.set = function CLKOUTV_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.prt = arguments[0]["prt"]; @@ -36,7 +36,7 @@ function CLKOUTV_f() { } else { this.model.ipar = new ScilabDouble([this.prt]); this.model.evtin = new ScilabDouble([1]); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -69,8 +69,8 @@ function CLKOUTV_f() { var y = orig[2-1]+sz[2-1]*[[0],[1/3],[1],[1],[1/3]]; var xo = orig[1-1]; var yo = orig[2-1]+sz[2-1]/3; - if (this.type[this.gr_i-1]==15) { - var coli = this.gr_i[2-1]; + if (this.type[gr_i-1]==15) { + var coli = gr_i[2-1]; var pcoli = xget("pattern"); xfpolys(this.x,y,coli); xset("pattern",coli); diff --git a/js/Sinks/CLKOUTV_f.pickle b/js/Sinks/CLKOUTV_f.pickle index 4523edef..1461c53d 100644 --- a/js/Sinks/CLKOUTV_f.pickle +++ b/js/Sinks/CLKOUTV_f.pickle @@ -2,28 +2,24 @@ c__builtin__ set p0 ((lp1 -S'prt' +S'diag' p2 -aS'diag' -p3 aS'default_color' +p3 +aS'prt' p4 -aS'exprs' -p5 -aS'gr_i' -p6 aS'graphics' -p7 +p5 aS'x' -p8 +p6 aS'model' -p9 +p7 aS'type' -p10 +p8 aS'options' -p11 -atp12 -Rp13 +p9 +atp10 +Rp11 .(dp0 S'xo' p1 diff --git a/js/Sinks/CLKOUT_f.js b/js/Sinks/CLKOUT_f.js index 88ec4ea3..b3e7f946 100644 --- a/js/Sinks/CLKOUT_f.js +++ b/js/Sinks/CLKOUT_f.js @@ -9,8 +9,8 @@ function CLKOUT_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = string(this.prt); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs])," "); + var exprs = string(this.prt); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([exprs])," "); return new BasicBlock(this.x); } CLKOUT_f.prototype.details = function CLKOUT_f() { @@ -23,8 +23,8 @@ function CLKOUT_f() { return options; } CLKOUT_f.prototype.set = function CLKOUT_f() { - this.exprs = this.graphics.exprs; - this.exprs = this.exprs[1-1]; + var exprs = this.graphics.exprs; + var exprs = exprs[1-1]; while (true) { var ok = true; this.prt = parseFloat(arguments[0]["prt"]); @@ -39,7 +39,7 @@ function CLKOUT_f() { this.model.ipar = new ScilabDouble([this.prt]); this.model.evtin = new ScilabDouble([1]); 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/Sinks/CLKOUT_f.pickle b/js/Sinks/CLKOUT_f.pickle index 8de8dad9..c3b14260 100644 --- a/js/Sinks/CLKOUT_f.pickle +++ b/js/Sinks/CLKOUT_f.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'prt' p2 -aS'prt' +aS'x' p3 -aS'gr_i' +aS'model' p4 aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Sinks/CMAT3D.js b/js/Sinks/CMAT3D.js index 5656b99c..b220e9f2 100644 --- a/js/Sinks/CMAT3D.js +++ b/js/Sinks/CMAT3D.js @@ -19,9 +19,9 @@ function CMAT3D() { this.model.rpar = new ScilabDouble([this.colormap.slice()],[this.x],[y]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[strcat(string(this.x)," ")],[strcat(string(y)," ")],[string("jetcolormap(25)")],[string(this.cmin)],[string(this.cmax)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CMAT3D\",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(string(this.x)," ")],[strcat(string(y)," ")],[string("jetcolormap(25)")],[string(this.cmin)],[string(this.cmax)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CMAT3D\",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); } CMAT3D.prototype.details = function CMAT3D() { @@ -38,7 +38,7 @@ function CMAT3D() { return options; } CMAT3D.prototype.set = function CMAT3D() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.vec_x = arguments[0]["vec_x"]; @@ -69,7 +69,7 @@ function CMAT3D() { var rpar = [[this.colormap.slice()],[this.vec_x.slice()],[this.vec_y.slice()]]; this.model.ipar = new ScilabDouble(ipar); 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/Sinks/CMAT3D.pickle b/js/Sinks/CMAT3D.pickle index 4db7bf86..70976a35 100644 --- a/js/Sinks/CMAT3D.pickle +++ b/js/Sinks/CMAT3D.pickle @@ -8,22 +8,18 @@ aS'vec_x' p3 aS'vec_y' p4 -aS'exprs' -p5 -aS'gr_i' -p6 aS'graphics' -p7 +p5 aS'x' -p8 +p6 aS'model' -p9 +p7 aS'cmax' -p10 +p8 aS'cmin' -p11 -atp12 -Rp13 +p9 +atp10 +Rp11 .(dp0 S'cmin' p1 diff --git a/js/Sinks/CMATVIEW.js b/js/Sinks/CMATVIEW.js index d6abdde1..e06541ac 100644 --- a/js/Sinks/CMATVIEW.js +++ b/js/Sinks/CMATVIEW.js @@ -17,9 +17,9 @@ function CMATVIEW() { this.model.rpar = new ScilabDouble([alpha_c],[beta_c],[this.colormap.slice()]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[string("jetcolormap(25)")],[string(this.cmin)],[string(this.cmax)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CMATVIEW\",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("jetcolormap(25)")],[string(this.cmin)],[string(this.cmax)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CMATVIEW\",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); } CMATVIEW.prototype.details = function CMATVIEW() { @@ -34,7 +34,7 @@ function CMATVIEW() { return options; } CMATVIEW.prototype.set = function CMATVIEW() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.colormap = parseFloat(arguments[0]["colormap"]); @@ -61,7 +61,7 @@ function CMATVIEW() { var rpar = [[alpha_c],[beta_c],[this.colormap.slice()]]; this.model.ipar = new ScilabDouble(ipar); 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/Sinks/CMATVIEW.pickle b/js/Sinks/CMATVIEW.pickle index 06435d50..c6a3e5b6 100644 --- a/js/Sinks/CMATVIEW.pickle +++ b/js/Sinks/CMATVIEW.pickle @@ -2,24 +2,20 @@ c__builtin__ set p0 ((lp1 -S'colormap' +S'cmin' p2 -aS'exprs' +aS'graphics' p3 -aS'gr_i' +aS'x' p4 -aS'graphics' +aS'model' p5 -aS'x' +aS'cmax' p6 -aS'model' +aS'colormap' p7 -aS'cmax' -p8 -aS'cmin' -p9 -atp10 -Rp11 +atp8 +Rp9 .(dp0 S'cmin' p1 diff --git a/js/Sinks/CMSCOPE.js b/js/Sinks/CMSCOPE.js index 20969d00..e45ce629 100644 --- a/js/Sinks/CMSCOPE.js +++ b/js/Sinks/CMSCOPE.js @@ -22,9 +22,9 @@ function CMSCOPE() { this.model.ipar = new ScilabDouble([this.win],[size(this.in1,"*")],[this.N],[this.wpos.slice()],[this.wdim.slice()],[this.in1.slice()],[this.clrs.slice(1-1,sum(this.in1))]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[strcat(string(this.in1)," ")],[strcat(string(this.clrs)," ")],[string(this.win)],[sci2exp([])],[sci2exp([])],[strcat(string(this.ymin)," ")],[strcat(string(this.ymax)," ")],[strcat(string(this.per)," ")],[string(this.N)],[string(0)],[emptystr()]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CMSCOPE\",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(string(this.in1)," ")],[strcat(string(this.clrs)," ")],[string(this.win)],[sci2exp([])],[sci2exp([])],[strcat(string(this.ymin)," ")],[strcat(string(this.ymax)," ")],[strcat(string(this.per)," ")],[string(this.N)],[string(0)],[emptystr()]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CMSCOPE\",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); } CMSCOPE.prototype.details = function CMSCOPE() { @@ -47,7 +47,7 @@ function CMSCOPE() { return options; } CMSCOPE.prototype.set = function CMSCOPE() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.in1 = inverse(arguments[0]["in1"]); @@ -143,7 +143,7 @@ function CMSCOPE() { this.model.ipar = new ScilabDouble(ipar); this.model.label = new ScilabDouble([this.nom]); this.graphics.id = new ScilabDouble([this.nom]); - 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/Sinks/CMSCOPE.pickle b/js/Sinks/CMSCOPE.pickle index 043924d7..0645baab 100644 --- a/js/Sinks/CMSCOPE.pickle +++ b/js/Sinks/CMSCOPE.pickle @@ -20,22 +20,18 @@ aS'per' p9 aS'N' p10 -aS'exprs' -p11 -aS'gr_i' -p12 aS'graphics' -p13 +p11 aS'x' -p14 +p12 aS'model' -p15 +p13 aS'ymin' -p16 +p14 aS'heritance' -p17 -atp18 -Rp19 +p15 +atp16 +Rp17 .(dp0 S'clrs' p1 diff --git a/js/Sinks/CSCOPE.js b/js/Sinks/CSCOPE.js index 5b12e2ea..4ad77d3d 100644 --- a/js/Sinks/CSCOPE.js +++ b/js/Sinks/CSCOPE.js @@ -18,9 +18,9 @@ function CSCOPE() { this.model.ipar = new ScilabDouble([this.win],[1],[this.N],[this.clrs],[this.wpos],[this.wdim]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[strcat(string(this.clrs)," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.ymin)],[string(this.ymax)],[string(this.per)],[string(this.N)],[transpose(string(0))],[emptystr()]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CSCOPE\",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(string(this.clrs)," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.ymin)],[string(this.ymax)],[string(this.per)],[string(this.N)],[transpose(string(0))],[emptystr()]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CSCOPE\",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); } CSCOPE.prototype.details = function CSCOPE() { @@ -42,7 +42,7 @@ function CSCOPE() { return options; } CSCOPE.prototype.set = function CSCOPE() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.clrs = inverse(arguments[0]["clrs"]); @@ -111,7 +111,7 @@ function CSCOPE() { this.model.evtin = new ScilabDouble([ones(1-this.heritance,1)]); this.model.label = new ScilabDouble([this.nom]); this.graphics.id = new ScilabDouble([this.nom]); - 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/Sinks/CSCOPE.pickle b/js/Sinks/CSCOPE.pickle index 1190c106..9b7286a1 100644 --- a/js/Sinks/CSCOPE.pickle +++ b/js/Sinks/CSCOPE.pickle @@ -18,22 +18,18 @@ aS'per' p8 aS'N' p9 -aS'exprs' -p10 -aS'gr_i' -p11 aS'graphics' -p12 +p10 aS'x' -p13 +p11 aS'model' -p14 +p12 aS'ymin' -p15 +p13 aS'heritance' -p16 -atp17 -Rp18 +p14 +atp15 +Rp16 .(dp0 S'clrs' p1 diff --git a/js/Sinks/CSCOPXY.js b/js/Sinks/CSCOPXY.js index dc49319e..d42f46e5 100644 --- a/js/Sinks/CSCOPXY.js +++ b/js/Sinks/CSCOPXY.js @@ -22,9 +22,9 @@ function CSCOPXY() { this.model.ipar = new ScilabDouble([this.win],[1],[this.N],[this.clrs],[this.siz],[1],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[string(this.nbr_curves)],[sci2exp(this.clrs)],[sci2exp(this.siz)],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.xmin)],[string(this.xmax)],[string(this.ymin)],[string(this.ymax)],[string(this.N)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CSCOPXY\",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.nbr_curves)],[sci2exp(this.clrs)],[sci2exp(this.siz)],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.xmin)],[string(this.xmax)],[string(this.ymin)],[string(this.ymax)],[string(this.N)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CSCOPXY\",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); } CSCOPXY.prototype.details = function CSCOPXY() { @@ -47,7 +47,7 @@ function CSCOPXY() { return options; } CSCOPXY.prototype.set = function CSCOPXY() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.nbr_curves = parseFloat(arguments[0]["nbr_curves"]); @@ -117,7 +117,7 @@ function CSCOPXY() { var ipar = [[this.win],[1],[this.N],[this.clrs],[this.siz],[1],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]]; 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/Sinks/CSCOPXY.pickle b/js/Sinks/CSCOPXY.pickle index a3b31d8e..171d6647 100644 --- a/js/Sinks/CSCOPXY.pickle +++ b/js/Sinks/CSCOPXY.pickle @@ -16,26 +16,22 @@ aS'wdim' p7 aS'N' p8 -aS'exprs' -p9 -aS'gr_i' -p10 aS'xmax' -p11 +p9 aS'graphics' -p12 +p10 aS'xmin' -p13 +p11 aS'x' -p14 +p12 aS'model' -p15 +p13 aS'nbr_curves' -p16 +p14 aS'win' -p17 -atp18 -Rp19 +p15 +atp16 +Rp17 .(dp0 S'clrs' p1 diff --git a/js/Sinks/CSCOPXY3D.js b/js/Sinks/CSCOPXY3D.js index 9b25962a..3e73e43c 100644 --- a/js/Sinks/CSCOPXY3D.js +++ b/js/Sinks/CSCOPXY3D.js @@ -22,9 +22,9 @@ function CSCOPXY3D() { this.model.ipar = new ScilabDouble([this.win],[8],[this.N],[this.clrs.slice()],[this.siz.slice()],[8],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[string(this.nbr_curves)],[strcat(string(this.clrs)," ")],[strcat(string(this.siz)," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[strcat(string(this.vec_x)," ")],[strcat(string(this.vec_y)," ")],[strcat(string(this.vec_z)," ")],[strcat(string(this.param3ds)," ")],[string(this.N)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CSCOPXY3D\",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.nbr_curves)],[strcat(string(this.clrs)," ")],[strcat(string(this.siz)," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[strcat(string(this.vec_x)," ")],[strcat(string(this.vec_y)," ")],[strcat(string(this.vec_z)," ")],[strcat(string(this.param3ds)," ")],[string(this.N)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CSCOPXY3D\",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); } CSCOPXY3D.prototype.details = function CSCOPXY3D() { @@ -47,7 +47,7 @@ function CSCOPXY3D() { return options; } CSCOPXY3D.prototype.set = function CSCOPXY3D() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.nbr_curves = parseFloat(arguments[0]["nbr_curves"]); @@ -127,7 +127,7 @@ function CSCOPXY3D() { var ipar = [[this.win],[size_siz],[this.N],[this.clrs.slice()],[this.siz.slice()],[1],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]]; 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/Sinks/CSCOPXY3D.pickle b/js/Sinks/CSCOPXY3D.pickle index 8e68f9ac..ecfc3cdb 100644 --- a/js/Sinks/CSCOPXY3D.pickle +++ b/js/Sinks/CSCOPXY3D.pickle @@ -20,22 +20,18 @@ aS'param3ds' p9 aS'N' p10 -aS'exprs' -p11 -aS'gr_i' -p12 aS'graphics' -p13 +p11 aS'x' -p14 +p12 aS'model' -p15 +p13 aS'nbr_curves' -p16 +p14 aS'win' -p17 -atp18 -Rp19 +p15 +atp16 +Rp17 .(dp0 S'clrs' p1 diff --git a/js/Sinks/OUTIMPL_f.js b/js/Sinks/OUTIMPL_f.js index 3ffe67be..0b4f8293 100644 --- a/js/Sinks/OUTIMPL_f.js +++ b/js/Sinks/OUTIMPL_f.js @@ -13,9 +13,9 @@ function OUTIMPL_f() { mo.model = "PORT"; mo.inputs = "n"; this.model.equations = new ScilabDouble([mo]); - this.exprs = "1"; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OUTIMPL_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = "1"; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OUTIMPL_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([exprs]),gr_i); this.x.graphics.in_implicit = ["I"]; return new ImplicitOutBlock(this.x); } @@ -29,9 +29,9 @@ function OUTIMPL_f() { return options; } OUTIMPL_f.prototype.set = function OUTIMPL_f() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")==2) { - this.exprs = this.exprs[1-1]; + var exprs = this.graphics.exprs; + if (size(exprs,"*")==2) { + var exprs = exprs[1-1]; } while (true) { var ok = true; @@ -48,7 +48,7 @@ function OUTIMPL_f() { var y = needcompile; } this.model.ipar = new ScilabDouble([this.prt]); - 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/Sinks/OUTIMPL_f.pickle b/js/Sinks/OUTIMPL_f.pickle index 387f4e48..56136135 100644 --- a/js/Sinks/OUTIMPL_f.pickle +++ b/js/Sinks/OUTIMPL_f.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'prt' p2 -aS'prt' +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/Sinks/OUT_f.js b/js/Sinks/OUT_f.js index e578c791..0b644878 100644 --- a/js/Sinks/OUT_f.js +++ b/js/Sinks/OUT_f.js @@ -11,9 +11,9 @@ function OUT_f() { this.model.ipar = new ScilabDouble([this.prt]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = string(this.prt); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OUT_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = string(this.prt); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OUT_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([exprs]),gr_i); return new ExplicitOutBlock(this.x); } OUT_f.prototype.details = function OUT_f() { @@ -26,9 +26,9 @@ function OUT_f() { return options; } OUT_f.prototype.set = function OUT_f() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")==2) { - this.exprs = this.exprs[1-1]; + var exprs = this.graphics.exprs; + if (size(exprs,"*")==2) { + var exprs = exprs[1-1]; } while (true) { var ok = true; @@ -41,7 +41,7 @@ function OUT_f() { block_parameter_error(msprintf("Wrong value for \'Port Number\' parameter: %d.",this.prt),"Strictly positive integer expected."); } else { this.model.ipar = new ScilabDouble([this.prt]); - 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/Sinks/OUT_f.pickle b/js/Sinks/OUT_f.pickle index d59ea7cf..25233f77 100644 --- a/js/Sinks/OUT_f.pickle +++ b/js/Sinks/OUT_f.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'prt' p2 -aS'prt' +aS'x' p3 -aS'gr_i' +aS'model' p4 aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'model.in2' p1 diff --git a/js/Sinks/TOWS_c.js b/js/Sinks/TOWS_c.js index 0f285c96..f07c35d0 100644 --- a/js/Sinks/TOWS_c.js +++ b/js/Sinks/TOWS_c.js @@ -18,9 +18,9 @@ function TOWS_c() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TOWS_c\",sz(1),sz(2));"]); - this.exprs = [[string(this.nz)],[string(this.varnam)],[string(this.herit)]]; - 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),\"TOWS_c\",sz(1),sz(2));"]); + var exprs = [[string(this.nz)],[string(this.varnam)],[string(this.herit)]]; + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } TOWS_c.prototype.details = function TOWS_c() { @@ -35,7 +35,7 @@ function TOWS_c() { return options; } TOWS_c.prototype.set = function TOWS_c() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.nz = parseFloat(arguments[0]["nz"]); @@ -68,7 +68,7 @@ function TOWS_c() { this.model.blocktype = new ScilabString(["d"]); } this.model.ipar = new ScilabDouble([this.nz],[length(this.varnam)],[transpose(this.ascii[this.varnam-1])]); - 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/Sinks/TOWS_c.pickle b/js/Sinks/TOWS_c.pickle index 07723464..330d4c47 100644 --- a/js/Sinks/TOWS_c.pickle +++ b/js/Sinks/TOWS_c.pickle @@ -4,24 +4,20 @@ p0 ((lp1 S'herit' p2 -aS'exprs' -p3 aS'nz' -p4 -aS'gr_i' -p5 +p3 aS'graphics' -p6 +p4 aS'x' -p7 +p5 aS'model' -p8 +p6 aS'ascii' -p9 +p7 aS'varnam' -p10 -atp11 -Rp12 +p8 +atp9 +Rp10 .(dp0 S'arg1' p1 diff --git a/js/Sinks/TRASH_f.js b/js/Sinks/TRASH_f.js index cf48b38b..bd5dea22 100644 --- a/js/Sinks/TRASH_f.js +++ b/js/Sinks/TRASH_f.js @@ -8,9 +8,9 @@ function TRASH_f() { this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = " "; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TRASH_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),\"TRASH_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); } TRASH_f.prototype.details = function TRASH_f() { diff --git a/js/Sinks/TRASH_f.pickle b/js/Sinks/TRASH_f.pickle index 969fe5fc..9478b876 100644 --- a/js/Sinks/TRASH_f.pickle +++ b/js/Sinks/TRASH_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/Sinks/WFILE_f.js b/js/Sinks/WFILE_f.js index 19f166b5..00d25edb 100644 --- a/js/Sinks/WFILE_f.js +++ b/js/Sinks/WFILE_f.js @@ -15,9 +15,9 @@ function WFILE_f() { this.model.ipar = new ScilabDouble([length(fname)],[length(frmt)],[0],[this.N],[this._str2code[fname-1]],[this._str2code[frmt-1]]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[sci2exp(this.in1)],[fname],[frmt],[string(this.N)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"WFILE_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 = [[sci2exp(this.in1)],[fname],[frmt],[string(this.N)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"WFILE_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); } WFILE_f.prototype.details = function WFILE_f() { @@ -37,11 +37,11 @@ function WFILE_f() { var warnMessage = msprintf("Feature %s is obsolete.","WFILE_f"); var warnAdvise = msprintf("Please use %s instead.","WRITEC_f"); var warnXcosMessage = msprintf("%s %s",warnMessage,warnAdvise); - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var dstate = this.model.dstate; var lunit = dstate[2-1]; - var fname = this.exprs[2-1]; - var frmt = this.exprs[3-1]; + var fname = exprs[2-1]; + var frmt = exprs[3-1]; while (true) { var ok = true; this.in1 = parseFloat(arguments[0]["in1"]); @@ -92,7 +92,7 @@ function WFILE_f() { this.model.dstate = new ScilabDouble(dstate); this.model.ipar = new ScilabDouble(ipar); this.model.dep_ut = new ScilabBoolean([true,false]); - 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/Sinks/WFILE_f.pickle b/js/Sinks/WFILE_f.pickle index 6cf01c1d..851555f2 100644 --- a/js/Sinks/WFILE_f.pickle +++ b/js/Sinks/WFILE_f.pickle @@ -6,26 +6,22 @@ S'isdir' p2 aS'_str2code' p3 -aS'in1' +aS'frmt1' p4 aS'fname1' p5 -aS'frmt1' +aS'in1' p6 -aS'exprs' -p7 -aS'gr_i' -p8 aS'graphics' -p9 +p7 aS'x' -p10 +p8 aS'model' -p11 +p9 aS'N' -p12 -atp13 -Rp14 +p10 +atp11 +Rp12 .(dp0 S'model.dstate' p1 diff --git a/js/Sinks/WRITEAU_f.js b/js/Sinks/WRITEAU_f.js index af012eb2..1ddffb03 100644 --- a/js/Sinks/WRITEAU_f.js +++ b/js/Sinks/WRITEAU_f.js @@ -16,9 +16,9 @@ function WRITEAU_f() { this.model.ipar = new ScilabDouble([length(fname)],[this._str2code[frmt-1]],[this.N],[this.swap],[this._str2code[fname-1]]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [string(this.N),string(this.swap)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"WRITEAU_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabString(this.exprs),this.gr_i); + var exprs = [string(this.N),string(this.swap)]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"WRITEAU_f\",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); } WRITEAU_f.prototype.details = function WRITEAU_f() { @@ -32,7 +32,7 @@ function WRITEAU_f() { return options; } WRITEAU_f.prototype.set = function WRITEAU_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var ipar = this.model.ipar; var dstate = this.model.dstate; var lunit = dstate[2-1]; @@ -65,7 +65,7 @@ function WRITEAU_f() { this.model.in = new ScilabDouble([1]); this.model.dstate = new ScilabDouble(dstate); 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/Sinks/WRITEAU_f.pickle b/js/Sinks/WRITEAU_f.pickle index f42ff3ef..0e7703be 100644 --- a/js/Sinks/WRITEAU_f.pickle +++ b/js/Sinks/WRITEAU_f.pickle @@ -6,22 +6,18 @@ S'_str2code' p2 aS'N' p3 -aS'exprs' -p4 -aS'gr_i' -p5 aS'swap' -p6 +p4 aS'graphics' -p7 +p5 aS'x' -p8 +p6 aS'model' -p9 +p7 aS'alreadyran' -p10 -atp11 -Rp12 +p8 +atp9 +Rp10 .(dp0 S'model.dstate' p1 diff --git a/js/Sinks/WRITEC_f.js b/js/Sinks/WRITEC_f.js index 816c1ee7..b4eea5fe 100644 --- a/js/Sinks/WRITEC_f.js +++ b/js/Sinks/WRITEC_f.js @@ -16,9 +16,9 @@ function WRITEC_f() { this.model.ipar = new ScilabDouble([length(fname)],[this._str2code[frmt-1]],[this.N],[this.swap],[this._str2code[fname-1]]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[sci2exp(this.in1)],[fname],[frmt],[string(this.N),string(this.swap)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"WRITEC_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[sci2exp(this.in1)],[fname],[frmt],[string(this.N),string(this.swap)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"WRITEC_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } WRITEC_f.prototype.details = function WRITEC_f() { @@ -35,12 +35,12 @@ function WRITEC_f() { return options; } WRITEC_f.prototype.set = function WRITEC_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var ipar = this.model.ipar; var dstate = this.model.dstate; var lunit = dstate[2-1]; - var fname = this.exprs[2-1]; - var frmt = this.exprs[3-1]; + var fname = exprs[2-1]; + var frmt = exprs[3-1]; while (true) { var ok = true; this.in1 = parseFloat(arguments[0]["in1"]); @@ -95,7 +95,7 @@ function WRITEC_f() { this.model.in = new ScilabDouble([nin]); this.model.dstate = new ScilabDouble(dstate); 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/Sinks/WRITEC_f.pickle b/js/Sinks/WRITEC_f.pickle index c4a21594..fa3e6c96 100644 --- a/js/Sinks/WRITEC_f.pickle +++ b/js/Sinks/WRITEC_f.pickle @@ -6,30 +6,26 @@ S'isdir' p2 aS'_str2code' p3 -aS'in1' +aS'frmt1' p4 aS'fname1' p5 -aS'frmt1' +aS'in1' p6 -aS'exprs' -p7 -aS'gr_i' -p8 aS'swap' -p9 +p7 aS'graphics' -p10 +p8 aS'x' -p11 +p9 aS'model' -p12 +p10 aS'N' -p13 +p11 aS'alreadyran' -p14 -atp15 -Rp16 +p12 +atp13 +Rp14 .(dp0 S'model.dstate' p1 diff --git a/js/Sources/CLKINV_f.js b/js/Sources/CLKINV_f.js index 622fd0e7..8462599e 100644 --- a/js/Sources/CLKINV_f.js +++ b/js/Sources/CLKINV_f.js @@ -9,9 +9,9 @@ function CLKINV_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = string(this.prt); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKINV_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = string(this.prt); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKINV_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([exprs]),gr_i); return new EventInBlock(this.x); } CLKINV_f.prototype.details = function CLKINV_f() { @@ -24,8 +24,8 @@ function CLKINV_f() { return options; } CLKINV_f.prototype.set = function CLKINV_f() { - this.exprs = this.graphics.exprs; - this.exprs = this.exprs[1-1]; + var exprs = this.graphics.exprs; + var exprs = exprs[1-1]; while (true) { var ok = true; this.prt = parseFloat(arguments[0]["prt"]); @@ -39,7 +39,7 @@ function CLKINV_f() { this.model.ipar = new ScilabDouble([this.prt]); this.model.evtout = new ScilabDouble([1]); this.model.firing = new ScilabDouble([-1]); - 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/Sources/CLKINV_f.pickle b/js/Sources/CLKINV_f.pickle index ac287eee..8c9907a4 100644 --- a/js/Sources/CLKINV_f.pickle +++ b/js/Sources/CLKINV_f.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'prt' p2 -aS'prt' +aS'x' p3 -aS'gr_i' +aS'model' p4 aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Sources/CLKIN_f.js b/js/Sources/CLKIN_f.js index 7c23fc38..4025cf52 100644 --- a/js/Sources/CLKIN_f.js +++ b/js/Sources/CLKIN_f.js @@ -9,8 +9,8 @@ function CLKIN_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = string(this.prt); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs])," "); + var exprs = string(this.prt); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([exprs])," "); return new BasicBlock(this.x); } CLKIN_f.prototype.details = function CLKIN_f() { @@ -23,8 +23,8 @@ function CLKIN_f() { return options; } CLKIN_f.prototype.set = function CLKIN_f() { - this.exprs = this.graphics.exprs; - this.exprs = this.exprs[1-1]; + var exprs = this.graphics.exprs; + var exprs = exprs[1-1]; while (true) { var ok = true; this.prt = parseFloat(arguments[0]["prt"]); @@ -39,7 +39,7 @@ function CLKIN_f() { this.model.ipar = new ScilabDouble([this.prt]); this.model.evtout = new ScilabDouble([1]); this.model.firing = new ScilabDouble([-1]); - 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/Sources/CLKIN_f.pickle b/js/Sources/CLKIN_f.pickle index 04cda836..1c20c047 100644 --- a/js/Sources/CLKIN_f.pickle +++ b/js/Sources/CLKIN_f.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'prt' p2 -aS'prt' +aS'x' p3 -aS'gr_i' +aS'model' p4 aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Sources/CLOCK_c.js b/js/Sources/CLOCK_c.js index 1b458be2..851894ab 100644 --- a/js/Sources/CLOCK_c.js +++ b/js/Sources/CLOCK_c.js @@ -21,7 +21,7 @@ function CLOCK_c() { split.graphics.orig = [[380.71066],[172]]; split.graphics.pein = 3; split.graphics.peout = [[5],[6]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLOCK_c\",sz(1),sz(2));"]); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLOCK_c\",sz(1),sz(2));"]); var diagram = scicos_diagram(); diagram.objs[1-1] = output_port; diagram.objs[2-1] = evtdly; @@ -32,7 +32,7 @@ function CLOCK_c() { this.x = scicos_block(); this.x.gui = "CLOCK_c"; this.x.graphics.sz = [2,2]; - this.x.graphics.gr_i = this.gr_i; + this.x.graphics.gr_i = gr_i; this.x.graphics.peout = 0; this.x.model.sim = "csuper"; this.x.model.evtout = 1; @@ -59,7 +59,7 @@ function CLOCK_c() { } } var newpar = list(); - this.exprs = xx.graphics.exprs; + var exprs = xx.graphics.exprs; this.model = xx.model; var t0_old = this.model.firing; var dt_old = this.model.rpar[1-1]; diff --git a/js/Sources/CLOCK_c.pickle b/js/Sources/CLOCK_c.pickle index 9141878c..229102f8 100644 --- a/js/Sources/CLOCK_c.pickle +++ b/js/Sources/CLOCK_c.pickle @@ -6,20 +6,16 @@ S'exprs0' p2 aS't0' p3 -aS'exprs' -p4 -aS'gr_i' -p5 aS'graphics' -p6 +p4 aS'x' -p7 +p5 aS'model' -p8 +p6 aS'dt' -p9 -atp10 -Rp11 +p7 +atp8 +Rp9 .(dp0 S'diagram.objs[1-1]' p1 diff --git a/js/Sources/CLOCK_f.js b/js/Sources/CLOCK_f.js index df9054ba..ecdc94c0 100644 --- a/js/Sources/CLOCK_f.js +++ b/js/Sources/CLOCK_f.js @@ -21,7 +21,7 @@ function CLOCK_f() { split.graphics.orig = [[380.71066],[172]]; split.graphics.pein = 3; split.graphics.peout = [[5],[6]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLOCK_f\",sz(1),sz(2));"]); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLOCK_f\",sz(1),sz(2));"]); var diagram = scicos_diagram(); diagram.objs[1-1] = output_port; diagram.objs[2-1] = evtdly; @@ -32,7 +32,7 @@ function CLOCK_f() { this.x = scicos_block(); this.x.gui = "CLOCK_f"; this.x.graphics.sz = [2,2]; - this.x.graphics.gr_i = this.gr_i; + this.x.graphics.gr_i = gr_i; this.x.graphics.peout = 0; this.x.model.sim = "csuper"; this.x.model.evtout = 1; @@ -59,7 +59,7 @@ function CLOCK_f() { } } var newpar = list(); - this.exprs = xx.graphics.exprs; + var exprs = xx.graphics.exprs; this.model = xx.model; var t0_old = this.model.firing; var dt_old = this.model.rpar; @@ -85,7 +85,7 @@ function CLOCK_f() { break; } } - if (!and([t0_old,dt_old]==[this.t0,this.dt])||!and(this.exprs0==this.exprs)) { + if (!and([t0_old,dt_old]==[this.t0,this.dt])||!and(this.exprs0==exprs)) { newpar[size(newpar)+1-1] = path; } if (t0_old!=this.t0) { diff --git a/js/Sources/CLOCK_f.pickle b/js/Sources/CLOCK_f.pickle index f4725772..c213a912 100644 --- a/js/Sources/CLOCK_f.pickle +++ b/js/Sources/CLOCK_f.pickle @@ -6,20 +6,16 @@ S'exprs0' p2 aS't0' p3 -aS'exprs' -p4 -aS'gr_i' -p5 aS'graphics' -p6 +p4 aS'x' -p7 +p5 aS'model' -p8 +p6 aS'dt' -p9 -atp10 -Rp11 +p7 +atp8 +Rp9 .(dp0 S'diagram.objs[1-1]' p1 diff --git a/js/Sources/CONST.js b/js/Sources/CONST.js index 69c4d6e7..c953464e 100644 --- a/js/Sources/CONST.js +++ b/js/Sources/CONST.js @@ -9,9 +9,9 @@ function CONST() { this.model.rpar = new ScilabDouble([this.C]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = strcat(sci2exp(this.C)); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST\",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.C)); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST\",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); } CONST.prototype.details = function CONST() { @@ -24,7 +24,7 @@ function CONST() { return options; } CONST.prototype.set = function CONST() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.C = parseFloat(arguments[0]["C"]); @@ -42,7 +42,7 @@ function CONST() { } else { this.model.rpar = new ScilabDouble(this.C.slice()); this.model.out = new ScilabDouble([nout]); - 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/Sources/CONST.pickle b/js/Sources/CONST.pickle index 92cb5675..859ab831 100644 --- a/js/Sources/CONST.pickle +++ b/js/Sources/CONST.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'C' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'C' p4 aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'sz' p1 diff --git a/js/Sources/CONST_f.js b/js/Sources/CONST_f.js index 993cb024..20613408 100644 --- a/js/Sources/CONST_f.js +++ b/js/Sources/CONST_f.js @@ -9,9 +9,9 @@ function CONST_f() { this.model.rpar = new ScilabDouble([this.C]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = strcat(sci2exp(this.C)); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST_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.C)); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST_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); } CONST_f.prototype.details = function CONST_f() { @@ -24,7 +24,7 @@ function CONST_f() { return options; } CONST_f.prototype.set = function CONST_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.C = parseFloat(arguments[0]["C"]); @@ -38,7 +38,7 @@ function CONST_f() { } else { this.model.rpar = new ScilabDouble(this.C.slice()); this.model.out = new ScilabDouble([nout]); - 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/Sources/CONST_f.pickle b/js/Sources/CONST_f.pickle index 710c4d0f..3ed3282f 100644 --- a/js/Sources/CONST_f.pickle +++ b/js/Sources/CONST_f.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'C' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'C' p4 aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Sources/CONST_m.js b/js/Sources/CONST_m.js index 23772a0a..7516aac2 100644 --- a/js/Sources/CONST_m.js +++ b/js/Sources/CONST_m.js @@ -12,9 +12,9 @@ function CONST_m() { this.model.opar = list(); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = sci2exp(this.C); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST_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 = sci2exp(this.C); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST_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); } CONST_m.prototype.details = function CONST_m() { @@ -27,7 +27,7 @@ function CONST_m() { return options; } CONST_m.prototype.set = function CONST_m() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.C = inverse(arguments[0]["C"]); @@ -68,7 +68,7 @@ function CONST_m() { this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; - 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/Sources/CONST_m.pickle b/js/Sources/CONST_m.pickle index 752c9d95..0ac43ba7 100644 --- a/js/Sources/CONST_m.pickle +++ b/js/Sources/CONST_m.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'C' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'type' p4 -aS'graphics' +aS'C' p5 -aS'x' +aS'graphics' p6 -aS'model' -p7 -aS'type' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/Sources/CURVE_c.js b/js/Sources/CURVE_c.js index 46004f4e..a64f7824 100644 --- a/js/Sources/CURVE_c.js +++ b/js/Sources/CURVE_c.js @@ -18,9 +18,9 @@ function CURVE_c() { this.model.evtin = new ScilabDouble([1]); this.model.evtout = new ScilabDouble([1]); this.model.firing = new ScilabDouble([0]); - this.exprs = [[sci2exp(this.Method)],[sci2exp(this.xx)],[sci2exp(this.yy)],[this.PeriodicOption],[Graf]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CURVE_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)],[this.PeriodicOption],[Graf]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CURVE_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); } CURVE_c.prototype.details = function CURVE_c() { @@ -37,7 +37,7 @@ function CURVE_c() { return options; } CURVE_c.prototype.set = function CURVE_c() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var ok = false; var SaveExit = false; while (true) { @@ -54,7 +54,7 @@ function CURVE_c() { if (this.PeriodicOption=="y"||this.PeriodicOption=="Y") { var PO = 1; } else { - this.exprs[4-1] = "n"; + exprs[4-1] = "n"; var PO = 0; } var mtd = int(this.Method); @@ -84,7 +84,7 @@ function CURVE_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]]; var rpar = []; @@ -115,16 +115,16 @@ function CURVE_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); + exprs[1-1] = sci2exp(New_methhod); if (oipar[3-1]==1) { var perop = "y"; } else { var perop = "n"; } - this.exprs[4-1] = perop; + exprs[4-1] = perop; var SaveExit = true; } else { var tmpvar4 = Do_Spline(N,mtd,this.xy.slice()[1-1],this.xy.slice()[2-1]); @@ -141,7 +141,7 @@ function CURVE_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]]; var SaveExit = true; } @@ -155,7 +155,7 @@ function CURVE_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/Sources/CURVE_c.pickle b/js/Sources/CURVE_c.pickle index 81ff6fbd..2280a785 100644 --- a/js/Sources/CURVE_c.pickle +++ b/js/Sources/CURVE_c.pickle @@ -10,7 +10,7 @@ aS'inrpar' p4 aS'sok' 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'PeriodicOption' p39 -aS'Amp' +aS'var4' p40 -aS'PeriodicOption' +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/Sources/CURV_f.js b/js/Sources/CURV_f.js index 8939719f..4d7dcf7e 100644 --- a/js/Sources/CURV_f.js +++ b/js/Sources/CURV_f.js @@ -15,8 +15,8 @@ function CURV_f() { this.model.ipar = new ScilabDouble([size(xx,1)],[axisdata.slice()]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CURV_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),\"CURV_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); } CURV_f.prototype.details = function CURV_f() { diff --git a/js/Sources/CURV_f.pickle b/js/Sources/CURV_f.pickle index 1b556535..28f07de4 100644 --- a/js/Sources/CURV_f.pickle +++ b/js/Sources/CURV_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'arg1' p1 diff --git a/js/Sources/Counter.js b/js/Sources/Counter.js index 2a589faf..e7dc1018 100644 --- a/js/Sources/Counter.js +++ b/js/Sources/Counter.js @@ -13,9 +13,9 @@ function Counter() { this.model.ipar = new ScilabDouble([this.rule],[this.maxim],[this.minim]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[string(this.minim)],[string(this.maxim)],[string(this.rule)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Counter\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[string(this.minim)],[string(this.maxim)],[string(this.rule)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Counter\",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); } Counter.prototype.details = function Counter() { @@ -30,7 +30,7 @@ function Counter() { return options; } Counter.prototype.set = function Counter() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.minim = parseFloat(arguments[0]["minim"]); @@ -46,7 +46,7 @@ function Counter() { } else if ((this.rule!=1&&this.rule!=2)) { block_parameter_error(msprintf("Wrong value for \'Rule\' parameter: %d",this.rule),msprintf("Must be in the interval %s.","[1,2]")); } else { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.dstate = new ScilabDouble([0]); this.model.ipar = new ScilabDouble([this.rule],[this.maxim],[this.minim]); this.x.graphics = this.graphics; diff --git a/js/Sources/Counter.pickle b/js/Sources/Counter.pickle index 5ef7d0ee..ef83c392 100644 --- a/js/Sources/Counter.pickle +++ b/js/Sources/Counter.pickle @@ -8,18 +8,14 @@ aS'maxim' p3 aS'rule' 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'model.dstate' p1 diff --git a/js/Sources/FROMWSB.js b/js/Sources/FROMWSB.js index d411920b..e8e2d6ef 100644 --- a/js/Sources/FROMWSB.js +++ b/js/Sources/FROMWSB.js @@ -7,8 +7,8 @@ function FROMWSB() { scs_m_1.objs[3-1] = scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[358.9421,271.584],sz=[20,20],flip=true,theta=0,exprs="1",pin=4,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=-2,intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m_1.objs[4-1] = scicos_link(xx=[[338.9421],[358.9421]],yy=[[281.584],[281.584]],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[3,1,1]); this.model = scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=-1,out2=-2,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),\"FROMWSB\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([5,2]),this.model,new ScilabDouble([]),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMWSB\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([5,2]),this.model,new ScilabDouble([]),gr_i); return new BasicBlock(this.x); } FROMWSB.prototype.details = function FROMWSB() { diff --git a/js/Sources/FROMWSB.pickle b/js/Sources/FROMWSB.pickle index f5bb2608..752ae120 100644 --- a/js/Sources/FROMWSB.pickle +++ b/js/Sources/FROMWSB.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/Sources/FROMWS_c.js b/js/Sources/FROMWS_c.js index 5e1810ea..6243ec1c 100644 --- a/js/Sources/FROMWS_c.js +++ b/js/Sources/FROMWS_c.js @@ -16,9 +16,9 @@ function FROMWS_c() { this.model.firing = new ScilabDouble([0]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMWS_c\",sz(1),sz(2));"]); - this.exprs = [[string(this.varnam)],[string(this.Method)],[string(this.ZC)],[string(this.OutEnd)]]; - this.x = new standard_define(new ScilabDouble([3.5,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMWS_c\",sz(1),sz(2));"]); + var exprs = [[string(this.varnam)],[string(this.Method)],[string(this.ZC)],[string(this.OutEnd)]]; + this.x = new standard_define(new ScilabDouble([3.5,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } FROMWS_c.prototype.details = function FROMWS_c() { @@ -34,7 +34,7 @@ function FROMWS_c() { return options; } FROMWS_c.prototype.set = function FROMWS_c() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.varnam = arguments[0]["varnam"]; @@ -73,7 +73,7 @@ function FROMWS_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.x.graphics = this.graphics; this.x.model = this.model; break; diff --git a/js/Sources/FROMWS_c.pickle b/js/Sources/FROMWS_c.pickle index 4fcf93b0..11118752 100644 --- a/js/Sources/FROMWS_c.pickle +++ b/js/Sources/FROMWS_c.pickle @@ -6,24 +6,20 @@ S'_str2code' p2 aS'ZC' p3 -aS'exprs' -p4 -aS'gr_i' -p5 aS'OutEnd' -p6 +p4 aS'graphics' -p7 +p5 aS'x' -p8 +p6 aS'model' -p9 +p7 aS'Method' -p10 +p8 aS'varnam' -p11 -atp12 -Rp13 +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/Sources/GENSIN_f.js b/js/Sources/GENSIN_f.js index f266b54d..9f5b887a 100644 --- a/js/Sources/GENSIN_f.js +++ b/js/Sources/GENSIN_f.js @@ -11,9 +11,9 @@ function GENSIN_f() { this.model.rpar = new ScilabDouble([1],[1],[0]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.exprs = [[string(rpar[1-1])],[string(rpar[2-1])],[string(rpar[3-1])]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GENSIN_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[string(rpar[1-1])],[string(rpar[2-1])],[string(rpar[3-1])]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GENSIN_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); } GENSIN_f.prototype.details = function GENSIN_f() { @@ -28,7 +28,7 @@ function GENSIN_f() { return options; } GENSIN_f.prototype.set = function GENSIN_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.M = arguments[0]["M"]; @@ -49,7 +49,7 @@ function GENSIN_f() { this.model.rpar = new ScilabDouble([this.M],[this.F],[this.P]); this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); - 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/Sources/GENSIN_f.pickle b/js/Sources/GENSIN_f.pickle index eec74ca4..c5cc3a29 100644 --- a/js/Sources/GENSIN_f.pickle +++ b/js/Sources/GENSIN_f.pickle @@ -2,24 +2,20 @@ c__builtin__ set p0 ((lp1 -S'P' +S'F' p2 -aS'F' -p3 aS'M' +p3 +aS'P' 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'model.sim' p1 diff --git a/js/Sources/GENSQR_f.js b/js/Sources/GENSQR_f.js index efd0abc4..3f5cfe62 100644 --- a/js/Sources/GENSQR_f.js +++ b/js/Sources/GENSQR_f.js @@ -11,9 +11,9 @@ function GENSQR_f() { this.model.dstate = new ScilabDouble([this.Amplitude]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = string(this.Amplitude); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GENSQR_f\",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.Amplitude); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GENSQR_f\",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); } GENSQR_f.prototype.details = function GENSQR_f() { @@ -26,9 +26,9 @@ function GENSQR_f() { return options; } GENSQR_f.prototype.set = function GENSQR_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; @@ -36,7 +36,7 @@ function GENSQR_f() { if (!ok) { break; } - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.dstate = new ScilabDouble([this.Amplitude]); this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); diff --git a/js/Sources/GENSQR_f.pickle b/js/Sources/GENSQR_f.pickle index d57cb644..f65a822d 100644 --- a/js/Sources/GENSQR_f.pickle +++ b/js/Sources/GENSQR_f.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'x' p2 -aS'gr_i' +aS'model' p3 aS'Amplitude' p4 aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Sources/GEN_SQR.js b/js/Sources/GEN_SQR.js index 9d42a6f6..ff8fd705 100644 --- a/js/Sources/GEN_SQR.js +++ b/js/Sources/GEN_SQR.js @@ -45,9 +45,9 @@ function GEN_SQR() { var Amax = 1; var rule = 1; var F = 1; - this.exprs = [sci2exp(Amin),sci2exp(Amax),sci2exp(rule),sci2exp(F)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GEN_SQR\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(this.exprs),this.gr_i); + var exprs = [sci2exp(Amin),sci2exp(Amax),sci2exp(rule),sci2exp(F)]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GEN_SQR\",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); } GEN_SQR.prototype.details = function GEN_SQR() { @@ -65,7 +65,7 @@ function GEN_SQR() { GEN_SQR.prototype.set = function GEN_SQR() { var y = this.needcompile; var typ = list(); - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var Btitre = "Set GEN_SQR parameters"; var Exprs0 = [["Amin"],["Amax"],["rule"],["F"]]; this.Bitems = [["Minimum Value"],["Maximum Value"],["Initial Value( 1= Minimum Value 2= Maximum Value)"],["Period (sec)"]]; @@ -94,7 +94,7 @@ function GEN_SQR() { var ok = tmpvar1[3]; if (ok) { var y = max(2,this.needcompile,needcompile2); - this.x.graphics.exprs = this.exprs; + this.x.graphics.exprs = exprs; this.x.model.rpar = sblock; break; } diff --git a/js/Sources/GEN_SQR.pickle b/js/Sources/GEN_SQR.pickle index df14bd84..63e01ea8 100644 --- a/js/Sources/GEN_SQR.pickle +++ b/js/Sources/GEN_SQR.pickle @@ -10,22 +10,18 @@ aS'scicos_context.Amax' p4 aS'scicos_context.rule' p5 -aS'exprs' -p6 -aS'gr_i' -p7 aS'graphics' -p8 +p6 aS'x' -p9 +p7 aS'model' -p10 +p8 aS'scicos_context.F' -p11 +p9 aS'scicos_context.Amin' -p12 -atp13 -Rp14 +p10 +atp11 +Rp12 .(dp0 S'model.odstate' p1 diff --git a/js/Sources/Ground_g.js b/js/Sources/Ground_g.js index 76eaf9ef..77b7d78c 100644 --- a/js/Sources/Ground_g.js +++ b/js/Sources/Ground_g.js @@ -13,9 +13,9 @@ function Ground_g() { this.model.opar = list(C); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = []; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Ground_g\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = []; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Ground_g\",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); } Ground_g.prototype.details = function Ground_g() { diff --git a/js/Sources/Ground_g.pickle b/js/Sources/Ground_g.pickle index dd054cc0..4c376fca 100644 --- a/js/Sources/Ground_g.pickle +++ b/js/Sources/Ground_g.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/Sources/INIMPL_f.js b/js/Sources/INIMPL_f.js index af1d8973..f0ea4798 100644 --- a/js/Sources/INIMPL_f.js +++ b/js/Sources/INIMPL_f.js @@ -13,9 +13,9 @@ function INIMPL_f() { mo.outputs = "n"; this.model.equations = new ScilabDouble([mo]); this.prt = 1; - this.exprs = "1"; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INIMPL_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = "1"; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INIMPL_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([exprs]),gr_i); this.x.graphics.out_implicit = ["I"]; return new ImplicitInBlock(this.x); } @@ -29,9 +29,9 @@ function INIMPL_f() { return options; } INIMPL_f.prototype.set = function INIMPL_f() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")==2) { - this.exprs = this.exprs[1-1]; + var exprs = this.graphics.exprs; + if (size(exprs,"*")==2) { + var exprs = exprs[1-1]; } while (true) { var ok = true; @@ -48,7 +48,7 @@ function INIMPL_f() { var y = needcompile; } this.model.ipar = new ScilabDouble([this.prt]); - 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/Sources/INIMPL_f.pickle b/js/Sources/INIMPL_f.pickle index fbc0cbbd..ea56a6a9 100644 --- a/js/Sources/INIMPL_f.pickle +++ b/js/Sources/INIMPL_f.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'exprs' +S'prt' p2 -aS'prt' +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/Sources/IN_f.js b/js/Sources/IN_f.js index eddd05b6..2503474d 100644 --- a/js/Sources/IN_f.js +++ b/js/Sources/IN_f.js @@ -10,9 +10,9 @@ function IN_f() { this.model.ipar = new ScilabDouble([prt]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = sci2exp(prt); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IN_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = sci2exp(prt); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IN_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([exprs]),gr_i); return new ExplicitInBlock(this.x); } IN_f.prototype.details = function IN_f() { @@ -22,20 +22,20 @@ function IN_f() { alert("parameters cannot be modified"); } IN_f.prototype.set = function IN_f() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")==2) { - this.exprs = this.exprs[1-1]; + var exprs = this.graphics.exprs; + if (size(exprs,"*")==2) { + var exprs = exprs[1-1]; } - if (size(this.exprs,"*")==1) { - this.exprs = [[this.exprs[1-1]],["[-1 -2]"],["-1"]]; + if (size(exprs,"*")==1) { + var exprs = [[exprs[1-1]],["[-1 -2]"],["-1"]]; } while (true) { - var tmpvar0 = getvalue("Set Input block parameters",[["Port number"],["Outport size ([-1 -2] for inherit)"],["Outport Type (-1 for inherit)"]],list("vec",1,"vec",-1,"vec",1),this.exprs); + var tmpvar0 = getvalue("Set Input block parameters",[["Port number"],["Outport size ([-1 -2] for inherit)"],["Outport Type (-1 for inherit)"]],list("vec",1,"vec",-1,"vec",1),exprs); var ok = tmpvar0[0]; var prt = tmpvar0[1]; var otsz = tmpvar0[2]; var ot = tmpvar0[3]; - this.exprs = tmpvar0[4]; + var exprs = tmpvar0[4]; if (!ok) { break; } @@ -59,7 +59,7 @@ function IN_f() { this.model.out = new ScilabDouble([otsz[1-1]]); this.model.out2 = new ScilabDouble([otsz[2-1]]); this.model.outtyp = new ScilabDouble([ot]); - 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/Sources/IN_f.pickle b/js/Sources/IN_f.pickle index 9d61a54d..367948fd 100644 --- a/js/Sources/IN_f.pickle +++ b/js/Sources/IN_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'needcompile' p1 diff --git a/js/Sources/Modulo_Count.js b/js/Sources/Modulo_Count.js index 4d9ac969..b87703f3 100644 --- a/js/Sources/Modulo_Count.js +++ b/js/Sources/Modulo_Count.js @@ -11,9 +11,9 @@ function Modulo_Count() { this.model.ipar = new ScilabDouble([this.base]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[string(this.ini_c)],[string(this.base)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Modulo_Count\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[string(this.ini_c)],[string(this.base)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Modulo_Count\",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); } Modulo_Count.prototype.details = function Modulo_Count() { @@ -27,7 +27,7 @@ function Modulo_Count() { return options; } Modulo_Count.prototype.set = function Modulo_Count() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.ini_c = parseFloat(arguments[0]["ini_c"]); @@ -42,7 +42,7 @@ function Modulo_Count() { } else if (this.base<=0) { block_parameter_error(msprintf("Wrong values for \'Upper Limit\' parameter: %d.",this.base),"Strictly positive integer expected."); } else { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.ipar = new ScilabDouble([this.base]); this.model.dstate = new ScilabDouble([this.ini_c]); this.x.graphics = this.graphics; diff --git a/js/Sources/Modulo_Count.pickle b/js/Sources/Modulo_Count.pickle index b8a493b5..3855fda6 100644 --- a/js/Sources/Modulo_Count.pickle +++ b/js/Sources/Modulo_Count.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'ini_c' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'ini_c' p4 aS'base' p5 aS'graphics' p6 -aS'x' -p7 -aS'model' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/Sources/PULSE_SC.js b/js/Sources/PULSE_SC.js index a24a6696..9a07b14e 100644 --- a/js/Sources/PULSE_SC.js +++ b/js/Sources/PULSE_SC.js @@ -40,9 +40,9 @@ function PULSE_SC() { var W = 30; var F = 1; var A = 1; - this.exprs = [sci2exp(E),sci2exp(W),sci2exp(F),sci2exp(A)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PULSE_SC\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(this.exprs),this.gr_i); + var exprs = [sci2exp(E),sci2exp(W),sci2exp(F),sci2exp(A)]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PULSE_SC\",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); } PULSE_SC.prototype.details = function PULSE_SC() { @@ -60,7 +60,7 @@ function PULSE_SC() { PULSE_SC.prototype.set = function PULSE_SC() { var y = this.needcompile; var typ = list(); - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var Btitre = "Set Pulse Generator parameters"; var Exprs0 = [["E"],["W"],["F"],["A"]]; this.Bitems = [["Phase delay (secs):"],["Pulse Width (% of period):"],["Period (secs):"],["Amplitude:"]]; @@ -89,7 +89,7 @@ function PULSE_SC() { var ok = tmpvar1[3]; if (ok) { var y = max(2,this.needcompile,needcompile2); - this.x.graphics.exprs = this.exprs; + this.x.graphics.exprs = exprs; this.x.model.rpar = sblock; break; } diff --git a/js/Sources/PULSE_SC.pickle b/js/Sources/PULSE_SC.pickle index 1d112dc6..bb16e667 100644 --- a/js/Sources/PULSE_SC.pickle +++ b/js/Sources/PULSE_SC.pickle @@ -8,24 +8,20 @@ aS'Bitems' p3 aS'scicos_context.W' p4 -aS'exprs' -p5 -aS'gr_i' -p6 aS'graphics' -p7 +p5 aS'x' -p8 +p6 aS'model' -p9 +p7 aS'scicos_context.A' -p10 +p8 aS'scicos_context.F' -p11 +p9 aS'scicos_context.E' -p12 -atp13 -Rp14 +p10 +atp11 +Rp12 .(dp0 S'model.odstate' p1 diff --git a/js/Sources/RAMP.js b/js/Sources/RAMP.js index 00427626..92b6aeaf 100644 --- a/js/Sources/RAMP.js +++ b/js/Sources/RAMP.js @@ -14,9 +14,9 @@ function RAMP() { this.model.nmode = new ScilabDouble([1]); this.model.nzcross = new ScilabDouble([1]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.exprs = [string(rpar)]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAMP\",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(rpar)]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAMP\",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); } RAMP.prototype.details = function RAMP() { @@ -31,7 +31,7 @@ function RAMP() { return options; } RAMP.prototype.set = function RAMP() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.slope = parseFloat(arguments[0]["slope"]); @@ -44,7 +44,7 @@ function RAMP() { block_parameter_error(msprintf("Wrong value for \'Start Time\' parameter: %e.",this.stt),"Null or positive integer expected."); } else { this.model.rpar = new ScilabDouble([this.slope],[this.stt],[this.iout]); - 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/Sources/RAMP.pickle b/js/Sources/RAMP.pickle index 3034ab2d..ed5f5386 100644 --- a/js/Sources/RAMP.pickle +++ b/js/Sources/RAMP.pickle @@ -8,18 +8,14 @@ aS'iout' p3 aS'stt' 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'slope' p1 diff --git a/js/Sources/RAND_f.js b/js/Sources/RAND_f.js index e67bbd98..6e841ab6 100644 --- a/js/Sources/RAND_f.js +++ b/js/Sources/RAND_f.js @@ -15,9 +15,9 @@ function RAND_f() { this.model.ipar = new ScilabDouble([this.flag]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[string(this.flag)],[sci2exp(this.a.slice())],[sci2exp(this.b.slice())],[string(this.model.dstate[1-1])]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAND_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[string(this.flag)],[sci2exp(this.a.slice())],[sci2exp(this.b.slice())],[string(this.model.dstate[1-1])]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAND_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); } RAND_f.prototype.details = function RAND_f() { @@ -33,12 +33,12 @@ function RAND_f() { return options; } RAND_f.prototype.set = function RAND_f() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")==5) { - this.exprs = this.exprs.slice(1-1,3); + var exprs = this.graphics.exprs; + if (size(exprs,"*")==5) { + var exprs = exprs.slice(1-1,3); } - if (size(this.exprs,"*")==3) { - this.exprs = [[this.exprs],[string(this.model.dstate[1-1])]]; + if (size(exprs,"*")==3) { + var exprs = [[exprs],[string(this.model.dstate[1-1])]]; } while (true) { var ok = true; @@ -54,7 +54,7 @@ function RAND_f() { throw "user error"; } else { var nout = size(this.a,"*"); - this.graphics.exprs = new ScilabDouble(this.exprs); + this.graphics.exprs = new ScilabDouble(exprs); this.model.out = new ScilabDouble([nout]); this.model.ipar = new ScilabDouble([this.flag]); this.model.rpar = new ScilabDouble([this.a.slice()],[this.b.slice()]); diff --git a/js/Sources/RAND_f.pickle b/js/Sources/RAND_f.pickle index 3f839704..b5f6d8b7 100644 --- a/js/Sources/RAND_f.pickle +++ b/js/Sources/RAND_f.pickle @@ -8,20 +8,16 @@ aS'b' p3 aS'seed_c' p4 -aS'exprs' -p5 aS'flag' -p6 -aS'gr_i' -p7 +p5 aS'graphics' -p8 +p6 aS'x' -p9 +p7 aS'model' -p10 -atp11 -Rp12 +p8 +atp9 +Rp10 .(dp0 S'model.dstate' p1 diff --git a/js/Sources/RAND_m.js b/js/Sources/RAND_m.js index 0ac19999..d32ff342 100644 --- a/js/Sources/RAND_m.js +++ b/js/Sources/RAND_m.js @@ -24,9 +24,9 @@ function RAND_m() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[sci2exp(1)],[string(this.flag)],[sci2exp([this.a])],[sci2exp([this.b])],[sci2exp([this.model.dstate[1-1],int(rand()*(10^7-1))])]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAND_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[sci2exp(1)],[string(this.flag)],[sci2exp([this.a])],[sci2exp([this.b])],[sci2exp([this.model.dstate[1-1],int(rand()*(10^7-1))])]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAND_m\",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); } RAND_m.prototype.details = function RAND_m() { @@ -43,9 +43,9 @@ function RAND_m() { return options; } RAND_m.prototype.set = function RAND_m() { - this.exprs = this.graphics.exprs; - if (size(this.exprs,"*")==14) { - this.exprs[9-1] = []; + var exprs = this.graphics.exprs; + if (size(exprs,"*")==14) { + exprs[9-1] = []; } while (true) { var ok = true; @@ -84,7 +84,7 @@ function RAND_m() { var ok = tmpvar0[2]; if (ok) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([4])); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.ipar = new ScilabDouble([this.flag]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Sources/RAND_m.pickle b/js/Sources/RAND_m.pickle index d4f91cd6..621e5395 100644 --- a/js/Sources/RAND_m.pickle +++ b/js/Sources/RAND_m.pickle @@ -8,22 +8,18 @@ aS'b' p3 aS'seed_c' p4 -aS'exprs' -p5 aS'flag' -p6 -aS'gr_i' -p7 +p5 aS'graphics' -p8 +p6 aS'x' -p9 +p7 aS'model' -p10 +p8 aS'typ' -p11 -atp12 -Rp13 +p9 +atp10 +Rp11 .(dp0 S'model.dstate' p1 diff --git a/js/Sources/READAU_f.js b/js/Sources/READAU_f.js index eaea76df..2a49387c 100644 --- a/js/Sources/READAU_f.js +++ b/js/Sources/READAU_f.js @@ -20,9 +20,9 @@ function READAU_f() { this.model.ipar = new ScilabDouble([length(fname)],[this._str2code[frmt-1]],[ievt],[this.N],[M],[this.swap],[offset],[this._str2code[fname-1]],[tmask],[outmask]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[fname],[string(this.N)],[string(this.swap)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"READAU_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([5,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[fname],[string(this.N)],[string(this.swap)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"READAU_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([5,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } READAU_f.prototype.details = function READAU_f() { @@ -37,14 +37,14 @@ function READAU_f() { return options; } READAU_f.prototype.set = function READAU_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var out = this.model.out; var dstate = this.model.dstate; var ipar = this.model.ipar; var imask = 9+ipar[1-1]; var tmask = ipar[imask-1]; var lunit = dstate[3-1]; - var fname = this.exprs[1-1]; + var fname = exprs[1-1]; while (true) { var ok = true; this.fname1 = parseFloat(arguments[0]["fname1"]); @@ -83,7 +83,7 @@ function READAU_f() { } this.model.dstate = new ScilabDouble(dstate); 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/Sources/READAU_f.pickle b/js/Sources/READAU_f.pickle index ccddd1bf..ffed799c 100644 --- a/js/Sources/READAU_f.pickle +++ b/js/Sources/READAU_f.pickle @@ -8,22 +8,18 @@ aS'fname1' p3 aS'N' p4 -aS'exprs' -p5 -aS'gr_i' -p6 aS'swap' -p7 +p5 aS'graphics' -p8 +p6 aS'x' -p9 +p7 aS'model' -p10 +p8 aS'alreadyran' -p11 -atp12 -Rp13 +p9 +atp10 +Rp11 .(dp0 S'tmask' p1 diff --git a/js/Sources/READC_f.js b/js/Sources/READC_f.js index 1c079a7f..f7e46f6f 100644 --- a/js/Sources/READC_f.js +++ b/js/Sources/READC_f.js @@ -24,9 +24,9 @@ function READC_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [["[]"],[sci2exp(this.outmask)],[fname],[frmt],[string(this.M)],[string(this.N)],[string(this.offset)],[string(this.swap)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"READC_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [["[]"],[sci2exp(this.outmask)],[fname],[frmt],[string(this.M)],[string(this.N)],[string(this.offset)],[string(this.swap)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"READC_f\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); } READC_f.prototype.details = function READC_f() { @@ -47,15 +47,15 @@ function READC_f() { } READC_f.prototype.set = function READC_f() { this.model = this.x.model; - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var out = this.model.out; var dstate = this.model.dstate; var ipar = this.model.ipar; var imask = 9+ipar[1-1]; var tmask = ipar[imask-1]; var lunit = dstate[3-1]; - var fname = this.exprs[3-1]; - var frmt = this.exprs[4-1]; + var fname = exprs[3-1]; + var frmt = exprs[4-1]; while (true) { var ok = true; this.tmask1 = parseFloat(arguments[0]["tmask1"]); @@ -128,7 +128,7 @@ function READC_f() { } this.model.dstate = new ScilabDouble(dstate); 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/Sources/READC_f.pickle b/js/Sources/READC_f.pickle index a089a11f..44fd236c 100644 --- a/js/Sources/READC_f.pickle +++ b/js/Sources/READC_f.pickle @@ -14,26 +14,22 @@ aS'fname1' p6 aS'N' p7 -aS'exprs' -p8 -aS'gr_i' -p9 aS'swap' -p10 +p8 aS'offset' -p11 +p9 aS'graphics' -p12 +p10 aS'x' -p13 +p11 aS'model' -p14 +p12 aS'tmask1' -p15 +p13 aS'alreadyran' -p16 -atp17 -Rp18 +p14 +atp15 +Rp16 .(dp0 S'tmask' p1 diff --git a/js/Sources/RFILE_f.js b/js/Sources/RFILE_f.js index d0e2060a..e2c2e9e3 100644 --- a/js/Sources/RFILE_f.js +++ b/js/Sources/RFILE_f.js @@ -20,9 +20,9 @@ function RFILE_f() { this.model.ipar = new ScilabDouble([length(fname)],[length(frmt)],[0],[this.N],[this._str2code[fname-1]],[this._str2code[frmt-1]],[tmask],[this.outmask]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[sci2exp([])],[sci2exp(this.outmask)],[fname],[frmt],[string(this.N)],[sci2exp(out)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RFILE_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 = [[sci2exp([])],[sci2exp(this.outmask)],[fname],[frmt],[string(this.N)],[sci2exp(out)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RFILE_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); } RFILE_f.prototype.details = function RFILE_f() { @@ -39,7 +39,7 @@ function RFILE_f() { return options; } RFILE_f.prototype.set = function RFILE_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var dstate = this.model.dstate; var ipar = this.model.ipar; var ievt = ipar[3-1]; @@ -47,10 +47,10 @@ function RFILE_f() { var imask = 5+ipar[1-1]+ipar[2-1]; var tmask = ipar[imask-1]; var lunit = dstate[3-1]; - var fname = this.exprs[3-1]; - var frmt = this.exprs[4-1]; - if (size(this.exprs,"*")>5) { - this.exprs[6-1] = []; + var fname = exprs[3-1]; + var frmt = exprs[4-1]; + if (size(exprs,"*")>5) { + exprs[6-1] = []; } while (true) { var ok = true; @@ -110,7 +110,7 @@ function RFILE_f() { } this.model.dstate = new ScilabDouble(dstate); 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/Sources/RFILE_f.pickle b/js/Sources/RFILE_f.pickle index 02baeec7..9e11ca6a 100644 --- a/js/Sources/RFILE_f.pickle +++ b/js/Sources/RFILE_f.pickle @@ -12,20 +12,16 @@ aS'fname1' p5 aS'N' p6 -aS'exprs' -p7 -aS'gr_i' -p8 aS'graphics' -p9 +p7 aS'x' -p10 +p8 aS'model' -p11 +p9 aS'tmask1' -p12 -atp13 -Rp14 +p10 +atp11 +Rp12 .(dp0 S'tmask' p1 diff --git a/js/Sources/SAWTOOTH_f.js b/js/Sources/SAWTOOTH_f.js index 3d40a764..52908988 100644 --- a/js/Sources/SAWTOOTH_f.js +++ b/js/Sources/SAWTOOTH_f.js @@ -8,9 +8,9 @@ function SAWTOOTH_f() { this.model.dstate = new ScilabDouble([0]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.exprs = " "; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAWTOOTH_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString([this.exprs]),this.gr_i); + var exprs = " "; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAWTOOTH_f\",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); } SAWTOOTH_f.prototype.details = function SAWTOOTH_f() { diff --git a/js/Sources/SAWTOOTH_f.pickle b/js/Sources/SAWTOOTH_f.pickle index 789aac5c..2e4584ec 100644 --- a/js/Sources/SAWTOOTH_f.pickle +++ b/js/Sources/SAWTOOTH_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/Sources/STEP.js b/js/Sources/STEP.js index d66f1c0c..d101a991 100644 --- a/js/Sources/STEP.js +++ b/js/Sources/STEP.js @@ -13,9 +13,9 @@ function STEP() { this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[string(1)],[string(rpar)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"STEP\",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(1)],[string(rpar)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"STEP\",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); } STEP.prototype.details = function STEP() { @@ -30,7 +30,7 @@ function STEP() { return options; } STEP.prototype.set = function STEP() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.temps = arguments[0]["temps"]; @@ -67,7 +67,7 @@ function STEP() { var rpar = [[this.in1],[this.fi]]; } 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/Sources/STEP.pickle b/js/Sources/STEP.pickle index 3c8db3c5..6cfc309f 100644 --- a/js/Sources/STEP.pickle +++ b/js/Sources/STEP.pickle @@ -2,24 +2,20 @@ c__builtin__ set p0 ((lp1 -S'fi' +S'graphics' p2 aS'in1' p3 aS'temps' p4 -aS'exprs' +aS'fi' p5 -aS'gr_i' -p6 -aS'graphics' -p7 aS'x' -p8 +p6 aS'model' -p9 -atp10 -Rp11 +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/Sources/STEP_FUNCTION.js b/js/Sources/STEP_FUNCTION.js index 34c936ad..e5f0f4fc 100644 --- a/js/Sources/STEP_FUNCTION.js +++ b/js/Sources/STEP_FUNCTION.js @@ -47,8 +47,8 @@ function STEP_FUNCTION() { this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); this.model.rpar = scs_m_1; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"STEP_FUNCTION\",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),\"STEP_FUNCTION\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),gr_i); return new BasicBlock(this.x); } STEP_FUNCTION.prototype.details = function STEP_FUNCTION() { diff --git a/js/Sources/STEP_FUNCTION.pickle b/js/Sources/STEP_FUNCTION.pickle index af8149d5..622150c0 100644 --- a/js/Sources/STEP_FUNCTION.pickle +++ b/js/Sources/STEP_FUNCTION.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/Sources/SampleCLK.js b/js/Sources/SampleCLK.js index b652d744..cedce089 100644 --- a/js/Sources/SampleCLK.js +++ b/js/Sources/SampleCLK.js @@ -8,8 +8,8 @@ function SampleCLK() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[sci2exp(1)],[sci2exp(0)]]; - this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs)," "); + var exprs = [[sci2exp(1)],[sci2exp(0)]]; + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs)," "); return new BasicBlock(this.x); } SampleCLK.prototype.details = function SampleCLK() { @@ -23,7 +23,7 @@ function SampleCLK() { return options; } SampleCLK.prototype.set = function SampleCLK() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.frequ = arguments[0]["frequ"]; @@ -49,7 +49,7 @@ function SampleCLK() { this.model.rpar = new ScilabDouble([this.frequ],[this.offset]); this.model.evtout = new ScilabDouble([1]); this.model.firing = new ScilabDouble([-1]); - 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/Sources/SampleCLK.pickle b/js/Sources/SampleCLK.pickle index de51428e..b9ddae6e 100644 --- a/js/Sources/SampleCLK.pickle +++ b/js/Sources/SampleCLK.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'frequ' +S'x' p2 -aS'offset' +aS'model' p3 -aS'exprs' +aS'offset' p4 -aS'gr_i' +aS'frequ' p5 aS'graphics' p6 -aS'x' -p7 -aS'model' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'needcompile' p1 diff --git a/js/Sources/Sigbuilder.js b/js/Sources/Sigbuilder.js index 051681b8..7c978791 100644 --- a/js/Sources/Sigbuilder.js +++ b/js/Sources/Sigbuilder.js @@ -11,8 +11,8 @@ function Sigbuilder() { scs_m_1.objs[7-1] = scicos_block(gui="CLKOUTV_f",graphics=scicos_graphics(orig=[339.49528,505.10704],sz=[20,30],flip=true,theta=0,exprs="1",pin=[],pout=[],pein=8,peout=[],gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="output",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="d",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m_1.objs[8-1] = scicos_link(xx=[[349.49528],[349.49528]],yy=[[565.10704],[535.10704]],id="drawlink",thick=[0,0],ct=[5,-1],from=[3,1,0],to=[7,1,1]); this.model = scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=1,evtin=[],evtout=1,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),\"Sigbuilder\",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),\"Sigbuilder\",sz(1),sz(2));"]); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([]),gr_i); return new BasicBlock(this.x); } Sigbuilder.prototype.details = function Sigbuilder() { diff --git a/js/Sources/Sigbuilder.pickle b/js/Sources/Sigbuilder.pickle index 212b3c98..d052935f 100644 --- a/js/Sources/Sigbuilder.pickle +++ b/js/Sources/Sigbuilder.pickle @@ -4,26 +4,22 @@ p0 ((lp1 S'N' p2 -aS'exprs' +aS'xxn' p3 -aS'gr_i' -p4 aS'graphics' -p5 +p4 aS'y' -p6 +p5 aS'x' -p7 +p6 aS'model' +p7 +aS'ORDER2' p8 aS'order' p9 -aS'ORDER2' -p10 -aS'xxn' -p11 -atp12 -Rp13 +atp10 +Rp11 .(dp0 S'Y[j-1]' p1 diff --git a/js/Sources/TIME_f.js b/js/Sources/TIME_f.js index e0861d58..c2016057 100644 --- a/js/Sources/TIME_f.js +++ b/js/Sources/TIME_f.js @@ -6,8 +6,8 @@ function TIME_f() { this.model.out = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TIME_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),\"TIME_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); } TIME_f.prototype.details = function TIME_f() { diff --git a/js/Sources/TIME_f.pickle b/js/Sources/TIME_f.pickle index cd43824b..e4b21f58 100644 --- a/js/Sources/TIME_f.pickle +++ b/js/Sources/TIME_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/Sources/TKSCALE.js b/js/Sources/TKSCALE.js index 257b69fd..e0ea58b3 100644 --- a/js/Sources/TKSCALE.js +++ b/js/Sources/TKSCALE.js @@ -11,9 +11,9 @@ function TKSCALE() { this.model.rpar = new ScilabDouble([this.a],[this.b],[this.f]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.exprs = [[sci2exp(this.a)],[sci2exp(this.b)],[sci2exp(this.f)]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TKSCALE\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); + var exprs = [[sci2exp(this.a)],[sci2exp(this.b)],[sci2exp(this.f)]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TKSCALE\",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); } TKSCALE.prototype.details = function TKSCALE() { @@ -28,13 +28,13 @@ function TKSCALE() { return options; } TKSCALE.prototype.set = function TKSCALE() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var ok = true; this.a = parseFloat(arguments[0]["a"]); this.b = parseFloat(arguments[0]["b"]); this.f = parseFloat(arguments[0]["f"]); if (ok) { - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble([this.a],[this.b],[this.f]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Sources/TKSCALE.pickle b/js/Sources/TKSCALE.pickle index e5bfa5a5..84b2c62c 100644 --- a/js/Sources/TKSCALE.pickle +++ b/js/Sources/TKSCALE.pickle @@ -8,18 +8,14 @@ aS'b' p3 aS'f' 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/Threshold/GENERAL_f.js b/js/Threshold/GENERAL_f.js index 3c897775..40d34677 100644 --- a/js/Threshold/GENERAL_f.js +++ b/js/Threshold/GENERAL_f.js @@ -13,9 +13,9 @@ function GENERAL_f() { this.model.blocktype = new ScilabString(["z"]); this.model.firing = new ScilabDouble([-ones(this.out,1)]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = [[strcat(sci2exp(this.in1))],[strcat(sci2exp(this.out))]]; - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GENERAL_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.in1))],[strcat(sci2exp(this.out))]]; + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GENERAL_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); } GENERAL_f.prototype.details = function GENERAL_f() { @@ -29,7 +29,7 @@ function GENERAL_f() { return options; } GENERAL_f.prototype.set = function GENERAL_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; var rpar = this.model.rpar; this.in1 = this.model.in; this.out = this.model.evtout; @@ -58,7 +58,7 @@ function GENERAL_f() { this.model.nzcross = new ScilabDouble([this.in1]); this.model.rpar = new ScilabDouble(rp.slice()); this.model.firing = new ScilabDouble([-ones(this.out,1)]); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; this.x.model = this.model; } diff --git a/js/Threshold/GENERAL_f.pickle b/js/Threshold/GENERAL_f.pickle index 678deb91..c3da51fb 100644 --- a/js/Threshold/GENERAL_f.pickle +++ b/js/Threshold/GENERAL_f.pickle @@ -2,22 +2,18 @@ c__builtin__ set p0 ((lp1 -S'in1' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'out' p4 -aS'graphics' +aS'in1' p5 -aS'x' +aS'graphics' p6 -aS'model' -p7 -aS'out' -p8 -atp9 -Rp10 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/Threshold/NEGTOPOS_f.js b/js/Threshold/NEGTOPOS_f.js index f3cb904c..aa053226 100644 --- a/js/Threshold/NEGTOPOS_f.js +++ b/js/Threshold/NEGTOPOS_f.js @@ -10,8 +10,8 @@ function NEGTOPOS_f() { this.model.blocktype = new ScilabString(["z"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NEGTOPOS_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),\"NEGTOPOS_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); } NEGTOPOS_f.prototype.details = function NEGTOPOS_f() { diff --git a/js/Threshold/NEGTOPOS_f.pickle b/js/Threshold/NEGTOPOS_f.pickle index 9ec9e406..07bc1448 100644 --- a/js/Threshold/NEGTOPOS_f.pickle +++ b/js/Threshold/NEGTOPOS_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/Threshold/POSTONEG_f.js b/js/Threshold/POSTONEG_f.js index dcef5065..7847c1a1 100644 --- a/js/Threshold/POSTONEG_f.js +++ b/js/Threshold/POSTONEG_f.js @@ -11,8 +11,8 @@ function POSTONEG_f() { this.model.blocktype = new ScilabString(["z"]); this.model.dep_ut = new ScilabBoolean([true,false]); this.model.firing = new ScilabDouble([-1]); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"POSTONEG_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),\"POSTONEG_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); } POSTONEG_f.prototype.details = function POSTONEG_f() { diff --git a/js/Threshold/POSTONEG_f.pickle b/js/Threshold/POSTONEG_f.pickle index 47d2f4e3..6a2bd6de 100644 --- a/js/Threshold/POSTONEG_f.pickle +++ b/js/Threshold/POSTONEG_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/Threshold/ZCROSS_f.js b/js/Threshold/ZCROSS_f.js index 4e5b1346..28cddce5 100644 --- a/js/Threshold/ZCROSS_f.js +++ b/js/Threshold/ZCROSS_f.js @@ -12,9 +12,9 @@ function ZCROSS_f() { this.model.blocktype = new ScilabString(["z"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.exprs = strcat(sci2exp(this.in1)); - this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ZCROSS_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.in1)); + var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ZCROSS_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); } ZCROSS_f.prototype.details = function ZCROSS_f() { @@ -27,7 +27,7 @@ function ZCROSS_f() { return options; } ZCROSS_f.prototype.set = function ZCROSS_f() { - this.exprs = this.graphics.exprs; + var exprs = this.graphics.exprs; while (true) { var ok = true; this.in1 = parseFloat(arguments[0]["in1"]); @@ -44,7 +44,7 @@ function ZCROSS_f() { var kk = kk+2^(this.in1+jj-1); } this.model.rpar = new ScilabDouble([-ones(kk,1)],[zeros(2^(2*this.in1)-kk,1)]); - this.graphics.exprs = new ScilabDouble([this.exprs]); + this.graphics.exprs = new ScilabDouble([exprs]); this.model.in = new ScilabDouble([this.in1]); this.model.nzcross = new ScilabDouble([this.in1]); this.model.firing = new ScilabDouble([-1]); diff --git a/js/Threshold/ZCROSS_f.pickle b/js/Threshold/ZCROSS_f.pickle index 30afed6c..227100b0 100644 --- a/js/Threshold/ZCROSS_f.pickle +++ b/js/Threshold/ZCROSS_f.pickle @@ -2,20 +2,16 @@ c__builtin__ set p0 ((lp1 -S'in1' +S'x' p2 -aS'exprs' +aS'model' p3 -aS'gr_i' +aS'in1' p4 aS'graphics' p5 -aS'x' -p6 -aS'model' -p7 -atp8 -Rp9 +atp6 +Rp7 .(dp0 S'arg1' p1 diff --git a/sci2jsyacc.py b/sci2jsyacc.py index b89c5bdc..24743129 100755 --- a/sci2jsyacc.py +++ b/sci2jsyacc.py @@ -65,8 +65,6 @@ JOB_BLOCKS = {} FUNCTION_VARS = set() LOCAL_VARS = set() GLOBAL_VARS = { - 'exprs', - 'gr_i', 'graphics', 'model', 'x', @@ -570,7 +568,7 @@ def p_lterm_assignment_expression(p): else: prefix = '' value = p[3][0] - if var == 'this.gr_i' and value == '[]': + if var == 'gr_i' and value == '[]': value = 'new ScilabString(["xstringb(orig(1),orig(2),\\"%s\\",sz(1),sz(2));"])' % (SCICOS_BLOCK_NAME) if var in LOCAL_VARS and '.' not in var: prefix = 'var ' |