diff options
| author | Sunil Shetye | 2018-07-12 23:16:08 +0530 |
|---|---|---|
| committer | Sunil Shetye | 2018-07-13 10:21:08 +0530 |
| commit | 214ade87a6cef2bf55f9b9f2848ffafc02f37f18 (patch) | |
| tree | 50fdfe7b1e8850622825e362ca865be3f0911009 | |
| parent | a2bfd6050ab2b5b6bbede92393b1f61d4ecc25aa (diff) | |
| download | sci2js-214ade87a6cef2bf55f9b9f2848ffafc02f37f18.tar.gz sci2js-214ade87a6cef2bf55f9b9f2848ffafc02f37f18.tar.bz2 sci2js-214ade87a6cef2bf55f9b9f2848ffafc02f37f18.zip | |
add more global variables
542 files changed, 6250 insertions, 4660 deletions
diff --git a/combined.js b/combined.js index 9dcfdaa6..083b5444 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 ScilabDouble([false,false]); - var exprs = "A"; - this.x = standard_define([2,1],this.model,exprs," "); + this.exprs = "A"; + this.x = standard_define([2,1],this.model,this.exprs," "); this.x.graphics.id = "From"; return new BasicBlock(this.x); } @@ -23,12 +23,13 @@ function CLKFROM() { } CLKFROM.prototype.set = function CLKFROM() { this.tag = arguments[0]["tag"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; while (true) { - [ok,this.tag,exprs] = scicos_getvalue("Set block parameters","Tag",list("str",-1),exprs); + [ok,this.tag,this.exprs] = scicos_getvalue("Set block parameters","Tag",list("str",-1),this.exprs); if (!ok) { break; } @@ -39,7 +40,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -59,8 +60,8 @@ function CLKGOTO() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabDouble([false,false]); - var exprs = [["A"],[sci2exp(1)]]; - this.x = standard_define([2,1],this.model,exprs," "); + this.exprs = [["A"],[sci2exp(1)]]; + this.x = standard_define([2,1],this.model,this.exprs," "); this.x.graphics.id = "Goto"; return new BasicBlock(this.x); } @@ -77,12 +78,13 @@ function CLKGOTO() { CLKGOTO.prototype.set = function CLKGOTO() { this.tag = arguments[0]["tag"] this.tagvis = parseFloat(arguments[0]["tagvis"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; while (true) { - [ok,this.tag,this.tagvis,exprs] = scicos_getvalue("Set block parameters",["Tag","Tag Visibility (1=Local 2=Scoped 3=Global)"],list("str",-1,"vec",1),exprs); + [ok,this.tag,this.tagvis,this.exprs] = scicos_getvalue("Set block parameters",["Tag","Tag Visibility (1=Local 2=Scoped 3=Global)"],list("str",-1,"vec",1),this.exprs); if (!ok) { break; } @@ -100,7 +102,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -126,9 +128,9 @@ function CLKGotoTagVisibility() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabDouble([false,false]); - var exprs = "A"; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKGotoTagVisibility\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = "A"; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKGotoTagVisibility\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CLKGotoTagVisibility.prototype.details = function CLKGotoTagVisibility() { @@ -142,12 +144,13 @@ function CLKGotoTagVisibility() { } CLKGotoTagVisibility.prototype.set = function CLKGotoTagVisibility() { this.tag = arguments[0]["tag"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.tag,exprs] = scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),exprs); + [ok,this.tag,this.exprs] = scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),this.exprs); if (!ok) { break; } @@ -156,7 +159,7 @@ function CLKGotoTagVisibility() { var needcompile = 4; var y = needcompile; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.opar = list(new ScilabDouble([this.tag])); this.x.graphics = this.graphics; this.x.model = this.model; @@ -179,9 +182,9 @@ function DEMUX() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = string(this.out); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEMUX\",sz(1),sz(2));"]); - this.x = standard_define([.5,2],this.model,exprs,gr_i); + this.exprs = string(this.out); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEMUX\",sz(1),sz(2));"]); + this.x = standard_define([.5,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } DEMUX.prototype.details = function DEMUX() { @@ -195,12 +198,13 @@ function DEMUX() { } DEMUX.prototype.set = function DEMUX() { this.out = parseFloat(arguments[0]["out"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.out,exprs] = scicos_getvalue("Set DEMUX block parameters",["number of output ports or vector of sizes"],list("intvec",-1),exprs); + [ok,this.out,this.exprs] = scicos_getvalue("Set DEMUX block parameters",["number of output ports or vector of sizes"],list("intvec",-1),this.exprs); if (!ok) { break; } @@ -234,7 +238,7 @@ function DEMUX() { } } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.ipar = new ScilabDouble([this.out]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -256,9 +260,9 @@ function DEMUX_f() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = string(this.out); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEMUX_f\",sz(1),sz(2));"]); - this.x = standard_define([.5,2],this.model,exprs,gr_i); + this.exprs = string(this.out); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEMUX_f\",sz(1),sz(2));"]); + this.x = standard_define([.5,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } DEMUX_f.prototype.details = function DEMUX_f() { @@ -272,12 +276,13 @@ function DEMUX_f() { } DEMUX_f.prototype.set = function DEMUX_f() { this.out = parseFloat(arguments[0]["out"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.out,exprs] = scicos_getvalue("Set DEMUX block parameters",["number of output ports or vector of sizes"],list("vec",-1),exprs); + [ok,this.out,this.exprs] = scicos_getvalue("Set DEMUX block parameters",["number of output ports or vector of sizes"],list("vec",-1),this.exprs); if (!ok) { break; } @@ -311,7 +316,7 @@ function DEMUX_f() { } } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.ipar = new ScilabDouble([this.out]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -337,9 +342,9 @@ function ESELECT_f() { this.model.dep_ut = new ScilabDouble([true,false]); this.model.nmode = new ScilabDouble([0]); this.model.nzcross = new ScilabDouble([0]); - 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 = standard_define([4,2],this.model,exprs,gr_i); + 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 = standard_define([4,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } ESELECT_f.prototype.details = function ESELECT_f() { @@ -357,18 +362,19 @@ function ESELECT_f() { this.out = parseFloat(arguments[0]["out"]) this.inh = parseFloat(arguments[0]["inh"]) this.nmod = parseFloat(arguments[0]["nmod"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; - if (size(exprs,"*")==1) { - exprs[2-1] = string(1); + this.exprs = this.graphics.exprs; + if (size(this.exprs,"*")==1) { + this.exprs[2-1] = string(1); } - if (size(exprs,"*")==2) { - exprs[3-1] = string(0); + if (size(this.exprs,"*")==2) { + this.exprs[3-1] = string(0); } this.model = arg1.model; while (true) { - [ok,this.out,this.inh,this.nmod,exprs] = scicos_getvalue("Set ESELECT block parameters",["number of output event ports","Inherit (1: no, 0: yes)","zero-crossing (0: no, 1: yes)"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.out,this.inh,this.nmod,this.exprs] = scicos_getvalue("Set ESELECT block parameters",["number of output event ports","Inherit (1: no, 0: yes)","zero-crossing (0: no, 1: yes)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -389,7 +395,7 @@ function ESELECT_f() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.evtout = new ScilabDouble([ones(this.out,1)]); this.model.firing = new ScilabDouble([-ones(this.out,1)]); this.x.graphics = this.graphics; @@ -414,9 +420,9 @@ function EXTRACTOR() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); this.model.ipar = new ScilabDouble([this.ind]); - var exprs = [sci2exp(this.ind)]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACTOR\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,exprs,gr_i); + this.exprs = [sci2exp(this.ind)]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACTOR\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } EXTRACTOR.prototype.details = function EXTRACTOR() { @@ -430,12 +436,13 @@ function EXTRACTOR() { } EXTRACTOR.prototype.set = function EXTRACTOR() { this.ind = parseFloat(arguments[0]["ind"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.ind,exprs] = scicos_getvalue("Set block parameters",["indices to extract"],list("vec",-1),exprs); + [ok,this.ind,this.exprs] = scicos_getvalue("Set block parameters",["indices to extract"],list("vec",-1),this.exprs); if (!ok) { break; } @@ -447,7 +454,7 @@ function EXTRACTOR() { var ok = tmpvar0[2]; if (ok) { this.model.ipar = new ScilabDouble(this.ind); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -471,9 +478,9 @@ function FROM() { this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,false]); - var exprs = ["A"]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROM\",sz(1),sz(2));"]); - this.x = standard_define([2,1],this.model,exprs,gr_i); + this.exprs = ["A"]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROM\",sz(1),sz(2));"]); + this.x = standard_define([2,1],this.model,this.exprs,this.gr_i); this.x.graphics.id = "From"; return new BasicBlock(this.x); } @@ -488,12 +495,13 @@ function FROM() { } FROM.prototype.set = function FROM() { this.tag = arguments[0]["tag"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.tag,exprs] = scicos_getvalue("Set parameters",["Tag"],list("str",-1),exprs); + [ok,this.tag,this.exprs] = scicos_getvalue("Set parameters",["Tag"],list("str",-1),this.exprs); if (!ok) { break; } @@ -502,7 +510,7 @@ function FROM() { var needcompile = 4; var y = needcompile; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.opar = list(new ScilabDouble([this.tag])); this.x.model = this.model; this.x.graphics = this.graphics; @@ -531,9 +539,9 @@ function FROMMO() { var mo = modelica(); mo.model = "frommo"; mo.outputs = "n"; - var exprs = ["A"]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMMO\",sz(1),sz(2));"]); - this.x = standard_define([2,1],this.model,exprs,gr_i); + this.exprs = ["A"]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMMO\",sz(1),sz(2));"]); + this.x = standard_define([2,1],this.model,this.exprs,this.gr_i); this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); } @@ -548,12 +556,13 @@ function FROMMO() { } FROMMO.prototype.set = function FROMMO() { this.tag = arguments[0]["tag"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.tag,exprs] = scicos_getvalue("Set parameters",["Tag"],list("str",-1),exprs); + [ok,this.tag,this.exprs] = scicos_getvalue("Set parameters",["Tag"],list("str",-1),this.exprs); if (!ok) { break; } @@ -562,7 +571,7 @@ function FROMMO() { var needcompile = 4; var y = needcompile; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.opar = list(new ScilabDouble([this.tag])); this.x.model = this.model; this.x.graphics = this.graphics; @@ -588,9 +597,9 @@ function GOTO() { this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,false]); - var exprs = [["A"],[sci2exp(1)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GOTO\",sz(1),sz(2));"]); - this.x = standard_define([2,1],this.model,exprs,gr_i); + this.exprs = [["A"],[sci2exp(1)]]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GOTO\",sz(1),sz(2));"]); + this.x = standard_define([2,1],this.model,this.exprs,this.gr_i); this.x.graphics.id = "Goto"; return new BasicBlock(this.x); } @@ -607,12 +616,13 @@ function GOTO() { GOTO.prototype.set = function GOTO() { this.tag = arguments[0]["tag"] this.tagvis = parseFloat(arguments[0]["tagvis"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.tag,this.tagvis,exprs] = scicos_getvalue("Set parameters",["Tag","Tag Visibility(1=Local 2=scoped 3= global)"],list("str",-1,"vec",1),exprs); + [ok,this.tag,this.tagvis,this.exprs] = scicos_getvalue("Set parameters",["Tag","Tag Visibility(1=Local 2=scoped 3= global)"],list("str",-1,"vec",1),this.exprs); if (!ok) { break; } @@ -626,7 +636,7 @@ function GOTO() { var needcompile = 4; var y = needcompile; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.opar = list(new ScilabDouble([this.tag])); this.model.ipar = new ScilabDouble([this.tagvis]); this.x.model = this.model; @@ -657,9 +667,9 @@ function GOTOMO() { var mo = modelica(); mo.model = "gotomo"; mo.inputs = "p"; - var exprs = [["A"],[sci2exp(1)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GOTOMO\",sz(1),sz(2));"]); - this.x = standard_define([2,1],this.model,exprs,gr_i); + this.exprs = [["A"],[sci2exp(1)]]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GOTOMO\",sz(1),sz(2));"]); + this.x = standard_define([2,1],this.model,this.exprs,this.gr_i); this.x.graphics.in_implicit = ["I"]; return new BasicBlock(this.x); } @@ -676,12 +686,13 @@ function GOTOMO() { GOTOMO.prototype.set = function GOTOMO() { this.tag = arguments[0]["tag"] this.tagvis = parseFloat(arguments[0]["tagvis"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.tag,this.tagvis,exprs] = scicos_getvalue("Set parameters",["Tag","Tag Visibility(1=Local 2=scoped 3= global)"],list("str",-1,"vec",1),exprs); + [ok,this.tag,this.tagvis,this.exprs] = scicos_getvalue("Set parameters",["Tag","Tag Visibility(1=Local 2=scoped 3= global)"],list("str",-1,"vec",1),this.exprs); if (!ok) { break; } @@ -695,7 +706,7 @@ function GOTOMO() { var needcompile = 4; var y = needcompile; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.opar = list(new ScilabDouble([this.tag])); this.model.ipar = new ScilabDouble([this.tagvis]); this.x.model = this.model; @@ -724,9 +735,9 @@ function GotoTagVisibility() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabDouble([false,false]); - var exprs = "A"; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GotoTagVisibility\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = "A"; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GotoTagVisibility\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } GotoTagVisibility.prototype.details = function GotoTagVisibility() { @@ -740,12 +751,13 @@ function GotoTagVisibility() { } GotoTagVisibility.prototype.set = function GotoTagVisibility() { this.tag = arguments[0]["tag"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.tag,exprs] = scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),exprs); + [ok,this.tag,this.exprs] = scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),this.exprs); if (!ok) { break; } @@ -754,7 +766,7 @@ function GotoTagVisibility() { var needcompile = 4; var y = needcompile; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.opar = list(new ScilabDouble([this.tag])); this.x.graphics = this.graphics; this.x.model = this.model; @@ -781,9 +793,9 @@ function GotoTagVisibilityMO() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabDouble([false,false]); - var exprs = "A"; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GotoTagVisibilityMO\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = "A"; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GotoTagVisibilityMO\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } GotoTagVisibilityMO.prototype.details = function GotoTagVisibilityMO() { @@ -797,12 +809,13 @@ function GotoTagVisibilityMO() { } GotoTagVisibilityMO.prototype.set = function GotoTagVisibilityMO() { this.tag = arguments[0]["tag"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.tag,exprs] = scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),exprs); + [ok,this.tag,this.exprs] = scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),this.exprs); if (!ok) { break; } @@ -811,7 +824,7 @@ function GotoTagVisibilityMO() { var needcompile = 4; var y = needcompile; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.opar = list(new ScilabDouble([this.tag])); this.x.graphics = this.graphics; this.x.model = this.model; @@ -836,9 +849,9 @@ function ISELECT_f() { this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } ISELECT_f.prototype.details = function ISELECT_f() { @@ -854,12 +867,13 @@ function ISELECT_f() { ISELECT_f.prototype.set = function ISELECT_f() { this.nout = parseFloat(arguments[0]["nout"]) this.z0 = parseFloat(arguments[0]["z0"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.nout,this.z0,exprs] = scicos_getvalue("Set parameters",["number of outputs","initial connected output"],list("vec",1,"vec",1),exprs); + [ok,this.nout,this.z0,this.exprs] = scicos_getvalue("Set parameters",["number of outputs","initial connected output"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -871,7 +885,7 @@ function ISELECT_f() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.dstate = new ScilabDouble([this.z0-1]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -904,9 +918,9 @@ function ISELECT_m() { this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } ISELECT_m.prototype.details = function ISELECT_m() { @@ -924,12 +938,13 @@ function ISELECT_m() { this.typ = inverse(arguments[0]["typ"]) this.nout = parseFloat(arguments[0]["nout"]) this.z0 = parseFloat(arguments[0]["z0"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.typ,this.nout,this.z0,exprs] = scicos_getvalue("Set parameters",["Datatype(1= real double 2=Complex 3=int32 ...)","number of outputs","initial connected output"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.typ,this.nout,this.z0,this.exprs] = scicos_getvalue("Set parameters",["Datatype(1= real double 2=Complex 3=int32 ...)","number of outputs","initial connected output"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -949,7 +964,7 @@ function ISELECT_m() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.dstate = new ScilabDouble([this.z0]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -972,9 +987,9 @@ function MUX() { this.model.ipar = new ScilabDouble([this.in1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = string(this.in1); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MUX\",sz(1),sz(2));"]); - this.x = standard_define([.5,2],this.model,exprs,gr_i); + this.exprs = string(this.in1); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MUX\",sz(1),sz(2));"]); + this.x = standard_define([.5,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } MUX.prototype.details = function MUX() { @@ -987,12 +1002,13 @@ function MUX() { } MUX.prototype.set = function MUX() { this.in1 = parseFloat(arguments[0]["in1"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.in1,exprs] = scicos_getvalue("Set MUX block parameters","number of input ports or vector of sizes",list("intvec",-1),exprs); + [ok,this.in1,this.exprs] = scicos_getvalue("Set MUX block parameters","number of input ports or vector of sizes",list("intvec",-1),this.exprs); if (!ok) { break; } @@ -1026,7 +1042,7 @@ function MUX() { } } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.ipar = new ScilabDouble([this.in1]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -1047,9 +1063,9 @@ function MUX_f() { this.model.ipar = new ScilabDouble([this.in1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = string(this.in1); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MUX_f\",sz(1),sz(2));"]); - this.x = standard_define([0.5,2],this.model,exprs,gr_i); + this.exprs = string(this.in1); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MUX_f\",sz(1),sz(2));"]); + this.x = standard_define([0.5,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } MUX_f.prototype.details = function MUX_f() { @@ -1062,12 +1078,13 @@ function MUX_f() { } MUX_f.prototype.set = function MUX_f() { this.in1 = parseFloat(arguments[0]["in1"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.in1,exprs] = scicos_getvalue("Set MUX block parameters","number of input ports or vector of sizes",list("vec",-1),exprs); + [ok,this.in1,this.exprs] = scicos_getvalue("Set MUX block parameters","number of input ports or vector of sizes",list("vec",-1),this.exprs); if (!ok) { break; } @@ -1101,7 +1118,7 @@ function MUX_f() { } } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.ipar = new ScilabDouble([this.in1]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -1124,9 +1141,9 @@ function M_SWITCH() { this.model.ipar = new ScilabDouble(ipar); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - 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 = standard_define([2.5,2],this.model,exprs,gr_i); + 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 = standard_define([2.5,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } M_SWITCH.prototype.details = function M_SWITCH() { @@ -1144,12 +1161,13 @@ function M_SWITCH() { this.nin = parseFloat(arguments[0]["nin"]) this.base = parseFloat(arguments[0]["base"]) this.rule = arguments[0]["rule"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.nin,this.base,this.rule,exprs] = scicos_getvalue("Set parameters",["number of inputs","zero base indexing (0), otherwise 1","rounding rule: int (0), round (1), ceil (2), floor (3)"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.nin,this.base,this.rule,this.exprs] = scicos_getvalue("Set parameters",["number of inputs","zero base indexing (0), otherwise 1","rounding rule: int (0), round (1), ceil (2), floor (3)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -1178,7 +1196,7 @@ function M_SWITCH() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.ipar = new ScilabDouble([this.base],[this.rule]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -1200,9 +1218,9 @@ function NRMSOM_f() { this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = [string(this.nin)]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NRMSOM_f\",sz(1),sz(2));"]); - this.x = standard_define([.2,2],this.model,exprs,gr_i); + this.exprs = [string(this.nin)]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NRMSOM_f\",sz(1),sz(2));"]); + this.x = standard_define([.2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } NRMSOM_f.prototype.details = function NRMSOM_f() { @@ -1216,12 +1234,13 @@ function NRMSOM_f() { } NRMSOM_f.prototype.set = function NRMSOM_f() { this.nin = parseFloat(arguments[0]["nin"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.nin,exprs] = scicos_getvalue("Set parameters",["number of inputs"],list("vec",1),exprs); + [ok,this.nin,this.exprs] = scicos_getvalue("Set parameters",["number of inputs"],list("vec",1),this.exprs); if (!ok) { break; } @@ -1230,7 +1249,7 @@ function NRMSOM_f() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -1254,9 +1273,9 @@ function RELAY_f() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,true]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } RELAY_f.prototype.details = function RELAY_f() { @@ -1272,13 +1291,14 @@ function RELAY_f() { RELAY_f.prototype.set = function RELAY_f() { this.nin = parseFloat(arguments[0]["nin"]) this.z0 = arguments[0]["z0"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; var ipar = this.model.ipar; while (true) { - [ok,this.nin,this.z0,exprs] = scicos_getvalue("Set parameters",["number of inputs","initial connected input"],list("vec",1,"vec",1),exprs); + [ok,this.nin,this.z0,this.exprs] = scicos_getvalue("Set parameters",["number of inputs","initial connected input"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -1290,7 +1310,7 @@ function RELAY_f() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.dstate = new ScilabString([this.z0-1]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -1311,9 +1331,9 @@ function SCALAR2VECTOR() { this.model.in1 = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = [string([this.nout])]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SCALAR2VECTOR\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,exprs,gr_i); + this.exprs = [string([this.nout])]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SCALAR2VECTOR\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } SCALAR2VECTOR.prototype.details = function SCALAR2VECTOR() { @@ -1327,12 +1347,13 @@ function SCALAR2VECTOR() { } SCALAR2VECTOR.prototype.set = function SCALAR2VECTOR() { this.nout = parseFloat(arguments[0]["nout"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.nout,exprs] = scicos_getvalue("Set block parameters",["size of output (-1: if don\'t know)"],list("vec",1),exprs); + [ok,this.nout,this.exprs] = scicos_getvalue("Set block parameters",["size of output (-1: if don\'t know)"],list("vec",1),this.exprs); if (!ok) { break; } @@ -1348,7 +1369,7 @@ function SCALAR2VECTOR() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -1371,9 +1392,9 @@ function SELECT_f() { this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } SELECT_f.prototype.details = function SELECT_f() { @@ -1389,12 +1410,13 @@ function SELECT_f() { SELECT_f.prototype.set = function SELECT_f() { this.nin = parseFloat(arguments[0]["nin"]) this.z0 = parseFloat(arguments[0]["z0"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.nin,this.z0,exprs] = scicos_getvalue("Set parameters",["number of inputs","initial connected input"],list("vec",1,"vec",1),exprs); + [ok,this.nin,this.z0,this.exprs] = scicos_getvalue("Set parameters",["number of inputs","initial connected input"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -1406,7 +1428,7 @@ function SELECT_f() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.dstate = new ScilabDouble([this.z0-1]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -1439,9 +1461,9 @@ function SELECT_m() { this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } SELECT_m.prototype.details = function SELECT_m() { @@ -1459,12 +1481,13 @@ function SELECT_m() { this.typ = inverse(arguments[0]["typ"]) this.nin = parseFloat(arguments[0]["nin"]) this.z0 = parseFloat(arguments[0]["z0"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.typ,this.nin,this.z0,exprs] = scicos_getvalue("Set parameters",["Datatype(1= real double 2=Complex 3=int32 ..)","number of inputs","initial connected input"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.typ,this.nin,this.z0,this.exprs] = scicos_getvalue("Set parameters",["Datatype(1= real double 2=Complex 3=int32 ..)","number of inputs","initial connected input"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -1484,7 +1507,7 @@ function SELECT_m() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.dstate = new ScilabDouble([this.z0]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -1560,9 +1583,9 @@ function SWITCH2() { this.model.nmode = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } SWITCH2.prototype.details = function SWITCH2() { @@ -1580,12 +1603,13 @@ function SWITCH2() { this.rule = parseFloat(arguments[0]["rule"]) this.thra = arguments[0]["thra"] this.nzz = parseFloat(arguments[0]["nzz"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.rule,this.thra,this.nzz,exprs] = scicos_getvalue("Set parameters",["pass first input if: u2>=a (0), u2>a (1), u2~=a (2)","threshold a","use zero crossing: yes (1), no (0)"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.rule,this.thra,this.nzz,this.exprs] = scicos_getvalue("Set parameters",["pass first input if: u2>=a (0), u2>a (1), u2~=a (2)","threshold a","use zero crossing: yes (1), no (0)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -1596,7 +1620,7 @@ function SWITCH2() { if ((this.rule>2)) { this.rule = 2; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.ipar = new ScilabDouble([this.rule]); this.model.rpar = new ScilabDouble([this.thra]); if (this.nzz!=0) { @@ -1633,9 +1657,9 @@ function SWITCH2_m() { this.model.nmode = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } SWITCH2_m.prototype.details = function SWITCH2_m() { @@ -1655,12 +1679,13 @@ function SWITCH2_m() { this.rule = parseFloat(arguments[0]["rule"]) this.thra = arguments[0]["thra"] this.nzz = parseFloat(arguments[0]["nzz"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.ot,this.rule,this.thra,this.nzz,exprs] = scicos_getvalue("Set parameters",["Datatype (1=real double 2=complex 3=int32 ...)","pass first input if: u2>=a (0), u2>a (1), u2~=a (2)","threshold a","use zero crossing: yes (1), no (0)"],list("vec",1,"vec",1,"vec",1,"vec",1),exprs); + [ok,this.ot,this.rule,this.thra,this.nzz,this.exprs] = scicos_getvalue("Set parameters",["Datatype (1=real double 2=complex 3=int32 ...)","pass first input if: u2>=a (0), u2>a (1), u2~=a (2)","threshold a","use zero crossing: yes (1), no (0)"],list("vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -1671,7 +1696,7 @@ function SWITCH2_m() { if ((this.rule>2)) { this.rule = 2; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.ipar = new ScilabDouble([this.rule]); this.model.rpar = new ScilabDouble([this.thra]); if (this.nzz!=0) { @@ -1719,9 +1744,9 @@ function SWITCH_f() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,true]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } SWITCH_f.prototype.details = function SWITCH_f() { @@ -1737,13 +1762,14 @@ function SWITCH_f() { SWITCH_f.prototype.set = function SWITCH_f() { this.nin = parseFloat(arguments[0]["nin"]) this.z0 = arguments[0]["z0"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; var ipar = this.model.ipar; while (true) { - [ok,this.nin,this.z0,exprs] = scicos_getvalue("Set switch parameters",["number of inputs","connected input"],list("vec",1,"vec",1),exprs); + [ok,this.nin,this.z0,this.exprs] = scicos_getvalue("Set switch parameters",["number of inputs","connected input"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -1755,7 +1781,7 @@ function SWITCH_f() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.ipar = new ScilabString([this.z0-1]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -1804,15 +1830,15 @@ function CCS() { mo.outputs = MO; this.model.rpar = new ScilabDouble(PrametersValue); mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName)); - var exprs = []; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CCS\",sz(1),sz(2));"]); + this.exprs = []; + this.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 ScilabDouble([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = standard_define([2.1,3],this.model,exprs,list(gr_i,0)); + this.x = standard_define([2.1,3],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); @@ -1828,7 +1854,7 @@ function CCS() { CCS.prototype.set = function CCS() { this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; this.x = arg1; return new BasicBlock(this.x); @@ -1872,15 +1898,15 @@ function CVS() { mo.outputs = MO; this.model.rpar = new ScilabDouble(PrametersValue); mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName)); - var exprs = []; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CVS\",sz(1),sz(2));"]); + this.exprs = []; + this.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 ScilabDouble([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = standard_define([2.1,3],this.model,exprs,list(gr_i,0)); + this.x = standard_define([2.1,3],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); @@ -1896,7 +1922,7 @@ function CVS() { CVS.prototype.set = function CVS() { this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; this.x = arg1; return new BasicBlock(this.x); @@ -1920,9 +1946,9 @@ function Capacitor() { this.model.equations = new ScilabDouble([mo]); this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); - var exprs = string([[this.C],[this.v]]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Capacitor\",sz(1),sz(2));"]); - this.x = standard_define([2,1.1],this.model,exprs,list(gr_i,0)); + this.exprs = string([[this.C],[this.v]]); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Capacitor\",sz(1),sz(2));"]); + this.x = standard_define([2,1.1],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -1940,18 +1966,19 @@ function Capacitor() { Capacitor.prototype.set = function Capacitor() { this.C = parseFloat(arguments[0]["C"]) this.v = parseFloat(arguments[0]["v"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.C,this.v,exprs] = scicos_getvalue("Set Capacitor block parameter",["C (F)","Initial Voltage"],list("vec",1,"vec",1),exprs); + [ok,this.C,this.v,this.exprs] = scicos_getvalue("Set Capacitor block parameter",["C (F)","Initial Voltage"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } 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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -1976,9 +2003,9 @@ function ConstantVoltage() { mo.outputs = "n"; mo.parameters = list("V",list(this.V)); this.model.equations = new ScilabDouble([mo]); - var exprs = string(this.V); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ConstantVoltage\",sz(1),sz(2));"]); - this.x = standard_define([1.5,1.1],this.model,exprs,list(gr_i,0)); + this.exprs = string(this.V); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ConstantVoltage\",sz(1),sz(2));"]); + this.x = standard_define([1.5,1.1],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -1993,18 +2020,19 @@ function ConstantVoltage() { } ConstantVoltage.prototype.set = function ConstantVoltage() { this.V = parseFloat(arguments[0]["V"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.V,exprs] = scicos_getvalue("Set ConstantVoltage block parameter","V (volt)",list("vec",1),exprs); + [ok,this.V,this.exprs] = scicos_getvalue("Set ConstantVoltage block parameter","V (volt)",list("vec",1),this.exprs); if (!ok) { break; } this.model.rpar = new ScilabDouble([this.V]); this.model.equations.parameters[2-1] = list(new ScilabDouble([this.V])); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -2026,9 +2054,9 @@ function CurrentSensor() { mo.inputs = "p"; mo.outputs = [["n"],["i"]]; this.model.equations = new ScilabDouble([mo]); - var exprs = []; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CurrentSensor\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,list(gr_i,0)); + this.exprs = []; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CurrentSensor\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["E"]]; return new BasicBlock(this.x); @@ -2066,9 +2094,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]); - 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 = standard_define([2,1],this.model,exprs,list(gr_i,0)); + 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 = standard_define([2,1],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -2090,18 +2118,19 @@ function Diode() { this.Vt = parseFloat(arguments[0]["Vt"]) this.Maxexp = parseFloat(arguments[0]["Maxexp"]) this.R = parseFloat(arguments[0]["R"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.Ids,this.Vt,this.Maxexp,this.R,exprs] = scicos_getvalue("Set Diode block parameter",["Saturation cuurent (A)","Voltage equivalent to temperature (Volt)","Max exponent for linear continuation","R (ohm)"],list("vec",1,"vec",1,"vec",1,"vec",1),exprs); + [ok,this.Ids,this.Vt,this.Maxexp,this.R,this.exprs] = scicos_getvalue("Set Diode block parameter",["Saturation cuurent (A)","Voltage equivalent to temperature (Volt)","Max exponent for linear continuation","R (ohm)"],list("vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } this.model.rpar = new ScilabDouble([this.Ids],[this.Vt],[this.Maxexp],[this.R]); this.model.equations.parameters = list(["Ids","Vt","Maxexp","R"],list(this.Ids,this.Vt,this.Maxexp,this.R)); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -2122,9 +2151,9 @@ function Ground() { mo.model = "Ground"; mo.inputs = "p"; this.model.equations = new ScilabDouble([mo]); - var exprs = ""; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Ground\",sz(1),sz(2));"]); - this.x = standard_define([1,1],this.model,exprs,list(gr_i,0)); + this.exprs = ""; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Ground\",sz(1),sz(2));"]); + this.x = standard_define([1,1],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new GroundBlock(this.x); @@ -2180,15 +2209,15 @@ function Gyrator() { mo.outputs = MO; this.model.rpar = new ScilabDouble(PrametersValue); mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName)); - var exprs = [["1"],["1"]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Gyrator\",sz(1),sz(2));"]); + this.exprs = [["1"],["1"]]; + this.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 ScilabDouble([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = standard_define([2,2],this.model,exprs,list(gr_i,0)); + this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); @@ -2206,19 +2235,20 @@ function Gyrator() { Gyrator.prototype.set = function Gyrator() { this.G1 = arguments[0]["G1"] this.G2 = arguments[0]["G2"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; this.x = arg1; - var exprs = this.x.graphics.exprs; + this.exprs = this.x.graphics.exprs; while (true) { - [ok,this.G1,this.G2,exprs] = scicos_getvalue([["Set Gyrator block parameters:"],[""],["G1: Gyration conductance"],["G2: Gyration conductance"]],["G1","G2"],list("vec",1,"vec",1),exprs); + [ok,this.G1,this.G2,this.exprs] = scicos_getvalue([["Set Gyrator block parameters:"],[""],["G1: Gyration conductance"],["G2: Gyration conductance"]],["G1","G2"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } this.x.model.equations.parameters[2-1] = list(this.G1,this.G2); - this.x.graphics.exprs = exprs; + this.x.graphics.exprs = this.exprs; break; } return new BasicBlock(this.x); @@ -2262,15 +2292,15 @@ function IdealTransformer() { mo.outputs = MO; this.model.rpar = new ScilabDouble(PrametersValue); mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName)); - var exprs = ["1"]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IdealTransformer\",sz(1),sz(2));"]); + this.exprs = ["1"]; + this.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 ScilabDouble([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = standard_define([2,2],this.model,exprs,list(gr_i,0)); + this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); @@ -2286,19 +2316,20 @@ function IdealTransformer() { } IdealTransformer.prototype.set = function IdealTransformer() { this.N = arguments[0]["N"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; this.x = arg1; - var exprs = this.x.graphics.exprs; + this.exprs = this.x.graphics.exprs; while (true) { - [ok,this.N,exprs] = scicos_getvalue([["Set Transformer block parameters:"],[""],["N:"+" Turn ratio (N1/N2)"]],["N"],list("vec",1),exprs); + [ok,this.N,this.exprs] = scicos_getvalue([["Set Transformer block parameters:"],[""],["N:"+" Turn ratio (N1/N2)"]],["N"],list("vec",1),this.exprs); if (!ok) { break; } this.x.model.equations.parameters[2-1] = list(this.N); - this.x.graphics.exprs = exprs; + this.x.graphics.exprs = this.exprs; break; } return new BasicBlock(this.x); @@ -2321,9 +2352,9 @@ function Inductor() { mo.outputs = "n"; mo.parameters = list("L",list(this.L)); this.model.equations = new ScilabDouble([mo]); - var exprs = string(this.L); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Inductor\",sz(1),sz(2));"]); - this.x = standard_define([2,0.9],this.model,exprs,list(gr_i,0)); + this.exprs = string(this.L); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Inductor\",sz(1),sz(2));"]); + this.x = standard_define([2,0.9],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -2338,18 +2369,19 @@ function Inductor() { } Inductor.prototype.set = function Inductor() { this.L = parseFloat(arguments[0]["L"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.L,exprs] = scicos_getvalue("Set Inductor block parameter","L (H)",list("vec",1),exprs); + [ok,this.L,this.exprs] = scicos_getvalue("Set Inductor block parameter","L (H)",list("vec",1),this.exprs); if (!ok) { break; } this.model.rpar = new ScilabDouble([this.L]); this.model.equations.parameters[2-1] = list(new ScilabDouble([this.L])); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -2366,9 +2398,9 @@ function MOTOR() { this.model.sim = new ScilabString(["motor"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MOTOR\",sz(1),sz(2));"]); - var exprs = ""; - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MOTOR\",sz(1),sz(2));"]); + this.exprs = ""; + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); this.x.graphics.out_implicit = [["I"],["I"]]; this.x.graphics.in_implicit = ["I"]; return new BasicBlock(this.x); @@ -2410,9 +2442,9 @@ function NMOS() { this.model.equations = new ScilabDouble([mo]); this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["I"],["I"]]; return new BasicBlock(this.x); @@ -2444,17 +2476,18 @@ function NMOS() { this.dW = parseFloat(arguments[0]["dW"]) this.dL = parseFloat(arguments[0]["dL"]) this.RDS = parseFloat(arguments[0]["RDS"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.W,this.L,this.Beta,this.Vt,this.K2,this.K5,this.dW,this.dL,this.RDS,exprs] = scicos_getvalue("Set NMOS Transistor block parameters",["Width [m]","Length [m]","Transconductance parameter [A/(V*V)]","Zero bias threshold voltage [V]","Bulk threshold parameter","Reduction of pinch-off region","Narrowing of channel [m]","Shortening of channel [m]","Drain-Source-Resistance [Ohm]"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs); + [ok,this.W,this.L,this.Beta,this.Vt,this.K2,this.K5,this.dW,this.dL,this.RDS,this.exprs] = scicos_getvalue("Set NMOS Transistor block parameters",["Width [m]","Length [m]","Transconductance parameter [A/(V*V)]","Zero bias threshold voltage [V]","Bulk threshold parameter","Reduction of pinch-off region","Narrowing of channel [m]","Shortening of channel [m]","Drain-Source-Resistance [Ohm]"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),this.exprs); if (!ok) { 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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -2500,15 +2533,15 @@ function NPN() { mo.outputs = MO; this.model.rpar = new ScilabDouble(PrametersValue); mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName)); - 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.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));"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = standard_define([2,2],this.model,exprs,list(gr_i,0)); + this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); @@ -2556,19 +2589,20 @@ function NPN() { this.Gbe = arguments[0]["Gbe"] this.Vt = arguments[0]["Vt"] this.EMinMax = arguments[0]["EMinMax"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; this.x = arg1; - var exprs = this.x.graphics.exprs; + this.exprs = this.x.graphics.exprs; while (true) { - [ok,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,exprs] = scicos_getvalue([["Set NPN block parameters:"],[""]],["Bf : Forward beta","Br : Reverse beta","Is : Transport saturation current","Vak : Early voltage (inverse), 1/Volt","Tauf: Ideal forward transit time","Taur: Ideal reverse transit time","Ccs : Collector-substrat(ground) cap.","Cje : Base-emitter zero bias depletion cap.","Cjc : Base-coll. zero bias depletion cap.","Phie: Base-emitter diffusion voltage","Me : Base-emitter gradation exponent","Phic: Base-collector diffusion voltage","Mc : Base-collector gradation exponent","Gbc : Base-collector conductance","Gbe : Base-emitter conductance","Vt : Voltage equivalent of temperature","EMinmax: if x > EMinMax, the exp(x) is linearized"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs); + [ok,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.exprs] = scicos_getvalue([["Set NPN block parameters:"],[""]],["Bf : Forward beta","Br : Reverse beta","Is : Transport saturation current","Vak : Early voltage (inverse), 1/Volt","Tauf: Ideal forward transit time","Taur: Ideal reverse transit time","Ccs : Collector-substrat(ground) cap.","Cje : Base-emitter zero bias depletion cap.","Cjc : Base-coll. zero bias depletion cap.","Phie: Base-emitter diffusion voltage","Me : Base-emitter gradation exponent","Phic: Base-collector diffusion voltage","Mc : Base-collector gradation exponent","Gbc : Base-collector conductance","Gbe : Base-emitter conductance","Vt : Voltage equivalent of temperature","EMinmax: if x > EMinMax, the exp(x) is linearized"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { 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 = exprs; + this.x.graphics.exprs = this.exprs; break; } return new BasicBlock(this.x); @@ -2592,9 +2626,9 @@ function OpAmp() { this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.model.rpar = new ScilabDouble(Z); - var exprs = string(Z); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OpAmp\",sz(1),sz(2));"]); - this.x = standard_define([3,5],this.model,exprs,gr_i); + this.exprs = string(Z); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OpAmp\",sz(1),sz(2));"]); + this.x = standard_define([3,5],this.model,this.exprs,this.gr_i); this.x.graphics.in_implicit = [["I"],["I"]]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -2614,17 +2648,18 @@ function OpAmp() { this.OLGain = arguments[0]["OLGain"] this.SatH = arguments[0]["SatH"] this.SatL = arguments[0]["SatL"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (false) { - [ok,this.OLGain,this.SatH,this.SatL,exprs] = scicos_getvalue("Set the Operational Amplifier parameters",["Open Loop Gain","Positive saturation voltage","Negative saturation voltage"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.OLGain,this.SatH,this.SatL,this.exprs] = scicos_getvalue("Set the Operational Amplifier parameters",["Open Loop Gain","Positive saturation voltage","Negative saturation voltage"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { 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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -2656,9 +2691,9 @@ function PMOS() { this.model.equations = new ScilabDouble([mo]); this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["I"],["I"]]; return new BasicBlock(this.x); @@ -2690,17 +2725,18 @@ function PMOS() { this.dW = parseFloat(arguments[0]["dW"]) this.dL = parseFloat(arguments[0]["dL"]) this.RDS = parseFloat(arguments[0]["RDS"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.W,this.L,this.Beta,this.Vt,this.K2,this.K5,this.dW,this.dL,this.RDS,exprs] = scicos_getvalue("Set PMOS Transistor parameters",["Width [m]","Length [m]","Transconductance parameter [A/(V*V)]","Zero bias threshold voltage [V]","Bulk threshold parameter","Reduction of pinch-off region","Narrowing of channel [m]","Shortening of channel [m]","Drain-Source-Resistance [Ohm]"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs); + [ok,this.W,this.L,this.Beta,this.Vt,this.K2,this.K5,this.dW,this.dL,this.RDS,this.exprs] = scicos_getvalue("Set PMOS Transistor parameters",["Width [m]","Length [m]","Transconductance parameter [A/(V*V)]","Zero bias threshold voltage [V]","Bulk threshold parameter","Reduction of pinch-off region","Narrowing of channel [m]","Shortening of channel [m]","Drain-Source-Resistance [Ohm]"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),this.exprs); if (!ok) { 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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -2746,15 +2782,15 @@ function PNP() { mo.outputs = MO; this.model.rpar = new ScilabDouble(PrametersValue); mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName)); - 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.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));"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = standard_define([2,2],this.model,exprs,list(gr_i,0)); + this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); @@ -2802,19 +2838,20 @@ function PNP() { this.Gbe = arguments[0]["Gbe"] this.Vt = arguments[0]["Vt"] this.EMinMax = arguments[0]["EMinMax"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; this.x = arg1; - var exprs = this.x.graphics.exprs; + this.exprs = this.x.graphics.exprs; while (true) { - [ok,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,exprs] = scicos_getvalue([["Set PNP block parameters:"],[""]],["Bf : Forward beta","Br : Reverse beta","Is : Transport saturation current","Vak : Early voltage (inverse), 1/Volt","Tauf: Ideal forward transit time","Taur: Ideal reverse transit time","Ccs : Collector-substrat(ground) cap.","Cje : Base-emitter zero bias depletion cap.","Cjc : Base-coll. zero bias depletion cap.","Phie: Base-emitter diffusion voltage","Me : Base-emitter gradation exponent","Phic: Base-collector diffusion voltage","Mc : Base-collector gradation exponent","Gbc : Base-collector conductance","Gbe : Base-emitter conductance","Vt : Voltage equivalent of temperature","EMinMax: if x > EMinMax, the exp(x) function is linearized"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs); + [ok,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.exprs] = scicos_getvalue([["Set PNP block parameters:"],[""]],["Bf : Forward beta","Br : Reverse beta","Is : Transport saturation current","Vak : Early voltage (inverse), 1/Volt","Tauf: Ideal forward transit time","Taur: Ideal reverse transit time","Ccs : Collector-substrat(ground) cap.","Cje : Base-emitter zero bias depletion cap.","Cjc : Base-coll. zero bias depletion cap.","Phie: Base-emitter diffusion voltage","Me : Base-emitter gradation exponent","Phic: Base-collector diffusion voltage","Mc : Base-collector gradation exponent","Gbc : Base-collector conductance","Gbe : Base-emitter conductance","Vt : Voltage equivalent of temperature","EMinMax: if x > EMinMax, the exp(x) function is linearized"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { 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 = exprs; + this.x.graphics.exprs = this.exprs; break; } return new BasicBlock(this.x); @@ -2835,8 +2872,8 @@ function PotentialSensor() { mo.inputs = "p"; mo.outputs = ["v"]; this.model.equations = new ScilabDouble([mo]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PotentialSensor\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,"",list(gr_i,0)); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PotentialSensor\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,"",list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["E"]; return new BasicBlock(this.x); @@ -2871,9 +2908,9 @@ function Resistor() { this.model.equations = new ScilabDouble([mo]); this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); - var exprs = string(this.R); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Resistor\",sz(1),sz(2));"]); - this.x = standard_define([2,1],this.model,exprs,list(gr_i,0)); + this.exprs = string(this.R); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Resistor\",sz(1),sz(2));"]); + this.x = standard_define([2,1],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -2888,18 +2925,19 @@ function Resistor() { } Resistor.prototype.set = function Resistor() { this.R = parseFloat(arguments[0]["R"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.R,exprs] = scicos_getvalue("Set Resistor block parameter","R (ohm)",list("vec",1),exprs); + [ok,this.R,this.exprs] = scicos_getvalue("Set Resistor block parameter","R (ohm)",list("vec",1),this.exprs); if (!ok) { break; } this.model.rpar = new ScilabDouble([this.R]); this.model.equations.parameters[2-1] = list(new ScilabDouble([this.R])); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -2928,9 +2966,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]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -2954,18 +2992,19 @@ function SineVoltage() { this.frq = parseFloat(arguments[0]["frq"]) this.offset = parseFloat(arguments[0]["offset"]) this.start = parseFloat(arguments[0]["start"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.V,this.ph,this.frq,this.offset,this.start,exprs] = scicos_getvalue("Set voltage source parameter",["Amplitude (Volt)","phase (rad)","Frequency (Hz)","Voltageoffset (V)","Timeoffset (s)"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs); + [ok,this.V,this.ph,this.frq,this.offset,this.start,this.exprs] = scicos_getvalue("Set voltage source parameter",["Amplitude (Volt)","phase (rad)","Frequency (Hz)","Voltageoffset (V)","Timeoffset (s)"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } 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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -2993,9 +3032,9 @@ function Switch() { this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.model.rpar = new ScilabDouble([Z]); - var exprs = string(Z); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Switch\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,list(gr_i,0)); + this.exprs = string(Z); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Switch\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = [["I"],["E"]]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -3013,17 +3052,18 @@ function Switch() { Switch.prototype.set = function Switch() { this.Ron = parseFloat(arguments[0]["Ron"]) this.Roff = parseFloat(arguments[0]["Roff"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.Ron,this.Roff,exprs] = scicos_getvalue("Set non-ideal electrical switch parameters",["Resistance in On state (Ohm)","Resistance in Off state (Ohm)"],list("vec",1,"vec",1),exprs); + [ok,this.Ron,this.Roff,this.exprs] = scicos_getvalue("Set non-ideal electrical switch parameters",["Resistance in On state (Ohm)","Resistance in Off state (Ohm)"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } this.model.equations.parameters[2-1] = list(new ScilabDouble([this.Ron]), new ScilabDouble([this.Roff])); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -3049,9 +3089,9 @@ function VVsourceAC() { mo.outputs = "n"; mo.parameters = list(["f"],list(this.FR)); this.model.equations = new ScilabDouble([mo]); - var exprs = [string(this.FR)]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VVsourceAC\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,list(gr_i,0)); + this.exprs = [string(this.FR)]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VVsourceAC\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I","E"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -3067,18 +3107,19 @@ function VVsourceAC() { } VVsourceAC.prototype.set = function VVsourceAC() { this.FR = parseFloat(arguments[0]["FR"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.FR,exprs] = scicos_getvalue("Set voltage source parameter",["Frequency (Hz)"],list("vec",-1),exprs); + [ok,this.FR,this.exprs] = scicos_getvalue("Set voltage source parameter",["Frequency (Hz)"],list("vec",-1),this.exprs); if (!ok) { break; } this.model.rpar = new ScilabDouble([this.FR]); this.model.equations.parameters[2-1] = list(new ScilabDouble([this.FR])); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -3100,9 +3141,9 @@ function VariableResistor() { this.model.equations = new ScilabDouble([mo]); this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); - var exprs = []; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VariableResistor\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,list(gr_i,0)); + this.exprs = []; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VariableResistor\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I","E"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -3134,9 +3175,9 @@ function VoltageSensor() { mo.inputs = "p"; mo.outputs = [["n"],["v"]]; this.model.equations = new ScilabDouble([mo]); - var exprs = []; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VoltageSensor\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,list(gr_i,0)); + this.exprs = []; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VoltageSensor\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["E"]]; return new VoltageSensorBlock(this.x); @@ -3172,9 +3213,9 @@ function VsourceAC() { mo.outputs = "n"; mo.parameters = list([["VA"],["f"]],list(this.VA,this.FR)); this.model.equations = new ScilabDouble([mo]); - 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 = standard_define([2,2],this.model,exprs,list(gr_i,0)); + 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 = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -3192,18 +3233,19 @@ function VsourceAC() { VsourceAC.prototype.set = function VsourceAC() { this.VA = parseFloat(arguments[0]["VA"]) this.FR = parseFloat(arguments[0]["FR"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.VA,this.FR,exprs] = scicos_getvalue("Set voltage source parameter",["Amplitude (Volt)","Frequency (Hz)"],list("vec",-1,"vec",-1),exprs); + [ok,this.VA,this.FR,this.exprs] = scicos_getvalue("Set voltage source parameter",["Amplitude (Volt)","Frequency (Hz)"],list("vec",-1,"vec",-1),this.exprs); if (!ok) { break; } 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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -3303,8 +3345,8 @@ function ANDLOG_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([false,false]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ANDLOG_f\",sz(1),sz(2));"]); - this.x = standard_define([3,3],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ANDLOG_f\",sz(1),sz(2));"]); + this.x = standard_define([3,3],this.model,[],this.gr_i); return new BasicBlock(this.x); } ANDLOG_f.prototype.details = function ANDLOG_f() { @@ -3330,8 +3372,8 @@ function CLKSOMV_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabDouble([false,false]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKSOMV_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKSOMV_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,[],this.gr_i); return new BasicBlock(this.x); } CLKSOMV_f.prototype.details = function CLKSOMV_f() { @@ -3357,8 +3399,8 @@ function CLKSOM_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabDouble([false,false]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKSOM_f\",sz(1),sz(2));"]); - this.x = standard_define([1,1]/1.2,this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKSOM_f\",sz(1),sz(2));"]); + this.x = standard_define([1,1]/1.2,this.model,[],this.gr_i); return new BasicBlock(this.x); } CLKSOM_f.prototype.details = function CLKSOM_f() { @@ -3411,9 +3453,9 @@ function END_c() { this.model.firing = new ScilabDouble([this.tf]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); - var exprs = string(this.tf); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"END_c\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = string(this.tf); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"END_c\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } END_c.prototype.details = function END_c() { @@ -3427,17 +3469,18 @@ function END_c() { } END_c.prototype.set = function END_c() { this.tf = parseFloat(arguments[0]["tf"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.tf,exprs] = scicos_getvalue("Set final simulation time",["Final simulation time"],list("vec",1),exprs); + [ok,this.tf,this.exprs] = scicos_getvalue("Set final simulation time",["Final simulation time"],list("vec",1),this.exprs); if (!ok) { break; } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.firing = new ScilabDouble([this.tf]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -3460,9 +3503,9 @@ function EVTDLY_c() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([this.ff]); this.model.dep_ut = new ScilabDouble([false,false]); - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } EVTDLY_c.prototype.details = function EVTDLY_c() { @@ -3478,12 +3521,13 @@ function EVTDLY_c() { EVTDLY_c.prototype.set = function EVTDLY_c() { this.dt = parseFloat(arguments[0]["dt"]) this.ff = parseFloat(arguments[0]["ff"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.dt,this.ff,exprs] = scicos_getvalue([["Set Event Delay block parameters"],["Delay is the delay between an input event "],[" and the generated output event"],["Block may initially generate an output event before "],[" any input event. \"Date of initial output event\""],[" gives the date of this event. Set a negative value"],[" to disable any output event."]],["Delay","Date of initial output event"],list("vec",1,"vec",1),exprs); + [ok,this.dt,this.ff,this.exprs] = scicos_getvalue([["Set Event Delay block parameters"],["Delay is the delay between an input event "],[" and the generated output event"],["Block may initially generate an output event before "],[" any input event. \"Date of initial output event\""],[" gives the date of this event. Set a negative value"],[" to disable any output event."]],["Delay","Date of initial output event"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -3492,7 +3536,7 @@ function EVTDLY_c() { var ok = false; } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.rpar = new ScilabDouble([this.dt],[this.ff]); this.model.firing = new ScilabDouble([this.ff]); this.x.graphics = this.graphics; @@ -3516,9 +3560,9 @@ function EVTDLY_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([this.ff]); this.model.dep_ut = new ScilabDouble([false,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } EVTDLY_f.prototype.details = function EVTDLY_f() { @@ -3534,12 +3578,13 @@ function EVTDLY_f() { EVTDLY_f.prototype.set = function EVTDLY_f() { this.dt = parseFloat(arguments[0]["dt"]) this.ff = parseFloat(arguments[0]["ff"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.dt,this.ff,exprs] = scicos_getvalue([["Set Event Delay block parameters"],["Delay is the delay between an input event "],[" and the generated output event"],["Block may initially generate an output event before "],[" any input event. \"Date of initial output event\""],[" gives the date of this event. Set a negative value"],[" if no initial event required"]],["Delay","Date of initial output event"],list("vec",1,"vec",1),exprs); + [ok,this.dt,this.ff,this.exprs] = scicos_getvalue([["Set Event Delay block parameters"],["Delay is the delay between an input event "],[" and the generated output event"],["Block may initially generate an output event before "],[" any input event. \"Date of initial output event\""],[" gives the date of this event. Set a negative value"],[" if no initial event required"]],["Delay","Date of initial output event"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -3548,7 +3593,7 @@ function EVTDLY_f() { var ok = false; } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.rpar = new ScilabDouble([this.dt]); this.model.firing = new ScilabDouble([this.ff]); this.x.graphics = this.graphics; @@ -3569,9 +3614,9 @@ function EVTGEN_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([this.tt]); this.model.dep_ut = new ScilabDouble([false,false]); - var exprs = string(this.tt); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTGEN_f\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,exprs,gr_i); + this.exprs = string(this.tt); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTGEN_f\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } EVTGEN_f.prototype.details = function EVTGEN_f() { @@ -3585,16 +3630,17 @@ function EVTGEN_f() { } EVTGEN_f.prototype.set = function EVTGEN_f() { this.tt = parseFloat(arguments[0]["tt"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.tt,exprs] = scicos_getvalue("Set Event time",["Event Time"],list("vec",1),exprs); + [ok,this.tt,this.exprs] = scicos_getvalue("Set Event time",["Event Time"],list("vec",1),this.exprs); if (!ok) { break; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); if (this.model.firing!=this.tt) { this.model.firing = new ScilabDouble([this.tt]); } @@ -3617,9 +3663,9 @@ function EVTVARDLY() { this.model.firing = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = string(this.model.firing); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTVARDLY\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = string(this.model.firing); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTVARDLY\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } EVTVARDLY.prototype.details = function EVTVARDLY() { @@ -3632,16 +3678,17 @@ function EVTVARDLY() { } EVTVARDLY.prototype.set = function EVTVARDLY() { this.fir = arguments[0]["fir"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.fir,exprs] = scicos_getvalue("Set parameter of variable event delay","Initial event firing time (<0 if absent)",list("vec",1),exprs); + [ok,this.fir,this.exprs] = scicos_getvalue("Set parameter of variable event delay","Initial event firing time (<0 if absent)",list("vec",1),this.exprs); if (!ok) { break; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.firing = new ScilabDouble([this.fir]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -3661,9 +3708,9 @@ function HALT_f() { this.model.ipar = new ScilabDouble([0]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); - var exprs = string(this.n); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"HALT_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = string(this.n); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"HALT_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } HALT_f.prototype.details = function HALT_f() { @@ -3677,17 +3724,18 @@ function HALT_f() { } HALT_f.prototype.set = function HALT_f() { this.n = parseFloat(arguments[0]["n"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.n,exprs] = scicos_getvalue("Set Halt block parameters",["State on halt"],list("vec",1),exprs); + [ok,this.n,this.exprs] = scicos_getvalue("Set Halt block parameters",["State on halt"],list("vec",1),this.exprs); if (!ok) { break; } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.ipar = new ScilabDouble([this.n]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -3712,9 +3760,9 @@ function IFTHEL_f() { this.model.dep_ut = new ScilabDouble([true,false]); this.model.nmode = new ScilabDouble([1]); this.model.nzcross = new ScilabDouble([1]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IFTHEL_f\",sz(1),sz(2));"]); - var exprs = [[string(this.model.in1)],[string(this.model.nmode)]]; - this.x = standard_define([3,3],this.model,exprs,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IFTHEL_f\",sz(1),sz(2));"]); + this.exprs = [[string(this.model.in1)],[string(this.model.nmode)]]; + this.x = standard_define([3,3],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } IFTHEL_f.prototype.details = function IFTHEL_f() { @@ -3730,18 +3778,19 @@ function IFTHEL_f() { IFTHEL_f.prototype.set = function IFTHEL_f() { this.inh = inverse(arguments[0]["inh"]) this.nmod = parseFloat(arguments[0]["nmod"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - if (exprs==[]) { - var exprs = string(1); + if (this.exprs==[]) { + this.exprs = string(1); } - if (size(exprs,"*")==1) { - exprs[2-1] = string(1); + if (size(this.exprs,"*")==1) { + this.exprs[2-1] = string(1); } while (true) { - [ok,this.inh,this.nmod,exprs] = scicos_getvalue("Set parameters",["Inherit (1: no, 0: yes)","zero-crossing (0: no, 1: yes)"],list("vec",1,"vec",1),exprs); + [ok,this.inh,this.nmod,this.exprs] = scicos_getvalue("Set parameters",["Inherit (1: no, 0: yes)","zero-crossing (0: no, 1: yes)"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -3757,7 +3806,7 @@ function IFTHEL_f() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabString([exprs]); + this.graphics.exprs = new ScilabString([this.exprs]); this.model.evtin = new ScilabDouble(this.inh); this.model.sim[2-1] = new ScilabDouble([-1]); this.model.nmode = new ScilabDouble([this.nmod]); @@ -3775,12 +3824,12 @@ function MCLOCK_f() { MCLOCK_f.prototype.define = function MCLOCK_f() { var nn = 2; var dt = 0.1; - var exprs = [[string(dt)],[string(nn)]]; + this.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 = exprs; + mfclck.graphics.exprs = this.exprs; mfclck.graphics.pein = 12; mfclck.graphics.peout = [[4],[3]]; mfclck.model.rpar = 0.1; @@ -3815,7 +3864,7 @@ function MCLOCK_f() { split2.graphics.orig = [[482.45315],[169.33333]]; split2.graphics.pein = 5; split2.graphics.peout = [[12],[13]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MCLOCK_f\",sz(1),sz(2));"]); + this.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; @@ -3833,7 +3882,7 @@ function MCLOCK_f() { this.x = scicos_block(); this.x.gui = "MCLOCK_f"; this.x.graphics.sz = [3,2]; - this.x.graphics.gr_i = gr_i; + this.x.graphics.gr_i = this.gr_i; this.x.model.sim = "csuper"; this.x.model.evtout = [[1],[1]]; this.x.model.blocktype = "h"; @@ -3886,9 +3935,9 @@ function MFCLCK_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1,0]); this.model.dep_ut = new ScilabDouble([false,false]); - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } MFCLCK_f.prototype.details = function MFCLCK_f() { @@ -3904,18 +3953,19 @@ function MFCLCK_f() { MFCLCK_f.prototype.set = function MFCLCK_f() { this.dt = parseFloat(arguments[0]["dt"]) this.nn = parseFloat(arguments[0]["nn"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - [ok,this.dt,this.nn,exprs] = scicos_getvalue("Set Multifrequency clock parameters",["basic period (1/f)","multiply by (n)"],list("vec",1,"vec",1),exprs); + [ok,this.dt,this.nn,this.exprs] = scicos_getvalue("Set Multifrequency clock parameters",["basic period (1/f)","multiply by (n)"],list("vec",1,"vec",1),this.exprs); if (ok) { this.model.ipar = new ScilabDouble([this.nn]); this.model.rpar = new ScilabDouble([this.dt]); var hh = this.model.firing; hh[2-1] = 0; this.model.firing = new ScilabDouble(hh); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; } @@ -3934,9 +3984,9 @@ function M_freq() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([0,-1,-1]); this.model.dep_ut = new ScilabDouble([false,false]); - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } M_freq.prototype.details = function M_freq() { @@ -3952,12 +4002,13 @@ function M_freq() { M_freq.prototype.set = function M_freq() { this.frequ = inverse(arguments[0]["frequ"]) this.offset = inverse(arguments[0]["offset"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; while (true) { - [ok,this.frequ,this.offset,exprs] = scicos_getvalue("Set block parameters",["Sample time","Offset"],list("vec",-1,"vec",-1),exprs); + [ok,this.frequ,this.offset,this.exprs] = scicos_getvalue("Set block parameters",["Sample time","Offset"],list("vec",-1,"vec",-1),this.exprs); if (!ok) { break; } @@ -3998,7 +4049,7 @@ function M_freq() { this.graphics.sz = new ScilabDouble([50,40]); } this.model.firing = new ScilabDouble([fir]); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -4018,8 +4069,8 @@ function VirtualCLK0() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabDouble([false,false]); - var exprs = []; - this.x = standard_define([2,2],this.model,exprs," "); + this.exprs = []; + this.x = standard_define([2,2],this.model,this.exprs," "); return new BasicBlock(this.x); } VirtualCLK0.prototype.details = function VirtualCLK0() { @@ -4140,8 +4191,8 @@ function freq_div() { this.model.evtin = new ScilabDouble([1]); this.model.evtout = new ScilabDouble([1]); this.model.rpar = scs_m_1; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"freq_div\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"freq_div\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,[],this.gr_i); return new BasicBlock(this.x); } freq_div.prototype.details = function freq_div() { @@ -4157,6 +4208,7 @@ function freq_div() { freq_div.prototype.set = function freq_div() { %ph = parseFloat(arguments[0]["%ph"]) %df = parseFloat(arguments[0]["%df"]) + this.exprs = inverse(arguments[0]["exprs"]) for (i=1;i<=length(arg1.model.rpar.objs);i+=1) { var o = arg1.model.rpar.objs[i-1]; if (typeof(o)=="Block"&&o.gui=="Modulo_Count") { @@ -4174,10 +4226,10 @@ function freq_div() { var xx = arg1[spath-1]; var xxn = xx; this.graphics = xx.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = xx.model; while (true) { - [ok,%ph,%df,exprs] = scicos_getvalue("Set frequency division block parameters",["Phase (0 to division factor -1)","Division factor"],list("vec",1,"vec",1),exprs); + [ok,%ph,%df,this.exprs] = scicos_getvalue("Set frequency division block parameters",["Phase (0 to division factor -1)","Division factor"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -4189,7 +4241,7 @@ function freq_div() { if (%ph>%df-1) { %ph = %df-1; } - this.graphics.exprs = new ScilabDouble(exprs); + this.graphics.exprs = new ScilabDouble(this.exprs); this.model.ipar = new ScilabDouble([%df]); this.model.dstate = new ScilabDouble([%ph]); xxn.graphics = this.graphics; @@ -4272,9 +4324,9 @@ function Bache() { this.model.equations = new ScilabDouble([mo]); this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); - 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 = standard_define([2,2],this.model,exprs,list(gr_i,0)); + 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 = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = [["I"],["I"]]; this.x.graphics.out_implicit = [["I"],["I"],["E"]]; return new BasicBlock(this.x); @@ -4306,18 +4358,19 @@ function Bache() { this.z0 = parseFloat(arguments[0]["z0"]) this.T0 = parseFloat(arguments[0]["T0"]) this.p_rho = parseFloat(arguments[0]["p_rho"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.Patm,this.A,this.ze1,this.ze2,this.zs1,this.zs2,this.z0,this.T0,this.p_rho,exprs] = scicos_getvalue("Parametres de la bache",["Pression dans le ciel de la bache : Patm (Pa)","Section de la bache : A (m2)","Altitude du piquage d entrée 1: ze1 (m)","Altitude du piquage d entrée 2: ze2 (m)","Altitude du piquage de sortie 1: zs1 (m)","Altitude du piquage de sortie 2: zs2 (m)","Altitude initiale du fluide : z0 (m)","Température initiale du fluide : T0 (K)","Si >0, masse volumique imposée du fluide : p_rho (kg/m3)"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs); + [ok,this.Patm,this.A,this.ze1,this.ze2,this.zs1,this.zs2,this.z0,this.T0,this.p_rho,this.exprs] = scicos_getvalue("Parametres de la bache",["Pression dans le ciel de la bache : Patm (Pa)","Section de la bache : A (m2)","Altitude du piquage d entrée 1: ze1 (m)","Altitude du piquage d entrée 2: ze2 (m)","Altitude du piquage de sortie 1: zs1 (m)","Altitude du piquage de sortie 2: zs2 (m)","Altitude initiale du fluide : z0 (m)","Température initiale du fluide : T0 (K)","Si >0, masse volumique imposée du fluide : p_rho (kg/m3)"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),this.exprs); if (!ok) { break; } 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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -4363,15 +4416,15 @@ function Flowmeter() { mo.outputs = MO; this.model.rpar = new ScilabDouble([PrametersValue]); mo.parameters = list(ParametersName,PrametersValue,zeros(ParametersName)); - var exprs = "1"; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Flowmeter\",sz(1),sz(2));"]); + this.exprs = "1"; + this.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 ScilabDouble([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = standard_define([2,2],this.model,exprs,list(gr_i,0)); + this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); @@ -4386,19 +4439,20 @@ function Flowmeter() { } Flowmeter.prototype.set = function Flowmeter() { this.Qini = arguments[0]["Qini"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; this.x = arg1; - var exprs = this.x.graphics.exprs; + this.exprs = this.x.graphics.exprs; while (false) { - [ok,this.Qini,exprs] = scicos_getvalue([["Set Flowmeter block parameters:"],[""],["Qini: "]],"Qini",list("vec",1),exprs); + [ok,this.Qini,this.exprs] = scicos_getvalue([["Set Flowmeter block parameters:"],[""],["Qini: "]],"Qini",list("vec",1),this.exprs); if (!ok) { break; } this.x.model.equations.parameters[2-1] = list(this.Qini); - this.x.graphics.exprs = exprs; + this.x.graphics.exprs = this.exprs; break; } return new BasicBlock(this.x); @@ -4428,9 +4482,9 @@ function PerteDP() { this.model.equations = new ScilabDouble([mo]); this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); - 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 = standard_define([2,1],this.model,exprs,list(gr_i,0)); + 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 = standard_define([2,1],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -4456,18 +4510,19 @@ function PerteDP() { this.z1 = parseFloat(arguments[0]["z1"]) this.z2 = parseFloat(arguments[0]["z2"]) this.p_rho = parseFloat(arguments[0]["p_rho"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.L,this.D,this.lambda,this.z1,this.z2,this.p_rho,exprs] = scicos_getvalue("Parametres du tuyau",["Longueur du tube : L (m)","Diamètre interne du tube : D (m)","Coefficient de perte de charge-frottement(S.U) : lambda","Altitude entrée tuyauterie : z1 (m)","Altitude sortie tuyauterie : z2 (m)","Si >0, masse volumique imposée fu fluide : p_rho (kg/m3)"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs); + [ok,this.L,this.D,this.lambda,this.z1,this.z2,this.p_rho,this.exprs] = scicos_getvalue("Parametres du tuyau",["Longueur du tube : L (m)","Diamètre interne du tube : D (m)","Coefficient de perte de charge-frottement(S.U) : lambda","Altitude entrée tuyauterie : z1 (m)","Altitude sortie tuyauterie : z2 (m)","Si >0, masse volumique imposée fu fluide : p_rho (kg/m3)"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),this.exprs); if (!ok) { break; } 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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -4493,9 +4548,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.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); - 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 = standard_define([2.5,2],this.model,exprs,list(gr_i,0)); + 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 = standard_define([2.5,2],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; return new BasicBlock(this.x); } @@ -4516,18 +4571,19 @@ function PuitsP() { this.T0 = parseFloat(arguments[0]["T0"]) this.H0 = parseFloat(arguments[0]["H0"]) this.option_temperature = parseFloat(arguments[0]["option_temperature"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.P0,this.T0,this.H0,this.option_temperature,exprs] = scicos_getvalue("Paramètres du puits",["Pression de la source : P0 (Pa)","Temperature de la source : T0 (K)","Enthalpie spécifique de la source : H0 (J/kg)","1:température fixée - 2:enthalpie fixée : option_temperature"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs); + [ok,this.P0,this.T0,this.H0,this.option_temperature,this.exprs] = scicos_getvalue("Paramètres du puits",["Pression de la source : P0 (Pa)","Temperature de la source : T0 (K)","Enthalpie spécifique de la source : H0 (J/kg)","1:température fixée - 2:enthalpie fixée : option_temperature"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1),this.exprs); if (!ok) { break; } 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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -4555,9 +4611,9 @@ function SourceP() { this.model.equations = new ScilabDouble([mo]); this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); - 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 = standard_define([2.5,2],this.model,exprs,list(gr_i,0)); + 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 = standard_define([2.5,2],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); } @@ -4578,18 +4634,19 @@ function SourceP() { this.T0 = parseFloat(arguments[0]["T0"]) this.H0 = parseFloat(arguments[0]["H0"]) this.option_temperature = parseFloat(arguments[0]["option_temperature"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.P0,this.T0,this.H0,this.option_temperature,exprs] = scicos_getvalue("Paramètres du puits",["Pression de la source : P0 (Pa)","Temperature de la source : T0 (K)","Enthalpie spécifique de la source : H0 (J/kg)","1:température fixée - 2:enthalpie fixée : option_temperature"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs); + [ok,this.P0,this.T0,this.H0,this.option_temperature,this.exprs] = scicos_getvalue("Paramètres du puits",["Pression de la source : P0 (Pa)","Temperature de la source : T0 (K)","Enthalpie spécifique de la source : H0 (J/kg)","1:température fixée - 2:enthalpie fixée : option_temperature"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1),this.exprs); if (!ok) { break; } 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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -4617,9 +4674,9 @@ function VanneReglante() { this.model.equations = new ScilabDouble([mo]); this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); - 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 = standard_define([2,2],this.model,exprs,list(gr_i,0)); + 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 = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = [["I"],["E"]]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -4637,18 +4694,19 @@ function VanneReglante() { VanneReglante.prototype.set = function VanneReglante() { this.Cvmax = parseFloat(arguments[0]["Cvmax"]) this.p_rho = parseFloat(arguments[0]["p_rho"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.Cvmax,this.p_rho,exprs] = scicos_getvalue("Paramètres de la vanne reglante",["Cvmax","p_rho"],list("vec",-1,"vec",-1),exprs); + [ok,this.Cvmax,this.p_rho,this.exprs] = scicos_getvalue("Paramètres de la vanne reglante",["Cvmax","p_rho"],list("vec",-1,"vec",-1),this.exprs); if (!ok) { break; } 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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -4670,9 +4728,9 @@ function BITCLEAR() { this.model.opar = list(new ScilabDouble([int32(0)])); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = [[sci2exp(3)],[sci2exp(0)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BITCLEAR\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,exprs,gr_i); + this.exprs = [[sci2exp(3)],[sci2exp(0)]]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BITCLEAR\",sz(1),sz(2));"]); + this.x = standard_define([4,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } BITCLEAR.prototype.details = function BITCLEAR() { @@ -4688,12 +4746,13 @@ function BITCLEAR() { BITCLEAR.prototype.set = function BITCLEAR() { this.Datatype = arguments[0]["Datatype"] this.bit = parseFloat(arguments[0]["bit"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.Datatype,this.bit,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","BITCLEAR")],[" "],["Clear a bit"],[" "]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Index of Bit (0 is least significant)"],list("vec",1,"vec",1),exprs); + [ok,this.Datatype,this.bit,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","BITCLEAR")],[" "],["Clear a bit"],[" "]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Index of Bit (0 is least significant)"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -4745,7 +4804,7 @@ function BITCLEAR() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.opar = list(new ScilabDouble([n])); this.x.graphics = this.graphics; this.x.model = this.model; @@ -4769,9 +4828,9 @@ function BITSET() { this.model.opar = list(new ScilabDouble([uint32(0)])); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = [[sci2exp(3)],[sci2exp(0)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BITSET\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,exprs,gr_i); + this.exprs = [[sci2exp(3)],[sci2exp(0)]]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BITSET\",sz(1),sz(2));"]); + this.x = standard_define([4,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } BITSET.prototype.details = function BITSET() { @@ -4787,12 +4846,13 @@ function BITSET() { BITSET.prototype.set = function BITSET() { this.Datatype = arguments[0]["Datatype"] this.bit = parseFloat(arguments[0]["bit"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.Datatype,this.bit,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","BITSET")],[" "],["Set a bit"],[" "]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Index of Bit (0 is least significant)"],list("vec",1,"vec",1),exprs); + [ok,this.Datatype,this.bit,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","BITSET")],[" "],["Set a bit"],[" "]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Index of Bit (0 is least significant)"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -4842,7 +4902,7 @@ function BITSET() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.opar = list(new ScilabDouble([n])); this.x.graphics = this.graphics; this.x.model = this.model; @@ -4868,9 +4928,9 @@ function CONVERT() { this.model.ipar = new ScilabDouble([sgn]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CONVERT.prototype.details = function CONVERT() { @@ -4888,12 +4948,13 @@ function CONVERT() { this.it = parseFloat(arguments[0]["it"]) this.ot = parseFloat(arguments[0]["ot"]) this.np = arguments[0]["np"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; while (true) { - [ok,this.it,this.ot,this.np,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","CONVERT")],[" "],["Type conversion"],[" "]],["Input Type (1:double, 3:int32, 4:int16, 5:int8, ...)","Output Type (1:double, 3:int32, 4:int16, 5:int8, ...)","Do on Overflow (0:Nothing, 1:Saturate, 2:Error)"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.it,this.ot,this.np,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","CONVERT")],[" "],["Type conversion"],[" "]],["Input Type (1:double, 3:int32, 4:int16, 5:int8, ...)","Output Type (1:double, 3:int32, 4:int16, 5:int8, ...)","Do on Overflow (0:Nothing, 1:Saturate, 2:Error)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -5228,7 +5289,7 @@ function CONVERT() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -5327,8 +5388,8 @@ function DFLIPFLOP() { this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabDouble([true,false]); this.model.rpar = new ScilabDouble([scs_m]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DFLIPFLOP\",sz(1),sz(2));"]); - this.x = standard_define([2,3],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DFLIPFLOP\",sz(1),sz(2));"]); + this.x = standard_define([2,3],this.model,[],this.gr_i); return new BasicBlock(this.x); } DFLIPFLOP.prototype.details = function DFLIPFLOP() { @@ -5379,8 +5440,8 @@ function DLATCH() { this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabDouble([true,false]); this.model.rpar = new ScilabDouble([scs_m]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLATCH\",sz(1),sz(2));"]); - this.x = standard_define([2,3],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLATCH\",sz(1),sz(2));"]); + this.x = standard_define([2,3],this.model,[],this.gr_i); return new BasicBlock(this.x); } DLATCH.prototype.details = function DLATCH() { @@ -5411,9 +5472,9 @@ function EXTRACTBITS() { this.model.ipar = new ScilabDouble([0,numb]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - 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 = standard_define([4,2],this.model,exprs,gr_i); + 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 = standard_define([4,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } EXTRACTBITS.prototype.details = function EXTRACTBITS() { @@ -5433,12 +5494,13 @@ function EXTRACTBITS() { this.rule = parseFloat(arguments[0]["rule"]) this.bit = parseFloat(arguments[0]["bit"]) this.scal = arguments[0]["scal"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.Datatype,this.rule,this.bit,this.scal,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","EXTRACTBITS")],[" "],["Bits Extraction"],[" "],[" - Bits to Extract:"],[" 1 Upper Half"],[" 2 Lower Half"],[" 3 Range from MSB"],[" 4 Range to LSB"],[" 5 Range of Bits"],[" - Number of Bits or Index of bit : Index 0 is LSB"],[" If \'Bits to Extract\' is set to \'Range of bits\': [Start, End]"],[" "]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Bits to extract","Number of Bits or Index of Bit","Treat Bit Field as an Integer (0:No, 1:Yes)"],list("vec",1,"vec",1,"vec",-1,"vec",1),exprs); + [ok,this.Datatype,this.rule,this.bit,this.scal,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","EXTRACTBITS")],[" "],["Bits Extraction"],[" "],[" - Bits to Extract:"],[" 1 Upper Half"],[" 2 Lower Half"],[" 3 Range from MSB"],[" 4 Range to LSB"],[" 5 Range of Bits"],[" - Number of Bits or Index of bit : Index 0 is LSB"],[" If \'Bits to Extract\' is set to \'Range of bits\': [Start, End]"],[" "]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Bits to extract","Number of Bits or Index of Bit","Treat Bit Field as an Integer (0:No, 1:Yes)"],list("vec",1,"vec",1,"vec",-1,"vec",1),this.exprs); if (!ok) { break; } @@ -5632,7 +5694,7 @@ function EXTRACTBITS() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.ipar = new ScilabDouble([int(this.bit.slice())],[int(numb.slice())]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -5658,9 +5720,9 @@ function INTMUL() { this.model.ipar = new ScilabDouble([sgn]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = [[sci2exp(3)],[sci2exp(0)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTMUL\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = [[sci2exp(3)],[sci2exp(0)]]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTMUL\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } INTMUL.prototype.details = function INTMUL() { @@ -5676,12 +5738,13 @@ function INTMUL() { INTMUL.prototype.set = function INTMUL() { this.Datatype = arguments[0]["Datatype"] this.np = arguments[0]["np"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; while (true) { - [ok,this.Datatype,this.np,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","INTMUL")],[" "],["Integer matrix multiplication"],[" "]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Do on Overflow (0:Nothing, 1:Saturate, 2:Error)"],list("vec",1,"vec",1),exprs); + [ok,this.Datatype,this.np,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","INTMUL")],[" "],["Integer matrix multiplication"],[" "]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Do on Overflow (0:Nothing, 1:Saturate, 2:Error)"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -5752,7 +5815,7 @@ function INTMUL() { } if (ok) { this.model.ipar = new ScilabDouble([this.np]); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -5807,8 +5870,8 @@ function JKFLIPFLOP() { this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabDouble([true,false]); this.model.rpar = new ScilabDouble([scs_m]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"JKFLIPFLOP\",sz(1),sz(2));"]); - this.x = standard_define([2,3],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"JKFLIPFLOP\",sz(1),sz(2));"]); + this.x = standard_define([2,3],this.model,[],this.gr_i); return new BasicBlock(this.x); } JKFLIPFLOP.prototype.details = function JKFLIPFLOP() { @@ -5831,11 +5894,11 @@ function JKFLIPFLOP() { } var newpar = list(); var xx = arg1.model.rpar.objs[path-1]; - var exprs = xx.graphics.exprs[1-1]; + this.exprs = xx.graphics.exprs[1-1]; this.model = xx.model; var init_old = this.model.odstate[1-1]; while (true) { - [ok,this.init,this.exprs0] = scicos_getvalue([[msprintf("Set %s block parameters","JKFLIPFLOP")],[" "],["JK flip-flop"],[" "],["The \'Initial Value\' must be 0 or 1 of type int8"],[" - Negative values are considered as int8(0)"],[" - Positive values are considered as int8(1)"],[" "]],"Initial Value",list("vec",1),exprs); + [ok,this.init,this.exprs0] = scicos_getvalue([[msprintf("Set %s block parameters","JKFLIPFLOP")],[" "],["JK flip-flop"],[" "],["The \'Initial Value\' must be 0 or 1 of type int8"],[" - Negative values are considered as int8(0)"],[" - Positive values are considered as int8(1)"],[" "]],"Initial Value",list("vec",1),this.exprs); if (!ok) { break; } @@ -5880,9 +5943,9 @@ function LOGIC() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = [[sci2exp(this.mat)],[sci2exp(0)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOGIC\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = [[sci2exp(this.mat)],[sci2exp(0)]]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOGIC\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } LOGIC.prototype.details = function LOGIC() { @@ -5898,12 +5961,13 @@ function LOGIC() { LOGIC.prototype.set = function LOGIC() { this.mat = inverse(arguments[0]["mat"]) this.herit = arguments[0]["herit"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.mat,this.herit,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","LOGIC")],[" "],["Combinatorial logic"],[" "],[" Rows of the matrix are the output values"],[" Number of rows must be a power of two."],[" Number of columns gives the number of outputs."],[" "]],["Truth Table (matrix of outputs)","Accepts Inherited Events (0:No, 1:Yes)"],list("mat",[-1,-2],"vec",1),exprs); + [ok,this.mat,this.herit,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","LOGIC")],[" "],["Combinatorial logic"],[" "],[" Rows of the matrix are the output values"],[" Number of rows must be a power of two."],[" Number of columns gives the number of outputs."],[" "]],["Truth Table (matrix of outputs)","Accepts Inherited Events (0:No, 1:Yes)"],list("mat",[-1,-2],"vec",1),this.exprs); if (!ok) { break; } @@ -5931,7 +5995,7 @@ function LOGIC() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.mat = int8(this.mat); this.model.opar = list(new ScilabDouble([this.mat])); this.x.graphics = this.graphics; @@ -5959,9 +6023,9 @@ function SHIFT() { this.model.ipar = new ScilabDouble(sgn); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } SHIFT.prototype.details = function SHIFT() { @@ -5979,12 +6043,13 @@ function SHIFT() { this.Datatype = arguments[0]["Datatype"] this.nb = arguments[0]["nb"] this.np = arguments[0]["np"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; while (true) { - [ok,this.Datatype,this.nb,this.np,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","SHIFT")],[" "],["Shift/Rotates bits"]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Number of Bits to Shift Left (Negative number to shift right)","Shift Type (0:Arithmetic, 1:Circular)"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.Datatype,this.nb,this.np,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","SHIFT")],[" "],["Shift/Rotates bits"]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Number of Bits to Shift Left (Negative number to shift right)","Shift Type (0:Arithmetic, 1:Circular)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -6069,7 +6134,7 @@ function SHIFT() { } if (ok) { this.model.ipar = new ScilabDouble([this.nb]); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -6108,8 +6173,8 @@ function SRFLIPFLOP() { this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabDouble([true,false]); this.model.rpar = new ScilabDouble([scs_m]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SRFLIPFLOP\",sz(1),sz(2));"]); - this.x = standard_define([2,3],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SRFLIPFLOP\",sz(1),sz(2));"]); + this.x = standard_define([2,3],this.model,[],this.gr_i); return new BasicBlock(this.x); } SRFLIPFLOP.prototype.details = function SRFLIPFLOP() { @@ -6132,11 +6197,11 @@ function SRFLIPFLOP() { } var newpar = list(); var xx = arg1.model.rpar.objs[path-1]; - var exprs = xx.graphics.exprs[1-1]; + this.exprs = xx.graphics.exprs[1-1]; this.model = xx.model; var init_old = this.model.odstate[1-1]; while (true) { - [ok,this.init,this.exprs0] = scicos_getvalue([[msprintf("Set %s block parameters","SRFLIPFLOP")],[" "],["SR flip-flop"],[" "],["The \'Initial Value\' must be 0 or 1 of type int8"],[" - Negative values are considered as int8(0)"],[" - Positive values are considered as int8(1)"],[" "]],"Initial Value",list("vec",1),exprs); + [ok,this.init,this.exprs0] = scicos_getvalue([[msprintf("Set %s block parameters","SRFLIPFLOP")],[" "],["SR flip-flop"],[" "],["The \'Initial Value\' must be 0 or 1 of type int8"],[" - Negative values are considered as int8(0)"],[" - Positive values are considered as int8(1)"],[" "]],"Initial Value",list("vec",1),this.exprs); if (!ok) { break; } @@ -6175,9 +6240,9 @@ function BIGSOM_f() { this.model.rpar = new ScilabDouble(this.sgn); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = sci2exp(this.sgn); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BIGSOM_f\",sz(1),sz(2));"]); - this.x = standard_define([2,3],this.model,exprs,gr_i); + this.exprs = sci2exp(this.sgn); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BIGSOM_f\",sz(1),sz(2));"]); + this.x = standard_define([2,3],this.model,this.exprs,this.gr_i); return new BigSom(this.x); } BIGSOM_f.prototype.details = function BIGSOM_f() { @@ -6190,12 +6255,13 @@ function BIGSOM_f() { } BIGSOM_f.prototype.set = function BIGSOM_f() { this.sgn = inverse(arguments[0]["sgn"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; while (true) { - [ok,this.sgn,exprs] = scicos_getvalue("Set sum block parameters","Inputs ports signs/gain",list("vec",-1),exprs); + [ok,this.sgn,this.exprs] = scicos_getvalue("Set sum block parameters","Inputs ports signs/gain",list("vec",-1),this.exprs); if (!ok) { break; } @@ -6206,7 +6272,7 @@ function BIGSOM_f() { var ok = tmpvar0[2]; if (ok) { this.model.rpar = new ScilabDouble(this.sgn.slice()); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -6225,8 +6291,8 @@ function CLINDUMMY_f() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([false,true]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLINDUMMY_f\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLINDUMMY_f\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,[],this.gr_i); return new BasicBlock(this.x); } CLINDUMMY_f.prototype.details = function CLINDUMMY_f() { @@ -6250,7 +6316,7 @@ function CLR() { var B = 1; var C = 1; var D = 0; - var exprs = [["1"],["1+s"]]; + this.exprs = [["1"],["1+s"]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["csslti4"]), new ScilabDouble([4])); this.model.in1 = new ScilabDouble([1]); @@ -6259,8 +6325,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 ScilabDouble([false,true]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLR\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,exprs,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLR\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CLR.prototype.details = function CLR() { @@ -6276,9 +6342,10 @@ function CLR() { CLR.prototype.set = function CLR() { this.num = arguments[0]["num"] this.den = arguments[0]["den"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; var x0 = this.model.state; var rpar = this.model.rpar; @@ -6288,7 +6355,7 @@ function CLR() { var PREVAR_scicos_context = PREVAR_scicos_context; PREVAR_scicos_context.s = %s; while (true) { - [ok,this.num,this.den,exprs] = scicos_getvalue("Set continuous SISO transfer parameters",["Numerator (s)","Denominator (s)"],list("pol",1,"pol",1),exprs); + [ok,this.num,this.den,this.exprs] = scicos_getvalue("Set continuous SISO transfer parameters",["Numerator (s)","Denominator (s)"],list("pol",1,"pol",1),this.exprs); if (!ok) { break; } @@ -6303,7 +6370,7 @@ function CLR() { var B = tmpvar0[1]; var C = tmpvar0[2]; var D = tmpvar0[3]; - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); var tmpvar1 = size(A); var ns1 = tmpvar1[0]; var ns1 = tmpvar1[1]; @@ -6339,7 +6406,7 @@ function CLR_f() { var B = 1; var C = 1; var D = 0; - var exprs = [["1"],["1+s"]]; + this.exprs = [["1"],["1+s"]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["csslti"]), new ScilabDouble([1])); this.model.in1 = new ScilabDouble([1]); @@ -6348,8 +6415,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 ScilabDouble([false,true]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLR_f\",sz(1),sz(2));"]); - this.x = standard_define([2.5,2.5],this.model,exprs,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLR_f\",sz(1),sz(2));"]); + this.x = standard_define([2.5,2.5],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CLR_f.prototype.details = function CLR_f() { @@ -6365,9 +6432,10 @@ function CLR_f() { CLR_f.prototype.set = function CLR_f() { this.num = arguments[0]["num"] this.den = arguments[0]["den"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; var x0 = this.model.state; var rpar = this.model.rpar; @@ -6377,7 +6445,7 @@ function CLR_f() { var PREVAR_scicos_context = PREVAR_scicos_context; PREVAR_scicos_context.s = %s; while (true) { - [ok,this.num,this.den,exprs] = scicos_getvalue("Set continuous SISO transfer parameters",["Numerator (s)","Denominator (s)"],list("pol",1,"pol",1),exprs); + [ok,this.num,this.den,this.exprs] = scicos_getvalue("Set continuous SISO transfer parameters",["Numerator (s)","Denominator (s)"],list("pol",1,"pol",1),this.exprs); if (!ok) { break; } @@ -6392,7 +6460,7 @@ function CLR_f() { var B = tmpvar0[1]; var C = tmpvar0[2]; var D = tmpvar0[3]; - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); var tmpvar1 = size(A); var ns1 = tmpvar1[0]; var ns1 = tmpvar1[1]; @@ -6438,9 +6506,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 ScilabDouble([false,true]); - var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLSS\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,exprs,gr_i); + 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 = standard_define([4,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CLSS.prototype.details = function CLSS() { @@ -6462,15 +6530,16 @@ function CLSS() { this.C = parseFloat(arguments[0]["C"]) this.D = parseFloat(arguments[0]["D"]) this.x0 = parseFloat(arguments[0]["x0"]) + this.exprs = parseFloat(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; - if (size(exprs,"*")==7) { - var exprs = exprs[[1:4,7]-1]; + this.exprs = this.graphics.exprs; + if (size(this.exprs,"*")==7) { + this.exprs = this.exprs[[1:4,7]-1]; } this.model = arg1.model; while (true) { - [ok,this.A,this.B,this.C,this.D,this.x0,exprs] = scicos_getvalue("Set continuous linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),exprs); + [ok,this.A,this.B,this.C,this.D,this.x0,this.exprs] = scicos_getvalue("Set continuous linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),this.exprs); if (!ok) { break; } @@ -6503,7 +6572,7 @@ function CLSS() { this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; if (this.D!=[]) { if (norm(this.D,1)!=0) { @@ -6546,9 +6615,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 ScilabDouble([false,true]); - var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLSS_f\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,exprs,gr_i); + 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 = standard_define([4,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CLSS_f.prototype.details = function CLSS_f() { @@ -6570,15 +6639,16 @@ function CLSS_f() { this.C = parseFloat(arguments[0]["C"]) this.D = parseFloat(arguments[0]["D"]) this.x0 = parseFloat(arguments[0]["x0"]) + this.exprs = parseFloat(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; - if (size(exprs,"*")==7) { - var exprs = exprs[[1:4,7]-1]; + this.exprs = this.graphics.exprs; + if (size(this.exprs,"*")==7) { + this.exprs = this.exprs[[1:4,7]-1]; } this.model = arg1.model; while (true) { - [ok,this.A,this.B,this.C,this.D,this.x0,exprs] = scicos_getvalue("Set continuous linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),exprs); + [ok,this.A,this.B,this.C,this.D,this.x0,this.exprs] = scicos_getvalue("Set continuous linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),this.exprs); if (!ok) { break; } @@ -6601,7 +6671,7 @@ function CLSS_f() { this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; if (this.D!=[]) { if (norm(this.D,1)!=0) { @@ -6644,9 +6714,9 @@ function DELAYV_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([0,-1]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = [[string(this.nin)],[strcat(string(z0.slice(1-1,$-1)),";")],[string(this.T)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DELAYV_f\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } DELAYV_f.prototype.details = function DELAYV_f() { @@ -6664,16 +6734,17 @@ function DELAYV_f() { this.nin = parseFloat(arguments[0]["nin"]) this.zz0 = inverse(arguments[0]["zz0"]) this.T = parseFloat(arguments[0]["T"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; this.nin = this.model.in1[1-1]; var z0 = this.model.dstate; this.zz0 = z0.slice(1-1,$-1); var told = z0[$-1]; while (true) { - [ok,this.nin,this.zz0,this.T,exprs] = scicos_getvalue("Set delay parameters",["Number of inputs","Register initial condition","Max delay"],list("vec",1,"vec",-1,"vec",1),exprs); + [ok,this.nin,this.zz0,this.T,this.exprs] = scicos_getvalue("Set delay parameters",["Number of inputs","Register initial condition","Max delay"],list("vec",1,"vec",-1,"vec",1),this.exprs); if (!ok) { break; } @@ -6692,7 +6763,7 @@ function DELAYV_f() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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; @@ -6783,6 +6854,7 @@ function DELAY_f() { DELAY_f.prototype.set = function DELAY_f() { this.dt = arguments[0]["dt"] this.z0 = arguments[0]["z0"] + this.exprs = inverse(arguments[0]["exprs"]) var ppath = list(0,0); for (i=1;i<=length(arg1.model.rpar.objs);i+=1) { var o = arg1.model.rpar.objs[i-1]; @@ -6802,9 +6874,9 @@ 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; - var exprs = [[evtdly_exprs[1-1]],[register_exprs]]; + this.exprs = [[evtdly_exprs[1-1]],[register_exprs]]; while (true) { - [ok,this.dt,this.z0,exprs] = scicos_getvalue([["This block implements as a discretized delay"],["it is consist of a shift register and a clock"],["value of the delay is given by;","the discretization time step multiplied by the"],["number-1 of state of the register"]],["Discretization time step","Register initial state"],list("vec",1,"vec",-1),exprs); + [ok,this.dt,this.z0,this.exprs] = scicos_getvalue([["This block implements as a discretized delay"],["it is consist of a shift register and a clock"],["value of the delay is given by;","the discretization time step multiplied by the"],["number-1 of state of the register"]],["Discretization time step","Register initial state"],list("vec",1,"vec",-1),this.exprs); if (!ok) { break; } @@ -6820,13 +6892,13 @@ function DELAY_f() { if (!ok) { message(mess); } else { - evtdly.graphics.exprs[1-1] = exprs[1-1]; + evtdly.graphics.exprs[1-1] = this.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 = exprs[2-1]; + register.graphics.exprs = this.exprs[2-1]; if (or(register.model.dstate!=this.z0.slice())) { register.model.dstate = this.z0.slice(); newpar[$+1-1] = ppath[1-1]; @@ -6850,9 +6922,9 @@ function DERIV() { this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["x"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = []; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DERIV\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = []; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DERIV\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } DERIV.prototype.details = function DERIV() { @@ -6879,9 +6951,9 @@ function DIFF_c() { this.model.state = new ScilabDouble(this.x0); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); - var exprs = [[strcat(sci2exp(this.x0[1-1]))],[strcat(sci2exp(this.x0[2-1]))]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DIFF_c\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } DIFF_c.prototype.details = function DIFF_c() { @@ -6897,13 +6969,14 @@ function DIFF_c() { DIFF_c.prototype.set = function DIFF_c() { this.x0 = inverse(arguments[0]["x0"]) this.xd0 = inverse(arguments[0]["xd0"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { var ask_again = false; - [ok,this.x0,this.xd0,exprs] = scicos_getvalue("Set continuous linear system parameters",["Initial state","Initial Derivative"],list("vec",-1,"vec",-1),exprs); + [ok,this.x0,this.xd0,this.exprs] = scicos_getvalue("Set continuous linear system parameters",["Initial state","Initial Derivative"],list("vec",-1,"vec",-1),this.exprs); if (!ok) { break; } @@ -6920,7 +6993,7 @@ function DIFF_c() { var ask_again = true; } if (!ask_again) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.state = new ScilabDouble([this.x0],[this.xd0]); this.model.out = new ScilabDouble([N]); this.model.in1 = new ScilabDouble([N]); @@ -6941,7 +7014,7 @@ function DLR() { var B = 1; var C = 1; var D = 0; - var exprs = [["1"],["1+z"]]; + this.exprs = [["1"],["1+z"]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["dsslti4"]), new ScilabDouble([4])); this.model.in1 = new ScilabDouble([1]); @@ -6951,8 +7024,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 ScilabDouble([false,false]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLR\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,exprs,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLR\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } DLR.prototype.details = function DLR() { @@ -6968,16 +7041,17 @@ function DLR() { DLR.prototype.set = function DLR() { this.num = arguments[0]["num"] this.den = arguments[0]["den"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; var x0 = this.model.dstate; var ns = prod(size(x0)); var PREVAR_scicos_context = PREVAR_scicos_context; PREVAR_scicos_context.z = %z; while (true) { - [ok,this.num,this.den,exprs] = scicos_getvalue("Set discrete SISO transfer parameters",["Numerator (z)","Denominator (z)"],list("pol",1,"pol",1),exprs); + [ok,this.num,this.den,this.exprs] = scicos_getvalue("Set discrete SISO transfer parameters",["Numerator (z)","Denominator (z)"],list("pol",1,"pol",1),this.exprs); if (!ok) { break; } @@ -6992,7 +7066,7 @@ function DLR() { var B = tmpvar0[1]; var C = tmpvar0[2]; var D = tmpvar0[3]; - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); var tmpvar1 = size(A); var ns1 = tmpvar1[0]; var ns1 = tmpvar1[1]; @@ -7029,7 +7103,7 @@ function DLR_f() { var B = 1; var C = 1; var D = 0; - var exprs = [["1"],["1+z"]]; + this.exprs = [["1"],["1+z"]]; this.model = scicos_model(); this.model.sim = new ScilabString(["dsslti"]); this.model.in1 = new ScilabDouble([1]); @@ -7039,8 +7113,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 ScilabDouble([false,false]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLR_f\",sz(1),sz(2));"]); - this.x = standard_define([2.5,2.5],this.model,exprs,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLR_f\",sz(1),sz(2));"]); + this.x = standard_define([2.5,2.5],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } DLR_f.prototype.details = function DLR_f() { @@ -7056,16 +7130,17 @@ function DLR_f() { DLR_f.prototype.set = function DLR_f() { this.num = arguments[0]["num"] this.den = arguments[0]["den"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; var x0 = this.model.dstate; var ns = prod(size(x0)); var PREVAR_scicos_context = PREVAR_scicos_context; PREVAR_scicos_context.z = %z; while (true) { - [ok,this.num,this.den,exprs] = scicos_getvalue("Set discrete SISO transfer parameters",["Numerator (z)","Denominator (z)"],list("pol",1,"pol",1),exprs); + [ok,this.num,this.den,this.exprs] = scicos_getvalue("Set discrete SISO transfer parameters",["Numerator (z)","Denominator (z)"],list("pol",1,"pol",1),this.exprs); if (!ok) { break; } @@ -7080,7 +7155,7 @@ function DLR_f() { var B = tmpvar0[1]; var C = tmpvar0[2]; var D = tmpvar0[3]; - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); var tmpvar1 = size(A); var ns1 = tmpvar1[0]; var ns1 = tmpvar1[1]; @@ -7126,9 +7201,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 ScilabDouble([false,false]); - var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLSS\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,exprs,gr_i); + 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 = standard_define([4,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } DLSS.prototype.details = function DLSS() { @@ -7150,15 +7225,16 @@ function DLSS() { this.C = parseFloat(arguments[0]["C"]) this.D = parseFloat(arguments[0]["D"]) this.x0 = parseFloat(arguments[0]["x0"]) + this.exprs = parseFloat(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; - if (size(exprs,"*")==7) { - var exprs = exprs[[1:4,7]-1]; + this.exprs = this.graphics.exprs; + if (size(this.exprs,"*")==7) { + this.exprs = this.exprs[[1:4,7]-1]; } this.model = arg1.model; while (true) { - [ok,this.A,this.B,this.C,this.D,this.x0,exprs] = scicos_getvalue("Set discrete linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),exprs); + [ok,this.A,this.B,this.C,this.D,this.x0,this.exprs] = scicos_getvalue("Set discrete linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),this.exprs); if (!ok) { break; } @@ -7191,7 +7267,7 @@ function DLSS() { this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; if (this.D!=[]) { if (norm(this.D,1)!=0) { @@ -7233,9 +7309,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 ScilabDouble([false,false]); - var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLSS_f\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,exprs,gr_i); + 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 = standard_define([4,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } DLSS_f.prototype.details = function DLSS_f() { @@ -7257,15 +7333,16 @@ function DLSS_f() { this.C = parseFloat(arguments[0]["C"]) this.D = parseFloat(arguments[0]["D"]) this.x0 = parseFloat(arguments[0]["x0"]) + this.exprs = parseFloat(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; - if (size(exprs,"*")==7) { - var exprs = exprs[[1:4,7]-1]; + this.exprs = this.graphics.exprs; + if (size(this.exprs,"*")==7) { + this.exprs = this.exprs[[1:4,7]-1]; } this.model = arg1.model; while (true) { - [ok,this.A,this.B,this.C,this.D,this.x0,exprs] = scicos_getvalue("Set discrete linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),exprs); + [ok,this.A,this.B,this.C,this.D,this.x0,this.exprs] = scicos_getvalue("Set discrete linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),this.exprs); if (!ok) { break; } @@ -7288,7 +7365,7 @@ function DLSS_f() { this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; if (this.D!=[]) { if (norm(this.D,1)!=0) { @@ -7319,7 +7396,7 @@ function DOLLAR() { var z = 0; this.inh = 0; var in1 = 1; - var exprs = string([[z],[this.inh]]); + this.exprs = string([[z],[this.inh]]); this.model = scicos_model(); this.model.sim = list(new ScilabString(["dollar4"]), new ScilabDouble([4])); this.model.in1 = new ScilabDouble([in1]); @@ -7328,8 +7405,8 @@ function DOLLAR() { this.model.dstate = new ScilabDouble([z]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } DOLLAR.prototype.details = function DOLLAR() { @@ -7345,15 +7422,16 @@ function DOLLAR() { DOLLAR.prototype.set = function DOLLAR() { this.a = arguments[0]["a"] this.inh = parseFloat(arguments[0]["inh"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - if (size(exprs,"*")<2) { - exprs[2-1] = "0"; + if (size(this.exprs,"*")<2) { + this.exprs[2-1] = "0"; } while (true) { - [ok,this.a,this.inh,exprs] = scicos_getvalue("Set 1/z block parameters",["initial condition","Inherit (no:0, yes:1)"],list("mat",[-1,-2],"vec",-1),exprs); + [ok,this.a,this.inh,this.exprs] = scicos_getvalue("Set 1/z block parameters",["initial condition","Inherit (no:0, yes:1)"],list("mat",[-1,-2],"vec",-1),this.exprs); if (!ok) { break; } @@ -7407,7 +7485,7 @@ function DOLLAR() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -7422,7 +7500,7 @@ function DOLLAR_f() { var z = 0; this.inh = 0; var in1 = 1; - var exprs = string([[z],[this.inh]]); + this.exprs = string([[z],[this.inh]]); this.model = scicos_model(); this.model.sim = new ScilabString(["dollar"]); this.model.in1 = new ScilabDouble([in1]); @@ -7431,8 +7509,8 @@ function DOLLAR_f() { this.model.dstate = new ScilabDouble([z]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } DOLLAR_f.prototype.details = function DOLLAR_f() { @@ -7448,15 +7526,16 @@ function DOLLAR_f() { DOLLAR_f.prototype.set = function DOLLAR_f() { this.a = arguments[0]["a"] this.inh = parseFloat(arguments[0]["inh"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - if (size(exprs,"*")<2) { - exprs[2-1] = "0"; + if (size(this.exprs,"*")<2) { + this.exprs[2-1] = "0"; } while (true) { - [ok,this.a,this.inh,exprs] = scicos_getvalue("Set 1/z block parameters",["initial condition","Inherit (no:0, yes:1)"],list("vec",-1,"vec",-1),exprs); + [ok,this.a,this.inh,this.exprs] = scicos_getvalue("Set 1/z block parameters",["initial condition","Inherit (no:0, yes:1)"],list("vec",-1,"vec",-1),this.exprs); if (!ok) { break; } @@ -7472,7 +7551,7 @@ function DOLLAR_f() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.dstate = new ScilabDouble([this.a]); this.model.in1 = new ScilabDouble(in1); this.model.out = new ScilabDouble(out); @@ -7490,7 +7569,7 @@ function DOLLAR_m() { var z = 0; this.inh = 0; var in1 = 1; - var exprs = string([[z],[this.inh]]); + this.exprs = string([[z],[this.inh]]); this.model = scicos_model(); this.model.sim = list(new ScilabString(["dollar4"]), new ScilabDouble([4])); this.model.in1 = new ScilabDouble([in1]); @@ -7499,8 +7578,8 @@ function DOLLAR_m() { this.model.dstate = new ScilabDouble([z]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR_m\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR_m\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } DOLLAR_m.prototype.details = function DOLLAR_m() { @@ -7516,15 +7595,16 @@ function DOLLAR_m() { DOLLAR_m.prototype.set = function DOLLAR_m() { this.a = arguments[0]["a"] this.inh = parseFloat(arguments[0]["inh"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - if (size(exprs,"*")<2) { - exprs[2-1] = "0"; + if (size(this.exprs,"*")<2) { + this.exprs[2-1] = "0"; } while (true) { - [ok,this.a,this.inh,exprs] = scicos_getvalue("Set 1/z block parameters",["initial condition","Inherit (no:0, yes:1)"],list("mat",[-1,-2],"vec",-1),exprs); + [ok,this.a,this.inh,this.exprs] = scicos_getvalue("Set 1/z block parameters",["initial condition","Inherit (no:0, yes:1)"],list("mat",[-1,-2],"vec",-1),this.exprs); if (!ok) { break; } @@ -7578,7 +7658,7 @@ function DOLLAR_m() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -7604,9 +7684,9 @@ function GAINBLK() { this.model.rpar = new ScilabDouble([this.gain]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = [strcat(sci2exp(this.gain))]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAINBLK\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = [strcat(sci2exp(this.gain))]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAINBLK\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } GAINBLK.prototype.details = function GAINBLK() { @@ -7622,15 +7702,16 @@ function GAINBLK() { GAINBLK.prototype.set = function GAINBLK() { this.gain = parseFloat(arguments[0]["gain"]) this.over = arguments[0]["over"] + this.exprs = inverse(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - if (size(exprs,"*")==1) { - var exprs = [[exprs],[sci2exp(0)]]; + if (size(this.exprs,"*")==1) { + this.exprs = [[this.exprs],[sci2exp(0)]]; } while (true) { - [ok,this.gain,this.over,exprs] = scicos_getvalue("Set gain block parameters",["Gain","Do On Overflow(0=Nothing 1=Saturate 2=Error)"],list("mat",[-1,-1],"vec",1),exprs); + [ok,this.gain,this.over,this.exprs] = scicos_getvalue("Set gain block parameters",["Gain","Do On Overflow(0=Nothing 1=Saturate 2=Error)"],list("mat",[-1,-1],"vec",1),this.exprs); if (!ok) { break; } @@ -7742,7 +7823,7 @@ function GAINBLK() { } } if (ok) { - this.graphics.exprs = new ScilabDouble(exprs); + this.graphics.exprs = new ScilabDouble(this.exprs); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -7765,9 +7846,9 @@ function GAINBLK_f() { this.model.rpar = new ScilabDouble([this.gain]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = [strcat(sci2exp(this.gain))]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAINBLK_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = [strcat(sci2exp(this.gain))]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAINBLK_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } GAINBLK_f.prototype.details = function GAINBLK_f() { @@ -7781,12 +7862,13 @@ function GAINBLK_f() { } GAINBLK_f.prototype.set = function GAINBLK_f() { this.gain = parseFloat(arguments[0]["gain"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.gain,exprs] = scicos_getvalue("Set gain block parameters",["Gain"],list("mat",[-1,-1]),exprs[1-1]); + [ok,this.gain,this.exprs] = scicos_getvalue("Set gain block parameters",["Gain"],list("mat",[-1,-1]),this.exprs[1-1]); if (!ok) { break; } @@ -7801,7 +7883,7 @@ function GAINBLK_f() { this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.rpar = new ScilabDouble(this.gain.slice()); this.x.graphics = this.graphics; this.x.model = this.model; @@ -7825,9 +7907,9 @@ function GAIN_f() { this.model.rpar = new ScilabDouble([this.gain]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } GAIN_f.prototype.details = function GAIN_f() { @@ -7841,12 +7923,13 @@ function GAIN_f() { } GAIN_f.prototype.set = function GAIN_f() { this.gain = parseFloat(arguments[0]["gain"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.gain,exprs] = scicos_getvalue("Set gain block parameters",["Gain"],list("mat",[-1,-1]),exprs[1-1]); + [ok,this.gain,this.exprs] = scicos_getvalue("Set gain block parameters",["Gain"],list("mat",[-1,-1]),this.exprs[1-1]); if (!ok) { break; } @@ -7861,7 +7944,7 @@ function GAIN_f() { this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.rpar = new ScilabDouble(this.gain.slice()); this.x.graphics = this.graphics; this.x.model = this.model; @@ -7886,9 +7969,9 @@ function INTEGRAL() { this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); this.x.graphics.id = "1/s"; return new BasicBlock(this.x); } @@ -7911,12 +7994,13 @@ function INTEGRAL() { this.satur = parseFloat(arguments[0]["satur"]) this.maxp = parseFloat(arguments[0]["maxp"]) this.lowp = arguments[0]["lowp"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.x0,this.reinit,this.satur,this.maxp,this.lowp,exprs] = scicos_getvalue("Set Integral block parameters",["Initial Condition","With re-intialization (1:yes, 0:no)","With saturation (1:yes, 0:no)","Upper limit","Lower limit"],list("vec",-1,"vec",1,"vec",1,"vec",-1,"vec",-1),exprs); + [ok,this.x0,this.reinit,this.satur,this.maxp,this.lowp,this.exprs] = scicos_getvalue("Set Integral block parameters",["Initial Condition","With re-intialization (1:yes, 0:no)","With saturation (1:yes, 0:no)","Upper limit","Lower limit"],list("vec",-1,"vec",1,"vec",1,"vec",-1,"vec",-1),this.exprs); if (!ok) { break; } @@ -7962,7 +8046,7 @@ function INTEGRAL() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -7982,9 +8066,9 @@ function INTEGRAL_f() { this.model.state = new ScilabDouble([this.x0]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); - var exprs = strcat(sci2exp(this.x0)); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = strcat(sci2exp(this.x0)); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } INTEGRAL_f.prototype.details = function INTEGRAL_f() { @@ -7997,16 +8081,17 @@ function INTEGRAL_f() { } INTEGRAL_f.prototype.set = function INTEGRAL_f() { this.x0 = parseFloat(arguments[0]["x0"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.x0,exprs] = scicos_getvalue("Set continuous linear system parameters","Initial state",list("vec",1),exprs); + [ok,this.x0,this.exprs] = scicos_getvalue("Set continuous linear system parameters","Initial state",list("vec",1),this.exprs); if (!ok) { break; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.state = new ScilabDouble([this.x0]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -8032,9 +8117,9 @@ function INTEGRAL_m() { this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } INTEGRAL_m.prototype.details = function INTEGRAL_m() { @@ -8056,12 +8141,13 @@ function INTEGRAL_m() { this.satur = parseFloat(arguments[0]["satur"]) this.maxp = parseFloat(arguments[0]["maxp"]) this.lowp = parseFloat(arguments[0]["lowp"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.x0,this.reinit,this.satur,this.maxp,this.lowp,exprs] = scicos_getvalue("Set Integral block parameters",["Initial Condition","With re-intialization (1:yes, 0:no)","With saturation (1:yes, 0:no)","Upper limit","Lower limit"],list("mat",[-1,-1],"vec",1,"vec",1,"mat",[-1,-1],"mat",[-1,-1]),exprs); + [ok,this.x0,this.reinit,this.satur,this.maxp,this.lowp,this.exprs] = scicos_getvalue("Set Integral block parameters",["Initial Condition","With re-intialization (1:yes, 0:no)","With saturation (1:yes, 0:no)","Upper limit","Lower limit"],list("mat",[-1,-1],"vec",1,"vec",1,"mat",[-1,-1],"mat",[-1,-1]),this.exprs); if (!ok) { break; } @@ -8149,7 +8235,7 @@ function INTEGRAL_m() { } } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -8195,8 +8281,8 @@ function PID() { this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = new ScilabDouble([false,false]); this.model.rpar = new ScilabDouble([scs_m]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PID\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PID\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,[],this.gr_i); return new BasicBlock(this.x); } PID.prototype.details = function PID() { @@ -8247,17 +8333,17 @@ function PID() { } var newpar = list(); var xx1 = arg1.model.rpar.objs[ppath[1-1]-1]; - exprs[1-1] = xx1.graphics.exprs[1-1]; + this.exprs[1-1] = xx1.graphics.exprs[1-1]; var p_old = xx1.model.rpar; var xx2 = arg1.model.rpar.objs[ppath[2-1]-1]; - exprs[2-1] = xx2.graphics.exprs[1-1]; + this.exprs[2-1] = xx2.graphics.exprs[1-1]; var i_old = xx2.model.rpar; var xx3 = arg1.model.rpar.objs[ppath[3-1]-1]; - exprs[3-1] = xx3.graphics.exprs[1-1]; + this.exprs[3-1] = xx3.graphics.exprs[1-1]; var d_old = xx3.model.rpar; var y = 0; while (true) { - [ok,this.p,this.i,this.d,this.exprs0] = scicos_getvalue("Set PID parameters",["Proportional","Integral","Derivation"],list("vec",-1,"vec",-1,"vec",-1),exprs); + [ok,this.p,this.i,this.d,this.exprs0] = scicos_getvalue("Set PID parameters",["Proportional","Integral","Derivation"],list("vec",-1,"vec",-1,"vec",-1),this.exprs); if (!ok) { break; } @@ -8299,9 +8385,9 @@ function REGISTER() { this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); - var exprs = strcat(string(this.z0),";"); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"REGISTER\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,exprs,gr_i); + this.exprs = strcat(string(this.z0),";"); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"REGISTER\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } REGISTER.prototype.details = function REGISTER() { @@ -8317,15 +8403,16 @@ function REGISTER() { REGISTER.prototype.set = function REGISTER() { this.z0 = parseFloat(arguments[0]["z0"]) this.it = arguments[0]["it"] + this.exprs = inverse(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - if (size(exprs,1)==1) { - var exprs = [[exprs],[sci2exp(1)]]; + if (size(this.exprs,1)==1) { + this.exprs = [[this.exprs],[sci2exp(1)]]; } while (true) { - [ok,this.z0,this.it,exprs] = scicos_getvalue("Set delay parameters",["Register initial condition","Datatype (1=double 3=int32 ...)"],list("vec",-1,"vec",1),exprs); + [ok,this.z0,this.it,this.exprs] = scicos_getvalue("Set delay parameters",["Register initial condition","Datatype (1=double 3=int32 ...)"],list("vec",-1,"vec",1),this.exprs); if (!ok) { break; } @@ -8372,7 +8459,7 @@ function REGISTER() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble(exprs); + this.graphics.exprs = new ScilabDouble(this.exprs); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -8393,9 +8480,9 @@ function REGISTER_f() { this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); - var exprs = strcat(string(this.z0),";"); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"REGISTER_f\",sz(1),sz(2));"]); - this.x = standard_define([2.5,2.5],this.model,exprs,gr_i); + this.exprs = strcat(string(this.z0),";"); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"REGISTER_f\",sz(1),sz(2));"]); + this.x = standard_define([2.5,2.5],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } REGISTER_f.prototype.details = function REGISTER_f() { @@ -8408,12 +8495,13 @@ function REGISTER_f() { } REGISTER_f.prototype.set = function REGISTER_f() { this.z0 = parseFloat(arguments[0]["z0"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.z0,exprs] = scicos_getvalue("Set delay parameters","Register initial condition",list("vec",-1),exprs); + [ok,this.z0,this.exprs] = scicos_getvalue("Set delay parameters","Register initial condition",list("vec",-1),this.exprs); if (!ok) { break; } @@ -8422,7 +8510,7 @@ function REGISTER_f() { var ok = false; } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.dstate = new ScilabDouble([this.z0]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -8443,8 +8531,8 @@ function SAMPHOLD() { this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([true,false]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPHOLD\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model," ",gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPHOLD\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model," ",this.gr_i); return new BasicBlock(this.x); } SAMPHOLD.prototype.details = function SAMPHOLD() { @@ -8476,8 +8564,8 @@ function SAMPHOLD_m() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPHOLD_m\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPHOLD_m\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } SAMPHOLD_m.prototype.details = function SAMPHOLD_m() { @@ -8491,13 +8579,14 @@ function SAMPHOLD_m() { } SAMPHOLD_m.prototype.set = function SAMPHOLD_m() { this.it = arguments[0]["it"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.x.model.firing = []; this.graphics = arg1.graphics; var label = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.it,exprs] = scicos_getvalue("Set parameters Block",["Datatype(1=real double 2=Complex 3=int32 ...)"],list("vec",1),label); + [ok,this.it,this.exprs] = scicos_getvalue("Set parameters Block",["Datatype(1=real double 2=Complex 3=int32 ...)"],list("vec",1),label); if (!ok) { break; } @@ -8512,7 +8601,7 @@ function SAMPHOLD_m() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); arg1.graphics = this.graphics; arg1.model = this.model; this.x = arg1; @@ -8534,8 +8623,8 @@ function SAMPLEHOLD_f() { this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([true,false]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPLEHOLD_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model," ",gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPLEHOLD_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model," ",this.gr_i); return new BasicBlock(this.x); } SAMPLEHOLD_f.prototype.details = function SAMPLEHOLD_f() { @@ -8563,9 +8652,9 @@ function SOM_f() { this.model.rpar = new ScilabDouble(sgn); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = [[sci2exp(1)],[sci2exp(sgn)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SOM_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = [[sci2exp(1)],[sci2exp(sgn)]]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SOM_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } SOM_f.prototype.details = function SOM_f() { @@ -8580,12 +8669,12 @@ function SOM_f() { this.x = arg1; this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = this.graphics.exprs; - if (size(exprs,"*")==2) { - var exprs = exprs[2-1]; + this.exprs = this.graphics.exprs; + if (size(this.exprs,"*")==2) { + this.exprs = this.exprs[2-1]; } - if (size(exprs,"*")!=3) { - var exprs = string(this.model.rpar); + if (size(this.exprs,"*")!=3) { + this.exprs = string(this.model.rpar); } if (this.graphics.flip) { var labs = ["down","left","up"]; @@ -8593,7 +8682,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)+exprs.slice())]]; + var str = [[str],[(part(labs.slice(),1,7)+this.exprs.slice())]]; message(str); return new BasicBlock(this.x); } @@ -8611,9 +8700,9 @@ function SUMMATION() { this.model.ipar = new ScilabDouble(this.sgn); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = sci2exp(this.sgn); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUMMATION\",sz(1),sz(2));"]); - this.x = standard_define([2,3],this.model,exprs,gr_i); + this.exprs = sci2exp(this.sgn); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUMMATION\",sz(1),sz(2));"]); + this.x = standard_define([2,3],this.model,this.exprs,this.gr_i); return new Summation(this.x); } SUMMATION.prototype.details = function SUMMATION() { @@ -8631,17 +8720,18 @@ function SUMMATION() { this.Datatype = arguments[0]["Datatype"] this.sgn = inverse(arguments[0]["sgn"]) this.satur = arguments[0]["satur"] + this.exprs = inverse(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; this.model = arg1.model; - 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)]]; + 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)]]; } while (true) { - [ok,this.Datatype,this.sgn,this.satur,exprs] = scicos_getvalue("Set sum block parameters",["Datatype (1=real double 2=complex 3=int32 ...)","Number of inputs or sign vector (of +1, -1)","Do on Overflow(0=Nothing 1=Saturate 2=Error)"],list("vec",1,"vec",-1,"vec",1),exprs); + [ok,this.Datatype,this.sgn,this.satur,this.exprs] = scicos_getvalue("Set sum block parameters",["Datatype (1=real double 2=complex 3=int32 ...)","Number of inputs or sign vector (of +1, -1)","Do on Overflow(0=Nothing 1=Saturate 2=Error)"],list("vec",1,"vec",-1,"vec",1),this.exprs); if (!ok) { break; } @@ -8741,7 +8831,7 @@ function SUMMATION() { if (ok) { this.model.rpar = new ScilabDouble([this.satur]); this.model.ipar = new ScilabDouble([this.sgn]); - this.graphics.exprs = new ScilabDouble(exprs); + this.graphics.exprs = new ScilabDouble(this.exprs); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -8759,9 +8849,9 @@ function SUM_f() { this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUM_f\",sz(1),sz(2));"]); - var exprs = []; - this.x = standard_define([1,1],this.model,exprs,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUM_f\",sz(1),sz(2));"]); + this.exprs = []; + this.x = standard_define([1,1],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } SUM_f.prototype.details = function SUM_f() { @@ -8797,9 +8887,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 ScilabDouble([false,true]); - var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TCLSS\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } TCLSS.prototype.details = function TCLSS() { @@ -8821,15 +8911,16 @@ function TCLSS() { this.C = parseFloat(arguments[0]["C"]) this.D = parseFloat(arguments[0]["D"]) this.x0 = parseFloat(arguments[0]["x0"]) + this.exprs = parseFloat(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - if (size(exprs,"*")==7) { - var exprs = exprs[[1:4,7]-1]; + if (size(this.exprs,"*")==7) { + this.exprs = this.exprs[[1:4,7]-1]; } while (true) { - [ok,this.A,this.B,this.C,this.D,this.x0,exprs] = scicos_getvalue("Set continuous linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),exprs); + [ok,this.A,this.B,this.C,this.D,this.x0,this.exprs] = scicos_getvalue("Set continuous linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),this.exprs); if (!ok) { break; } @@ -8852,7 +8943,7 @@ function TCLSS() { this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; if (this.D!=[]) { if (norm(this.D,1)!=0) { @@ -8902,9 +8993,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 ScilabDouble([false,true]); - var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TCLSS_f\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } TCLSS_f.prototype.details = function TCLSS_f() { @@ -8926,15 +9017,16 @@ function TCLSS_f() { this.C = parseFloat(arguments[0]["C"]) this.D = parseFloat(arguments[0]["D"]) this.x0 = parseFloat(arguments[0]["x0"]) + this.exprs = parseFloat(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - if (size(exprs,"*")==7) { - var exprs = exprs[[1:4,7]-1]; + if (size(this.exprs,"*")==7) { + this.exprs = this.exprs[[1:4,7]-1]; } while (true) { - [ok,this.A,this.B,this.C,this.D,this.x0,exprs] = scicos_getvalue("Set continuous linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),exprs); + [ok,this.A,this.B,this.C,this.D,this.x0,this.exprs] = scicos_getvalue("Set continuous linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),this.exprs); if (!ok) { break; } @@ -8957,7 +9049,7 @@ function TCLSS_f() { this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; if (this.D!=[]) { if (norm(this.D,1)!=0) { @@ -9002,9 +9094,9 @@ function TIME_DELAY() { this.model.ipar = new ScilabDouble([this.N]); this.model.blocktype = new ScilabString(["x"]); this.model.dep_ut = new ScilabDouble([false,true]); - 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 = standard_define([3.5,2],this.model,exprs,gr_i); + 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 = standard_define([3.5,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } TIME_DELAY.prototype.details = function TIME_DELAY() { @@ -9022,13 +9114,14 @@ function TIME_DELAY() { this.T = parseFloat(arguments[0]["T"]) this.init = parseFloat(arguments[0]["init"]) this.N = parseFloat(arguments[0]["N"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; var nin = this.model.in1[1-1]; while (true) { - [ok,this.T,this.init,this.N,exprs] = scicos_getvalue("Set delay parameters",["Delay","initial input","Buffer size"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.T,this.init,this.N,this.exprs] = scicos_getvalue("Set delay parameters",["Delay","initial input","Buffer size"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -9047,7 +9140,7 @@ function TIME_DELAY() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.rpar = new ScilabDouble([this.T],[this.init]); this.model.ipar = new ScilabDouble([this.N]); this.model.dep_ut = new ScilabDouble([false,true]); @@ -9074,9 +9167,9 @@ function VARIABLE_DELAY() { this.model.ipar = new ScilabDouble([this.N]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } VARIABLE_DELAY.prototype.details = function VARIABLE_DELAY() { @@ -9094,13 +9187,14 @@ function VARIABLE_DELAY() { this.T = parseFloat(arguments[0]["T"]) this.init = parseFloat(arguments[0]["init"]) this.N = parseFloat(arguments[0]["N"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; var nin = this.model.in1[1-1]; while (true) { - [ok,this.T,this.init,this.N,exprs] = scicos_getvalue("Set delay parameters",["Max delay","initial input","Buffer size"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.T,this.init,this.N,this.exprs] = scicos_getvalue("Set delay parameters",["Max delay","initial input","Buffer size"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -9119,7 +9213,7 @@ function VARIABLE_DELAY() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.rpar = new ScilabDouble([this.T],[this.init]); this.model.ipar = new ScilabDouble([this.N]); this.x.graphics = this.graphics; @@ -9153,8 +9247,8 @@ function CUMSUM() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(0)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CUMSUM\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CUMSUM\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } CUMSUM.prototype.details = function CUMSUM() { @@ -9261,8 +9355,8 @@ function EXTRACT() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp([1])],[sci2exp([1])]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACT\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACT\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } EXTRACT.prototype.details = function EXTRACT() { @@ -9280,6 +9374,7 @@ function EXTRACT() { this.typ = inverse(arguments[0]["typ"]) this.a = inverse(arguments[0]["a"]) this.b = inverse(arguments[0]["b"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; var label = this.graphics.exprs; @@ -9288,7 +9383,7 @@ function EXTRACT() { label[9-1] = []; } while (true) { - [ok,this.typ,this.a,this.b,exprs] = scicos_getvalue("Set EXTRACT Block",["Datatype (1=real double 2=Complex)","Lines to extract","Columns to extract"],list("vec",1,"mat",[1,-1],"mat",[1,-1]),label); + [ok,this.typ,this.a,this.b,this.exprs] = scicos_getvalue("Set EXTRACT Block",["Datatype (1=real double 2=Complex)","Lines to extract","Columns to extract"],list("vec",1,"mat",[1,-1],"mat",[1,-1]),label); this.a = this.a.slice(); this.b = this.b.slice(); if (!ok) { @@ -9329,7 +9424,7 @@ function EXTRACT() { var out = [ma,mb]; var funtyp = 4; if (ok) { - var label = exprs; + var label = this.exprs; var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; @@ -9368,8 +9463,8 @@ function EXTTRI() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTTRI\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTTRI\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } EXTTRI.prototype.details = function EXTTRI() { @@ -9473,8 +9568,8 @@ function MATBKSL() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATBKSL\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATBKSL\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } MATBKSL.prototype.details = function MATBKSL() { @@ -9488,6 +9583,7 @@ function MATBKSL() { } MATBKSL.prototype.set = function MATBKSL() { this.typ = inverse(arguments[0]["typ"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; var label = this.graphics.exprs; @@ -9496,7 +9592,7 @@ function MATBKSL() { label[9-1] = []; } while (true) { - [ok,this.typ,exprs] = scicos_getvalue("Set MATBKSL Block",["Datatype (1=real double 2=Complex)"],list("vec",1),label); + [ok,this.typ,this.exprs] = scicos_getvalue("Set MATBKSL Block",["Datatype (1=real double 2=Complex)"],list("vec",1),label); if (!ok) { break; } @@ -9516,7 +9612,7 @@ function MATBKSL() { var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { - var label = exprs; + var label = this.exprs; var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; @@ -9555,8 +9651,8 @@ function MATCATH() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(2)]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATCATH\",sz(1),sz(2));"]); - this.x = standard_define([2,3],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATCATH\",sz(1),sz(2));"]); + this.x = standard_define([2,3],this.model,label,this.gr_i); return new BasicBlock(this.x); } MATCATH.prototype.details = function MATCATH() { @@ -9629,8 +9725,8 @@ function MATCATV() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(2)]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATCATV\",sz(1),sz(2));"]); - this.x = standard_define([2,3],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATCATV\",sz(1),sz(2));"]); + this.x = standard_define([2,3],this.model,label,this.gr_i); return new BasicBlock(this.x); } MATCATV.prototype.details = function MATCATV() { @@ -9702,8 +9798,8 @@ function MATDET() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDET\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDET\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } MATDET.prototype.details = function MATDET() { @@ -9717,6 +9813,7 @@ function MATDET() { } MATDET.prototype.set = function MATDET() { this.typ = inverse(arguments[0]["typ"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; var label = this.graphics.exprs; @@ -9725,7 +9822,7 @@ function MATDET() { label[9-1] = []; } while (true) { - [ok,this.typ,exprs] = scicos_getvalue("Set MATDET Block",["Datatype(1=real double 2=Complex)"],list("vec",1),label); + [ok,this.typ,this.exprs] = scicos_getvalue("Set MATDET Block",["Datatype(1=real double 2=Complex)"],list("vec",1),label); if (!ok) { break; } @@ -9745,7 +9842,7 @@ function MATDET() { var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { - var label = exprs; + var label = this.exprs; var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; @@ -9784,8 +9881,8 @@ function MATDIAG() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDIAG\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDIAG\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } MATDIAG.prototype.details = function MATDIAG() { @@ -9799,6 +9896,7 @@ function MATDIAG() { } MATDIAG.prototype.set = function MATDIAG() { this.typ = inverse(arguments[0]["typ"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; var label = this.graphics.exprs; @@ -9807,7 +9905,7 @@ function MATDIAG() { label[9-1] = []; } while (true) { - [ok,this.typ,exprs] = scicos_getvalue("Set MATDIAG Block",["Datatype (1=real double 2=Complex)"],list("vec",1),label); + [ok,this.typ,this.exprs] = scicos_getvalue("Set MATDIAG Block",["Datatype (1=real double 2=Complex)"],list("vec",1),label); if (!ok) { break; } @@ -9827,7 +9925,7 @@ function MATDIAG() { var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { - var label = exprs; + var label = this.exprs; var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; @@ -9866,8 +9964,8 @@ function MATDIV() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDIV\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDIV\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } MATDIV.prototype.details = function MATDIV() { @@ -9881,6 +9979,7 @@ function MATDIV() { } MATDIV.prototype.set = function MATDIV() { this.typ = inverse(arguments[0]["typ"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; var label = this.graphics.exprs; @@ -9889,7 +9988,7 @@ function MATDIV() { label[9-1] = []; } while (true) { - [ok,this.typ,exprs] = scicos_getvalue("Set MATDIV Block",["Datatype(1=real double 2=Complex)"],list("vec",1),label); + [ok,this.typ,this.exprs] = scicos_getvalue("Set MATDIV Block",["Datatype(1=real double 2=Complex)"],list("vec",1),label); if (!ok) { break; } @@ -9909,7 +10008,7 @@ function MATDIV() { var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { - var label = exprs; + var label = this.exprs; var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; @@ -9948,8 +10047,8 @@ function MATEIG() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATEIG\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATEIG\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } MATEIG.prototype.details = function MATEIG() { @@ -10054,8 +10153,8 @@ function MATEXPM() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATEXPM\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATEXPM\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } MATEXPM.prototype.details = function MATEXPM() { @@ -10069,6 +10168,7 @@ function MATEXPM() { } MATEXPM.prototype.set = function MATEXPM() { this.typ = inverse(arguments[0]["typ"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; var label = this.graphics.exprs; @@ -10077,7 +10177,7 @@ function MATEXPM() { label[9-1] = []; } while (true) { - [ok,this.typ,exprs] = scicos_getvalue("Set EXPM Block",["Datatype(1=real double 2=Complex)"],list("vec",1),label); + [ok,this.typ,this.exprs] = scicos_getvalue("Set EXPM Block",["Datatype(1=real double 2=Complex)"],list("vec",1),label); if (!ok) { break; } @@ -10097,7 +10197,7 @@ function MATEXPM() { var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { - var label = exprs; + var label = this.exprs; var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; @@ -10136,8 +10236,8 @@ function MATINV() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATINV\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATINV\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } MATINV.prototype.details = function MATINV() { @@ -10151,6 +10251,7 @@ function MATINV() { } MATINV.prototype.set = function MATINV() { this.typ = inverse(arguments[0]["typ"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; var label = this.graphics.exprs; @@ -10159,7 +10260,7 @@ function MATINV() { label[9-1] = []; } while (true) { - [ok,this.typ,exprs] = scicos_getvalue("Set MATINV Block",["Datatype(1=real double 2=Complex)"],list("vec",1),label); + [ok,this.typ,this.exprs] = scicos_getvalue("Set MATINV Block",["Datatype(1=real double 2=Complex)"],list("vec",1),label); if (!ok) { break; } @@ -10179,7 +10280,7 @@ function MATINV() { var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { - var label = exprs; + var label = this.exprs; var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; @@ -10218,8 +10319,8 @@ function MATLU() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = sci2exp(1); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATLU\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATLU\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } MATLU.prototype.details = function MATLU() { @@ -10299,8 +10400,8 @@ function MATMAGPHI() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATMAGPHI\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATMAGPHI\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } MATMAGPHI.prototype.details = function MATMAGPHI() { @@ -10375,8 +10476,8 @@ function MATMUL() { this.model.dep_ut = new ScilabDouble([true,false]); this.model.ipar = new ScilabDouble([1]); var label = [sci2exp(this.model.ipar)]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATMUL\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATMUL\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } MATMUL.prototype.details = function MATMUL() { @@ -10394,6 +10495,7 @@ function MATMUL() { this.dtype = arguments[0]["dtype"] this.rule = parseFloat(arguments[0]["rule"]) this.np = parseFloat(arguments[0]["np"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = this.x.graphics; var label = this.graphics.exprs; @@ -10408,7 +10510,7 @@ function MATMUL() { label[3-1] = sci2exp(1); } while (true) { - [ok,this.dtype,this.rule,this.np,exprs] = scicos_getvalue([["Set MATMUL parameter"],["For the Multipication rule:"],[" 1= Matrix by Matrix"],[" 2= Matrix by Matrix element wise "],[" 3= Matrix by Scalar"],["In the third case the second input will be the scalar"]],["Datatype(1=real double 2=Complex 3=int32 ...)","Multiplication rule","Do on Overflow(0=Nothing 1=Saturate 2=Error)"],list("vec",1,"vec",1,"vec",1),label); + [ok,this.dtype,this.rule,this.np,this.exprs] = scicos_getvalue([["Set MATMUL parameter"],["For the Multipication rule:"],[" 1= Matrix by Matrix"],[" 2= Matrix by Matrix element wise "],[" 3= Matrix by Scalar"],["In the third case the second input will be the scalar"]],["Datatype(1=real double 2=Complex 3=int32 ...)","Multiplication rule","Do on Overflow(0=Nothing 1=Saturate 2=Error)"],list("vec",1,"vec",1,"vec",1),label); if (!ok) { break; } @@ -10516,7 +10618,7 @@ function MATMUL() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - var label = exprs; + var label = this.exprs; this.model.ipar = new ScilabDouble([this.rule]); this.model.rpar = new ScilabDouble([kmin],[kmax]); this.graphics.exprs = new ScilabDouble([label]); @@ -10552,8 +10654,8 @@ function MATPINV() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATPINV\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATPINV\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } MATPINV.prototype.details = function MATPINV() { @@ -10567,6 +10669,7 @@ function MATPINV() { } MATPINV.prototype.set = function MATPINV() { this.typ = inverse(arguments[0]["typ"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; var label = this.graphics.exprs; @@ -10575,7 +10678,7 @@ function MATPINV() { label[9-1] = []; } while (true) { - [ok,this.typ,exprs] = scicos_getvalue("Set MATPINV Block",["Datatype(1=real double 2=Complex)"],list("vec",1),label); + [ok,this.typ,this.exprs] = scicos_getvalue("Set MATPINV Block",["Datatype(1=real double 2=Complex)"],list("vec",1),label); if (!ok) { break; } @@ -10595,7 +10698,7 @@ function MATPINV() { var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { - var label = exprs; + var label = this.exprs; var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; @@ -10634,8 +10737,8 @@ function MATRESH() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp([1,1])],[sci2exp([1,1])]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATRESH\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATRESH\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } MATRESH.prototype.details = function MATRESH() { @@ -10746,8 +10849,8 @@ function MATSING() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATSING\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATSING\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } MATSING.prototype.details = function MATSING() { @@ -10855,8 +10958,8 @@ function MATSUM() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(0)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATSUM\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATSUM\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } MATSUM.prototype.details = function MATSUM() { @@ -10953,8 +11056,8 @@ function MATTRAN() { this.model.out2 = new ScilabDouble([-1]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATTRAN\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATTRAN\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } MATTRAN.prototype.details = function MATTRAN() { @@ -10970,6 +11073,7 @@ function MATTRAN() { MATTRAN.prototype.set = function MATTRAN() { this.typ = inverse(arguments[0]["typ"]) this.rule = arguments[0]["rule"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; var label = this.graphics.exprs; @@ -10978,7 +11082,7 @@ function MATTRAN() { label[2-1] = sci2exp(1); } while (true) { - [ok,this.typ,this.rule,exprs] = scicos_getvalue("Set MATTRAN Block",["Datatype(1=real double 2=Complex)","rule (1=.\' 2=\')"],list("vec",1,"vec",1),label); + [ok,this.typ,this.rule,this.exprs] = scicos_getvalue("Set MATTRAN Block",["Datatype(1=real double 2=Complex)","rule (1=.\' 2=\')"],list("vec",1,"vec",1),label); if (!ok) { break; } @@ -11002,7 +11106,7 @@ function MATTRAN() { var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { - var label = exprs; + var label = this.exprs; var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; @@ -11041,8 +11145,8 @@ function MATZCONJ() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = []; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATZCONJ\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATZCONJ\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } MATZCONJ.prototype.details = function MATZCONJ() { @@ -11081,8 +11185,8 @@ function MATZREIM() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = sci2exp(1); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATZREIM\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATZREIM\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } MATZREIM.prototype.details = function MATZREIM() { @@ -11168,8 +11272,8 @@ function RICC() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RICC\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RICC\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } RICC.prototype.details = function RICC() { @@ -11185,6 +11289,7 @@ function RICC() { RICC.prototype.set = function RICC() { this.tpe = arguments[0]["tpe"] this.mod = arguments[0]["mod"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; var label = this.graphics.exprs; @@ -11193,7 +11298,7 @@ function RICC() { label[9-1] = []; } while (true) { - [ok,this.tpe,this.mod,exprs] = scicos_getvalue("Set RICC Block",["Type (1=Cont 2=Disc)","Model(1=Schr 2=sign(cont) inv(disc))"],list("vec",1,"vec",1),label); + [ok,this.tpe,this.mod,this.exprs] = scicos_getvalue("Set RICC Block",["Type (1=Cont 2=Disc)","Model(1=Schr 2=sign(cont) inv(disc))"],list("vec",1,"vec",1),label); if (!ok) { break; } @@ -11201,7 +11306,7 @@ function RICC() { var out = [this.model.out,this.model.out2]; var it = [1,1,1]; var ot = 1; - var label = exprs; + var label = this.exprs; var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; @@ -11241,8 +11346,8 @@ function ROOTCOEF() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ROOTCOEF\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ROOTCOEF\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } ROOTCOEF.prototype.details = function ROOTCOEF() { @@ -11258,6 +11363,7 @@ function ROOTCOEF() { ROOTCOEF.prototype.set = function ROOTCOEF() { this.typ = inverse(arguments[0]["typ"]) this.inp = arguments[0]["inp"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; var label = this.graphics.exprs; @@ -11266,7 +11372,7 @@ function ROOTCOEF() { label[9-1] = []; } while (true) { - [ok,this.typ,this.inp,exprs] = scicos_getvalue("Set ROOTCOEF Block",["Datatype(1=real double 2=Complex)","input row size"],list("vec",1,"vec",1),label); + [ok,this.typ,this.inp,this.exprs] = scicos_getvalue("Set ROOTCOEF Block",["Datatype(1=real double 2=Complex)","input row size"],list("vec",1,"vec",1),label); if (!ok) { break; } @@ -11286,7 +11392,7 @@ function ROOTCOEF() { var out = [this.inp+1,this.model.out2]; var funtyp = 4; if (ok) { - var label = exprs; + var label = this.exprs; var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; @@ -11315,8 +11421,8 @@ function SQRT() { this.model.out2 = new ScilabDouble([-2]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SQRT\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SQRT\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } SQRT.prototype.details = function SQRT() { @@ -11330,12 +11436,13 @@ function SQRT() { } SQRT.prototype.set = function SQRT() { this.typ = inverse(arguments[0]["typ"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; var label = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.typ,exprs] = scicos_getvalue("Set SQRT Block",["Datatype(1=real double 2=Complex)"],list("vec",1),label); + [ok,this.typ,this.exprs] = scicos_getvalue("Set SQRT Block",["Datatype(1=real double 2=Complex)"],list("vec",1),label); if (!ok) { break; } @@ -11353,7 +11460,7 @@ function SQRT() { var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { - var label = exprs; + var label = this.exprs; var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; @@ -11392,8 +11499,8 @@ function SUBMAT() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(1)],[sci2exp(1)],[sci2exp(1)],[sci2exp(1)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUBMAT\",sz(1),sz(2));"]); - this.x = standard_define([2.5,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUBMAT\",sz(1),sz(2));"]); + this.x = standard_define([2.5,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } SUBMAT.prototype.details = function SUBMAT() { @@ -11417,6 +11524,7 @@ function SUBMAT() { this.c = arguments[0]["c"] this.d = arguments[0]["d"] this.inp = arguments[0]["inp"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; var label = this.graphics.exprs; @@ -11425,7 +11533,7 @@ function SUBMAT() { label[6-1] = sci2exp([1,1]); } while (true) { - [ok,this.typ,this.a,this.b,this.c,this.d,this.inp,exprs] = scicos_getvalue("Set SUBMAT Block",["Datatype (1=real double 2=Complex)","Starting Row Index","Ending Row Index","Starting Column Index","Ending Column Index","Input Dimensions"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",2),label); + [ok,this.typ,this.a,this.b,this.c,this.d,this.inp,this.exprs] = scicos_getvalue("Set SUBMAT Block",["Datatype (1=real double 2=Complex)","Starting Row Index","Ending Row Index","Starting Column Index","Ending Column Index","Input Dimensions"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",2),label); if (!ok) { break; } @@ -11465,7 +11573,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 = exprs; + var label = this.exprs; if (ok) { var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),[],[]); this.model = tmpvar0[0]; @@ -11492,7 +11600,7 @@ function AUTOMAT() { this.XP = [[1],[1]]; var C1 = [2]; var C2 = [1]; - var exprs = [[string(NMode)],[string(this.Minitial)],[string(NX)],[sci2exp(this.X0)],[sci2exp(this.XP)],[sci2exp(C1)],[sci2exp(C2)]]; + this.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(); @@ -11507,8 +11615,8 @@ function AUTOMAT() { this.model.dep_ut = new ScilabDouble([false,true]); this.model.ipar = new ScilabDouble(ipar); this.model.rpar = new ScilabDouble(rpar); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"AUTOMAT\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,exprs,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"AUTOMAT\",sz(1),sz(2));"]); + this.x = standard_define([4,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } AUTOMAT.prototype.details = function AUTOMAT() { @@ -11522,7 +11630,7 @@ function AUTOMAT() { AUTOMAT.prototype.set = function AUTOMAT() { this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; var ipar = this.model.ipar; var NMode = ipar[1-1]; @@ -11544,14 +11652,14 @@ function AUTOMAT() { if (!this.ok) { break; } - var NMode_old = size(exprs,"*")-5; + var NMode_old = size(this.exprs,"*")-5; var ModifEncore = false; if ((NMode_old>NMode)) { - exprs.slice(NMode+6-1,NMode_old+5) = []; + this.exprs.slice(NMode+6-1,NMode_old+5) = []; var ModifEncore = true; } if ((NMode_old<NMode)) { - exprs.slice(NMode_old+6-1,NMode+5) = exprs[NMode_old+4-1]; + this.exprs.slice(NMode_old+6-1,NMode+5) = this.exprs[NMode_old+4-1]; var ModifEncore = true; } if ((NX!=size(this.X0,"*"))) { @@ -11585,7 +11693,7 @@ function AUTOMAT() { var MaxModes = 1; var nzcross = 0; for (i=1;i<=NMode;i+=1) { - var Ci = evstr(exprs[5+i-1]); + var Ci = evstr(this.exprs[5+i-1]); var ipar = [[ipar],[Ci]]; INP[i-1][1-1] = 2*NX+length(Ci); if ((nzcross<length(Ci))) { @@ -11616,7 +11724,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.model.ipar = new ScilabDouble(ipar); this.model.rpar = new ScilabDouble([rpar]); @@ -11630,7 +11738,7 @@ function AUTOMAT() { /* autogenerated from "macros/Misc/BACKLASH.sci" */ function BACKLASH() { BACKLASH.prototype.define = function BACKLASH() { - var exprs = [["0"],["1"],["1"]]; + this.exprs = [["0"],["1"],["1"]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["backlash"]), new ScilabDouble([4])); this.model.in1 = new ScilabDouble([1]); @@ -11639,8 +11747,8 @@ function BACKLASH() { this.model.nzcross = new ScilabDouble([2]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BACKLASH\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,exprs,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BACKLASH\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } BACKLASH.prototype.details = function BACKLASH() { @@ -11658,18 +11766,19 @@ function BACKLASH() { this.ini = arguments[0]["ini"] this.gap = arguments[0]["gap"] this.zcr = arguments[0]["zcr"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; var rpar = this.model.rpar; while (true) { - [ok,this.ini,this.gap,this.zcr,exprs] = scicos_getvalue("Set backlash parameters",["initial output","gap","use zero-crossing (0:no, 1:yes)"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.ini,this.gap,this.zcr,this.exprs] = scicos_getvalue("Set backlash parameters",["initial output","gap","use zero-crossing (0:no, 1:yes)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); rpar[1-1] = this.ini; rpar[2-1] = this.gap; if (this.zcr!=0) { @@ -11721,9 +11830,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 ScilabDouble([false,true]); - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } BOUNCE.prototype.details = function BOUNCE() { @@ -11753,16 +11862,17 @@ function BOUNCE() { this.yd = inverse(arguments[0]["yd"]) this.g = parseFloat(arguments[0]["g"]) this.C = parseFloat(arguments[0]["C"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - if (size(exprs,"*")<9) { - exprs[8-1] = "9.81"; - exprs[9-1] = "0"; + if (size(this.exprs,"*")<9) { + this.exprs[8-1] = "9.81"; + this.exprs[9-1] = "0"; } while (true) { - [ok,this.rpar1,this.rpar2,this.walls,this.xt,this.xd,this.y,this.yd,this.g,this.C,exprs] = scicos_getvalue(["Set Bounce Block"],["Mass","Radius","[xmin,xmax,ymin,ymax]","xpos","xdpos","ypos","ydpos","g (gravity)","C (aerodynamic coeff"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",1,"vec",1),exprs); + [ok,this.rpar1,this.rpar2,this.walls,this.xt,this.xd,this.y,this.yd,this.g,this.C,this.exprs] = scicos_getvalue(["Set Bounce Block"],["Mass","Radius","[xmin,xmax,ymin,ymax]","xpos","xdpos","ypos","ydpos","g (gravity)","C (aerodynamic coeff"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -11811,7 +11921,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -11852,9 +11962,9 @@ function BOUNCEXY() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([false,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } BOUNCEXY.prototype.details = function BOUNCEXY() { @@ -11882,13 +11992,14 @@ function BOUNCEXY() { this.xmax = parseFloat(arguments[0]["xmax"]) this.ymin = parseFloat(arguments[0]["ymin"]) this.ymax = parseFloat(arguments[0]["ymax"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; var dstate = this.model.dstate; while (true) { - [ok,this.clrs,this.siz,this.win,this.imode,this.xmin,this.xmax,this.ymin,this.ymax,exprs] = scicos_getvalue("Set Scope parameters",["colors","radii","window number (-1 for automatic)","animation mode (0,1)","Xmin","Xmax","Ymin","Ymax"],list("vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs); + [ok,this.clrs,this.siz,this.win,this.imode,this.xmin,this.xmax,this.ymin,this.ymax,this.exprs] = scicos_getvalue("Set Scope parameters",["colors","radii","window number (-1 for automatic)","animation mode (0,1)","Xmin","Xmax","Ymin","Ymax"],list("vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -11926,7 +12037,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -11953,9 +12064,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 ScilabDouble([false,false]); - var exprs = string(this.model.rpar); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BPLATFORM\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = string(this.model.rpar); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BPLATFORM\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } BPLATFORM.prototype.details = function BPLATFORM() { @@ -11981,13 +12092,14 @@ function BPLATFORM() { this.xmax = parseFloat(arguments[0]["xmax"]) this.ymin = parseFloat(arguments[0]["ymin"]) this.ymax = parseFloat(arguments[0]["ymax"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; var dstate = this.model.dstate; while (true) { - [ok,this.plen,this.csiz,this.phi,this.xmin,this.xmax,this.ymin,this.ymax,exprs] = scicos_getvalue("Set Scope parameters",["pendulum length","cart size (square side)","slope","Xmin","Xmax","Ymin","Ymax"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs); + [ok,this.plen,this.csiz,this.phi,this.xmin,this.xmax,this.ymin,this.ymax,this.exprs] = scicos_getvalue("Set Scope parameters",["pendulum length","cart size (square side)","slope","Xmin","Xmax","Ymin","Ymax"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -12009,7 +12121,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -12048,8 +12160,8 @@ function CBLOCK() { this.model.dep_ut = new ScilabDouble([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"]),[]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CBLOCK\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CBLOCK\",sz(1),sz(2));"]); + this.x = standard_define([4,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } CBLOCK.prototype.details = function CBLOCK() { @@ -12201,8 +12313,8 @@ function CBLOCK4() { this.model.outtyp = new ScilabDouble([1]); this.model.dep_ut = new ScilabDouble([true,false]); var label = list([[funam],["n"],[sci2exp([this.model.in1,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"]],[]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CBLOCK4\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CBLOCK4\",sz(1),sz(2));"]); + this.x = standard_define([4,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } CBLOCK4.prototype.details = function CBLOCK4() { @@ -12362,9 +12474,9 @@ function CONSTRAINT2_c() { this.model.ipar = new ScilabDouble(this.id); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CONSTRAINT2_c.prototype.details = function CONSTRAINT2_c() { @@ -12382,13 +12494,14 @@ function CONSTRAINT2_c() { this.x0 = inverse(arguments[0]["x0"]) this.xd0 = inverse(arguments[0]["xd0"]) this.id = inverse(arguments[0]["id"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { var ask_again = false; - [ok,this.x0,this.xd0,this.id,exprs] = scicos_getvalue("Set Constraint block parameters",["Initial guess values of states x","Initial guess values of derivative x\'","Id(i)=1: if x\'(i) is present in the feedback, else Id(i)=0"],list("vec",-1,"vec",-1,"vec",-1),exprs); + [ok,this.x0,this.xd0,this.id,this.exprs] = scicos_getvalue("Set Constraint block parameters",["Initial guess values of states x","Initial guess values of derivative x\'","Id(i)=1: if x\'(i) is present in the feedback, else Id(i)=0"],list("vec",-1,"vec",-1,"vec",-1),this.exprs); if (!ok) { break; } @@ -12419,7 +12532,7 @@ function CONSTRAINT2_c() { } } if (!ask_again) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.state = new ScilabDouble([this.x0],[this.xd0]); this.model.out = new ScilabDouble([N],[N]); this.model.in1 = new ScilabDouble([N]); @@ -12444,9 +12557,9 @@ function CONSTRAINT_c() { this.model.state = new ScilabDouble(this.x0); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); - var exprs = "0"; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONSTRAINT_c\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,exprs,gr_i); + this.exprs = "0"; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONSTRAINT_c\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CONSTRAINT_c.prototype.details = function CONSTRAINT_c() { @@ -12459,12 +12572,13 @@ function CONSTRAINT_c() { } CONSTRAINT_c.prototype.set = function CONSTRAINT_c() { this.x0 = inverse(arguments[0]["x0"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.x0,exprs] = scicos_getvalue("Set solver block parameters","Initial guess values",list("vec",-1),exprs); + [ok,this.x0,this.exprs] = scicos_getvalue("Set solver block parameters","Initial guess values",list("vec",-1),this.exprs); if (!ok) { break; } @@ -12478,7 +12592,7 @@ function CONSTRAINT_c() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.state = new ScilabDouble([this.x0],[zeros(N,1)]); this.model.out = new ScilabDouble([N]); this.model.in1 = new ScilabDouble([N]); @@ -12507,9 +12621,9 @@ function DEADBAND() { this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } DEADBAND.prototype.details = function DEADBAND() { @@ -12527,12 +12641,13 @@ function DEADBAND() { this.maxp = parseFloat(arguments[0]["maxp"]) this.minp = parseFloat(arguments[0]["minp"]) this.zeroc = arguments[0]["zeroc"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.maxp,this.minp,this.zeroc,exprs] = scicos_getvalue("Set Deadband parameters",["End of dead band","Start of dead band","zero crossing (0:no, 1:yes)"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.maxp,this.minp,this.zeroc,this.exprs] = scicos_getvalue("Set Deadband parameters",["End of dead band","Start of dead band","zero crossing (0:no, 1:yes)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -12548,7 +12663,7 @@ function DEADBAND() { this.model.nzcross = new ScilabDouble([0]); this.model.nmode = new ScilabDouble([0]); } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -12563,9 +12678,9 @@ function DEBUG() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["%debug_scicos"]), new ScilabDouble([99])); this.model.blocktype = new ScilabString(["d"]); - 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 = standard_define([8,2],this.model,exprs,gr_i); + 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 = standard_define([8,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } DEBUG.prototype.details = function DEBUG() { @@ -12579,8 +12694,8 @@ function DEBUG() { DEBUG.prototype.set = function DEBUG() { this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; - var textmp = exprs[2-1]; + this.exprs = this.graphics.exprs; + var textmp = this.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); @@ -12592,7 +12707,7 @@ function DEBUG() { warning("off"); save(this.TMPDIR+"/debug_scicos",this.debug_scicos); warning(warnMode); - exprs[2-1] = txt; + this.exprs[2-1] = txt; if ((scicos_debug()!=2&&scicos_debug()!=3)) { scicos_debug(2); } @@ -12606,7 +12721,7 @@ function DEBUG() { } } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; } return new BasicBlock(this.x); @@ -12646,9 +12761,9 @@ function DIFF_f() { this.model.state = new ScilabDouble(this.x0); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); - var exprs = [[strcat(sci2exp(this.x0[1-1]))],[strcat(sci2exp(this.x0[2-1]))]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DIFF_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } DIFF_f.prototype.details = function DIFF_f() { @@ -12664,16 +12779,17 @@ function DIFF_f() { DIFF_f.prototype.set = function DIFF_f() { this.x0 = inverse(arguments[0]["x0"]) this.xd0 = arguments[0]["xd0"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.x0,this.xd0,exprs] = scicos_getvalue("Set continuous linear system parameters",["Initial state","Initial Derivative"],list("vec",1,"vec",1),exprs); + [ok,this.x0,this.xd0,this.exprs] = scicos_getvalue("Set continuous linear system parameters",["Initial state","Initial Derivative"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.state = new ScilabDouble([this.x0.slice()],[this.xd0.slice()]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -12705,7 +12821,7 @@ function DSUPER() { this.x = arg1; return; } - var exprs = this.graphics.exprs[1-1]; + this.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,$); @@ -12738,7 +12854,7 @@ function DSUPER() { var needcompile2 = tmpvar1[2]; this.ok = tmpvar1[3]; var y = max(2,this.needcompile,needcompile2); - this.x.graphics.exprs[1-1] = exprs; + this.x.graphics.exprs[1-1] = this.exprs; this.x.model.rpar = sblock; } else { this.x = arg1; @@ -12759,9 +12875,9 @@ function EDGETRIGGER() { this.model.ipar = new ScilabDouble([sign(this.edge)]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = [string(this.edge)]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EDGETRIGGER\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,exprs,gr_i); + this.exprs = [string(this.edge)]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EDGETRIGGER\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } EDGETRIGGER.prototype.details = function EDGETRIGGER() { @@ -12775,17 +12891,18 @@ function EDGETRIGGER() { } EDGETRIGGER.prototype.set = function EDGETRIGGER() { this.edge = parseFloat(arguments[0]["edge"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.edge,exprs] = scicos_getvalue("Set edge trigger block parameters",["rising (1), falling (-1), both (0)"],list("vec",1),exprs); + [ok,this.edge,this.exprs] = scicos_getvalue("Set edge trigger block parameters",["rising (1), falling (-1), both (0)"],list("vec",1),this.exprs); if (!ok) { break; } this.model.ipar = new ScilabDouble([sign(this.edge)]); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -12872,8 +12989,8 @@ function EDGE_TRIGGER() { this.model.in1 = new ScilabDouble([1]); this.model.evtout = new ScilabDouble([1]); this.model.rpar = scs_m_1; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EDGE_TRIGGER\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EDGE_TRIGGER\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,[],this.gr_i); return new BasicBlock(this.x); } EDGE_TRIGGER.prototype.details = function EDGE_TRIGGER() { @@ -12962,8 +13079,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()); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ENDBLK\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ENDBLK\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,[],this.gr_i); return new BasicBlock(this.x); } ENDBLK.prototype.details = function ENDBLK() { @@ -13129,8 +13246,8 @@ function Extract_Activation() { this.model.in1 = new ScilabDouble([1]); this.model.evtout = new ScilabDouble([1]); this.model.rpar = scs_m_1; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Extract_Activation\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Extract_Activation\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,[],this.gr_i); return new BasicBlock(this.x); } Extract_Activation.prototype.details = function Extract_Activation() { @@ -13162,9 +13279,9 @@ function HYSTHERESIS() { this.model.nmode = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } HYSTHERESIS.prototype.details = function HYSTHERESIS() { @@ -13186,19 +13303,20 @@ function HYSTHERESIS() { this.out_high = arguments[0]["out_high"] this.out_low = arguments[0]["out_low"] this.nzz = parseFloat(arguments[0]["nzz"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.high_lim,this.low_lim,this.out_high,this.out_low,this.nzz,exprs] = scicos_getvalue("Set parameters",["switch on at","switch off at","output when on","output when off","use zero crossing: yes (1), no (0)"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs); + [ok,this.high_lim,this.low_lim,this.out_high,this.out_low,this.nzz,this.exprs] = scicos_getvalue("Set parameters",["switch on at","switch off at","output when on","output when off","use zero crossing: yes (1), no (0)"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } if (this.low_lim>this.high_lim) { message("switch on value must be larger than switch off value"); } else { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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; @@ -13255,9 +13373,9 @@ function LOGICAL_OP() { this.model.ipar = new ScilabDouble(ipar); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } LOGICAL_OP.prototype.details = function LOGICAL_OP() { @@ -13277,15 +13395,16 @@ function LOGICAL_OP() { this.rule = parseFloat(arguments[0]["rule"]) this.Datatype = arguments[0]["Datatype"] this.tp = parseFloat(arguments[0]["tp"]) + this.exprs = inverse(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - if (size(exprs,1)==2) { - var exprs = [[exprs],[sci2exp(1)],[sci2exp(0)]]; + if (size(this.exprs,1)==2) { + this.exprs = [[this.exprs],[sci2exp(1)],[sci2exp(0)]]; } while (true) { - [ok,this.nin,this.rule,this.Datatype,this.tp,exprs] = scicos_getvalue("Set parameters",["number of inputs","Operator: AND (0), OR (1), NAND (2), NOR (3), XOR (4), NOT (5)","Datatype (1=double 3=int32 ...)","Bitwise Rule(0=No 1=yes)"],list("vec",1,"vec",1,"vec",1,"vec",1),exprs); + [ok,this.nin,this.rule,this.Datatype,this.tp,this.exprs] = scicos_getvalue("Set parameters",["number of inputs","Operator: AND (0), OR (1), NAND (2), NOR (3), XOR (4), NOT (5)","Datatype (1=double 3=int32 ...)","Bitwise Rule(0=No 1=yes)"],list("vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -13363,7 +13482,7 @@ function LOGICAL_OP() { } else if (this.rule==5) { var label = "NOT"; } - this.graphics.exprs = new ScilabDouble(exprs); + this.graphics.exprs = new ScilabDouble(this.exprs); this.graphics.style = new ScilabDouble(["blockWithLabel;displayedLabel="+label]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -13385,7 +13504,7 @@ function MBLOCK() { var paramv = list(0.1,.0001); this.pprop = [[0],[0]]; var nameF = "generic"; - 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.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 ScilabDouble([false,true]); @@ -13402,8 +13521,8 @@ function MBLOCK() { this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"r"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"r"),1)]); this.model.equations = mo; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MBLOCK\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,exprs,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MBLOCK\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,this.exprs,this.gr_i); this.x.graphics.in_implicit = this.intype; this.x.graphics.out_implicit = this.outtype; return new BasicBlock(this.x); @@ -13435,18 +13554,18 @@ function MBLOCK() { this.x = arg1; this.model = arg1.model; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; - if (this.type[exprs-1]==15) { + this.exprs = this.graphics.exprs; + if (this.type[this.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; } - 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.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]); } - this.lab_1 = list(exprs.in1,exprs.intype,exprs.out,exprs.outtype,exprs.param,exprs.pprop,exprs.nameF); - var lab_2 = exprs.paramv; + this.lab_1 = list(this.exprs.in1,this.exprs.intype,this.exprs.out,this.exprs.outtype,this.exprs.param,this.exprs.pprop,this.exprs.nameF); + var lab_2 = this.exprs.paramv; while (true) { [ok,this.Tin,this.Tintype,this.Tout,this.Touttype,this.Tparam,this.pprop,this.Tfunam,this.lab_1] = scicos_getvalue("Set Modelica generic block parameters",["Input variables: ","Input variables types: ","Output variables: ","Output variables types:","Parameters in Modelica:","Parameters properties: ","Function name: "],list("str",-1,"str",-1,"str",-1,"str",-1,"str",-1,"vec",-1,"str",-1),this.lab_1); if (!ok) { @@ -13601,7 +13720,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 = exprs.paramv; + var lab_2 = this.exprs.paramv; } } } @@ -13615,7 +13734,7 @@ function MBLOCK() { if (extF==".mo"&&fileinfo(this.funam)!=[]) { var tt = mgetl(this.funam); } else { - var tt = exprs.funtxt; + var tt = this.exprs.funtxt; var mo = this.model.equations; if (mo.model!=nameF) { var tt = []; @@ -13644,31 +13763,31 @@ function MBLOCK() { this.model.rpar = new ScilabDouble([this.model.rpar],[paramv[i-1].slice()]); } this.model.sim[1-1] = new ScilabDouble([this.funam]); - exprs.in1 = 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(); + this.exprs.in1 = 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(); if (Tparam_sz!=0) { if (this.type[lab_2-1]==15) { for (i=1;i<=lstsize(lab_2);i+=1) { - exprs.paramv[i-1] = lab_2[i-1]; + this.exprs.paramv[i-1] = lab_2[i-1]; } } else { for (i=1;i<=size(lab_2,"*");i+=1) { - exprs.paramv[i-1] = lab_2[i-1]; + this.exprs.paramv[i-1] = lab_2[i-1]; } } } - exprs.pprop = this.lab_1[6-1]; - exprs.nameF = this.lab_1[7-1]; - exprs.funtxt = tt; + this.exprs.pprop = this.lab_1[6-1]; + this.exprs.nameF = this.lab_1[7-1]; + this.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 ScilabDouble(this.intype); this.graphics.out_implicit = new ScilabDouble(this.outtype); - this.graphics.exprs = exprs; + this.graphics.exprs = this.exprs; this.x.graphics = this.graphics; break; } @@ -13681,7 +13800,7 @@ function MEMORY_f() { MEMORY_f.prototype.define = function MEMORY_f() { var z = 0; var in1 = 1; - var exprs = [[string(z)],[string(1)]]; + this.exprs = [[string(z)],[string(1)]]; this.model = scicos_model(); this.model.sim = new ScilabString(["memo"]); this.model.in1 = new ScilabDouble([in1]); @@ -13691,8 +13810,8 @@ function MEMORY_f() { this.model.rpar = new ScilabDouble([z]); this.model.blocktype = new ScilabString(["m"]); this.model.dep_ut = new ScilabDouble([false,false]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MEMORY_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MEMORY_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } MEMORY_f.prototype.details = function MEMORY_f() { @@ -13708,12 +13827,13 @@ function MEMORY_f() { MEMORY_f.prototype.set = function MEMORY_f() { this.a = arguments[0]["a"] this.inh = parseFloat(arguments[0]["inh"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.a,this.inh,exprs] = scicos_getvalue("Set memory block parameters",["initial condition","Inherit (1: no, 0: yes)"],list("vec",-1,"vec",1),exprs); + [ok,this.a,this.inh,this.exprs] = scicos_getvalue("Set memory block parameters",["initial condition","Inherit (1: no, 0: yes)"],list("vec",-1,"vec",1),this.exprs); if (!ok) { break; } @@ -13733,7 +13853,7 @@ function MEMORY_f() { } var in1 = out; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.rpar = new ScilabDouble([this.a]); this.model.in1 = new ScilabDouble([in1]); this.model.out = new ScilabDouble([out]); @@ -13756,7 +13876,7 @@ function MPBLOCK() { var paramv = list(); var pprop = []; var nameF = "myModel"; - 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.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 ScilabDouble([true,true]); @@ -13773,8 +13893,8 @@ function MPBLOCK() { this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"r"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"r"),1)]); this.model.equations = mo; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MPBLOCK\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,exprs,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MPBLOCK\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,this.exprs,this.gr_i); this.x.graphics.in_implicit = this.intype; this.x.graphics.out_implicit = this.outtype; return new BasicBlock(this.x); @@ -13791,18 +13911,18 @@ function MPBLOCK() { this.x = arg1; this.model = arg1.model; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; - if (this.type[exprs-1]==15) { + this.exprs = this.graphics.exprs; + if (this.type[this.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; } - 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]); + 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 lab_1 = list(exprs.in1,exprs.intype,exprs.out,exprs.outtype,exprs.param,exprs.pprop,exprs.nameF); - var lab_2 = exprs.paramv; + var lab_1 = list(this.exprs.in1,this.exprs.intype,this.exprs.out,this.exprs.outtype,this.exprs.param,this.exprs.pprop,this.exprs.nameF); + var lab_2 = this.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]; @@ -13940,7 +14060,7 @@ function MPBLOCK() { var lab_2_tmp = list(); if (Tparam_sz!=0) { for (i=1;i<=Tparam_sz;i+=1) { - var ee = evstr(exprs.param); + var ee = evstr(this.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]; @@ -13971,7 +14091,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 = exprs.paramv; + var lab_2 = this.exprs.paramv; } } } @@ -13999,31 +14119,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]); - exprs.in1 = 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(); + this.exprs.in1 = 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(); if (Tparam_sz!=0) { if (this.type[lab_2-1]==15) { for (i=1;i<=lstsize(lab_2);i+=1) { - exprs.paramv[i-1] = lab_2[i-1]; + this.exprs.paramv[i-1] = lab_2[i-1]; } } else { for (i=1;i<=size(lab_2,"*");i+=1) { - exprs.paramv[i-1] = lab_2[i-1]; + this.exprs.paramv[i-1] = lab_2[i-1]; } } } - exprs.pprop = lab_1[6-1]; - exprs.nameF = lab_1[7-1]; - exprs.funtxt = ""; + this.exprs.pprop = lab_1[6-1]; + this.exprs.nameF = lab_1[7-1]; + this.exprs.funtxt = ""; this.x.model = this.model; this.graphics.gr_i[1-1][1-1] = new ScilabString(["txt=[\' "+nameF+" \'];"]); this.graphics.in_implicit = new ScilabDouble(this.intype); this.graphics.out_implicit = new ScilabDouble(this.outtype); - this.graphics.exprs = exprs; + this.graphics.exprs = this.exprs; this.x.graphics = this.graphics; break; } @@ -14043,8 +14163,8 @@ function PAL_f() { this.model.rpar = new ScilabDouble([scs]); this.model.blocktype = new ScilabString(["h"]); this.model.dep_ut = new ScilabDouble([false,false]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PAL_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PAL_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,[],this.gr_i); this.x.graphics.id = scs.props.title[1-1]; return new BasicBlock(this.x); } @@ -14089,9 +14209,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 ScilabDouble([false,false]); - var exprs = string(this.model.rpar); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PENDULUM_ANIM\",sz(1),sz(2));"]); - this.x = standard_define([3,3],this.model,exprs,gr_i); + this.exprs = string(this.model.rpar); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PENDULUM_ANIM\",sz(1),sz(2));"]); + this.x = standard_define([3,3],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } PENDULUM_ANIM.prototype.details = function PENDULUM_ANIM() { @@ -14117,13 +14237,14 @@ function PENDULUM_ANIM() { this.xmax = parseFloat(arguments[0]["xmax"]) this.ymin = parseFloat(arguments[0]["ymin"]) this.ymax = parseFloat(arguments[0]["ymax"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; var dstate = this.model.dstate; while (true) { - [ok,this.plen,this.csiz,this.phi,this.xmin,this.xmax,this.ymin,this.ymax,exprs] = scicos_getvalue("Set Scope parameters",["pendulum length","cart size (square side)","slope","Xmin","Xmax","Ymin","Ymax"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs); + [ok,this.plen,this.csiz,this.phi,this.xmin,this.xmax,this.ymin,this.ymax,this.exprs] = scicos_getvalue("Set Scope parameters",["pendulum length","cart size (square side)","slope","Xmin","Xmax","Ymin","Ymax"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -14145,7 +14266,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -14167,9 +14288,9 @@ function RATELIMITER() { this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - 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 = standard_define([3.5,2],this.model,exprs,gr_i); + 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 = standard_define([3.5,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } RATELIMITER.prototype.details = function RATELIMITER() { @@ -14185,12 +14306,13 @@ function RATELIMITER() { RATELIMITER.prototype.set = function RATELIMITER() { this.maxp = parseFloat(arguments[0]["maxp"]) this.minp = parseFloat(arguments[0]["minp"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.maxp,this.minp,exprs] = scicos_getvalue("Set rate limiter parameters",["max slope","min slope"],list("vec",1,"vec",1),exprs); + [ok,this.maxp,this.minp,this.exprs] = scicos_getvalue("Set rate limiter parameters",["max slope","min slope"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -14199,7 +14321,7 @@ function RATELIMITER() { } else { var rpar = [[this.maxp],[this.minp]]; this.model.rpar = new ScilabDouble(rpar); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -14220,9 +14342,9 @@ function RELATIONALOP() { this.model.ipar = new ScilabDouble(ipar); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = [[string(ipar)],[string(0)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RELATIONALOP\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = [[string(ipar)],[string(0)]]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RELATIONALOP\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); this.x.graphics.style = ["fontSize=13;fontStyle=1;displayedLabel="+label]; return new BasicBlock(this.x); } @@ -14241,15 +14363,16 @@ function RELATIONALOP() { this.rule = parseFloat(arguments[0]["rule"]) this.zcr = parseFloat(arguments[0]["zcr"]) this.Datatype = arguments[0]["Datatype"] + this.exprs = inverse(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - if (size(exprs,1)==2) { - var exprs = [[exprs],[sci2exp(1)]]; + if (size(this.exprs,1)==2) { + this.exprs = [[this.exprs],[sci2exp(1)]]; } while (true) { - [ok,this.rule,this.zcr,this.Datatype,exprs] = scicos_getvalue("Set parameters",["Operator: == (0), ~= (1), < (2), <= (3), > (4), >= (5)","Use zero crossing (no: 0), (yes: 1)","Datatype (1=double 3=int32 ...)"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.rule,this.zcr,this.Datatype,this.exprs] = scicos_getvalue("Set parameters",["Operator: == (0), ~= (1), < (2), <= (3), > (4), >= (5)","Use zero crossing (no: 0), (yes: 1)","Datatype (1=double 3=int32 ...)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -14303,7 +14426,7 @@ function RELATIONALOP() { } else if (this.rule==5) { var label = "≥"; } - this.graphics.exprs = new ScilabDouble(exprs); + this.graphics.exprs = new ScilabDouble(this.exprs); this.graphics.style = new ScilabDouble(["fontSize=13;fontStyle=1;displayedLabel="+label]); this.model.ipar = new ScilabDouble([this.rule]); this.model.nzcross = new ScilabDouble([this.zcr]); @@ -14361,8 +14484,8 @@ function SUPER_f() { this.model.rpar = new ScilabDouble([scs]); this.model.blocktype = new ScilabString(["h"]); this.model.dep_ut = new ScilabDouble([false,false]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUPER_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUPER_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,[],this.gr_i); return new SuperBlock(this.x); } SUPER_f.prototype.details = function SUPER_f() { @@ -14387,11 +14510,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]); - var exprs = [["Text"],[string(this.font)],[string(this.siz)]]; + this.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(exprs); + this.graphics.exprs = new ScilabDouble(this.exprs); this.x = mlist(["Text","graphics","model","void","gui"],this.graphics,this.model," ","TEXT_f"); return new TextBlock(this.x); } @@ -14410,16 +14533,17 @@ function TEXT_f() { this.txt = arguments[0]["txt"] this.font = parseFloat(arguments[0]["font"]) this.siz = parseFloat(arguments[0]["siz"]) + this.exprs = inverse(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; var orig = this.graphics.orig; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - if (size(exprs,"*")==1) { - var exprs = [[exprs],["3"],["1"]]; + if (size(this.exprs,"*")==1) { + this.exprs = [[this.exprs],["3"],["1"]]; } while (true) { - [ok,this.txt,this.font,this.siz,exprs] = scicos_getvalue("Set Text block parameters",["Text","Font number","Font size"],list("str",-1,"vec",1,"vec",1),exprs); + [ok,this.txt,this.font,this.siz,this.exprs] = scicos_getvalue("Set Text block parameters",["Text","Font number","Font size"],list("str",-1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -14432,14 +14556,14 @@ function TEXT_f() { var ok = false; } if (ok) { - this.graphics.exprs = new ScilabDouble(exprs); + this.graphics.exprs = new ScilabDouble(this.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,exprs[1-1],evstr(exprs[2-1]),evstr(exprs[3-1])); + var r = xstringl(0,0,this.exprs[1-1],evstr(this.exprs[2-1]),evstr(this.exprs[3-1])); gh_winpal.font_style = default_font_style; gh_winpal.font_size = default_font_size; gh_winpal.font_color = default_font_color; @@ -14483,8 +14607,8 @@ function c_block() { this.model.firing = new ScilabDouble(auto); this.model.dep_ut = new ScilabDouble([true,false]); var label = list([[sci2exp(in1)],[sci2exp(out)],[strcat(sci2exp(this.rpar))],[this.funam]],list([])); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"c_block\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"c_block\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } c_block.prototype.details = function c_block() { @@ -14568,8 +14692,8 @@ function fortran_block() { this.model.dep_ut = new ScilabDouble([true,false]); this.funam = "forty"; var label = list([[sci2exp(this.model.in1)],[sci2exp(this.model.out)],[strcat(sci2exp(this.model.rpar))],[this.funam]],list([])); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"fortran_block\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"fortran_block\",sz(1),sz(2));"]); + this.x = standard_define([4,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } fortran_block.prototype.details = function fortran_block() { @@ -14644,9 +14768,9 @@ function func_block() { this.model.out = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } func_block.prototype.details = function func_block() { @@ -14660,16 +14784,16 @@ function func_block() { func_block.prototype.set = function func_block() { this.model = arg1.model; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.x = arg1; this.model = this.x.model; - var tmpvar0 = genfunc(exprs); + var tmpvar0 = genfunc(this.exprs); var ok = tmpvar0[0]; var mac = tmpvar0[1]; - var exprs = tmpvar0[2]; + this.exprs = tmpvar0[2]; if (ok) { this.model.sim = new ScilabDouble([mac]); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.model = this.model; this.x.graphics = this.graphics; } @@ -14695,8 +14819,8 @@ function generic_block() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp(this.model.in1)],[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"]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } generic_block.prototype.details = function generic_block() { @@ -14828,8 +14952,8 @@ function generic_block2() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp(this.model.in1)],[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"]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block2\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block2\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } generic_block2.prototype.details = function generic_block2() { @@ -14963,8 +15087,8 @@ function generic_block3() { this.model.outtyp = new ScilabDouble([1]); this.model.dep_ut = new ScilabDouble([true,false]); var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp([this.model.in1,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"]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block3\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block3\",sz(1),sz(2));"]); + this.x = standard_define([4,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } generic_block3.prototype.details = function generic_block3() { @@ -15125,9 +15249,9 @@ function scifunc_block() { this.model.blocktype = new ScilabString([typ]); this.model.firing = new ScilabDouble(auto); this.model.dep_ut = new ScilabDouble([true,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } scifunc_block.prototype.details = function scifunc_block() { @@ -15162,16 +15286,16 @@ function scifunc_block() { this.x = arg1; this.model = arg1.model; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; - if (size(exprs[1-1],"*")==8) { - exprs[1-1][9-1] = "0"; + this.exprs = this.graphics.exprs; + if (size(this.exprs[1-1],"*")==8) { + this.exprs[1-1][9-1] = "0"; } while (true) { - [ok,this.i,this.o,this.ci,this.co,this.xx,this.z,this.rpar,this.auto0,this.deptime,this.lab] = scicos_getvalue([["Set scifunc_block parameters"],["only regular blocks supported"]],["input ports sizes","output port sizes","input event ports sizes","output events ports sizes","initial continuous state","initial discrete state","System parameters vector","initial firing vector (<0 for no firing)","is block always active (0:no, 1:yes)"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec","sum(%4)","vec",1),exprs[1-1]); + [ok,this.i,this.o,this.ci,this.co,this.xx,this.z,this.rpar,this.auto0,this.deptime,this.lab] = scicos_getvalue([["Set scifunc_block parameters"],["only regular blocks supported"]],["input ports sizes","output port sizes","input event ports sizes","output events ports sizes","initial continuous state","initial discrete state","System parameters vector","initial firing vector (<0 for no firing)","is block always active (0:no, 1:yes)"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec","sum(%4)","vec",1),this.exprs[1-1]); if (!ok) { break; } - exprs[1-1] = this.lab; + this.exprs[1-1] = this.lab; this.xx = this.xx.slice(); this.z = this.z.slice(); this.rpar = this.rpar.slice(); @@ -15184,7 +15308,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(exprs[2-1],this.i,this.o,nci,nco,size(this.xx,1),size(this.z,1),nrp,"c"); + var tmpvar0 = genfunc1(this.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]; @@ -15212,8 +15336,8 @@ function scifunc_block() { this.model.firing = new ScilabDouble([auto]); this.model.dep_ut = new ScilabDouble([dep_ut]); this.x.model = this.model; - exprs[2-1] = tt; - this.graphics.exprs = new ScilabDouble([exprs]); + this.exprs[2-1] = tt; + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; break; } @@ -15253,9 +15377,9 @@ function scifunc_block_m() { this.model.blocktype = new ScilabString([typ]); this.model.firing = new ScilabDouble(auto); this.model.dep_ut = new ScilabDouble([true,false]); - 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 = standard_define([4,2],this.model,exprs,gr_i); + 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 = standard_define([4,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } scifunc_block_m.prototype.details = function scifunc_block_m() { @@ -15290,13 +15414,13 @@ function scifunc_block_m() { this.x = arg1; this.model = arg1.model; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; while (true) { - [ok,this.i,this.o,this.ci,this.co,this.xx,this.z,this.rpar,this.auto0,this.deptime,this.lab] = scicos_getvalue([["Set scifunc_block parameters"],["only regular blocks supported"]],["input ports sizes","output port sizes","input event ports sizes","output events ports sizes","initial continuous state","initial discrete state","System parameters vector","initial firing vector (<0 for no firing)","is block always active (0:no, 1:yes)"],list("mat",[-1,2],"mat",[-2,2],"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",1),exprs[1-1]); + [ok,this.i,this.o,this.ci,this.co,this.xx,this.z,this.rpar,this.auto0,this.deptime,this.lab] = scicos_getvalue([["Set scifunc_block parameters"],["only regular blocks supported"]],["input ports sizes","output port sizes","input event ports sizes","output events ports sizes","initial continuous state","initial discrete state","System parameters vector","initial firing vector (<0 for no firing)","is block always active (0:no, 1:yes)"],list("mat",[-1,2],"mat",[-2,2],"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",1),this.exprs[1-1]); if (!ok) { break; } - exprs[1-1] = this.lab; + this.exprs[1-1] = this.lab; this.xx = this.xx.slice(); this.z = this.z.slice(); this.rpar = this.rpar.slice(); @@ -15309,7 +15433,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(exprs[2-1],this.i,this.o,nci,nco,size(this.xx,1),size(this.z,1),nrp,"c"); + var tmpvar0 = genfunc2(this.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]; @@ -15337,8 +15461,8 @@ function scifunc_block_m() { this.model.firing = new ScilabDouble([auto]); this.model.dep_ut = new ScilabDouble([dep_ut]); this.x.model = this.model; - exprs[2-1] = tt; - this.graphics.exprs = new ScilabDouble([exprs]); + this.exprs[2-1] = tt; + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; break; } @@ -15356,8 +15480,8 @@ function ABSBLK_f() { this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ABSBLK_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ABSBLK_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,[],this.gr_i); return new BasicBlock(this.x); } ABSBLK_f.prototype.details = function ABSBLK_f() { @@ -15385,9 +15509,9 @@ function ABS_VALUE() { this.model.nmode = new ScilabDouble([nu]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = [string([1])]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ABS_VALUE\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = [string([1])]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ABS_VALUE\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } ABS_VALUE.prototype.details = function ABS_VALUE() { @@ -15401,16 +15525,17 @@ function ABS_VALUE() { } ABS_VALUE.prototype.set = function ABS_VALUE() { this.zcr = arguments[0]["zcr"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.zcr,exprs] = scicos_getvalue("Set block parameters",["use zero_crossing (1: yes) (0:no)"],list("vec",1),exprs); + [ok,this.zcr,this.exprs] = scicos_getvalue("Set block parameters",["use zero_crossing (1: yes) (0:no)"],list("vec",1),this.exprs); if (!ok) { break; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); if (ok) { if (this.zcr!=0) { this.model.nmode = new ScilabDouble([-1]); @@ -15437,8 +15562,8 @@ function COSBLK_f() { this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"COSBLK_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"COSBLK_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,[],this.gr_i); return new BasicBlock(this.x); } COSBLK_f.prototype.details = function COSBLK_f() { @@ -15474,9 +15599,9 @@ function DLRADAPT_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } DLRADAPT_f.prototype.details = function DLRADAPT_f() { @@ -15500,12 +15625,13 @@ function DLRADAPT_f() { this.g = inverse(arguments[0]["g"]) this.last_u = inverse(arguments[0]["last_u"]) this.last_y = inverse(arguments[0]["last_y"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.p,this.rn,this.rd,this.g,this.last_u,this.last_y,exprs] = scicos_getvalue("Set block parameters",["Vector of p mesh points","Numerator roots (one line for each mesh)","Denominator roots (one line for each mesh)","Vector of gain at mesh points","past inputs (Num degree values)","past outputs (Den degree values)"],list("vec",-1,"mat",[-1,-1],"mat",["size(%1,\'*\')","-1"],"vec","size(%1,\'*\')","vec","size(%2,2)","vec","size(%3,2)"),exprs); + [ok,this.p,this.rn,this.rd,this.g,this.last_u,this.last_y,this.exprs] = scicos_getvalue("Set block parameters",["Vector of p mesh points","Numerator roots (one line for each mesh)","Denominator roots (one line for each mesh)","Vector of gain at mesh points","past inputs (Num degree values)","past outputs (Den degree values)"],list("vec",-1,"mat",[-1,-1],"mat",["size(%1,\'*\')","-1"],"vec","size(%1,\'*\')","vec","size(%2,2)","vec","size(%3,2)"),this.exprs); if (!ok) { break; } @@ -15523,7 +15649,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -15544,9 +15670,9 @@ function EXPBLK_f() { this.model.rpar = new ScilabDouble([this.a]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = ["%e"]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXPBLK_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = ["%e"]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXPBLK_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } EXPBLK_f.prototype.details = function EXPBLK_f() { @@ -15559,22 +15685,23 @@ function EXPBLK_f() { } EXPBLK_f.prototype.set = function EXPBLK_f() { this.a = parseFloat(arguments[0]["a"]) + this.exprs = parseFloat(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - if (size(exprs,"*")==2) { - var exprs = exprs[2-1]; + if (size(this.exprs,"*")==2) { + this.exprs = this.exprs[2-1]; } while (true) { - [ok,this.a,exprs] = scicos_getvalue("Set a^u block parameters","a (>0)",list("vec",1),exprs); + [ok,this.a,this.exprs] = scicos_getvalue("Set a^u block parameters","a (>0)",list("vec",1),this.exprs); if (!ok) { break; } if (or(this.a<=0)) { message("a^u : a must be positive"); } else { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.rpar = new ScilabDouble([this.a]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -15600,9 +15727,9 @@ function EXPBLK_m() { this.model.rpar = new ScilabDouble([this.a]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = ["%e"]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXPBLK_m\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = ["%e"]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXPBLK_m\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } EXPBLK_m.prototype.details = function EXPBLK_m() { @@ -15615,22 +15742,23 @@ function EXPBLK_m() { } EXPBLK_m.prototype.set = function EXPBLK_m() { this.a = parseFloat(arguments[0]["a"]) + this.exprs = parseFloat(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - if (size(exprs,"*")==2) { - var exprs = exprs[2-1]; + if (size(this.exprs,"*")==2) { + this.exprs = this.exprs[2-1]; } while (true) { - [ok,this.a,exprs] = scicos_getvalue("Set a^u block parameters","a (>0)",list("vec",1),exprs); + [ok,this.a,this.exprs] = scicos_getvalue("Set a^u block parameters","a (>0)",list("vec",1),this.exprs); if (!ok) { break; } if (or(this.a<=0)) { message("a^u : a must be positive"); } else { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.rpar = new ScilabDouble([this.a]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -15650,9 +15778,9 @@ function FSV_f() { this.model.out = new ScilabDouble([in1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = " "; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FSV_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = " "; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FSV_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } FSV_f.prototype.details = function FSV_f() { @@ -15682,9 +15810,9 @@ function INTRP2BLK_f() { this.model.ipar = new ScilabDouble([2],[2]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } INTRP2BLK_f.prototype.details = function INTRP2BLK_f() { @@ -15702,12 +15830,13 @@ function INTRP2BLK_f() { this.a = inverse(arguments[0]["a"]) this.b = inverse(arguments[0]["b"]) this.c = inverse(arguments[0]["c"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.a,this.b,this.c,exprs] = scicos_getvalue("Set Interpolation block parameters",["X coord.","Y coord.","Z values"],list("vec",-1,"vec",-1,"mat",[-1,-1]),exprs); + [ok,this.a,this.b,this.c,this.exprs] = scicos_getvalue("Set Interpolation block parameters",["X coord.","Y coord.","Z values"],list("vec",-1,"vec",-1,"mat",[-1,-1]),this.exprs); if (!ok) { break; } @@ -15717,7 +15846,7 @@ function INTRP2BLK_f() { message("X and Y must be strictly increasing"); } else { if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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; @@ -15741,9 +15870,9 @@ function INTRPLBLK_f() { this.model.rpar = new ScilabDouble([this.a],[this.b]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } INTRPLBLK_f.prototype.details = function INTRPLBLK_f() { @@ -15759,12 +15888,13 @@ function INTRPLBLK_f() { INTRPLBLK_f.prototype.set = function INTRPLBLK_f() { this.a = inverse(arguments[0]["a"]) this.b = inverse(arguments[0]["b"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.a,this.b,exprs] = scicos_getvalue("Set Interpolation block parameters",["X coord.","Y coord."],list("vec",-1,"vec",-1),exprs); + [ok,this.a,this.b,this.exprs] = scicos_getvalue("Set Interpolation block parameters",["X coord.","Y coord."],list("vec",-1,"vec",-1),this.exprs); if (!ok) { break; } @@ -15774,7 +15904,7 @@ function INTRPLBLK_f() { message("X must be strictly increasing"); } else { if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.rpar = new ScilabDouble([this.a.slice()],[this.b.slice()]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -15795,9 +15925,9 @@ function INVBLK() { this.model.out = new ScilabDouble([in1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = " "; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INVBLK\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = " "; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INVBLK\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } INVBLK.prototype.details = function INVBLK() { @@ -15823,9 +15953,9 @@ function INVBLK_f() { this.model.out = new ScilabDouble([in1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = " "; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INVBLK_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = " "; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INVBLK_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } INVBLK_f.prototype.details = function INVBLK_f() { @@ -15853,9 +15983,9 @@ function LOGBLK_f() { this.model.rpar = new ScilabDouble([this.a]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = "%e"; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOGBLK_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = "%e"; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOGBLK_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } LOGBLK_f.prototype.details = function LOGBLK_f() { @@ -15868,15 +15998,16 @@ function LOGBLK_f() { } LOGBLK_f.prototype.set = function LOGBLK_f() { this.a = parseFloat(arguments[0]["a"]) + this.exprs = parseFloat(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - if (size(exprs,"*")==2) { - var exprs = exprs[2-1]; + if (size(this.exprs,"*")==2) { + this.exprs = this.exprs[2-1]; } while (true) { - [ok,this.a,exprs] = scicos_getvalue("Set log block parameters","Basis (>1)",list("vec",1),exprs); + [ok,this.a,this.exprs] = scicos_getvalue("Set log block parameters","Basis (>1)",list("vec",1),this.exprs); if (!ok) { break; } @@ -15884,7 +16015,7 @@ function LOGBLK_f() { message("Basis must be larger than 1"); } else { if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.rpar = new ScilabDouble([this.a]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -15913,9 +16044,9 @@ function LOOKUP2D() { this.model.ipar = new ScilabDouble([Nx],[Ny],[this.Method]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - 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 = standard_define([2.5,2],this.model,exprs,gr_i); + 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 = standard_define([2.5,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } LOOKUP2D.prototype.details = function LOOKUP2D() { @@ -15937,15 +16068,16 @@ function LOOKUP2D() { this.zz = inverse(arguments[0]["zz"]) this.Method = parseFloat(arguments[0]["Method"]) this.graf = arguments[0]["graf"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.model = arg1.model; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; var ok = false; var SaveExit = false; while (true) { var Ask_again = false; - [ok,this.xx,this.yy,this.zz,this.Method,this.graf,exprs] = scicos_getvalue("2D Lookup table parameters",["Row index input values","Column index input values","Table data","Lookup method(1..5)","Launch graphic window(y/n)?"],list("vec",-1,"vec",-1,"mat",[-1,-1],"vec",1,"str",1),exprs); + [ok,this.xx,this.yy,this.zz,this.Method,this.graf,this.exprs] = scicos_getvalue("2D Lookup table parameters",["Row index input values","Column index input values","Table data","Lookup method(1..5)","Launch graphic window(y/n)?"],list("vec",-1,"vec",-1,"mat",[-1,-1],"vec",1,"str",1),this.exprs); if (!ok) { break; } @@ -15959,8 +16091,8 @@ function LOOKUP2D() { if (this.graf!="y"&&this.graf!="Y") { this.graf = "n"; } - exprs[5-1] = "n"; - exprs[4-1] = sci2exp(mtd); + this.exprs[5-1] = "n"; + this.exprs[4-1] = sci2exp(mtd); var METHOD = getmethod(mtd); if (!Ask_again) { this.xx = this.xx.slice(); @@ -16008,7 +16140,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.model = this.model; this.x.graphics = this.graphics; break; @@ -16040,9 +16172,9 @@ function LOOKUP_c() { this.model.evtin = new ScilabDouble([]); this.model.evtout = new ScilabDouble([]); this.model.firing = new ScilabDouble([0]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } LOOKUP_c.prototype.details = function LOOKUP_c() { @@ -16064,15 +16196,16 @@ function LOOKUP_c() { this.yy = inverse(arguments[0]["yy"]) this.extrapo = parseFloat(arguments[0]["extrapo"]) this.graf = arguments[0]["graf"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.model = arg1.model; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; var ok = false; var SaveExit = false; while (true) { var Ask_again = false; - [ok,this.Method,this.xx,this.yy,this.extrapo,this.graf,exprs] = scicos_getvalue("Lookup table parameters",["Spline Interpolation method (0..9)","x","y","Extrapolate method (0,1)","Launch graphic window(y/n)?"],list("vec",1,"vec",-1,"vec",-1,"vec",1,"str",1),exprs); + [ok,this.Method,this.xx,this.yy,this.extrapo,this.graf,this.exprs] = scicos_getvalue("Lookup table parameters",["Spline Interpolation method (0..9)","x","y","Extrapolate method (0,1)","Launch graphic window(y/n)?"],list("vec",1,"vec",-1,"vec",-1,"vec",1,"str",1),this.exprs); if (!ok) { break; } @@ -16116,7 +16249,7 @@ function LOOKUP_c() { var tmpvar2 = cleandata(this.xy); this.xy = tmpvar2[0]; var N = size(this.xy,"r"); - exprs[5-1] = "n"; + this.exprs[5-1] = "n"; if (this.graf=="y"||this.graf=="Y") { var ipar = [[N],[mtd],[PO],[this.extrapo]]; var rpar = []; @@ -16149,11 +16282,11 @@ function LOOKUP_c() { var DChange = true; } if (DChange) { - exprs[2-1] = strcat(sci2exp(xy2.slice()[1-1])); - exprs[3-1] = strcat(sci2exp(xy2.slice()[2-1])); + this.exprs[2-1] = strcat(sci2exp(xy2.slice()[1-1])); + this.exprs[3-1] = strcat(sci2exp(xy2.slice()[2-1])); } - exprs[1-1] = sci2exp(New_methhod); - exprs[4-1] = sci2exp(oipar[4-1]); + this.exprs[1-1] = sci2exp(New_methhod); + this.exprs[4-1] = sci2exp(oipar[4-1]); if (oipar[3-1]==1) { var perop = "y"; } else { @@ -16175,7 +16308,7 @@ function LOOKUP_c() { var orpar = [[this.xy.slice()[1-1]],[this.xy.slice()[2-1]]]; } } - exprs[1-1] = sci2exp(mtd); + this.exprs[1-1] = sci2exp(mtd); var oipar = [[N],[mtd],[PO],[this.extrapo]]; var SaveExit = true; } @@ -16189,7 +16322,7 @@ function LOOKUP_c() { } this.model.rpar = new ScilabDouble(orpar); this.model.ipar = new ScilabDouble(oipar); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.model = this.model; this.x.graphics = this.graphics; break; @@ -16208,8 +16341,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 ScilabDouble([true,false]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOOKUP_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOOKUP_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,[],this.gr_i); return new BasicBlock(this.x); } LOOKUP_f.prototype.details = function LOOKUP_f() { @@ -16223,7 +16356,7 @@ function LOOKUP_f() { LOOKUP_f.prototype.set = function LOOKUP_f() { this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; var rpar = this.model.rpar; var n = size(rpar,"*")/2; @@ -16268,9 +16401,9 @@ function MAXMIN() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); this.model.ipar = new ScilabDouble([0]); - var exprs = [string(transpose([2,1,1]))]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MAXMIN\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = [string(transpose([2,1,1]))]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MAXMIN\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); this.x.graphics.style = "MAXMIN;displayedLabel=MAX"; return new BasicBlock(this.x); } @@ -16289,12 +16422,13 @@ function MAXMIN() { this.mm = parseFloat(arguments[0]["mm"]) this.nin = arguments[0]["nin"] this.zcr = parseFloat(arguments[0]["zcr"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.mm,this.nin,this.zcr,exprs] = scicos_getvalue("Set Max/Min block parameters",["Min (1) or Max (2) ","Number of input vectors (1 or 2)","zero-crossing (1: yes, 0;no)"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.mm,this.nin,this.zcr,this.exprs] = scicos_getvalue("Set Max/Min block parameters",["Min (1) or Max (2) ","Number of input vectors (1 or 2)","zero-crossing (1: yes, 0;no)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -16335,7 +16469,7 @@ function MAXMIN() { var label = "MAX"; } this.graphics.style = new ScilabString(["MAXMIN;displayedLabel="+label]); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -16355,9 +16489,9 @@ function MAX_f() { this.model.dstate = new ScilabDouble([0],[0]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = " "; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MAX_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = " "; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MAX_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } MAX_f.prototype.details = function MAX_f() { @@ -16384,9 +16518,9 @@ function MIN_f() { this.model.dstate = new ScilabDouble([0],[0]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = sci2exp(in1); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MIN_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = sci2exp(in1); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MIN_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } MIN_f.prototype.details = function MIN_f() { @@ -16414,9 +16548,9 @@ function POWBLK_f() { this.model.rpar = new ScilabDouble([this.a]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = string(this.a); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"POWBLK_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = string(this.a); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"POWBLK_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } POWBLK_f.prototype.details = function POWBLK_f() { @@ -16429,19 +16563,20 @@ function POWBLK_f() { } POWBLK_f.prototype.set = function POWBLK_f() { this.a = parseFloat(arguments[0]["a"]) + this.exprs = parseFloat(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - if (size(exprs,"*")==2) { - var exprs = exprs[2-1]; + if (size(this.exprs,"*")==2) { + this.exprs = this.exprs[2-1]; } while (true) { - [ok,this.a,exprs] = scicos_getvalue("Set u^a block parameters","to the power of",list("vec",1),exprs); + [ok,this.a,this.exprs] = scicos_getvalue("Set u^a block parameters","to the power of",list("vec",1),this.exprs); if (!ok) { break; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); if (this.a==int(this.a)) { this.model.ipar = new ScilabDouble([this.a]); this.model.rpar = new ScilabDouble([]); @@ -16468,9 +16603,9 @@ function PRODUCT() { this.model.ipar = new ScilabDouble(this.sgn); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = sci2exp(this.sgn); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PRODUCT\",sz(1),sz(2));"]); - this.x = standard_define([2,3],this.model,exprs,gr_i); + this.exprs = sci2exp(this.sgn); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PRODUCT\",sz(1),sz(2));"]); + this.x = standard_define([2,3],this.model,this.exprs,this.gr_i); return new Product(this.x); } PRODUCT.prototype.details = function PRODUCT() { @@ -16483,12 +16618,13 @@ function PRODUCT() { } PRODUCT.prototype.set = function PRODUCT() { this.sgn = inverse(arguments[0]["sgn"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; while (true) { - [ok,this.sgn,exprs] = scicos_getvalue([[" Set multiplication block parameters"],["(multiplication is set with + 1, division with -1)"],[""]],"Number of inputs or sign vector",list("vec",-1),exprs); + [ok,this.sgn,this.exprs] = scicos_getvalue([[" Set multiplication block parameters"],["(multiplication is set with + 1, division with -1)"],[""]],"Number of inputs or sign vector",list("vec",-1),this.exprs); if (!ok) { break; } @@ -16523,7 +16659,7 @@ function PRODUCT() { } if (ok) { this.model.ipar = new ScilabDouble([this.sgn]); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -16570,9 +16706,9 @@ function QUANT_f() { this.model.ipar = new ScilabDouble([this.meth]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } QUANT_f.prototype.details = function QUANT_f() { @@ -16588,12 +16724,13 @@ function QUANT_f() { QUANT_f.prototype.set = function QUANT_f() { this.pas = parseFloat(arguments[0]["pas"]) this.meth = parseFloat(arguments[0]["meth"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.pas,this.meth,exprs] = scicos_getvalue("Set parameters",["Step","Quantization Type (1-4)"],list("vec",1,"vec",1),exprs); + [ok,this.pas,this.meth,this.exprs] = scicos_getvalue("Set parameters",["Step","Quantization Type (1-4)"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -16613,7 +16750,7 @@ function QUANT_f() { case 4: this.model.sim = new ScilabString(["qzcel"]); } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -16637,9 +16774,9 @@ function SATURATION() { this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } SATURATION.prototype.details = function SATURATION() { @@ -16657,12 +16794,13 @@ function SATURATION() { this.maxp = parseFloat(arguments[0]["maxp"]) this.minp = parseFloat(arguments[0]["minp"]) this.zeroc = arguments[0]["zeroc"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.maxp,this.minp,this.zeroc,exprs] = scicos_getvalue("Set Saturation parameters",["Upper limit","Lower limit","zero crossing (0:no, 1:yes)"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.maxp,this.minp,this.zeroc,this.exprs] = scicos_getvalue("Set Saturation parameters",["Upper limit","Lower limit","zero crossing (0:no, 1:yes)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -16678,7 +16816,7 @@ function SATURATION() { this.model.nzcross = new ScilabDouble([0]); this.model.nmode = new ScilabDouble([0]); } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -16702,9 +16840,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 ScilabDouble([true,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } SAT_f.prototype.details = function SAT_f() { @@ -16722,12 +16860,13 @@ function SAT_f() { this.minp = parseFloat(arguments[0]["minp"]) this.maxp = parseFloat(arguments[0]["maxp"]) this.pente = arguments[0]["pente"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.minp,this.maxp,this.pente,exprs] = scicos_getvalue("Set Saturation parameters",["Min","Max","Slope"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.minp,this.maxp,this.pente,this.exprs] = scicos_getvalue("Set Saturation parameters",["Min","Max","Slope"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -16739,7 +16878,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -16760,9 +16899,9 @@ function SIGNUM() { this.model.nmode = new ScilabDouble([nu]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = [string([1])]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SIGNUM\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = [string([1])]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SIGNUM\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } SIGNUM.prototype.details = function SIGNUM() { @@ -16776,16 +16915,17 @@ function SIGNUM() { } SIGNUM.prototype.set = function SIGNUM() { this.zcr = arguments[0]["zcr"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.zcr,exprs] = scicos_getvalue("Set block parameters",["use zero_crossing (1: yes) (0:no)"],list("vec",1),exprs); + [ok,this.zcr,this.exprs] = scicos_getvalue("Set block parameters",["use zero_crossing (1: yes) (0:no)"],list("vec",1),this.exprs); if (!ok) { break; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); if (ok) { if (this.zcr!=0) { this.model.nmode = new ScilabDouble([-1]); @@ -16811,9 +16951,9 @@ function SINBLK_f() { this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = " "; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SINBLK_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = " "; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SINBLK_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } SINBLK_f.prototype.details = function SINBLK_f() { @@ -16839,9 +16979,9 @@ function TANBLK_f() { this.model.out = new ScilabDouble([in1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = sci2exp(in1); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TANBLK_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = sci2exp(in1); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TANBLK_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } TANBLK_f.prototype.details = function TANBLK_f() { @@ -16867,9 +17007,9 @@ function TrigFun() { this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = "sin"; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TrigFun\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,exprs,gr_i); + this.exprs = "sin"; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TrigFun\",sz(1),sz(2));"]); + this.x = standard_define([4,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } TrigFun.prototype.details = function TrigFun() { @@ -16882,21 +17022,22 @@ function TrigFun() { } TrigFun.prototype.set = function TrigFun() { this.fun = arguments[0]["fun"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; 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) { - [ok,this.fun,exprs] = scicos_getvalue(PREVAR_GG,"Function",list("str",1),exprs); + [ok,this.fun,this.exprs] = scicos_getvalue(PREVAR_GG,"Function",list("str",1),this.exprs); if (!ok) { break; } if (find(PREVAR_FF==this.fun)==[]) { message("Sorry but "+this.fun+" is not in the list!"); } else { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); execstr("model.sim=list(\'"+this.fun+"_blk\',4)"); this.x.graphics = this.graphics; this.x.model = this.model; @@ -16918,8 +17059,8 @@ function PDE() { this.model.dep_ut = new ScilabDouble([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,[],""); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PDE\",sz(1),sz(2));"]); - this.x = standard_define([3,3],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PDE\",sz(1),sz(2));"]); + this.x = standard_define([3,3],this.model,label,this.gr_i); return new BasicBlock(this.x); } PDE.prototype.details = function PDE() { @@ -17141,9 +17282,9 @@ function AFFICH_m() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); this.model.label = new ScilabString([""]); - var exprs = [[sci2exp([this.model.in1,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 = standard_define([3,2],this.model,exprs,gr_i); + this.exprs = [[sci2exp([this.model.in1,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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new AfficheBlock(this.x); } AFFICH_m.prototype.details = function AFFICH_m() { @@ -17169,12 +17310,13 @@ function AFFICH_m() { this.nt = parseFloat(arguments[0]["nt"]) this.nd = parseFloat(arguments[0]["nd"]) this.herit = arguments[0]["herit"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.in1,this.font,this.fontsize,this.colr,this.nt,this.nd,this.herit,exprs] = scicos_getvalue("Set parameters",["Input Size","Font number","Font size","Color","Total number of digits","Number of rational part digits","Block inherits (1) or not (0)"],list("mat",[1,2],"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs); + [ok,this.in1,this.font,this.fontsize,this.colr,this.nt,this.nd,this.herit,this.exprs] = scicos_getvalue("Set parameters",["Input Size","Font number","Font size","Color","Total number of digits","Number of rational part digits","Block inherits (1) or not (0)"],list("mat",[1,2],"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -17215,7 +17357,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -17266,12 +17408,13 @@ function BARXY() { this.ymin = parseFloat(arguments[0]["ymin"]) this.ymax = parseFloat(arguments[0]["ymax"]) this.thickness = arguments[0]["thickness"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.xmin,this.xmax,this.ymin,this.ymax,this.thickness,exprs] = scicos_getvalue("Set Scope parameters",["Xmin","Xmax","Ymin","Ymax","Segs Thickness"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs); + [ok,this.xmin,this.xmax,this.ymin,this.ymax,this.thickness,this.exprs] = scicos_getvalue("Set Scope parameters",["Xmin","Xmax","Ymin","Ymax","Segs Thickness"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -17293,7 +17436,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -17327,9 +17470,9 @@ function CANIMXY() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([false,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CANIMXY.prototype.details = function CANIMXY() { @@ -17363,12 +17506,13 @@ function CANIMXY() { this.ymin = parseFloat(arguments[0]["ymin"]) this.ymax = parseFloat(arguments[0]["ymax"]) this.N = parseFloat(arguments[0]["N"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.nbr_curves,this.clrs,this.siz,this.win,this.wpos,this.wdim,this.xmin,this.xmax,this.ymin,this.ymax,this.N,exprs] = scicos_getvalue("Set Scope parameters",["Number of Curves","color (>0) or mark (<0)","line or mark size","Output window number (-1 for automatic)","Output window position","Output window sizes","Xmin","Xmax","Ymin","Ymax","Buffer size"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs); + [ok,this.nbr_curves,this.clrs,this.siz,this.win,this.wpos,this.wdim,this.xmin,this.xmax,this.ymin,this.ymax,this.N,this.exprs] = scicos_getvalue("Set Scope parameters",["Number of Curves","color (>0) or mark (<0)","line or mark size","Output window number (-1 for automatic)","Output window position","Output window sizes","Xmin","Xmax","Ymin","Ymax","Buffer size"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -17424,7 +17568,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -17458,9 +17602,9 @@ function CANIMXY3D() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([false,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CANIMXY3D.prototype.details = function CANIMXY3D() { @@ -17494,12 +17638,13 @@ function CANIMXY3D() { this.vec_z = inverse(arguments[0]["vec_z"]) this.param3ds = inverse(arguments[0]["param3ds"]) this.N = parseFloat(arguments[0]["N"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.nbr_curves,this.clrs,this.siz,this.win,this.wpos,this.wdim,this.vec_x,this.vec_y,this.vec_z,this.param3ds,this.N,exprs] = scicos_getvalue("Set Scope parameters",["Number of curves","color (>0) or mark (<0)","line or mark size","Output window number (-1 for automatic)","Output window position","Output window sizes","Xmin and Xmax","Ymin and Ymax","Zmin and Zmax","Alpha and Theta","Buffer size"],list("vec",1,"vec",-1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",1),exprs); + [ok,this.nbr_curves,this.clrs,this.siz,this.win,this.wpos,this.wdim,this.vec_x,this.vec_y,this.vec_z,this.param3ds,this.N,this.exprs] = scicos_getvalue("Set Scope parameters",["Number of curves","color (>0) or mark (<0)","line or mark size","Output window number (-1 for automatic)","Output window position","Output window sizes","Xmin and Xmax","Ymin and Ymax","Zmin and Zmax","Alpha and Theta","Buffer size"],list("vec",1,"vec",-1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",1),this.exprs); if (!ok) { break; } @@ -17572,7 +17717,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -17597,9 +17742,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 ScilabDouble([false,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CEVENTSCOPE.prototype.details = function CEVENTSCOPE() { @@ -17623,12 +17768,13 @@ function CEVENTSCOPE() { this.wpos = inverse(arguments[0]["wpos"]) this.wdim = inverse(arguments[0]["wdim"]) this.per = parseFloat(arguments[0]["per"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.nclock,this.clrs,this.win,this.wpos,this.wdim,this.per,exprs] = scicos_getvalue("Set Scope parameters",["Number of event inputs","colors c (>0) or mark (<0)","Output window number (-1 for automatic)","Output window position","Output window sizes","Refresh period"],list("vec",1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec",1),exprs); + [ok,this.nclock,this.clrs,this.win,this.wpos,this.wdim,this.per,this.exprs] = scicos_getvalue("Set Scope parameters",["Number of event inputs","colors c (>0) or mark (<0)","Output window number (-1 for automatic)","Output window position","Output window sizes","Refresh period"],list("vec",1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec",1),this.exprs); this.nclock = int(this.nclock); this.clrs = int(this.clrs); this.win = int(this.win); @@ -17679,7 +17825,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -17706,9 +17852,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 ScilabDouble([true,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CFSCOPE.prototype.details = function CFSCOPE() { @@ -17738,12 +17884,13 @@ function CFSCOPE() { this.per = parseFloat(arguments[0]["per"]) this.N = parseFloat(arguments[0]["N"]) this.wu = arguments[0]["wu"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.clrs,this.win,this.wpos,this.wdim,this.ymin,this.ymax,this.per,this.N,this.wu,exprs] = scicos_getvalue("Set Scope parameters",["Color (>0) or mark (<0) vector (8 entries)","Output window number (-1 for automatic)","Output window position","Output window sizes","Ymin","Ymax","Refresh period","Buffer size","Links to view"],list("vec",8,"vec",1,"vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",-1),exprs); + [ok,this.clrs,this.win,this.wpos,this.wdim,this.ymin,this.ymax,this.per,this.N,this.wu,this.exprs] = scicos_getvalue("Set Scope parameters",["Color (>0) or mark (<0) vector (8 entries)","Output window number (-1 for automatic)","Output window position","Output window sizes","Ymin","Ymax","Refresh period","Buffer size","Links to view"],list("vec",8,"vec",1,"vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",-1),this.exprs); if (!ok) { break; } @@ -17798,7 +17945,7 @@ function CFSCOPE() { this.model.ipar = new ScilabDouble(ipar); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -17818,8 +17965,8 @@ function CLKOUTV_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([false,false]); - var exprs = string(this.prt); - this.x = standard_define([1,1],this.model,exprs," "); + this.exprs = string(this.prt); + this.x = standard_define([1,1],this.model,this.exprs," "); return new EventOutBlock(this.x); } CLKOUTV_f.prototype.details = function CLKOUTV_f() { @@ -17832,12 +17979,13 @@ function CLKOUTV_f() { } CLKOUTV_f.prototype.set = function CLKOUTV_f() { this.prt = arguments[0]["prt"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; while (true) { - [ok,this.prt,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","CLKOUTV_f")],[" "],["Event output port"]],"Port number",list("vec",1),exprs); + [ok,this.prt,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","CLKOUTV_f")],[" "],["Event output port"]],"Port number",list("vec",1),this.exprs); if (!ok) { break; } @@ -17847,7 +17995,7 @@ function CLKOUTV_f() { } else { this.model.ipar = new ScilabDouble([this.prt]); this.model.evtin = new ScilabDouble([1]); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -17887,9 +18035,9 @@ 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; - var gr_i = arg1.graphics.gr_i; - if (this.type[gr_i-1]==15) { - var coli = gr_i[2-1]; + this.gr_i = arg1.graphics.gr_i; + if (this.type[this.gr_i-1]==15) { + var coli = this.gr_i[2-1]; var pcoli = xget("pattern"); xfpolys(this.x,y,coli); xset("pattern",coli); @@ -17929,8 +18077,8 @@ function CLKOUT_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([false,false]); - var exprs = string(this.prt); - this.x = standard_define([1,1],this.model,exprs," "); + this.exprs = string(this.prt); + this.x = standard_define([1,1],this.model,this.exprs," "); return new BasicBlock(this.x); } CLKOUT_f.prototype.details = function CLKOUT_f() { @@ -17943,13 +18091,14 @@ function CLKOUT_f() { } CLKOUT_f.prototype.set = function CLKOUT_f() { this.prt = parseFloat(arguments[0]["prt"]) + this.exprs = parseFloat(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = this.graphics.exprs; - var exprs = exprs[1-1]; + this.exprs = this.graphics.exprs; + this.exprs = this.exprs[1-1]; while (true) { - [ok,this.prt,exprs] = scicos_getvalue("Set Event Output block parameters","Port number",list("vec",1),exprs); + [ok,this.prt,this.exprs] = scicos_getvalue("Set Event Output block parameters","Port number",list("vec",1),this.exprs); if (!ok) { break; } @@ -17960,7 +18109,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -17990,9 +18139,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 ScilabDouble([true,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CMAT3D.prototype.details = function CMAT3D() { @@ -18014,12 +18163,13 @@ function CMAT3D() { this.colormap = parseFloat(arguments[0]["colormap"]) this.cmin = parseFloat(arguments[0]["cmin"]) this.cmax = parseFloat(arguments[0]["cmax"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.vec_x,this.vec_y,this.colormap,this.cmin,this.cmax,exprs] = scicos_getvalue("Set Scope parameters",["Bounds Vector X (-1 for standard)","Bounds Vector Y (-1 for standard)","ColorMap","Zmin","Zmax"],list("vec",-1,"vec",-1,"vec",-1,"vec",1,"vec",1),exprs); + [ok,this.vec_x,this.vec_y,this.colormap,this.cmin,this.cmax,this.exprs] = scicos_getvalue("Set Scope parameters",["Bounds Vector X (-1 for standard)","Bounds Vector Y (-1 for standard)","ColorMap","Zmin","Zmax"],list("vec",-1,"vec",-1,"vec",-1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -18042,7 +18192,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -18070,9 +18220,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 ScilabDouble([true,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CMATVIEW.prototype.details = function CMATVIEW() { @@ -18090,12 +18240,13 @@ function CMATVIEW() { this.colormap = parseFloat(arguments[0]["colormap"]) this.cmin = parseFloat(arguments[0]["cmin"]) this.cmax = parseFloat(arguments[0]["cmax"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.colormap,this.cmin,this.cmax,exprs] = scicos_getvalue("Set Scope parameters",["ColorMap","Minimum level range","Maximum level range"],list("vec",-1,"vec",1,"vec",1),exprs); + [ok,this.colormap,this.cmin,this.cmax,this.exprs] = scicos_getvalue("Set Scope parameters",["ColorMap","Minimum level range","Maximum level range"],list("vec",-1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -18116,7 +18267,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -18149,9 +18300,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 ScilabDouble([true,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CMSCOPE.prototype.details = function CMSCOPE() { @@ -18185,12 +18336,13 @@ function CMSCOPE() { this.N = parseFloat(arguments[0]["N"]) this.heritance = arguments[0]["heritance"] this.nom = arguments[0]["nom"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.in1,this.clrs,this.win,this.wpos,this.wdim,this.ymin,this.ymax,this.per,this.N,this.heritance,this.nom,exprs] = scicos_getvalue("Set Scope parameters",["Input ports sizes","Drawing colors (>0) or mark (<0)","Output window number (-1 for automatic)","Output window position","Output window sizes","Ymin vector","Ymax vector","Refresh period","Buffer size","Accept herited events 0/1","Name of Scope (label&Id)"],list("vec",-1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec","size(%1,\'*\')","vec","size(%1,\'*\')","vec","size(%1,\'*\')","vec",1,"vec",1,"str",1),exprs); + [ok,this.in1,this.clrs,this.win,this.wpos,this.wdim,this.ymin,this.ymax,this.per,this.N,this.heritance,this.nom,this.exprs] = scicos_getvalue("Set Scope parameters",["Input ports sizes","Drawing colors (>0) or mark (<0)","Output window number (-1 for automatic)","Output window position","Output window sizes","Ymin vector","Ymax vector","Refresh period","Buffer size","Accept herited events 0/1","Name of Scope (label&Id)"],list("vec",-1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec","size(%1,\'*\')","vec","size(%1,\'*\')","vec","size(%1,\'*\')","vec",1,"vec",1,"str",1),this.exprs); if (!ok) { break; } @@ -18272,7 +18424,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -18302,9 +18454,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 ScilabDouble([true,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CSCOPE.prototype.details = function CSCOPE() { @@ -18336,12 +18488,13 @@ function CSCOPE() { this.N = parseFloat(arguments[0]["N"]) this.heritance = arguments[0]["heritance"] this.nom = arguments[0]["nom"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.clrs,this.win,this.wpos,this.wdim,this.ymin,this.ymax,this.per,this.N,this.heritance,this.nom,exprs] = scicos_getvalue("Set Scope parameters",["Color (>0) or mark (<0) vector (8 entries)","Output window number (-1 for automatic)","Output window position","Output window sizes","Ymin","Ymax","Refresh period","Buffer size","Accept herited events 0/1","Name of Scope (label&Id)"],list("vec",8,"vec",1,"vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"str",1),exprs); + [ok,this.clrs,this.win,this.wpos,this.wdim,this.ymin,this.ymax,this.per,this.N,this.heritance,this.nom,this.exprs] = scicos_getvalue("Set Scope parameters",["Color (>0) or mark (<0) vector (8 entries)","Output window number (-1 for automatic)","Output window position","Output window sizes","Ymin","Ymax","Refresh period","Buffer size","Accept herited events 0/1","Name of Scope (label&Id)"],list("vec",8,"vec",1,"vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"str",1),this.exprs); if (!ok) { break; } @@ -18397,7 +18550,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -18430,9 +18583,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 ScilabDouble([false,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CSCOPXY.prototype.details = function CSCOPXY() { @@ -18466,12 +18619,13 @@ function CSCOPXY() { this.ymin = parseFloat(arguments[0]["ymin"]) this.ymax = parseFloat(arguments[0]["ymax"]) this.N = parseFloat(arguments[0]["N"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.nbr_curves,this.clrs,this.siz,this.win,this.wpos,this.wdim,this.xmin,this.xmax,this.ymin,this.ymax,this.N,exprs] = scicos_getvalue("Set Scope parameters",["Number of Curves","color (>0) or mark (<0)","line or mark size","Output window number (-1 for automatic)","Output window position","Output window sizes","Xmin","Xmax","Ymin","Ymax","Buffer size"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs); + [ok,this.nbr_curves,this.clrs,this.siz,this.win,this.wpos,this.wdim,this.xmin,this.xmax,this.ymin,this.ymax,this.N,this.exprs] = scicos_getvalue("Set Scope parameters",["Number of Curves","color (>0) or mark (<0)","line or mark size","Output window number (-1 for automatic)","Output window position","Output window sizes","Xmin","Xmax","Ymin","Ymax","Buffer size"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -18527,7 +18681,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -18560,9 +18714,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 ScilabDouble([false,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CSCOPXY3D.prototype.details = function CSCOPXY3D() { @@ -18596,12 +18750,13 @@ function CSCOPXY3D() { this.vec_z = inverse(arguments[0]["vec_z"]) this.param3ds = inverse(arguments[0]["param3ds"]) this.N = parseFloat(arguments[0]["N"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.nbr_curves,this.clrs,this.siz,this.win,this.wpos,this.wdim,this.vec_x,this.vec_y,this.vec_z,this.param3ds,this.N,exprs] = scicos_getvalue("Set Scope parameters",["Number of curves","color (>0) or mark (<0)","Line or Mark Size","Output window number (-1 for automatic)","Output window position","Output window sizes","Xmin and Xmax","Ymin and Ymax","Zmin and Zmax","Alpha and Theta","Buffer size"],list("vec",1,"vec",-1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec",2,"vec",2,"vec",2,"vec",2,"vec",1),exprs); + [ok,this.nbr_curves,this.clrs,this.siz,this.win,this.wpos,this.wdim,this.vec_x,this.vec_y,this.vec_z,this.param3ds,this.N,this.exprs] = scicos_getvalue("Set Scope parameters",["Number of curves","color (>0) or mark (<0)","Line or Mark Size","Output window number (-1 for automatic)","Output window position","Output window sizes","Xmin and Xmax","Ymin and Ymax","Zmin and Zmax","Alpha and Theta","Buffer size"],list("vec",1,"vec",-1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec",2,"vec",2,"vec",2,"vec",2,"vec",1),this.exprs); if (!ok) { break; } @@ -18668,7 +18823,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -18694,9 +18849,9 @@ function OUTIMPL_f() { mo.model = "PORT"; mo.inputs = "n"; this.model.equations = new ScilabDouble([mo]); - var exprs = "1"; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OUTIMPL_f\",sz(1),sz(2));"]); - this.x = standard_define([1,1],this.model,exprs,gr_i); + this.exprs = "1"; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OUTIMPL_f\",sz(1),sz(2));"]); + this.x = standard_define([1,1],this.model,this.exprs,this.gr_i); this.x.graphics.in_implicit = ["I"]; return new ImplicitOutBlock(this.x); } @@ -18710,15 +18865,16 @@ function OUTIMPL_f() { } OUTIMPL_f.prototype.set = function OUTIMPL_f() { this.prt = parseFloat(arguments[0]["prt"]) + this.exprs = parseFloat(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - if (size(exprs,"*")==2) { - var exprs = exprs[1-1]; + if (size(this.exprs,"*")==2) { + this.exprs = this.exprs[1-1]; } while (true) { - [ok,this.prt,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","OUTIMPL_f")],[" "],["Implicit output port"]],"Port number",list("vec",1),exprs); + [ok,this.prt,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","OUTIMPL_f")],[" "],["Implicit output port"]],"Port number",list("vec",1),this.exprs); if (!ok) { break; } @@ -18731,7 +18887,7 @@ function OUTIMPL_f() { var y = needcompile; } this.model.ipar = new ScilabDouble([this.prt]); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -18753,9 +18909,9 @@ function OUT_f() { this.model.ipar = new ScilabDouble([this.prt]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,false]); - var exprs = string(this.prt); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OUT_f\",sz(1),sz(2));"]); - this.x = standard_define([1,1],this.model,exprs,gr_i); + this.exprs = string(this.prt); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OUT_f\",sz(1),sz(2));"]); + this.x = standard_define([1,1],this.model,this.exprs,this.gr_i); return new ExplicitOutBlock(this.x); } OUT_f.prototype.details = function OUT_f() { @@ -18768,15 +18924,16 @@ function OUT_f() { } OUT_f.prototype.set = function OUT_f() { this.prt = parseFloat(arguments[0]["prt"]) + this.exprs = parseFloat(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = this.graphics.exprs; - if (size(exprs,"*")==2) { - var exprs = exprs[1-1]; + this.exprs = this.graphics.exprs; + if (size(this.exprs,"*")==2) { + this.exprs = this.exprs[1-1]; } while (true) { - [ok,this.prt,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","OUT_f")],[" "],["Regular output port"]],"Port number",list("vec",1),exprs); + [ok,this.prt,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","OUT_f")],[" "],["Regular output port"]],"Port number",list("vec",1),this.exprs); if (!ok) { break; } @@ -18785,7 +18942,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -18814,9 +18971,9 @@ function TOWS_c() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([false,false]); - 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 = standard_define([4,2],this.model,exprs,gr_i); + 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 = standard_define([4,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } TOWS_c.prototype.details = function TOWS_c() { @@ -18834,12 +18991,13 @@ function TOWS_c() { this.nz = parseFloat(arguments[0]["nz"]) this.varnam = arguments[0]["varnam"] this.herit = parseFloat(arguments[0]["herit"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; while (true) { - [ok,this.nz,this.varnam,this.herit,exprs] = scicos_getvalue("Set Xcos buffer block",["Size of buffer","Scilab variable name","Inherit (no:0, yes:1)"],list("vec",1,"str",1,"vec",1),exprs); + [ok,this.nz,this.varnam,this.herit,this.exprs] = scicos_getvalue("Set Xcos buffer block",["Size of buffer","Scilab variable name","Inherit (no:0, yes:1)"],list("vec",1,"str",1,"vec",1),this.exprs); if (!ok) { break; } @@ -18865,7 +19023,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -18884,9 +19042,9 @@ function TRASH_f() { this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); - var exprs = " "; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TRASH_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = " "; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TRASH_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } TRASH_f.prototype.details = function TRASH_f() { @@ -18919,9 +19077,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 ScilabDouble([true,false]); - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } WFILE_f.prototype.details = function WFILE_f() { @@ -18941,6 +19099,7 @@ function WFILE_f() { this.fname1 = parseFloat(arguments[0]["fname1"]) this.frmt1 = parseFloat(arguments[0]["frmt1"]) this.N = parseFloat(arguments[0]["N"]) + this.exprs = arguments[0]["exprs"] warnobsolete("WRITEC_f","6.0.0"); var warnMessage = msprintf(_("Feature %s is obsolete."),"WFILE_f"); var warnAdvise = msprintf(_("Please use %s instead."),"WRITEC_f"); @@ -18948,14 +19107,14 @@ function WFILE_f() { warnBlockByUID(arg1.model.label,warnXcosMessage); this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; var dstate = this.model.dstate; var lunit = dstate[2-1]; - var fname = exprs[2-1]; - var frmt = exprs[3-1]; + var fname = this.exprs[2-1]; + var frmt = this.exprs[3-1]; while (true) { - [ok,this.in1,this.fname1,this.frmt1,this.N,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","WFILE_f")],[" "],["Write to output file"],[" "],["Write is done on:"],[" - A binary file if no format given"],[" - A formatted text file if a format (Fortran type) is given"]],["Input Size","Output File Name","Output Format","Buffer Size"],list("vec",1,"str",1,"str",1,"vec",1),exprs); + [ok,this.in1,this.fname1,this.frmt1,this.N,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","WFILE_f")],[" "],["Write to output file"],[" "],["Write is done on:"],[" - A binary file if no format given"],[" - A formatted text file if a format (Fortran type) is given"]],["Input Size","Output File Name","Output Format","Buffer Size"],list("vec",1,"str",1,"str",1,"vec",1),this.exprs); if (!ok) { break; } @@ -19000,7 +19159,7 @@ function WFILE_f() { this.model.dstate = new ScilabDouble(dstate); this.model.ipar = new ScilabDouble(ipar); this.model.dep_ut = new ScilabDouble([true,false]); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -19027,9 +19186,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 ScilabDouble([true,false]); - 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 = standard_define([4,2],this.model,exprs,gr_i); + 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 = standard_define([4,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } WRITEAU_f.prototype.details = function WRITEAU_f() { @@ -19045,15 +19204,16 @@ function WRITEAU_f() { WRITEAU_f.prototype.set = function WRITEAU_f() { this.N = parseFloat(arguments[0]["N"]) this.swap = parseFloat(arguments[0]["swap"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; var ipar = this.model.ipar; var dstate = this.model.dstate; var lunit = dstate[2-1]; while (true) { - [ok,this.N,this.swap,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","WRITEAU_f")],[" "],["Write \'.au\' sound file on audio device"]],["Buffer Size","Swap Mode (0:No, 1:Yes)"],list("vec",1,"vec",1),exprs); + [ok,this.N,this.swap,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","WRITEAU_f")],[" "],["Write \'.au\' sound file on audio device"]],["Buffer Size","Swap Mode (0:No, 1:Yes)"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -19079,7 +19239,7 @@ function WRITEAU_f() { this.model.in1 = new ScilabDouble([1]); this.model.dstate = new ScilabDouble(dstate); this.model.ipar = new ScilabDouble(ipar); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -19106,9 +19266,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 ScilabDouble([true,false]); - 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 = standard_define([4,2],this.model,exprs,gr_i); + 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 = standard_define([4,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } WRITEC_f.prototype.details = function WRITEC_f() { @@ -19130,17 +19290,18 @@ function WRITEC_f() { this.frmt1 = arguments[0]["frmt1"] this.N = parseFloat(arguments[0]["N"]) this.swap = parseFloat(arguments[0]["swap"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; var ipar = this.model.ipar; var dstate = this.model.dstate; var lunit = dstate[2-1]; - var fname = exprs[2-1]; - var frmt = exprs[3-1]; + var fname = this.exprs[2-1]; + var frmt = this.exprs[3-1]; while (true) { - [ok,this.in1,this.fname1,this.frmt1,this.N,this.swap,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","WRITEC_f")],[" "],["Write to C binary file"]],["Input Size","Output File Name","Output Format","Buffer Size","Swap Mode (0:No, 1:Yes)"],list("vec",1,"str",1,"str",1,"vec",1,"vec",1),exprs); + [ok,this.in1,this.fname1,this.frmt1,this.N,this.swap,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","WRITEC_f")],[" "],["Write to C binary file"]],["Input Size","Output File Name","Output Format","Buffer Size","Swap Mode (0:No, 1:Yes)"],list("vec",1,"str",1,"str",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -19188,7 +19349,7 @@ function WRITEC_f() { this.model.in1 = new ScilabDouble([nin]); this.model.dstate = new ScilabDouble(dstate); this.model.ipar = new ScilabDouble(ipar); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -19208,9 +19369,9 @@ function CLKINV_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabDouble([false,false]); - var exprs = string(this.prt); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKINV_f\",sz(1),sz(2));"]); - this.x = standard_define([1,1],this.model,exprs,gr_i); + this.exprs = string(this.prt); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKINV_f\",sz(1),sz(2));"]); + this.x = standard_define([1,1],this.model,this.exprs,this.gr_i); return new EventInBlock(this.x); } CLKINV_f.prototype.details = function CLKINV_f() { @@ -19223,13 +19384,14 @@ function CLKINV_f() { } CLKINV_f.prototype.set = function CLKINV_f() { this.prt = parseFloat(arguments[0]["prt"]) + this.exprs = parseFloat(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = this.graphics.exprs; - var exprs = exprs[1-1]; + this.exprs = this.graphics.exprs; + this.exprs = this.exprs[1-1]; while (true) { - [ok,this.prt,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","CLKINV_f")],[" "],["Event input port"],[" "]],"Port Number",list("vec",1),exprs); + [ok,this.prt,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","CLKINV_f")],[" "],["Event input port"],[" "]],"Port Number",list("vec",1),this.exprs); this.prt = int(this.prt); if (!ok) { break; @@ -19240,7 +19402,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -19260,8 +19422,8 @@ function CLKIN_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabDouble([false,false]); - var exprs = string(this.prt); - this.x = standard_define([1,1],this.model,exprs," "); + this.exprs = string(this.prt); + this.x = standard_define([1,1],this.model,this.exprs," "); return new BasicBlock(this.x); } CLKIN_f.prototype.details = function CLKIN_f() { @@ -19274,13 +19436,14 @@ function CLKIN_f() { } CLKIN_f.prototype.set = function CLKIN_f() { this.prt = parseFloat(arguments[0]["prt"]) + this.exprs = parseFloat(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = this.graphics.exprs; - var exprs = exprs[1-1]; + this.exprs = this.graphics.exprs; + this.exprs = this.exprs[1-1]; while (true) { - [ok,this.prt,exprs] = scicos_getvalue("Set Event Input block parameters","Port number",list("vec",1),exprs); + [ok,this.prt,this.exprs] = scicos_getvalue("Set Event Input block parameters","Port number",list("vec",1),this.exprs); this.prt = int(this.prt); if (!ok) { break; @@ -19291,7 +19454,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -19323,7 +19486,7 @@ function CLOCK_c() { split.graphics.orig = [[380.71066],[172]]; split.graphics.pein = 3; split.graphics.peout = [[5],[6]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLOCK_c\",sz(1),sz(2));"]); + this.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; @@ -19334,7 +19497,7 @@ function CLOCK_c() { this.x = scicos_block(); this.x.gui = "CLOCK_c"; this.x.graphics.sz = [2,2]; - this.x.graphics.gr_i = gr_i; + this.x.graphics.gr_i = this.gr_i; this.x.graphics.peout = 0; this.x.model.sim = "csuper"; this.x.model.evtout = 1; @@ -19367,13 +19530,13 @@ function CLOCK_c() { } var newpar = list(); var xx = arg1.model.rpar.objs[path-1]; - var exprs = xx.graphics.exprs; + this.exprs = xx.graphics.exprs; this.model = xx.model; var t0_old = this.model.firing; var dt_old = this.model.rpar[1-1]; var model_n = this.model; while (true) { - [ok,this.dt,this.t0,this.exprs0] = scicos_getvalue([[msprintf("Set %s block parameters","CLOCK_c")],[" "],["Event clock generator"],[" "],[" Do not start if \'Initialisation Time\' is negative"],[" "]],["Period","Initialisation Time"],list("vec",1,"vec",1),exprs); + [ok,this.dt,this.t0,this.exprs0] = scicos_getvalue([[msprintf("Set %s block parameters","CLOCK_c")],[" "],["Event clock generator"],[" "],[" Do not start if \'Initialisation Time\' is negative"],[" "]],["Period","Initialisation Time"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -19427,7 +19590,7 @@ function CLOCK_f() { split.graphics.orig = [[380.71066],[172]]; split.graphics.pein = 3; split.graphics.peout = [[5],[6]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLOCK_f\",sz(1),sz(2));"]); + this.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; @@ -19438,7 +19601,7 @@ function CLOCK_f() { this.x = scicos_block(); this.x.gui = "CLOCK_f"; this.x.graphics.sz = [2,2]; - this.x.graphics.gr_i = gr_i; + this.x.graphics.gr_i = this.gr_i; this.x.graphics.peout = 0; this.x.model.sim = "csuper"; this.x.model.evtout = 1; @@ -19471,13 +19634,13 @@ function CLOCK_f() { } var newpar = list(); var xx = arg1.model.rpar.objs[path-1]; - var exprs = xx.graphics.exprs; + this.exprs = xx.graphics.exprs; this.model = xx.model; var t0_old = this.model.firing; var dt_old = this.model.rpar; var model_n = this.model; while (true) { - [ok,this.dt,this.t0,this.exprs0] = scicos_getvalue("Set Clock block parameters",["Period","Init time"],list("vec",1,"vec",1),exprs); + [ok,this.dt,this.t0,this.exprs0] = scicos_getvalue("Set Clock block parameters",["Period","Init time"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -19494,7 +19657,7 @@ function CLOCK_f() { break; } } - if (!and([t0_old,dt_old]==[this.t0,this.dt])||!and(this.exprs0==exprs)) { + if (!and([t0_old,dt_old]==[this.t0,this.dt])||!and(this.exprs0==this.exprs)) { newpar[size(newpar)+1-1] = path; } if (t0_old!=this.t0) { @@ -19519,9 +19682,9 @@ function CONST() { this.model.rpar = new ScilabDouble([this.C]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); - var exprs = strcat(sci2exp(this.C)); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = strcat(sci2exp(this.C)); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CONST.prototype.details = function CONST() { @@ -19534,12 +19697,13 @@ function CONST() { } CONST.prototype.set = function CONST() { this.C = parseFloat(arguments[0]["C"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.C,exprs] = scicos_getvalue(["Set Contant Block"],"Constant",list("vec",-1),exprs); + [ok,this.C,this.exprs] = scicos_getvalue(["Set Contant Block"],"Constant",list("vec",-1),this.exprs); if (!ok) { break; } @@ -19552,7 +19716,7 @@ function CONST() { } else { this.model.rpar = new ScilabDouble(this.C.slice()); this.model.out = new ScilabDouble([nout]); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -19572,9 +19736,9 @@ function CONST_f() { this.model.rpar = new ScilabDouble([this.C]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); - var exprs = strcat(sci2exp(this.C)); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = strcat(sci2exp(this.C)); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CONST_f.prototype.details = function CONST_f() { @@ -19587,12 +19751,13 @@ function CONST_f() { } CONST_f.prototype.set = function CONST_f() { this.C = parseFloat(arguments[0]["C"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.C,exprs] = scicos_getvalue(["Set Contant Block"],"Constant",list("vec",-1),exprs); + [ok,this.C,this.exprs] = scicos_getvalue(["Set Contant Block"],"Constant",list("vec",-1),this.exprs); if (!ok) { break; } @@ -19602,7 +19767,7 @@ function CONST_f() { } else { this.model.rpar = new ScilabDouble(this.C.slice()); this.model.out = new ScilabDouble([nout]); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -19625,9 +19790,9 @@ function CONST_m() { this.model.opar = list(); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); - var exprs = sci2exp(this.C); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST_m\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = sci2exp(this.C); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST_m\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CONST_m.prototype.details = function CONST_m() { @@ -19640,12 +19805,13 @@ function CONST_m() { } CONST_m.prototype.set = function CONST_m() { this.C = inverse(arguments[0]["C"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.C,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","CONST_m")],[" "],["Constant value generator"],[" "]],"Constant Value",list("vec",-1),exprs); + [ok,this.C,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","CONST_m")],[" "],["Constant value generator"],[" "]],"Constant Value",list("vec",-1),this.exprs); if (!ok) { break; } @@ -19683,7 +19849,7 @@ function CONST_m() { this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -19713,9 +19879,9 @@ function CURVE_c() { this.model.evtin = new ScilabDouble([1]); this.model.evtout = new ScilabDouble([1]); this.model.firing = new ScilabDouble([0]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CURVE_c.prototype.details = function CURVE_c() { @@ -19737,22 +19903,23 @@ function CURVE_c() { this.yy = inverse(arguments[0]["yy"]) this.PeriodicOption = arguments[0]["PeriodicOption"] this.graf = arguments[0]["graf"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.model = arg1.model; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; var ok = false; var SaveExit = false; while (true) { var Ask_again = false; - [ok,this.Method,this.xx,this.yy,this.PeriodicOption,this.graf,exprs] = scicos_getvalue("Spline data",["Spline Method (0..7)","x","y","Periodic signal(y/n)?","Launch graphic window(y/n)?"],list("vec",1,"vec",-1,"vec",-1,"str",1,"str",1),exprs); + [ok,this.Method,this.xx,this.yy,this.PeriodicOption,this.graf,this.exprs] = scicos_getvalue("Spline data",["Spline Method (0..7)","x","y","Periodic signal(y/n)?","Launch graphic window(y/n)?"],list("vec",1,"vec",-1,"vec",-1,"str",1,"str",1),this.exprs); if (!ok) { break; } if (this.PeriodicOption=="y"||this.PeriodicOption=="Y") { var PO = 1; } else { - exprs[4-1] = "n"; + this.exprs[4-1] = "n"; var PO = 0; } var mtd = int(this.Method); @@ -19782,7 +19949,7 @@ function CURVE_c() { var tmpvar2 = cleandata(this.xy); this.xy = tmpvar2[0]; var N = size(this.xy,"r"); - exprs[5-1] = "n"; + this.exprs[5-1] = "n"; if (this.graf=="y"||this.graf=="Y") { var ipar = [[N],[mtd],[PO]]; var rpar = []; @@ -19813,16 +19980,16 @@ function CURVE_c() { var DChange = true; } if (DChange) { - exprs[2-1] = strcat(sci2exp(xy2.slice()[1-1])); - exprs[3-1] = strcat(sci2exp(xy2.slice()[2-1])); + this.exprs[2-1] = strcat(sci2exp(xy2.slice()[1-1])); + this.exprs[3-1] = strcat(sci2exp(xy2.slice()[2-1])); } - exprs[1-1] = sci2exp(New_methhod); + this.exprs[1-1] = sci2exp(New_methhod); if (oipar[3-1]==1) { var perop = "y"; } else { var perop = "n"; } - exprs[4-1] = perop; + this.exprs[4-1] = perop; var SaveExit = true; } else { var tmpvar4 = Do_Spline(N,mtd,this.xy.slice()[1-1],this.xy.slice()[2-1]); @@ -19839,7 +20006,7 @@ function CURVE_c() { var orpar = [[this.xy.slice()[1-1]],[this.xy.slice()[2-1]]]; } } - exprs[1-1] = sci2exp(mtd); + this.exprs[1-1] = sci2exp(mtd); var oipar = [[N],[mtd],[PO]]; var SaveExit = true; } @@ -19853,7 +20020,7 @@ function CURVE_c() { } this.model.rpar = new ScilabDouble(orpar); this.model.ipar = new ScilabDouble(oipar); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.model = this.model; this.x.graphics = this.graphics; break; @@ -19879,8 +20046,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 ScilabDouble([false,true]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CURV_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CURV_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,[],this.gr_i); return new BasicBlock(this.x); } CURV_f.prototype.details = function CURV_f() { @@ -19950,9 +20117,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 ScilabDouble([false,false]); - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } Counter.prototype.details = function Counter() { @@ -19970,12 +20137,13 @@ function Counter() { this.minim = parseFloat(arguments[0]["minim"]) this.maxim = parseFloat(arguments[0]["maxim"]) this.rule = parseFloat(arguments[0]["rule"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.minim,this.maxim,this.rule,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","Counter")],[" "],["Integer counter generator"],[" "]],["Minimum","Maximum","Rule (1:Increment, 2:Decrement)"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.minim,this.maxim,this.rule,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","Counter")],[" "],["Integer counter generator"],[" "]],["Minimum","Maximum","Rule (1:Increment, 2:Decrement)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -19986,7 +20154,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.dstate = new ScilabDouble([0]); this.model.ipar = new ScilabDouble([this.rule],[this.maxim],[this.minim]); this.x.graphics = this.graphics; @@ -20006,8 +20174,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()); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMWSB\",sz(1),sz(2));"]); - this.x = standard_define([5,2],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMWSB\",sz(1),sz(2));"]); + this.x = standard_define([5,2],this.model,[],this.gr_i); return new BasicBlock(this.x); } FROMWSB.prototype.details = function FROMWSB() { @@ -20107,9 +20275,9 @@ function FROMWS_c() { this.model.firing = new ScilabDouble([0]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,true]); - 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 = standard_define([3.5,2],this.model,exprs,gr_i); + 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 = standard_define([3.5,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } FROMWS_c.prototype.details = function FROMWS_c() { @@ -20129,12 +20297,13 @@ function FROMWS_c() { this.Method = parseFloat(arguments[0]["Method"]) this.ZC = parseFloat(arguments[0]["ZC"]) this.OutEnd = parseFloat(arguments[0]["OutEnd"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.varnam,this.Method,this.ZC,this.OutEnd,exprs] = scicos_getvalue("Set From_Workspace block parameters",["Variable name","Interpolation Method","Enable zero crossing(0:No, 1:Yes)?","Output at end(0:Zero, 1:Hold, 2:Repeat)"],list("str",1,"vec",1,"vec",1,"vec",1),exprs); + [ok,this.varnam,this.Method,this.ZC,this.OutEnd,this.exprs] = scicos_getvalue("Set From_Workspace block parameters",["Variable name","Interpolation Method","Enable zero crossing(0:No, 1:Yes)?","Output at end(0:Zero, 1:Hold, 2:Repeat)"],list("str",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -20163,7 +20332,7 @@ function FROMWS_c() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -20186,9 +20355,9 @@ function GENSIN_f() { this.model.rpar = new ScilabDouble([1],[1],[0]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } GENSIN_f.prototype.details = function GENSIN_f() { @@ -20206,12 +20375,13 @@ function GENSIN_f() { this.M = arguments[0]["M"] this.F = arguments[0]["F"] this.P = arguments[0]["P"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.M,this.F,this.P,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","GENSIN_f")],[" "],["Sine wave generator"],[" "]],["Magnitude","Frequency (rad/s)","Phase (rad)"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.M,this.F,this.P,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","GENSIN_f")],[" "],["Sine wave generator"],[" "]],["Magnitude","Frequency (rad/s)","Phase (rad)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -20227,7 +20397,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -20249,9 +20419,9 @@ function GENSQR_f() { this.model.dstate = new ScilabDouble([this.Amplitude]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); - var exprs = string(this.Amplitude); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GENSQR_f\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,exprs,gr_i); + this.exprs = string(this.Amplitude); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GENSQR_f\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } GENSQR_f.prototype.details = function GENSQR_f() { @@ -20265,19 +20435,20 @@ function GENSQR_f() { } GENSQR_f.prototype.set = function GENSQR_f() { this.Amplitude = parseFloat(arguments[0]["Amplitude"]) + this.exprs = parseFloat(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - if (size(exprs,"*")==2) { - var exprs = exprs[2-1]; + if (size(this.exprs,"*")==2) { + this.exprs = this.exprs[2-1]; } while (true) { - [ok,this.Amplitude,exprs] = scicos_getvalue(["Set Square generator block parameters"],["Amplitude"],list("vec",1),exprs); + [ok,this.Amplitude,this.exprs] = scicos_getvalue(["Set Square generator block parameters"],["Amplitude"],list("vec",1),this.exprs); if (!ok) { break; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.dstate = new ScilabDouble([this.Amplitude]); this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); @@ -20335,9 +20506,9 @@ function GEN_SQR() { var Amax = 1; var rule = 1; var F = 1; - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } GEN_SQR.prototype.details = function GEN_SQR() { @@ -20353,11 +20524,12 @@ function GEN_SQR() { scicos_context.Amax = arguments[0]["scicos_context.Amax"] scicos_context.rule = arguments[0]["scicos_context.rule"] scicos_context.F = arguments[0]["scicos_context.F"] + this.exprs = arguments[0]["exprs"] var y = this.needcompile; arg1.model.ipar = 1; var typ = list(); this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; var Btitre = "Set GEN_SQR parameters"; var Exprs0 = [["Amin"],["Amax"],["rule"],["F"]]; var Bitems = [["Minimum Value"],["Maximum Value"],["Initial Value( 1= Minimum Value 2= Maximum Value)"],["Period (sec)"]]; @@ -20366,7 +20538,7 @@ function GEN_SQR() { this.x = arg1; var ok = false; while (!ok) { - [ok,scicos_context.Amin,scicos_context.Amax,scicos_context.rule,scicos_context.F,exprs] = scicos_getvalue(Btitre,Bitems,Ss,exprs); + [ok,scicos_context.Amin,scicos_context.Amax,scicos_context.rule,scicos_context.F,this.exprs] = scicos_getvalue(Btitre,Bitems,Ss,this.exprs); if (!ok) { return; } @@ -20383,7 +20555,7 @@ function GEN_SQR() { var ok = tmpvar1[3]; if (ok) { var y = max(2,this.needcompile,needcompile2); - this.x.graphics.exprs = exprs; + this.x.graphics.exprs = this.exprs; this.x.model.rpar = sblock; break; } @@ -20410,9 +20582,9 @@ function Ground_g() { this.model.opar = list(C); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); - var exprs = []; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Ground_g\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = []; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Ground_g\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } Ground_g.prototype.details = function Ground_g() { @@ -20443,9 +20615,9 @@ function INIMPL_f() { mo.outputs = "n"; this.model.equations = new ScilabDouble([mo]); this.prt = 1; - var exprs = "1"; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INIMPL_f\",sz(1),sz(2));"]); - this.x = standard_define([1,1],this.model,exprs,gr_i); + this.exprs = "1"; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INIMPL_f\",sz(1),sz(2));"]); + this.x = standard_define([1,1],this.model,this.exprs,this.gr_i); this.x.graphics.out_implicit = ["I"]; return new ImplicitInBlock(this.x); } @@ -20459,15 +20631,16 @@ function INIMPL_f() { } INIMPL_f.prototype.set = function INIMPL_f() { this.prt = parseFloat(arguments[0]["prt"]) + this.exprs = parseFloat(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - if (size(exprs,"*")==2) { - var exprs = exprs[1-1]; + if (size(this.exprs,"*")==2) { + this.exprs = this.exprs[1-1]; } while (true) { - [ok,this.prt,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","INIMPL_f")],[" "],["Implicit input port"],[" "]],"Port Number",list("vec",1),exprs); + [ok,this.prt,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","INIMPL_f")],[" "],["Implicit input port"],[" "]],"Port Number",list("vec",1),this.exprs); if (!ok) { break; } @@ -20480,7 +20653,7 @@ function INIMPL_f() { var y = needcompile; } this.model.ipar = new ScilabDouble([this.prt]); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -20501,9 +20674,9 @@ function IN_f() { this.model.ipar = new ScilabDouble([prt]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,false]); - var exprs = sci2exp(prt); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IN_f\",sz(1),sz(2));"]); - this.x = standard_define([1,1],this.model,exprs,gr_i); + this.exprs = sci2exp(prt); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IN_f\",sz(1),sz(2));"]); + this.x = standard_define([1,1],this.model,this.exprs,this.gr_i); return new ExplicitInBlock(this.x); } IN_f.prototype.details = function IN_f() { @@ -20518,20 +20691,20 @@ function IN_f() { this.x = arg1; this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = this.graphics.exprs; - if (size(exprs,"*")==2) { - var exprs = exprs[1-1]; + this.exprs = this.graphics.exprs; + if (size(this.exprs,"*")==2) { + this.exprs = this.exprs[1-1]; } - if (size(exprs,"*")==1) { - var exprs = [[exprs[1-1]],["[-1 -2]"],["-1"]]; + if (size(this.exprs,"*")==1) { + this.exprs = [[this.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),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),this.exprs); var ok = tmpvar0[0]; var prt = tmpvar0[1]; var otsz = tmpvar0[2]; var ot = tmpvar0[3]; - var exprs = tmpvar0[4]; + this.exprs = tmpvar0[4]; if (!ok) { break; } @@ -20552,7 +20725,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(exprs); + this.graphics.exprs = new ScilabDouble(this.exprs); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -20574,9 +20747,9 @@ function Modulo_Count() { this.model.ipar = new ScilabDouble([this.base]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,false]); - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } Modulo_Count.prototype.details = function Modulo_Count() { @@ -20592,12 +20765,13 @@ function Modulo_Count() { Modulo_Count.prototype.set = function Modulo_Count() { this.ini_c = parseFloat(arguments[0]["ini_c"]) this.base = parseFloat(arguments[0]["base"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.ini_c,this.base,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","Modulo_Count")],[" "],["Modulo counter (0 to N counter)"],[" "]],["Initial State (zero or positive number)","Upper Limit (positive number)"],list("vec",1,"vec",1),exprs); + [ok,this.ini_c,this.base,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","Modulo_Count")],[" "],["Modulo counter (0 to N counter)"],[" "]],["Initial State (zero or positive number)","Upper Limit (positive number)"],list("vec",1,"vec",1),this.exprs); this.ini_c = int(this.ini_c); this.base = int(this.base); if (!ok) { @@ -20608,7 +20782,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.ipar = new ScilabDouble([this.base]); this.model.dstate = new ScilabDouble([this.ini_c]); this.x.graphics = this.graphics; @@ -20661,9 +20835,9 @@ function PULSE_SC() { var W = 30; var F = 1; var A = 1; - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } PULSE_SC.prototype.details = function PULSE_SC() { @@ -20679,11 +20853,12 @@ function PULSE_SC() { scicos_context.W = arguments[0]["scicos_context.W"] scicos_context.F = arguments[0]["scicos_context.F"] scicos_context.A = arguments[0]["scicos_context.A"] + this.exprs = arguments[0]["exprs"] var y = this.needcompile; arg1.model.ipar = 1; var typ = list(); this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; var Btitre = "Set Pulse Generator parameters"; var Exprs0 = [["E"],["W"],["F"],["A"]]; var Bitems = [["Phase delay (secs):"],["Pulse Width (% of period):"],["Period (secs):"],["Amplitude:"]]; @@ -20692,7 +20867,7 @@ function PULSE_SC() { this.x = arg1; var ok = false; while (!ok) { - [ok,scicos_context.E,scicos_context.W,scicos_context.F,scicos_context.A,exprs] = scicos_getvalue(Btitre,Bitems,Ss,exprs); + [ok,scicos_context.E,scicos_context.W,scicos_context.F,scicos_context.A,this.exprs] = scicos_getvalue(Btitre,Bitems,Ss,this.exprs); if (!ok) { return; } @@ -20709,7 +20884,7 @@ function PULSE_SC() { var ok = tmpvar1[3]; if (ok) { var y = max(2,this.needcompile,needcompile2); - this.x.graphics.exprs = exprs; + this.x.graphics.exprs = this.exprs; this.x.model.rpar = sblock; break; } @@ -20739,9 +20914,9 @@ function RAMP() { this.model.nmode = new ScilabDouble([1]); this.model.nzcross = new ScilabDouble([1]); this.model.dep_ut = new ScilabDouble([false,true]); - var exprs = [string(rpar)]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAMP\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = [string(rpar)]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAMP\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } RAMP.prototype.details = function RAMP() { @@ -20759,12 +20934,13 @@ function RAMP() { this.slope = parseFloat(arguments[0]["slope"]) this.stt = parseFloat(arguments[0]["stt"]) this.iout = parseFloat(arguments[0]["iout"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.slope,this.stt,this.iout,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","RAMP")],[" "],["Ramp function"],[" "]],["Slope","Start Time","Initial Value"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.slope,this.stt,this.iout,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","RAMP")],[" "],["Ramp function"],[" "]],["Slope","Start Time","Initial Value"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -20772,7 +20948,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -20798,9 +20974,9 @@ function RAND_f() { this.model.ipar = new ScilabDouble([this.flag]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabDouble([false,false]); - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } RAND_f.prototype.details = function RAND_f() { @@ -20820,18 +20996,19 @@ function RAND_f() { this.a = parseFloat(arguments[0]["a"]) this.b = parseFloat(arguments[0]["b"]) this.seed_c = arguments[0]["seed_c"] + this.exprs = inverse(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - if (size(exprs,"*")==5) { - var exprs = exprs.slice(1-1,3); + if (size(this.exprs,"*")==5) { + this.exprs = this.exprs.slice(1-1,3); } - if (size(exprs,"*")==3) { - var exprs = [[exprs],[string(this.model.dstate[1-1])]]; + if (size(this.exprs,"*")==3) { + this.exprs = [[this.exprs],[string(this.model.dstate[1-1])]]; } while (true) { - [ok,this.flag,this.a,this.b,this.seed_c,exprs] = scicos_getvalue([["Set Random generator block parameters"],["flag = 0 : Uniform distribution A is min and A+B max"],["flag = 1 : Normal distribution A is mean and B deviation"],[" "],["A and B must be vector with equal sizes"],["seed is the seed of random number generator (integer<2**31)"]],["flag","A","B","seed"],list("vec",1,"vec",-1,"vec","size(%2,\'*\')","vec",1),exprs); + [ok,this.flag,this.a,this.b,this.seed_c,this.exprs] = scicos_getvalue([["Set Random generator block parameters"],["flag = 0 : Uniform distribution A is min and A+B max"],["flag = 1 : Normal distribution A is mean and B deviation"],[" "],["A and B must be vector with equal sizes"],["seed is the seed of random number generator (integer<2**31)"]],["flag","A","B","seed"],list("vec",1,"vec",-1,"vec","size(%2,\'*\')","vec",1),this.exprs); if (!ok) { break; } @@ -20839,7 +21016,7 @@ function RAND_f() { message("flag must be equal to 1 or 0"); } else { var nout = size(this.a,"*"); - this.graphics.exprs = new ScilabDouble(exprs); + this.graphics.exprs = new ScilabDouble(this.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()]); @@ -20878,9 +21055,9 @@ function RAND_m() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([false,false]); - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } RAND_m.prototype.details = function RAND_m() { @@ -20902,15 +21079,16 @@ function RAND_m() { this.a = parseFloat(arguments[0]["a"]) this.b = parseFloat(arguments[0]["b"]) this.seed_c = arguments[0]["seed_c"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - if (size(exprs,"*")==14) { - exprs[9-1] = []; + if (size(this.exprs,"*")==14) { + this.exprs[9-1] = []; } while (true) { - [ok,this.typ,this.flag,this.a,this.b,this.seed_c,exprs] = scicos_getvalue([["Set Random generator block parameters"],["flag = 0 : Uniform distribution A is min and A+B max"],["flag = 1 : Normal distribution A is mean and B deviation"],[" "],["A and B must be matrix with equal sizes"]],["Datatype(1=real double 2=complex)","flag","A","B","SEED"],list("vec",1,"vec",1,"mat",[-1,-2],"mat","[-1 -2]","mat",[1,2]),exprs); + [ok,this.typ,this.flag,this.a,this.b,this.seed_c,this.exprs] = scicos_getvalue([["Set Random generator block parameters"],["flag = 0 : Uniform distribution A is min and A+B max"],["flag = 1 : Normal distribution A is mean and B deviation"],[" "],["A and B must be matrix with equal sizes"]],["Datatype(1=real double 2=complex)","flag","A","B","SEED"],list("vec",1,"vec",1,"mat",[-1,-2],"mat","[-1 -2]","mat",[1,2]),this.exprs); if (!ok) { break; } @@ -20939,7 +21117,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.ipar = new ScilabDouble([this.flag]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -20973,9 +21151,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 ScilabDouble([false,false]); - 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 = standard_define([5,2],this.model,exprs,gr_i); + 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 = standard_define([5,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } READAU_f.prototype.details = function READAU_f() { @@ -20993,9 +21171,10 @@ function READAU_f() { this.fname1 = parseFloat(arguments[0]["fname1"]) this.N = parseFloat(arguments[0]["N"]) this.swap = parseFloat(arguments[0]["swap"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; var out = this.model.out; var dstate = this.model.dstate; @@ -21003,9 +21182,9 @@ function READAU_f() { var imask = 9+ipar[1-1]; var tmask = ipar[imask-1]; var lunit = dstate[3-1]; - var fname = exprs[1-1]; + var fname = this.exprs[1-1]; while (true) { - [ok,this.fname1,this.N,this.swap,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","READAU_f")],[" "],["(Read Audio File)"],[" "],["Read is done on a binary \'.au\' file"]],["Input File Name","Buffer size","Swap Mode (0:No, 1:Yes)"],list("str",1,"vec",1,"vec",1),exprs); + [ok,this.fname1,this.N,this.swap,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","READAU_f")],[" "],["(Read Audio File)"],[" "],["Read is done on a binary \'.au\' file"]],["Input File Name","Buffer size","Swap Mode (0:No, 1:Yes)"],list("str",1,"vec",1,"vec",1),this.exprs); var tmask1 = []; var outmask = 1; var frmt1 = "uc"; @@ -21039,7 +21218,7 @@ function READAU_f() { } this.model.dstate = new ScilabDouble(dstate); this.model.ipar = new ScilabDouble(ipar); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -21075,9 +21254,9 @@ function READC_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabDouble([false,false]); - 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 = standard_define([4,2],this.model,exprs,gr_i); + 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 = standard_define([4,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } READC_f.prototype.details = function READC_f() { @@ -21105,20 +21284,21 @@ function READC_f() { this.N = parseFloat(arguments[0]["N"]) this.offset = parseFloat(arguments[0]["offset"]) this.swap = parseFloat(arguments[0]["swap"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.model = this.x.model; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.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 = exprs[3-1]; - var frmt = exprs[4-1]; + var fname = this.exprs[3-1]; + var frmt = this.exprs[4-1]; while (true) { - [ok,this.tmask1,this.outmask,this.fname1,this.frmt1,this.M,this.N,this.offset,this.swap,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","READC_f")],[" "],["Read from C binary file"]],["Time Record Selection","Outputs Record Selection","Input File Name","Input Format","Record Size","Buffer Size","Initial Record Index","Swap Mode (0:No, 1:Yes)"],list("vec",-1,"vec",-1,"str",1,"str",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs); + [ok,this.tmask1,this.outmask,this.fname1,this.frmt1,this.M,this.N,this.offset,this.swap,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","READC_f")],[" "],["Read from C binary file"]],["Time Record Selection","Outputs Record Selection","Input File Name","Input Format","Record Size","Buffer Size","Initial Record Index","Swap Mode (0:No, 1:Yes)"],list("vec",-1,"vec",-1,"str",1,"str",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -21181,7 +21361,7 @@ function READC_f() { } this.model.dstate = new ScilabDouble(dstate); this.model.ipar = new ScilabDouble(ipar); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -21213,9 +21393,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 ScilabDouble([false,false]); - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } RFILE_f.prototype.details = function RFILE_f() { @@ -21237,9 +21417,10 @@ function RFILE_f() { this.fname1 = parseFloat(arguments[0]["fname1"]) this.frmt1 = parseFloat(arguments[0]["frmt1"]) this.N = parseFloat(arguments[0]["N"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; var dstate = this.model.dstate; var ipar = this.model.ipar; @@ -21248,13 +21429,13 @@ function RFILE_f() { var imask = 5+ipar[1-1]+ipar[2-1]; var tmask = ipar[imask-1]; var lunit = dstate[3-1]; - var fname = exprs[3-1]; - var frmt = exprs[4-1]; - if (size(exprs,"*")>5) { - exprs[6-1] = []; + var fname = this.exprs[3-1]; + var frmt = this.exprs[4-1]; + if (size(this.exprs,"*")>5) { + this.exprs[6-1] = []; } while (true) { - [ok,this.tmask1,this.outmask,this.fname1,this.frmt1,this.N,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","RFILE_f")],[" "],["Read from an input file"],[" "],["Read is done on:"],[" - A binary file if no format given"],[" - A formatted text file if a format (fortran type) is given"]],["Time Record Selection","Outputs Record Selection","Input File Name","Input Format","Buffer Size"],list("vec",-1,"vec",-1,"str",1,"str",1,"vec",1),exprs); + [ok,this.tmask1,this.outmask,this.fname1,this.frmt1,this.N,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","RFILE_f")],[" "],["Read from an input file"],[" "],["Read is done on:"],[" - A binary file if no format given"],[" - A formatted text file if a format (fortran type) is given"]],["Time Record Selection","Outputs Record Selection","Input File Name","Input Format","Buffer Size"],list("vec",-1,"vec",-1,"str",1,"str",1,"vec",1),this.exprs); if (!ok) { break; } @@ -21306,7 +21487,7 @@ function RFILE_f() { } this.model.dstate = new ScilabDouble(dstate); this.model.ipar = new ScilabDouble(ipar); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -21326,9 +21507,9 @@ function SAWTOOTH_f() { this.model.dstate = new ScilabDouble([0]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); - var exprs = " "; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAWTOOTH_f\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,exprs,gr_i); + this.exprs = " "; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAWTOOTH_f\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } SAWTOOTH_f.prototype.details = function SAWTOOTH_f() { @@ -21359,9 +21540,9 @@ function STEP() { this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,false]); - var exprs = [[string(1)],[string(rpar)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"STEP\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = [[string(1)],[string(rpar)]]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"STEP\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } STEP.prototype.details = function STEP() { @@ -21379,12 +21560,13 @@ function STEP() { this.temps = arguments[0]["temps"] this.in1 = arguments[0]["in1"] this.fi = arguments[0]["fi"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.temps,this.in1,this.fi,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","STEP_FUNCTION")],[" "],["Step Function"],[" "]],["Step Time","Initial Value","Final Value"],list("vec",1,"vec",-1,"vec",-1),exprs); + [ok,this.temps,this.in1,this.fi,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","STEP_FUNCTION")],[" "],["Step Function"],[" "]],["Step Time","Initial Value","Final Value"],list("vec",1,"vec",-1,"vec",-1),this.exprs); if (!ok) { break; } @@ -21416,7 +21598,7 @@ function STEP() { var rpar = [[this.in1],[this.fi]]; } this.model.rpar = new ScilabDouble(rpar); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -21474,8 +21656,8 @@ function STEP_FUNCTION() { this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); this.model.rpar = scs_m_1; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"STEP_FUNCTION\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"STEP_FUNCTION\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,[],this.gr_i); return new BasicBlock(this.x); } STEP_FUNCTION.prototype.details = function STEP_FUNCTION() { @@ -21563,8 +21745,8 @@ function SampleCLK() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabDouble([false,false]); - var exprs = [[sci2exp(1)],[sci2exp(0)]]; - this.x = standard_define([2,2],this.model,exprs," "); + this.exprs = [[sci2exp(1)],[sci2exp(0)]]; + this.x = standard_define([2,2],this.model,this.exprs," "); return new BasicBlock(this.x); } SampleCLK.prototype.details = function SampleCLK() { @@ -21580,12 +21762,13 @@ function SampleCLK() { SampleCLK.prototype.set = function SampleCLK() { this.frequ = arguments[0]["frequ"] this.offset = arguments[0]["offset"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; while (true) { - [ok,this.frequ,this.offset,exprs] = scicos_getvalue("Set block parameters",["Sample time","Offset"],list("vec",1,"vec",1),exprs); + [ok,this.frequ,this.offset,this.exprs] = scicos_getvalue("Set block parameters",["Sample time","Offset"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -21605,7 +21788,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -21628,8 +21811,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()); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Sigbuilder\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Sigbuilder\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,[],this.gr_i); return new BasicBlock(this.x); } Sigbuilder.prototype.details = function Sigbuilder() { @@ -21720,8 +21903,8 @@ function TIME_f() { this.model.out = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TIME_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TIME_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,[],this.gr_i); return new BasicBlock(this.x); } TIME_f.prototype.details = function TIME_f() { @@ -21750,9 +21933,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 ScilabDouble([false,false]); - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } TKSCALE.prototype.details = function TKSCALE() { @@ -21770,13 +21953,14 @@ function TKSCALE() { this.a = parseFloat(arguments[0]["a"]) this.b = parseFloat(arguments[0]["b"]) this.f = parseFloat(arguments[0]["f"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - [ok,this.a,this.b,this.f,exprs] = scicos_getvalue("Set scale block parameters",["Min value","Max value","Normalization"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.a,this.b,this.f,this.exprs] = scicos_getvalue("Set scale block parameters",["Min value","Max value","Normalization"],list("vec",1,"vec",1,"vec",1),this.exprs); if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.rpar = new ScilabDouble([this.a],[this.b],[this.f]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -21799,9 +21983,9 @@ function GENERAL_f() { this.model.blocktype = new ScilabString(["z"]); this.model.firing = new ScilabDouble([-ones(this.out,1)]); this.model.dep_ut = new ScilabDouble([true,false]); - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } GENERAL_f.prototype.details = function GENERAL_f() { @@ -21817,16 +22001,17 @@ function GENERAL_f() { GENERAL_f.prototype.set = function GENERAL_f() { this.in1 = parseFloat(arguments[0]["in1"]) this.out = parseFloat(arguments[0]["out"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; var rpar = this.model.rpar; this.in1 = this.model.in1; this.out = this.model.evtout; var nin = sum(this.in1); var nout = sum(this.out); - [ok,this.in1,this.out,exprs] = scicos_getvalue("Set General Zero-Crossing parameters",["Input size","Number of event output"],list("vec",1,"vec",1),exprs); + [ok,this.in1,this.out,this.exprs] = scicos_getvalue("Set General Zero-Crossing parameters",["Input size","Number of event output"],list("vec",1,"vec",1),this.exprs); if (ok) { var tmpvar0 = check_io(this.model,this.graphics,this.in1,[],[],ones(this.out,1)); this.model = tmpvar0[0]; @@ -21847,7 +22032,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; } @@ -21868,8 +22053,8 @@ function NEGTOPOS_f() { this.model.blocktype = new ScilabString(["z"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabDouble([true,false]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NEGTOPOS_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NEGTOPOS_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,[],this.gr_i); return new BasicBlock(this.x); } NEGTOPOS_f.prototype.details = function NEGTOPOS_f() { @@ -21899,8 +22084,8 @@ function POSTONEG_f() { this.model.blocktype = new ScilabString(["z"]); this.model.dep_ut = new ScilabDouble([true,false]); this.model.firing = new ScilabDouble([-1]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"POSTONEG_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"POSTONEG_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,[],this.gr_i); return new BasicBlock(this.x); } POSTONEG_f.prototype.details = function POSTONEG_f() { @@ -21931,9 +22116,9 @@ function ZCROSS_f() { this.model.blocktype = new ScilabString(["z"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = strcat(sci2exp(this.in1)); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ZCROSS_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = strcat(sci2exp(this.in1)); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ZCROSS_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } ZCROSS_f.prototype.details = function ZCROSS_f() { @@ -21946,12 +22131,13 @@ function ZCROSS_f() { } ZCROSS_f.prototype.set = function ZCROSS_f() { this.in1 = parseFloat(arguments[0]["in1"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.in1,exprs] = scicos_getvalue([["Set Zero-Crossing parameters"],["All surfaces must cross together"]],"Input size",list("vec",1),exprs); + [ok,this.in1,this.exprs] = scicos_getvalue([["Set Zero-Crossing parameters"],["All surfaces must cross together"]],"Input size",list("vec",1),this.exprs); if (!ok) { break; } @@ -21964,7 +22150,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.in1 = 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 ab278050..a43ecbc0 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 ScilabDouble([false,false]); - var exprs = "A"; - this.x = standard_define([2,1],this.model,exprs," "); + this.exprs = "A"; + this.x = standard_define([2,1],this.model,this.exprs," "); this.x.graphics.id = "From"; return new BasicBlock(this.x); } @@ -23,12 +23,13 @@ function CLKFROM() { } CLKFROM.prototype.set = function CLKFROM() { this.tag = arguments[0]["tag"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; while (true) { - [ok,this.tag,exprs] = scicos_getvalue("Set block parameters","Tag",list("str",-1),exprs); + [ok,this.tag,this.exprs] = scicos_getvalue("Set block parameters","Tag",list("str",-1),this.exprs); if (!ok) { break; } @@ -39,7 +40,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 c97cb78c..e7091f3f 100644 --- a/js/Branching/CLKFROM.pickle +++ b/js/Branching/CLKFROM.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'gr_i' p2 -aS'model' +aS'exprs' p3 aS'tag' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'needcompile' p1 diff --git a/js/Branching/CLKGOTO.js b/js/Branching/CLKGOTO.js index 237992ae..cc21a9a0 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 ScilabDouble([false,false]); - var exprs = [["A"],[sci2exp(1)]]; - this.x = standard_define([2,1],this.model,exprs," "); + this.exprs = [["A"],[sci2exp(1)]]; + this.x = standard_define([2,1],this.model,this.exprs," "); this.x.graphics.id = "Goto"; return new BasicBlock(this.x); } @@ -27,12 +27,13 @@ function CLKGOTO() { CLKGOTO.prototype.set = function CLKGOTO() { this.tag = arguments[0]["tag"] this.tagvis = parseFloat(arguments[0]["tagvis"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; while (true) { - [ok,this.tag,this.tagvis,exprs] = scicos_getvalue("Set block parameters",["Tag","Tag Visibility (1=Local 2=Scoped 3=Global)"],list("str",-1,"vec",1),exprs); + [ok,this.tag,this.tagvis,this.exprs] = scicos_getvalue("Set block parameters",["Tag","Tag Visibility (1=Local 2=Scoped 3=Global)"],list("str",-1,"vec",1),this.exprs); if (!ok) { break; } @@ -50,7 +51,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 8c0d2129..ce176940 100644 --- a/js/Branching/CLKGOTO.pickle +++ b/js/Branching/CLKGOTO.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'tagvis' p2 -aS'model' +aS'gr_i' p3 -aS'tag' +aS'exprs' p4 -aS'tagvis' +aS'tag' p5 aS'graphics' p6 -atp7 -Rp8 +aS'x' +p7 +aS'model' +p8 +atp9 +Rp10 .(dp0 S'needcompile' p1 diff --git a/js/Branching/CLKGotoTagVisibility.js b/js/Branching/CLKGotoTagVisibility.js index 10dd1d16..4ab4da7c 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 ScilabDouble([false,false]); - var exprs = "A"; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKGotoTagVisibility\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = "A"; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKGotoTagVisibility\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CLKGotoTagVisibility.prototype.details = function CLKGotoTagVisibility() { @@ -30,12 +30,13 @@ function CLKGotoTagVisibility() { } CLKGotoTagVisibility.prototype.set = function CLKGotoTagVisibility() { this.tag = arguments[0]["tag"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.tag,exprs] = scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),exprs); + [ok,this.tag,this.exprs] = scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),this.exprs); if (!ok) { break; } @@ -44,7 +45,7 @@ function CLKGotoTagVisibility() { var needcompile = 4; var y = needcompile; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 a7889058..918f1bf7 100644 --- a/js/Branching/CLKGotoTagVisibility.pickle +++ b/js/Branching/CLKGotoTagVisibility.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'gr_i' p2 -aS'model' +aS'exprs' p3 aS'tag' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/Branching/DEMUX.js b/js/Branching/DEMUX.js index 61137fad..ed544002 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 ScilabDouble([true,false]); - var exprs = string(this.out); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEMUX\",sz(1),sz(2));"]); - this.x = standard_define([.5,2],this.model,exprs,gr_i); + this.exprs = string(this.out); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEMUX\",sz(1),sz(2));"]); + this.x = standard_define([.5,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } DEMUX.prototype.details = function DEMUX() { @@ -26,12 +26,13 @@ function DEMUX() { } DEMUX.prototype.set = function DEMUX() { this.out = parseFloat(arguments[0]["out"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.out,exprs] = scicos_getvalue("Set DEMUX block parameters",["number of output ports or vector of sizes"],list("intvec",-1),exprs); + [ok,this.out,this.exprs] = scicos_getvalue("Set DEMUX block parameters",["number of output ports or vector of sizes"],list("intvec",-1),this.exprs); if (!ok) { break; } @@ -65,7 +66,7 @@ function DEMUX() { } } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 82c8d94b..a3fa5b85 100644 --- a/js/Branching/DEMUX.pickle +++ b/js/Branching/DEMUX.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'exprs' p2 -aS'model' +aS'gr_i' p3 -aS'out' -p4 aS'graphics' +p4 +aS'x' p5 -atp6 -Rp7 +aS'model' +p6 +aS'out' +p7 +atp8 +Rp9 .(dp0 S'model.sim' p1 diff --git a/js/Branching/DEMUX_f.js b/js/Branching/DEMUX_f.js index 1d7808ad..94182b06 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 ScilabDouble([true,false]); - var exprs = string(this.out); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEMUX_f\",sz(1),sz(2));"]); - this.x = standard_define([.5,2],this.model,exprs,gr_i); + this.exprs = string(this.out); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEMUX_f\",sz(1),sz(2));"]); + this.x = standard_define([.5,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } DEMUX_f.prototype.details = function DEMUX_f() { @@ -26,12 +26,13 @@ function DEMUX_f() { } DEMUX_f.prototype.set = function DEMUX_f() { this.out = parseFloat(arguments[0]["out"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.out,exprs] = scicos_getvalue("Set DEMUX block parameters",["number of output ports or vector of sizes"],list("vec",-1),exprs); + [ok,this.out,this.exprs] = scicos_getvalue("Set DEMUX block parameters",["number of output ports or vector of sizes"],list("vec",-1),this.exprs); if (!ok) { break; } @@ -65,7 +66,7 @@ function DEMUX_f() { } } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 82c8d94b..a3fa5b85 100644 --- a/js/Branching/DEMUX_f.pickle +++ b/js/Branching/DEMUX_f.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'exprs' p2 -aS'model' +aS'gr_i' p3 -aS'out' -p4 aS'graphics' +p4 +aS'x' p5 -atp6 -Rp7 +aS'model' +p6 +aS'out' +p7 +atp8 +Rp9 .(dp0 S'model.sim' p1 diff --git a/js/Branching/ESELECT_f.js b/js/Branching/ESELECT_f.js index b543617b..7c45d10a 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 ScilabDouble([true,false]); this.model.nmode = new ScilabDouble([0]); this.model.nzcross = new ScilabDouble([0]); - 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 = standard_define([4,2],this.model,exprs,gr_i); + 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 = standard_define([4,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } ESELECT_f.prototype.details = function ESELECT_f() { @@ -34,18 +34,19 @@ function ESELECT_f() { this.out = parseFloat(arguments[0]["out"]) this.inh = parseFloat(arguments[0]["inh"]) this.nmod = parseFloat(arguments[0]["nmod"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; - if (size(exprs,"*")==1) { - exprs[2-1] = string(1); + this.exprs = this.graphics.exprs; + if (size(this.exprs,"*")==1) { + this.exprs[2-1] = string(1); } - if (size(exprs,"*")==2) { - exprs[3-1] = string(0); + if (size(this.exprs,"*")==2) { + this.exprs[3-1] = string(0); } this.model = arg1.model; while (true) { - [ok,this.out,this.inh,this.nmod,exprs] = scicos_getvalue("Set ESELECT block parameters",["number of output event ports","Inherit (1: no, 0: yes)","zero-crossing (0: no, 1: yes)"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.out,this.inh,this.nmod,this.exprs] = scicos_getvalue("Set ESELECT block parameters",["number of output event ports","Inherit (1: no, 0: yes)","zero-crossing (0: no, 1: yes)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -66,7 +67,7 @@ function ESELECT_f() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 9775491c..9e105914 100644 --- a/js/Branching/ESELECT_f.pickle +++ b/js/Branching/ESELECT_f.pickle @@ -4,18 +4,22 @@ p0 ((lp1 S'nmod' p2 -aS'inh' +aS'exprs' p3 -aS'graphics' +aS'gr_i' p4 -aS'x' +aS'inh' p5 -aS'model' +aS'graphics' p6 -aS'out' +aS'x' p7 -atp8 -Rp9 +aS'model' +p8 +aS'out' +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/Branching/EXTRACTOR.js b/js/Branching/EXTRACTOR.js index a4b49e1d..8134914a 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 ScilabDouble([true,false]); this.model.ipar = new ScilabDouble([this.ind]); - var exprs = [sci2exp(this.ind)]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACTOR\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,exprs,gr_i); + this.exprs = [sci2exp(this.ind)]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACTOR\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } EXTRACTOR.prototype.details = function EXTRACTOR() { @@ -25,12 +25,13 @@ function EXTRACTOR() { } EXTRACTOR.prototype.set = function EXTRACTOR() { this.ind = parseFloat(arguments[0]["ind"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.ind,exprs] = scicos_getvalue("Set block parameters",["indices to extract"],list("vec",-1),exprs); + [ok,this.ind,this.exprs] = scicos_getvalue("Set block parameters",["indices to extract"],list("vec",-1),this.exprs); if (!ok) { break; } @@ -42,7 +43,7 @@ function EXTRACTOR() { var ok = tmpvar0[2]; if (ok) { this.model.ipar = new ScilabDouble(this.ind); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 e8893247..8e0402fe 100644 --- a/js/Branching/EXTRACTOR.pickle +++ b/js/Branching/EXTRACTOR.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'ind' +S'exprs' p2 -aS'x' +aS'gr_i' p3 -aS'model' -p4 aS'graphics' +p4 +aS'ind' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'model.sim' p1 diff --git a/js/Branching/FROM.js b/js/Branching/FROM.js index 3b9260bb..9c13d8c9 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 ScilabDouble([false,false]); - var exprs = ["A"]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROM\",sz(1),sz(2));"]); - this.x = standard_define([2,1],this.model,exprs,gr_i); + this.exprs = ["A"]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROM\",sz(1),sz(2));"]); + this.x = standard_define([2,1],this.model,this.exprs,this.gr_i); this.x.graphics.id = "From"; return new BasicBlock(this.x); } @@ -30,12 +30,13 @@ function FROM() { } FROM.prototype.set = function FROM() { this.tag = arguments[0]["tag"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.tag,exprs] = scicos_getvalue("Set parameters",["Tag"],list("str",-1),exprs); + [ok,this.tag,this.exprs] = scicos_getvalue("Set parameters",["Tag"],list("str",-1),this.exprs); if (!ok) { break; } @@ -44,7 +45,7 @@ function FROM() { var needcompile = 4; var y = needcompile; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 a791941b..b1d966d0 100644 --- a/js/Branching/FROM.pickle +++ b/js/Branching/FROM.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'gr_i' p2 -aS'model' +aS'exprs' p3 aS'tag' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/Branching/FROMMO.js b/js/Branching/FROMMO.js index d7f417e4..207c71da 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"; - var exprs = ["A"]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMMO\",sz(1),sz(2));"]); - this.x = standard_define([2,1],this.model,exprs,gr_i); + this.exprs = ["A"]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMMO\",sz(1),sz(2));"]); + this.x = standard_define([2,1],this.model,this.exprs,this.gr_i); this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); } @@ -33,12 +33,13 @@ function FROMMO() { } FROMMO.prototype.set = function FROMMO() { this.tag = arguments[0]["tag"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.tag,exprs] = scicos_getvalue("Set parameters",["Tag"],list("str",-1),exprs); + [ok,this.tag,this.exprs] = scicos_getvalue("Set parameters",["Tag"],list("str",-1),this.exprs); if (!ok) { break; } @@ -47,7 +48,7 @@ function FROMMO() { var needcompile = 4; var y = needcompile; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 a3976214..7b6b2992 100644 --- a/js/Branching/FROMMO.pickle +++ b/js/Branching/FROMMO.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'gr_i' p2 -aS'model' +aS'exprs' p3 aS'tag' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/Branching/GOTO.js b/js/Branching/GOTO.js index e3532daf..690af30a 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 ScilabDouble([false,false]); - var exprs = [["A"],[sci2exp(1)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GOTO\",sz(1),sz(2));"]); - this.x = standard_define([2,1],this.model,exprs,gr_i); + this.exprs = [["A"],[sci2exp(1)]]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GOTO\",sz(1),sz(2));"]); + this.x = standard_define([2,1],this.model,this.exprs,this.gr_i); this.x.graphics.id = "Goto"; return new BasicBlock(this.x); } @@ -32,12 +32,13 @@ function GOTO() { GOTO.prototype.set = function GOTO() { this.tag = arguments[0]["tag"] this.tagvis = parseFloat(arguments[0]["tagvis"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.tag,this.tagvis,exprs] = scicos_getvalue("Set parameters",["Tag","Tag Visibility(1=Local 2=scoped 3= global)"],list("str",-1,"vec",1),exprs); + [ok,this.tag,this.tagvis,this.exprs] = scicos_getvalue("Set parameters",["Tag","Tag Visibility(1=Local 2=scoped 3= global)"],list("str",-1,"vec",1),this.exprs); if (!ok) { break; } @@ -51,7 +52,7 @@ function GOTO() { var needcompile = 4; var y = needcompile; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 06f62621..3de9759d 100644 --- a/js/Branching/GOTO.pickle +++ b/js/Branching/GOTO.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'tagvis' p2 -aS'model' +aS'gr_i' p3 -aS'tag' +aS'exprs' p4 -aS'tagvis' +aS'tag' p5 aS'graphics' p6 -atp7 -Rp8 +aS'x' +p7 +aS'model' +p8 +atp9 +Rp10 .(dp0 S'tagvis' p1 diff --git a/js/Branching/GOTOMO.js b/js/Branching/GOTOMO.js index 55b26401..bb2f2c05 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"; - var exprs = [["A"],[sci2exp(1)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GOTOMO\",sz(1),sz(2));"]); - this.x = standard_define([2,1],this.model,exprs,gr_i); + this.exprs = [["A"],[sci2exp(1)]]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GOTOMO\",sz(1),sz(2));"]); + this.x = standard_define([2,1],this.model,this.exprs,this.gr_i); this.x.graphics.in_implicit = ["I"]; return new BasicBlock(this.x); } @@ -35,12 +35,13 @@ function GOTOMO() { GOTOMO.prototype.set = function GOTOMO() { this.tag = arguments[0]["tag"] this.tagvis = parseFloat(arguments[0]["tagvis"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.tag,this.tagvis,exprs] = scicos_getvalue("Set parameters",["Tag","Tag Visibility(1=Local 2=scoped 3= global)"],list("str",-1,"vec",1),exprs); + [ok,this.tag,this.tagvis,this.exprs] = scicos_getvalue("Set parameters",["Tag","Tag Visibility(1=Local 2=scoped 3= global)"],list("str",-1,"vec",1),this.exprs); if (!ok) { break; } @@ -54,7 +55,7 @@ function GOTOMO() { var needcompile = 4; var y = needcompile; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 aaf02f69..bf20ace2 100644 --- a/js/Branching/GOTOMO.pickle +++ b/js/Branching/GOTOMO.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'tagvis' p2 -aS'model' +aS'gr_i' p3 -aS'tag' +aS'exprs' p4 -aS'tagvis' +aS'tag' p5 aS'graphics' p6 -atp7 -Rp8 +aS'x' +p7 +aS'model' +p8 +atp9 +Rp10 .(dp0 S'tagvis' p1 diff --git a/js/Branching/GotoTagVisibility.js b/js/Branching/GotoTagVisibility.js index 3a3fc93f..1d4f0f29 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 ScilabDouble([false,false]); - var exprs = "A"; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GotoTagVisibility\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = "A"; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GotoTagVisibility\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } GotoTagVisibility.prototype.details = function GotoTagVisibility() { @@ -30,12 +30,13 @@ function GotoTagVisibility() { } GotoTagVisibility.prototype.set = function GotoTagVisibility() { this.tag = arguments[0]["tag"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.tag,exprs] = scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),exprs); + [ok,this.tag,this.exprs] = scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),this.exprs); if (!ok) { break; } @@ -44,7 +45,7 @@ function GotoTagVisibility() { var needcompile = 4; var y = needcompile; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 a7889058..918f1bf7 100644 --- a/js/Branching/GotoTagVisibility.pickle +++ b/js/Branching/GotoTagVisibility.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'gr_i' p2 -aS'model' +aS'exprs' p3 aS'tag' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/Branching/GotoTagVisibilityMO.js b/js/Branching/GotoTagVisibilityMO.js index 57cd648a..91c817fd 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 ScilabDouble([false,false]); - var exprs = "A"; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GotoTagVisibilityMO\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = "A"; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GotoTagVisibilityMO\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } GotoTagVisibilityMO.prototype.details = function GotoTagVisibilityMO() { @@ -30,12 +30,13 @@ function GotoTagVisibilityMO() { } GotoTagVisibilityMO.prototype.set = function GotoTagVisibilityMO() { this.tag = arguments[0]["tag"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.tag,exprs] = scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),exprs); + [ok,this.tag,this.exprs] = scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),this.exprs); if (!ok) { break; } @@ -44,7 +45,7 @@ function GotoTagVisibilityMO() { var needcompile = 4; var y = needcompile; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 a7889058..918f1bf7 100644 --- a/js/Branching/GotoTagVisibilityMO.pickle +++ b/js/Branching/GotoTagVisibilityMO.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'gr_i' p2 -aS'model' +aS'exprs' p3 aS'tag' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/Branching/ISELECT_f.js b/js/Branching/ISELECT_f.js index 5b3297ec..7c3992fc 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 ScilabDouble([true,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } ISELECT_f.prototype.details = function ISELECT_f() { @@ -30,12 +30,13 @@ function ISELECT_f() { ISELECT_f.prototype.set = function ISELECT_f() { this.nout = parseFloat(arguments[0]["nout"]) this.z0 = parseFloat(arguments[0]["z0"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.nout,this.z0,exprs] = scicos_getvalue("Set parameters",["number of outputs","initial connected output"],list("vec",1,"vec",1),exprs); + [ok,this.nout,this.z0,this.exprs] = scicos_getvalue("Set parameters",["number of outputs","initial connected output"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -47,7 +48,7 @@ function ISELECT_f() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 b64cb2f9..cf5ae1e1 100644 --- a/js/Branching/ISELECT_f.pickle +++ b/js/Branching/ISELECT_f.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'exprs' p2 -aS'model' +aS'gr_i' p3 -aS'z0' +aS'graphics' p4 -aS'nout' +aS'x' p5 -aS'graphics' +aS'model' p6 -atp7 -Rp8 +aS'z0' +p7 +aS'nout' +p8 +atp9 +Rp10 .(dp0 S'model.sim' p1 diff --git a/js/Branching/ISELECT_m.js b/js/Branching/ISELECT_m.js index 46c9cbc5..dc34ae2f 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 ScilabDouble([true,false]); - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } ISELECT_m.prototype.details = function ISELECT_m() { @@ -40,12 +40,13 @@ function ISELECT_m() { this.typ = inverse(arguments[0]["typ"]) this.nout = parseFloat(arguments[0]["nout"]) this.z0 = parseFloat(arguments[0]["z0"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.typ,this.nout,this.z0,exprs] = scicos_getvalue("Set parameters",["Datatype(1= real double 2=Complex 3=int32 ...)","number of outputs","initial connected output"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.typ,this.nout,this.z0,this.exprs] = scicos_getvalue("Set parameters",["Datatype(1= real double 2=Complex 3=int32 ...)","number of outputs","initial connected output"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -65,7 +66,7 @@ function ISELECT_m() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 e4aa840a..afc20fa3 100644 --- a/js/Branching/ISELECT_m.pickle +++ b/js/Branching/ISELECT_m.pickle @@ -2,20 +2,24 @@ c__builtin__ set p0 ((lp1 -S'typ' +S'z0' p2 -aS'graphics' +aS'exprs' p3 -aS'x' +aS'gr_i' p4 -aS'model' +aS'graphics' p5 -aS'z0' +aS'x' p6 -aS'nout' +aS'model' p7 -atp8 -Rp9 +aS'typ' +p8 +aS'nout' +p9 +atp10 +Rp11 .(dp0 S'model.dstate' p1 diff --git a/js/Branching/MUX.js b/js/Branching/MUX.js index 33cf91bb..710b3825 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 ScilabDouble([true,false]); - var exprs = string(this.in1); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MUX\",sz(1),sz(2));"]); - this.x = standard_define([.5,2],this.model,exprs,gr_i); + this.exprs = string(this.in1); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MUX\",sz(1),sz(2));"]); + this.x = standard_define([.5,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } MUX.prototype.details = function MUX() { @@ -24,12 +24,13 @@ function MUX() { } MUX.prototype.set = function MUX() { this.in1 = parseFloat(arguments[0]["in1"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.in1,exprs] = scicos_getvalue("Set MUX block parameters","number of input ports or vector of sizes",list("intvec",-1),exprs); + [ok,this.in1,this.exprs] = scicos_getvalue("Set MUX block parameters","number of input ports or vector of sizes",list("intvec",-1),this.exprs); if (!ok) { break; } @@ -63,7 +64,7 @@ function MUX() { } } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 bc3a11ca..68f561c9 100644 --- a/js/Branching/MUX.pickle +++ b/js/Branching/MUX.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'in1' p2 -aS'model' +aS'exprs' p3 -aS'in1' +aS'gr_i' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'model.sim' p1 diff --git a/js/Branching/MUX_f.js b/js/Branching/MUX_f.js index 4c88c94e..094c051e 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 ScilabDouble([true,false]); - var exprs = string(this.in1); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MUX_f\",sz(1),sz(2));"]); - this.x = standard_define([0.5,2],this.model,exprs,gr_i); + this.exprs = string(this.in1); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MUX_f\",sz(1),sz(2));"]); + this.x = standard_define([0.5,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } MUX_f.prototype.details = function MUX_f() { @@ -24,12 +24,13 @@ function MUX_f() { } MUX_f.prototype.set = function MUX_f() { this.in1 = parseFloat(arguments[0]["in1"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.in1,exprs] = scicos_getvalue("Set MUX block parameters","number of input ports or vector of sizes",list("vec",-1),exprs); + [ok,this.in1,this.exprs] = scicos_getvalue("Set MUX block parameters","number of input ports or vector of sizes",list("vec",-1),this.exprs); if (!ok) { break; } @@ -63,7 +64,7 @@ function MUX_f() { } } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 bc3a11ca..68f561c9 100644 --- a/js/Branching/MUX_f.pickle +++ b/js/Branching/MUX_f.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'in1' p2 -aS'model' +aS'exprs' p3 -aS'in1' +aS'gr_i' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'model.sim' p1 diff --git a/js/Branching/M_SWITCH.js b/js/Branching/M_SWITCH.js index bf0ed7fe..cf144eff 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 ScilabDouble([true,false]); - 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 = standard_define([2.5,2],this.model,exprs,gr_i); + 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 = standard_define([2.5,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } M_SWITCH.prototype.details = function M_SWITCH() { @@ -31,12 +31,13 @@ function M_SWITCH() { this.nin = parseFloat(arguments[0]["nin"]) this.base = parseFloat(arguments[0]["base"]) this.rule = arguments[0]["rule"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.nin,this.base,this.rule,exprs] = scicos_getvalue("Set parameters",["number of inputs","zero base indexing (0), otherwise 1","rounding rule: int (0), round (1), ceil (2), floor (3)"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.nin,this.base,this.rule,this.exprs] = scicos_getvalue("Set parameters",["number of inputs","zero base indexing (0), otherwise 1","rounding rule: int (0), round (1), ceil (2), floor (3)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -65,7 +66,7 @@ function M_SWITCH() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 b2f42465..6a8b359c 100644 --- a/js/Branching/M_SWITCH.pickle +++ b/js/Branching/M_SWITCH.pickle @@ -6,16 +6,20 @@ S'nin' p2 aS'rule' p3 -aS'base' +aS'exprs' p4 -aS'graphics' +aS'gr_i' p5 -aS'x' +aS'base' p6 -aS'model' +aS'graphics' p7 -atp8 -Rp9 +aS'x' +p8 +aS'model' +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/Branching/NRMSOM_f.js b/js/Branching/NRMSOM_f.js index bec18258..ea15f6b7 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 ScilabDouble([true,false]); - var exprs = [string(this.nin)]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NRMSOM_f\",sz(1),sz(2));"]); - this.x = standard_define([.2,2],this.model,exprs,gr_i); + this.exprs = [string(this.nin)]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NRMSOM_f\",sz(1),sz(2));"]); + this.x = standard_define([.2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } NRMSOM_f.prototype.details = function NRMSOM_f() { @@ -25,12 +25,13 @@ function NRMSOM_f() { } NRMSOM_f.prototype.set = function NRMSOM_f() { this.nin = parseFloat(arguments[0]["nin"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.nin,exprs] = scicos_getvalue("Set parameters",["number of inputs"],list("vec",1),exprs); + [ok,this.nin,this.exprs] = scicos_getvalue("Set parameters",["number of inputs"],list("vec",1),this.exprs); if (!ok) { break; } @@ -39,7 +40,7 @@ function NRMSOM_f() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 95b68196..27340c37 100644 --- a/js/Branching/NRMSOM_f.pickle +++ b/js/Branching/NRMSOM_f.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'nin' p2 -aS'model' +aS'exprs' p3 -aS'nin' +aS'gr_i' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'model.sim' p1 diff --git a/js/Branching/RELAY_f.js b/js/Branching/RELAY_f.js index 1a4e0d43..1745376c 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 ScilabDouble([true,true]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } RELAY_f.prototype.details = function RELAY_f() { @@ -31,13 +31,14 @@ function RELAY_f() { RELAY_f.prototype.set = function RELAY_f() { this.nin = parseFloat(arguments[0]["nin"]) this.z0 = arguments[0]["z0"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; var ipar = this.model.ipar; while (true) { - [ok,this.nin,this.z0,exprs] = scicos_getvalue("Set parameters",["number of inputs","initial connected input"],list("vec",1,"vec",1),exprs); + [ok,this.nin,this.z0,this.exprs] = scicos_getvalue("Set parameters",["number of inputs","initial connected input"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -49,7 +50,7 @@ function RELAY_f() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 cb090d13..9700e89e 100644 --- a/js/Branching/RELAY_f.pickle +++ b/js/Branching/RELAY_f.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'nin' p2 -aS'model' +aS'exprs' p3 -aS'z0' +aS'gr_i' p4 -aS'nin' -p5 aS'graphics' +p5 +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +aS'z0' +p8 +atp9 +Rp10 .(dp0 S'model.dstate' p1 diff --git a/js/Branching/SCALAR2VECTOR.js b/js/Branching/SCALAR2VECTOR.js index bdedbfce..18895dd4 100644 --- a/js/Branching/SCALAR2VECTOR.js +++ b/js/Branching/SCALAR2VECTOR.js @@ -8,9 +8,9 @@ function SCALAR2VECTOR() { this.model.in1 = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); - var exprs = [string([this.nout])]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SCALAR2VECTOR\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,exprs,gr_i); + this.exprs = [string([this.nout])]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SCALAR2VECTOR\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } SCALAR2VECTOR.prototype.details = function SCALAR2VECTOR() { @@ -24,12 +24,13 @@ function SCALAR2VECTOR() { } SCALAR2VECTOR.prototype.set = function SCALAR2VECTOR() { this.nout = parseFloat(arguments[0]["nout"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.nout,exprs] = scicos_getvalue("Set block parameters",["size of output (-1: if don\'t know)"],list("vec",1),exprs); + [ok,this.nout,this.exprs] = scicos_getvalue("Set block parameters",["size of output (-1: if don\'t know)"],list("vec",1),this.exprs); if (!ok) { break; } @@ -45,7 +46,7 @@ function SCALAR2VECTOR() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 ed70c2af..ed60d5ef 100644 --- a/js/Branching/SCALAR2VECTOR.pickle +++ b/js/Branching/SCALAR2VECTOR.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'exprs' p2 -aS'model' +aS'gr_i' p3 -aS'nout' -p4 aS'graphics' +p4 +aS'x' p5 -atp6 -Rp7 +aS'model' +p6 +aS'nout' +p7 +atp8 +Rp9 .(dp0 S'model.sim' p1 diff --git a/js/Branching/SELECT_f.js b/js/Branching/SELECT_f.js index 1946c662..3f5ca888 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 ScilabDouble([true,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } SELECT_f.prototype.details = function SELECT_f() { @@ -30,12 +30,13 @@ function SELECT_f() { SELECT_f.prototype.set = function SELECT_f() { this.nin = parseFloat(arguments[0]["nin"]) this.z0 = parseFloat(arguments[0]["z0"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.nin,this.z0,exprs] = scicos_getvalue("Set parameters",["number of inputs","initial connected input"],list("vec",1,"vec",1),exprs); + [ok,this.nin,this.z0,this.exprs] = scicos_getvalue("Set parameters",["number of inputs","initial connected input"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -47,7 +48,7 @@ function SELECT_f() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 33b87e7a..79e3c230 100644 --- a/js/Branching/SELECT_f.pickle +++ b/js/Branching/SELECT_f.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'nin' p2 -aS'model' +aS'exprs' p3 -aS'z0' +aS'gr_i' p4 -aS'nin' -p5 aS'graphics' +p5 +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +aS'z0' +p8 +atp9 +Rp10 .(dp0 S'model.sim' p1 diff --git a/js/Branching/SELECT_m.js b/js/Branching/SELECT_m.js index 4642dad9..b8a5bd74 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 ScilabDouble([true,false]); - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } SELECT_m.prototype.details = function SELECT_m() { @@ -40,12 +40,13 @@ function SELECT_m() { this.typ = inverse(arguments[0]["typ"]) this.nin = parseFloat(arguments[0]["nin"]) this.z0 = parseFloat(arguments[0]["z0"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.typ,this.nin,this.z0,exprs] = scicos_getvalue("Set parameters",["Datatype(1= real double 2=Complex 3=int32 ..)","number of inputs","initial connected input"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.typ,this.nin,this.z0,this.exprs] = scicos_getvalue("Set parameters",["Datatype(1= real double 2=Complex 3=int32 ..)","number of inputs","initial connected input"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -65,7 +66,7 @@ function SELECT_m() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 f9c2cfa9..c8879d34 100644 --- a/js/Branching/SELECT_m.pickle +++ b/js/Branching/SELECT_m.pickle @@ -4,18 +4,22 @@ p0 ((lp1 S'nin' p2 -aS'typ' +aS'z0' p3 -aS'graphics' +aS'exprs' p4 -aS'x' +aS'gr_i' p5 -aS'model' +aS'graphics' p6 -aS'z0' +aS'x' p7 -atp8 -Rp9 +aS'model' +p8 +aS'typ' +p9 +atp10 +Rp11 .(dp0 S'model.dstate' p1 diff --git a/js/Branching/SELF_SWITCH.pickle b/js/Branching/SELF_SWITCH.pickle index df5cf582..f7d79ec6 100644 --- a/js/Branching/SELF_SWITCH.pickle +++ b/js/Branching/SELF_SWITCH.pickle @@ -2,12 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'stateOpen' p2 -aS'stateOpen' +aS'exprs' p3 -atp4 -Rp5 +aS'gr_i' +p4 +aS'graphics' +p5 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'diagram.objs[1-1]' p1 diff --git a/js/Branching/SWITCH2.js b/js/Branching/SWITCH2.js index 738579b3..88f40bb9 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 ScilabDouble([true,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } SWITCH2.prototype.details = function SWITCH2() { @@ -35,12 +35,13 @@ function SWITCH2() { this.rule = parseFloat(arguments[0]["rule"]) this.thra = arguments[0]["thra"] this.nzz = parseFloat(arguments[0]["nzz"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.rule,this.thra,this.nzz,exprs] = scicos_getvalue("Set parameters",["pass first input if: u2>=a (0), u2>a (1), u2~=a (2)","threshold a","use zero crossing: yes (1), no (0)"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.rule,this.thra,this.nzz,this.exprs] = scicos_getvalue("Set parameters",["pass first input if: u2>=a (0), u2>a (1), u2~=a (2)","threshold a","use zero crossing: yes (1), no (0)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -51,7 +52,7 @@ function SWITCH2() { if ((this.rule>2)) { this.rule = 2; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 c7e23169..3b8a12e8 100644 --- a/js/Branching/SWITCH2.pickle +++ b/js/Branching/SWITCH2.pickle @@ -8,14 +8,18 @@ aS'rule' p3 aS'thra' p4 -aS'graphics' +aS'exprs' p5 -aS'x' +aS'gr_i' p6 -aS'model' +aS'graphics' p7 -atp8 -Rp9 +aS'x' +p8 +aS'model' +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/Branching/SWITCH2_m.js b/js/Branching/SWITCH2_m.js index a3a2c7fc..b7ea3784 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 ScilabDouble([true,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } SWITCH2_m.prototype.details = function SWITCH2_m() { @@ -40,12 +40,13 @@ function SWITCH2_m() { this.rule = parseFloat(arguments[0]["rule"]) this.thra = arguments[0]["thra"] this.nzz = parseFloat(arguments[0]["nzz"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.ot,this.rule,this.thra,this.nzz,exprs] = scicos_getvalue("Set parameters",["Datatype (1=real double 2=complex 3=int32 ...)","pass first input if: u2>=a (0), u2>a (1), u2~=a (2)","threshold a","use zero crossing: yes (1), no (0)"],list("vec",1,"vec",1,"vec",1,"vec",1),exprs); + [ok,this.ot,this.rule,this.thra,this.nzz,this.exprs] = scicos_getvalue("Set parameters",["Datatype (1=real double 2=complex 3=int32 ...)","pass first input if: u2>=a (0), u2>a (1), u2~=a (2)","threshold a","use zero crossing: yes (1), no (0)"],list("vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -56,7 +57,7 @@ function SWITCH2_m() { if ((this.rule>2)) { this.rule = 2; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 b798f56f..733fcd2c 100644 --- a/js/Branching/SWITCH2_m.pickle +++ b/js/Branching/SWITCH2_m.pickle @@ -8,16 +8,20 @@ aS'rule' p3 aS'thra' p4 -aS'graphics' +aS'exprs' p5 -aS'x' +aS'gr_i' p6 -aS'model' +aS'graphics' p7 -aS'ot' +aS'x' p8 -atp9 -Rp10 +aS'model' +p9 +aS'ot' +p10 +atp11 +Rp12 .(dp0 S'arg1' p1 diff --git a/js/Branching/SWITCH_f.js b/js/Branching/SWITCH_f.js index 8ca9c036..bf9b0bd8 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 ScilabDouble([true,true]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } SWITCH_f.prototype.details = function SWITCH_f() { @@ -30,13 +30,14 @@ function SWITCH_f() { SWITCH_f.prototype.set = function SWITCH_f() { this.nin = parseFloat(arguments[0]["nin"]) this.z0 = arguments[0]["z0"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; var ipar = this.model.ipar; while (true) { - [ok,this.nin,this.z0,exprs] = scicos_getvalue("Set switch parameters",["number of inputs","connected input"],list("vec",1,"vec",1),exprs); + [ok,this.nin,this.z0,this.exprs] = scicos_getvalue("Set switch parameters",["number of inputs","connected input"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -48,7 +49,7 @@ function SWITCH_f() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 bd0fe2a2..8b909059 100644 --- a/js/Branching/SWITCH_f.pickle +++ b/js/Branching/SWITCH_f.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'nin' p2 -aS'model' +aS'exprs' p3 -aS'z0' +aS'gr_i' p4 -aS'nin' -p5 aS'graphics' +p5 +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +aS'z0' +p8 +atp9 +Rp10 .(dp0 S'arg1' p1 diff --git a/js/Electrical/CCS.js b/js/Electrical/CCS.js index fac95aa1..61b96852 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)); - var exprs = []; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CCS\",sz(1),sz(2));"]); + this.exprs = []; + this.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 ScilabDouble([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = standard_define([2.1,3],this.model,exprs,list(gr_i,0)); + this.x = standard_define([2.1,3],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); @@ -60,7 +60,7 @@ function CCS() { CCS.prototype.set = function CCS() { this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; this.x = arg1; return new BasicBlock(this.x); diff --git a/js/Electrical/CCS.pickle b/js/Electrical/CCS.pickle index 86117e01..35f6a110 100644 --- a/js/Electrical/CCS.pickle +++ b/js/Electrical/CCS.pickle @@ -6,10 +6,14 @@ S'x' p2 aS'model' p3 -aS'graphics' +aS'gr_i' p4 -atp5 -Rp6 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/Electrical/CVS.js b/js/Electrical/CVS.js index 40920b17..052d7100 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)); - var exprs = []; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CVS\",sz(1),sz(2));"]); + this.exprs = []; + this.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 ScilabDouble([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = standard_define([2.1,3],this.model,exprs,list(gr_i,0)); + this.x = standard_define([2.1,3],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); @@ -60,7 +60,7 @@ function CVS() { CVS.prototype.set = function CVS() { this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; this.x = arg1; return new BasicBlock(this.x); diff --git a/js/Electrical/CVS.pickle b/js/Electrical/CVS.pickle index 86117e01..35f6a110 100644 --- a/js/Electrical/CVS.pickle +++ b/js/Electrical/CVS.pickle @@ -6,10 +6,14 @@ S'x' p2 aS'model' p3 -aS'graphics' +aS'gr_i' p4 -atp5 -Rp6 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/Electrical/Capacitor.js b/js/Electrical/Capacitor.js index 8b9601f7..d11d389c 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.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); - var exprs = string([[this.C],[this.v]]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Capacitor\",sz(1),sz(2));"]); - this.x = standard_define([2,1.1],this.model,exprs,list(gr_i,0)); + this.exprs = string([[this.C],[this.v]]); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Capacitor\",sz(1),sz(2));"]); + this.x = standard_define([2,1.1],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -36,18 +36,19 @@ function Capacitor() { Capacitor.prototype.set = function Capacitor() { this.C = parseFloat(arguments[0]["C"]) this.v = parseFloat(arguments[0]["v"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.C,this.v,exprs] = scicos_getvalue("Set Capacitor block parameter",["C (F)","Initial Voltage"],list("vec",1,"vec",1),exprs); + [ok,this.C,this.v,this.exprs] = scicos_getvalue("Set Capacitor block parameter",["C (F)","Initial Voltage"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } 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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 ecb39b69..f3585d18 100644 --- a/js/Electrical/Capacitor.pickle +++ b/js/Electrical/Capacitor.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'C' p2 -aS'model' -p3 aS'v' +p3 +aS'exprs' p4 -aS'C' +aS'gr_i' p5 aS'graphics' p6 -atp7 -Rp8 +aS'x' +p7 +aS'model' +p8 +atp9 +Rp10 .(dp0 S'arg1' p1 diff --git a/js/Electrical/ConstantVoltage.js b/js/Electrical/ConstantVoltage.js index 8ac4d151..dc90df63 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]); - var exprs = string(this.V); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ConstantVoltage\",sz(1),sz(2));"]); - this.x = standard_define([1.5,1.1],this.model,exprs,list(gr_i,0)); + this.exprs = string(this.V); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ConstantVoltage\",sz(1),sz(2));"]); + this.x = standard_define([1.5,1.1],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -32,18 +32,19 @@ function ConstantVoltage() { } ConstantVoltage.prototype.set = function ConstantVoltage() { this.V = parseFloat(arguments[0]["V"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.V,exprs] = scicos_getvalue("Set ConstantVoltage block parameter","V (volt)",list("vec",1),exprs); + [ok,this.V,this.exprs] = scicos_getvalue("Set ConstantVoltage block parameter","V (volt)",list("vec",1),this.exprs); if (!ok) { break; } this.model.rpar = new ScilabDouble([this.V]); this.model.equations.parameters[2-1] = list(new ScilabDouble([this.V])); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 2de4f0ac..92a04c12 100644 --- a/js/Electrical/ConstantVoltage.pickle +++ b/js/Electrical/ConstantVoltage.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'graphics' p2 -aS'model' +aS'exprs' p3 -aS'V' +aS'gr_i' p4 -aS'graphics' +aS'V' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/Electrical/CurrentSensor.js b/js/Electrical/CurrentSensor.js index e055927e..73659ef1 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]); - var exprs = []; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CurrentSensor\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,list(gr_i,0)); + this.exprs = []; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CurrentSensor\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,list(this.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 13759532..31a790d2 100644 --- a/js/Electrical/CurrentSensor.pickle +++ b/js/Electrical/CurrentSensor.pickle @@ -6,8 +6,14 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'gr_i' +p4 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/Electrical/Diode.js b/js/Electrical/Diode.js index f696eef6..d29202b3 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]); - 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 = standard_define([2,1],this.model,exprs,list(gr_i,0)); + 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 = standard_define([2,1],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -42,18 +42,19 @@ function Diode() { this.Vt = parseFloat(arguments[0]["Vt"]) this.Maxexp = parseFloat(arguments[0]["Maxexp"]) this.R = parseFloat(arguments[0]["R"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.Ids,this.Vt,this.Maxexp,this.R,exprs] = scicos_getvalue("Set Diode block parameter",["Saturation cuurent (A)","Voltage equivalent to temperature (Volt)","Max exponent for linear continuation","R (ohm)"],list("vec",1,"vec",1,"vec",1,"vec",1),exprs); + [ok,this.Ids,this.Vt,this.Maxexp,this.R,this.exprs] = scicos_getvalue("Set Diode block parameter",["Saturation cuurent (A)","Voltage equivalent to temperature (Volt)","Max exponent for linear continuation","R (ohm)"],list("vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } this.model.rpar = new ScilabDouble([this.Ids],[this.Vt],[this.Maxexp],[this.R]); this.model.equations.parameters = list(["Ids","Vt","Maxexp","R"],list(this.Ids,this.Vt,this.Maxexp,this.R)); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 0e45a349..cb1adba4 100644 --- a/js/Electrical/Diode.pickle +++ b/js/Electrical/Diode.pickle @@ -2,22 +2,26 @@ c__builtin__ set p0 ((lp1 -S'Maxexp' +S'R' p2 aS'Ids' p3 -aS'R' +aS'Maxexp' p4 -aS'Vt' +aS'exprs' p5 -aS'graphics' +aS'gr_i' p6 -aS'x' +aS'Vt' p7 -aS'model' +aS'graphics' p8 -atp9 -Rp10 +aS'x' +p9 +aS'model' +p10 +atp11 +Rp12 .(dp0 S'arg1' p1 diff --git a/js/Electrical/Ground.js b/js/Electrical/Ground.js index 50163380..e7c04710 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]); - var exprs = ""; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Ground\",sz(1),sz(2));"]); - this.x = standard_define([1,1],this.model,exprs,list(gr_i,0)); + this.exprs = ""; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Ground\",sz(1),sz(2));"]); + this.x = standard_define([1,1],this.model,this.exprs,list(this.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 4ffcd0a3..bec9342e 100644 --- a/js/Electrical/Ground.pickle +++ b/js/Electrical/Ground.pickle @@ -6,8 +6,14 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'gr_i' +p4 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/Electrical/Gyrator.js b/js/Electrical/Gyrator.js index bf52abfb..00c0e951 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)); - var exprs = [["1"],["1"]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Gyrator\",sz(1),sz(2));"]); + this.exprs = [["1"],["1"]]; + this.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 ScilabDouble([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = standard_define([2,2],this.model,exprs,list(gr_i,0)); + this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); @@ -62,19 +62,20 @@ function Gyrator() { Gyrator.prototype.set = function Gyrator() { this.G1 = arguments[0]["G1"] this.G2 = arguments[0]["G2"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; this.x = arg1; - var exprs = this.x.graphics.exprs; + this.exprs = this.x.graphics.exprs; while (true) { - [ok,this.G1,this.G2,exprs] = scicos_getvalue([["Set Gyrator block parameters:"],[""],["G1: Gyration conductance"],["G2: Gyration conductance"]],["G1","G2"],list("vec",1,"vec",1),exprs); + [ok,this.G1,this.G2,this.exprs] = scicos_getvalue([["Set Gyrator block parameters:"],[""],["G1: Gyration conductance"],["G2: Gyration conductance"]],["G1","G2"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } this.x.model.equations.parameters[2-1] = list(this.G1,this.G2); - this.x.graphics.exprs = exprs; + this.x.graphics.exprs = this.exprs; break; } return new BasicBlock(this.x); diff --git a/js/Electrical/Gyrator.pickle b/js/Electrical/Gyrator.pickle index 6de599d3..c683f394 100644 --- a/js/Electrical/Gyrator.pickle +++ b/js/Electrical/Gyrator.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'G2' p2 -aS'model' +aS'G1' p3 -aS'G2' +aS'exprs' p4 -aS'G1' +aS'gr_i' p5 aS'graphics' p6 -atp7 -Rp8 +aS'x' +p7 +aS'model' +p8 +atp9 +Rp10 .(dp0 S'x.model.equations.parameters[2-1]' p1 diff --git a/js/Electrical/IdealTransformer.js b/js/Electrical/IdealTransformer.js index 3b2037c2..a24cdbb2 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)); - var exprs = ["1"]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IdealTransformer\",sz(1),sz(2));"]); + this.exprs = ["1"]; + this.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 ScilabDouble([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = standard_define([2,2],this.model,exprs,list(gr_i,0)); + this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); @@ -60,19 +60,20 @@ function IdealTransformer() { } IdealTransformer.prototype.set = function IdealTransformer() { this.N = arguments[0]["N"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; this.x = arg1; - var exprs = this.x.graphics.exprs; + this.exprs = this.x.graphics.exprs; while (true) { - [ok,this.N,exprs] = scicos_getvalue([["Set Transformer block parameters:"],[""],["N:"+" Turn ratio (N1/N2)"]],["N"],list("vec",1),exprs); + [ok,this.N,this.exprs] = scicos_getvalue([["Set Transformer block parameters:"],[""],["N:"+" Turn ratio (N1/N2)"]],["N"],list("vec",1),this.exprs); if (!ok) { break; } this.x.model.equations.parameters[2-1] = list(this.N); - this.x.graphics.exprs = exprs; + this.x.graphics.exprs = this.exprs; break; } return new BasicBlock(this.x); diff --git a/js/Electrical/IdealTransformer.pickle b/js/Electrical/IdealTransformer.pickle index 6420988c..19ad5954 100644 --- a/js/Electrical/IdealTransformer.pickle +++ b/js/Electrical/IdealTransformer.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'N' p2 -aS'model' +aS'exprs' p3 -aS'N' +aS'gr_i' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'x.model.equations.parameters[2-1]' p1 diff --git a/js/Electrical/Inductor.js b/js/Electrical/Inductor.js index bf577ee0..fc028e43 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]); - var exprs = string(this.L); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Inductor\",sz(1),sz(2));"]); - this.x = standard_define([2,0.9],this.model,exprs,list(gr_i,0)); + this.exprs = string(this.L); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Inductor\",sz(1),sz(2));"]); + this.x = standard_define([2,0.9],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -32,18 +32,19 @@ function Inductor() { } Inductor.prototype.set = function Inductor() { this.L = parseFloat(arguments[0]["L"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.L,exprs] = scicos_getvalue("Set Inductor block parameter","L (H)",list("vec",1),exprs); + [ok,this.L,this.exprs] = scicos_getvalue("Set Inductor block parameter","L (H)",list("vec",1),this.exprs); if (!ok) { break; } this.model.rpar = new ScilabDouble([this.L]); this.model.equations.parameters[2-1] = list(new ScilabDouble([this.L])); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 6fd3d126..b7c3a7df 100644 --- a/js/Electrical/Inductor.pickle +++ b/js/Electrical/Inductor.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'L' p2 -aS'model' +aS'exprs' p3 -aS'L' +aS'gr_i' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/Electrical/MOTOR.js b/js/Electrical/MOTOR.js index 254d7d5b..0683c275 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 ScilabDouble([true,false]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MOTOR\",sz(1),sz(2));"]); - var exprs = ""; - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MOTOR\",sz(1),sz(2));"]); + this.exprs = ""; + this.x = standard_define([2,2],this.model,this.exprs,this.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 a1c0ad46..9c6210d5 100644 --- a/js/Electrical/MOTOR.pickle +++ b/js/Electrical/MOTOR.pickle @@ -6,8 +6,14 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'gr_i' +p4 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/Electrical/NMOS.js b/js/Electrical/NMOS.js index 5096d9f5..7632989f 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.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["I"],["I"]]; return new BasicBlock(this.x); @@ -56,17 +56,18 @@ function NMOS() { this.dW = parseFloat(arguments[0]["dW"]) this.dL = parseFloat(arguments[0]["dL"]) this.RDS = parseFloat(arguments[0]["RDS"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.W,this.L,this.Beta,this.Vt,this.K2,this.K5,this.dW,this.dL,this.RDS,exprs] = scicos_getvalue("Set NMOS Transistor block parameters",["Width [m]","Length [m]","Transconductance parameter [A/(V*V)]","Zero bias threshold voltage [V]","Bulk threshold parameter","Reduction of pinch-off region","Narrowing of channel [m]","Shortening of channel [m]","Drain-Source-Resistance [Ohm]"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs); + [ok,this.W,this.L,this.Beta,this.Vt,this.K2,this.K5,this.dW,this.dL,this.RDS,this.exprs] = scicos_getvalue("Set NMOS Transistor block parameters",["Width [m]","Length [m]","Transconductance parameter [A/(V*V)]","Zero bias threshold voltage [V]","Bulk threshold parameter","Reduction of pinch-off region","Narrowing of channel [m]","Shortening of channel [m]","Drain-Source-Resistance [Ohm]"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),this.exprs); if (!ok) { 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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 9990c4ba..2be5e1af 100644 --- a/js/Electrical/NMOS.pickle +++ b/js/Electrical/NMOS.pickle @@ -8,26 +8,30 @@ aS'K5' p3 aS'RDS' p4 -aS'L' -p5 aS'K2' +p5 +aS'L' p6 -aS'Beta' +aS'exprs' p7 -aS'Vt' +aS'Beta' p8 -aS'W' +aS'gr_i' p9 -aS'graphics' +aS'Vt' p10 -aS'x' +aS'W' p11 -aS'model' +aS'graphics' p12 -aS'dW' +aS'x' p13 -atp14 -Rp15 +aS'model' +p14 +aS'dW' +p15 +atp16 +Rp17 .(dp0 S'arg1' p1 diff --git a/js/Electrical/NPN.js b/js/Electrical/NPN.js index 88227a3c..5246a65a 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)); - 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.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));"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = standard_define([2,2],this.model,exprs,list(gr_i,0)); + this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); @@ -92,19 +92,20 @@ function NPN() { this.Gbe = arguments[0]["Gbe"] this.Vt = arguments[0]["Vt"] this.EMinMax = arguments[0]["EMinMax"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; this.x = arg1; - var exprs = this.x.graphics.exprs; + this.exprs = this.x.graphics.exprs; while (true) { - [ok,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,exprs] = scicos_getvalue([["Set NPN block parameters:"],[""]],["Bf : Forward beta","Br : Reverse beta","Is : Transport saturation current","Vak : Early voltage (inverse), 1/Volt","Tauf: Ideal forward transit time","Taur: Ideal reverse transit time","Ccs : Collector-substrat(ground) cap.","Cje : Base-emitter zero bias depletion cap.","Cjc : Base-coll. zero bias depletion cap.","Phie: Base-emitter diffusion voltage","Me : Base-emitter gradation exponent","Phic: Base-collector diffusion voltage","Mc : Base-collector gradation exponent","Gbc : Base-collector conductance","Gbe : Base-emitter conductance","Vt : Voltage equivalent of temperature","EMinmax: if x > EMinMax, the exp(x) is linearized"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs); + [ok,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.exprs] = scicos_getvalue([["Set NPN block parameters:"],[""]],["Bf : Forward beta","Br : Reverse beta","Is : Transport saturation current","Vak : Early voltage (inverse), 1/Volt","Tauf: Ideal forward transit time","Taur: Ideal reverse transit time","Ccs : Collector-substrat(ground) cap.","Cje : Base-emitter zero bias depletion cap.","Cjc : Base-coll. zero bias depletion cap.","Phie: Base-emitter diffusion voltage","Me : Base-emitter gradation exponent","Phic: Base-collector diffusion voltage","Mc : Base-collector gradation exponent","Gbc : Base-collector conductance","Gbe : Base-emitter conductance","Vt : Voltage equivalent of temperature","EMinmax: if x > EMinMax, the exp(x) is linearized"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { 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 = exprs; + this.x.graphics.exprs = this.exprs; break; } return new BasicBlock(this.x); diff --git a/js/Electrical/NPN.pickle b/js/Electrical/NPN.pickle index 8930541b..aa977a9f 100644 --- a/js/Electrical/NPN.pickle +++ b/js/Electrical/NPN.pickle @@ -2,48 +2,52 @@ c__builtin__ set p0 ((lp1 -S'Me' +S'Vak' p2 -aS'Vak' +aS'Cjc' p3 -aS'Bf' +aS'Cje' p4 -aS'Gbe' +aS'Phic' p5 -aS'Tauf' +aS'Bf' p6 -aS'Gbc' +aS'Br' p7 -aS'Mc' +aS'Me' p8 -aS'Phic' +aS'Phie' p9 -aS'Cjc' +aS'Gbe' p10 -aS'Is' +aS'Tauf' p11 -aS'Phie' +aS'Gbc' p12 -aS'Ccs' +aS'Mc' p13 -aS'Cje' +aS'Ccs' p14 aS'Taur' p15 -aS'Vt' +aS'graphics' p16 -aS'Br' +aS'EMinMax' p17 -aS'graphics' +aS'Is' p18 -aS'EMinMax' +aS'exprs' p19 -aS'x' +aS'gr_i' p20 -aS'model' +aS'Vt' p21 -atp22 -Rp23 +aS'x' +p22 +aS'model' +p23 +atp24 +Rp25 .(dp0 S'x.model.equations.parameters[2-1]' p1 diff --git a/js/Electrical/OpAmp.js b/js/Electrical/OpAmp.js index 4a807bc0..31437ba3 100644 --- a/js/Electrical/OpAmp.js +++ b/js/Electrical/OpAmp.js @@ -16,9 +16,9 @@ function OpAmp() { this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.model.rpar = new ScilabDouble(Z); - var exprs = string(Z); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OpAmp\",sz(1),sz(2));"]); - this.x = standard_define([3,5],this.model,exprs,gr_i); + this.exprs = string(Z); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OpAmp\",sz(1),sz(2));"]); + this.x = standard_define([3,5],this.model,this.exprs,this.gr_i); this.x.graphics.in_implicit = [["I"],["I"]]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -38,17 +38,18 @@ function OpAmp() { this.OLGain = arguments[0]["OLGain"] this.SatH = arguments[0]["SatH"] this.SatL = arguments[0]["SatL"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (false) { - [ok,this.OLGain,this.SatH,this.SatL,exprs] = scicos_getvalue("Set the Operational Amplifier parameters",["Open Loop Gain","Positive saturation voltage","Negative saturation voltage"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.OLGain,this.SatH,this.SatL,this.exprs] = scicos_getvalue("Set the Operational Amplifier parameters",["Open Loop Gain","Positive saturation voltage","Negative saturation voltage"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { 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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 4ca97336..e96d6dc2 100644 --- a/js/Electrical/OpAmp.pickle +++ b/js/Electrical/OpAmp.pickle @@ -4,18 +4,22 @@ p0 ((lp1 S'OLGain' p2 -aS'graphics' +aS'exprs' p3 -aS'SatH' +aS'gr_i' p4 -aS'x' +aS'graphics' p5 -aS'model' +aS'SatH' p6 -aS'SatL' +aS'x' p7 -atp8 -Rp9 +aS'model' +p8 +aS'SatL' +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/Electrical/PMOS.js b/js/Electrical/PMOS.js index 01c64d2f..ae570801 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.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["I"],["I"]]; return new BasicBlock(this.x); @@ -56,17 +56,18 @@ function PMOS() { this.dW = parseFloat(arguments[0]["dW"]) this.dL = parseFloat(arguments[0]["dL"]) this.RDS = parseFloat(arguments[0]["RDS"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.W,this.L,this.Beta,this.Vt,this.K2,this.K5,this.dW,this.dL,this.RDS,exprs] = scicos_getvalue("Set PMOS Transistor parameters",["Width [m]","Length [m]","Transconductance parameter [A/(V*V)]","Zero bias threshold voltage [V]","Bulk threshold parameter","Reduction of pinch-off region","Narrowing of channel [m]","Shortening of channel [m]","Drain-Source-Resistance [Ohm]"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs); + [ok,this.W,this.L,this.Beta,this.Vt,this.K2,this.K5,this.dW,this.dL,this.RDS,this.exprs] = scicos_getvalue("Set PMOS Transistor parameters",["Width [m]","Length [m]","Transconductance parameter [A/(V*V)]","Zero bias threshold voltage [V]","Bulk threshold parameter","Reduction of pinch-off region","Narrowing of channel [m]","Shortening of channel [m]","Drain-Source-Resistance [Ohm]"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),this.exprs); if (!ok) { 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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 9990c4ba..2be5e1af 100644 --- a/js/Electrical/PMOS.pickle +++ b/js/Electrical/PMOS.pickle @@ -8,26 +8,30 @@ aS'K5' p3 aS'RDS' p4 -aS'L' -p5 aS'K2' +p5 +aS'L' p6 -aS'Beta' +aS'exprs' p7 -aS'Vt' +aS'Beta' p8 -aS'W' +aS'gr_i' p9 -aS'graphics' +aS'Vt' p10 -aS'x' +aS'W' p11 -aS'model' +aS'graphics' p12 -aS'dW' +aS'x' p13 -atp14 -Rp15 +aS'model' +p14 +aS'dW' +p15 +atp16 +Rp17 .(dp0 S'arg1' p1 diff --git a/js/Electrical/PNP.js b/js/Electrical/PNP.js index 3ba3ea3b..295f7c44 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)); - 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.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));"]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = standard_define([2,2],this.model,exprs,list(gr_i,0)); + this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); @@ -92,19 +92,20 @@ function PNP() { this.Gbe = arguments[0]["Gbe"] this.Vt = arguments[0]["Vt"] this.EMinMax = arguments[0]["EMinMax"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; this.x = arg1; - var exprs = this.x.graphics.exprs; + this.exprs = this.x.graphics.exprs; while (true) { - [ok,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,exprs] = scicos_getvalue([["Set PNP block parameters:"],[""]],["Bf : Forward beta","Br : Reverse beta","Is : Transport saturation current","Vak : Early voltage (inverse), 1/Volt","Tauf: Ideal forward transit time","Taur: Ideal reverse transit time","Ccs : Collector-substrat(ground) cap.","Cje : Base-emitter zero bias depletion cap.","Cjc : Base-coll. zero bias depletion cap.","Phie: Base-emitter diffusion voltage","Me : Base-emitter gradation exponent","Phic: Base-collector diffusion voltage","Mc : Base-collector gradation exponent","Gbc : Base-collector conductance","Gbe : Base-emitter conductance","Vt : Voltage equivalent of temperature","EMinMax: if x > EMinMax, the exp(x) function is linearized"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs); + [ok,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.exprs] = scicos_getvalue([["Set PNP block parameters:"],[""]],["Bf : Forward beta","Br : Reverse beta","Is : Transport saturation current","Vak : Early voltage (inverse), 1/Volt","Tauf: Ideal forward transit time","Taur: Ideal reverse transit time","Ccs : Collector-substrat(ground) cap.","Cje : Base-emitter zero bias depletion cap.","Cjc : Base-coll. zero bias depletion cap.","Phie: Base-emitter diffusion voltage","Me : Base-emitter gradation exponent","Phic: Base-collector diffusion voltage","Mc : Base-collector gradation exponent","Gbc : Base-collector conductance","Gbe : Base-emitter conductance","Vt : Voltage equivalent of temperature","EMinMax: if x > EMinMax, the exp(x) function is linearized"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { 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 = exprs; + this.x.graphics.exprs = this.exprs; break; } return new BasicBlock(this.x); diff --git a/js/Electrical/PNP.pickle b/js/Electrical/PNP.pickle index 8930541b..aa977a9f 100644 --- a/js/Electrical/PNP.pickle +++ b/js/Electrical/PNP.pickle @@ -2,48 +2,52 @@ c__builtin__ set p0 ((lp1 -S'Me' +S'Vak' p2 -aS'Vak' +aS'Cjc' p3 -aS'Bf' +aS'Cje' p4 -aS'Gbe' +aS'Phic' p5 -aS'Tauf' +aS'Bf' p6 -aS'Gbc' +aS'Br' p7 -aS'Mc' +aS'Me' p8 -aS'Phic' +aS'Phie' p9 -aS'Cjc' +aS'Gbe' p10 -aS'Is' +aS'Tauf' p11 -aS'Phie' +aS'Gbc' p12 -aS'Ccs' +aS'Mc' p13 -aS'Cje' +aS'Ccs' p14 aS'Taur' p15 -aS'Vt' +aS'graphics' p16 -aS'Br' +aS'EMinMax' p17 -aS'graphics' +aS'Is' p18 -aS'EMinMax' +aS'exprs' p19 -aS'x' +aS'gr_i' p20 -aS'model' +aS'Vt' p21 -atp22 -Rp23 +aS'x' +p22 +aS'model' +p23 +atp24 +Rp25 .(dp0 S'x.model.equations.parameters[2-1]' p1 diff --git a/js/Electrical/PotentialSensor.js b/js/Electrical/PotentialSensor.js index 850af214..c6e1bab1 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]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PotentialSensor\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,"",list(gr_i,0)); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PotentialSensor\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,"",list(this.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 5e42e801..1677f93c 100644 --- a/js/Electrical/PotentialSensor.pickle +++ b/js/Electrical/PotentialSensor.pickle @@ -6,8 +6,14 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'gr_i' +p4 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/Electrical/Resistor.js b/js/Electrical/Resistor.js index fa493c6d..ab3ddf84 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.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); - var exprs = string(this.R); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Resistor\",sz(1),sz(2));"]); - this.x = standard_define([2,1],this.model,exprs,list(gr_i,0)); + this.exprs = string(this.R); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Resistor\",sz(1),sz(2));"]); + this.x = standard_define([2,1],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -32,18 +32,19 @@ function Resistor() { } Resistor.prototype.set = function Resistor() { this.R = parseFloat(arguments[0]["R"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.R,exprs] = scicos_getvalue("Set Resistor block parameter","R (ohm)",list("vec",1),exprs); + [ok,this.R,this.exprs] = scicos_getvalue("Set Resistor block parameter","R (ohm)",list("vec",1),this.exprs); if (!ok) { break; } this.model.rpar = new ScilabDouble([this.R]); this.model.equations.parameters[2-1] = list(new ScilabDouble([this.R])); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 c7940c9a..070fe90f 100644 --- a/js/Electrical/Resistor.pickle +++ b/js/Electrical/Resistor.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'R' p2 -aS'model' +aS'exprs' p3 -aS'R' +aS'gr_i' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/Electrical/SineVoltage.js b/js/Electrical/SineVoltage.js index 97e2bfde..13b008b0 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]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -45,18 +45,19 @@ function SineVoltage() { this.frq = parseFloat(arguments[0]["frq"]) this.offset = parseFloat(arguments[0]["offset"]) this.start = parseFloat(arguments[0]["start"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.V,this.ph,this.frq,this.offset,this.start,exprs] = scicos_getvalue("Set voltage source parameter",["Amplitude (Volt)","phase (rad)","Frequency (Hz)","Voltageoffset (V)","Timeoffset (s)"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs); + [ok,this.V,this.ph,this.frq,this.offset,this.start,this.exprs] = scicos_getvalue("Set voltage source parameter",["Amplitude (Volt)","phase (rad)","Frequency (Hz)","Voltageoffset (V)","Timeoffset (s)"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } 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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 db2b83d2..464dfc6e 100644 --- a/js/Electrical/SineVoltage.pickle +++ b/js/Electrical/SineVoltage.pickle @@ -2,24 +2,28 @@ c__builtin__ set p0 ((lp1 -S'graphics' +S'start' p2 -aS'offset' +aS'graphics' p3 -aS'start' +aS'offset' p4 -aS'frq' +aS'exprs' p5 -aS'V' +aS'frq' p6 -aS'x' +aS'gr_i' p7 -aS'model' +aS'V' p8 -aS'ph' +aS'x' p9 -atp10 -Rp11 +aS'model' +p10 +aS'ph' +p11 +atp12 +Rp13 .(dp0 S'arg1' p1 diff --git a/js/Electrical/Switch.js b/js/Electrical/Switch.js index a60c5e2a..5fc20dd9 100644 --- a/js/Electrical/Switch.js +++ b/js/Electrical/Switch.js @@ -18,9 +18,9 @@ function Switch() { this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.model.rpar = new ScilabDouble([Z]); - var exprs = string(Z); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Switch\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,list(gr_i,0)); + this.exprs = string(Z); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Switch\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = [["I"],["E"]]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -38,17 +38,18 @@ function Switch() { Switch.prototype.set = function Switch() { this.Ron = parseFloat(arguments[0]["Ron"]) this.Roff = parseFloat(arguments[0]["Roff"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.Ron,this.Roff,exprs] = scicos_getvalue("Set non-ideal electrical switch parameters",["Resistance in On state (Ohm)","Resistance in Off state (Ohm)"],list("vec",1,"vec",1),exprs); + [ok,this.Ron,this.Roff,this.exprs] = scicos_getvalue("Set non-ideal electrical switch parameters",["Resistance in On state (Ohm)","Resistance in Off state (Ohm)"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } this.model.equations.parameters[2-1] = list(new ScilabDouble([this.Ron]), new ScilabDouble([this.Roff])); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 478106f5..4c2ce9dd 100644 --- a/js/Electrical/Switch.pickle +++ b/js/Electrical/Switch.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'Roff' p2 -aS'model' +aS'Ron' p3 -aS'Roff' +aS'exprs' p4 -aS'Ron' +aS'gr_i' p5 aS'graphics' p6 -atp7 -Rp8 +aS'x' +p7 +aS'model' +p8 +atp9 +Rp10 .(dp0 S'arg1' p1 diff --git a/js/Electrical/VVsourceAC.js b/js/Electrical/VVsourceAC.js index 84dcd9dc..907daeb0 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]); - var exprs = [string(this.FR)]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VVsourceAC\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,list(gr_i,0)); + this.exprs = [string(this.FR)]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VVsourceAC\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I","E"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -34,18 +34,19 @@ function VVsourceAC() { } VVsourceAC.prototype.set = function VVsourceAC() { this.FR = parseFloat(arguments[0]["FR"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.FR,exprs] = scicos_getvalue("Set voltage source parameter",["Frequency (Hz)"],list("vec",-1),exprs); + [ok,this.FR,this.exprs] = scicos_getvalue("Set voltage source parameter",["Frequency (Hz)"],list("vec",-1),this.exprs); if (!ok) { break; } this.model.rpar = new ScilabDouble([this.FR]); this.model.equations.parameters[2-1] = list(new ScilabDouble([this.FR])); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 0d8e9a0a..b1563a7d 100644 --- a/js/Electrical/VVsourceAC.pickle +++ b/js/Electrical/VVsourceAC.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'FR' p2 -aS'model' +aS'exprs' p3 -aS'FR' +aS'gr_i' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'FR' p1 diff --git a/js/Electrical/VariableResistor.js b/js/Electrical/VariableResistor.js index a2175f58..2efac33a 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.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); - var exprs = []; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VariableResistor\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,list(gr_i,0)); + this.exprs = []; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VariableResistor\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,list(this.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 850419e5..4e1a30e9 100644 --- a/js/Electrical/VariableResistor.pickle +++ b/js/Electrical/VariableResistor.pickle @@ -6,8 +6,14 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'gr_i' +p4 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/Electrical/VoltageSensor.js b/js/Electrical/VoltageSensor.js index 40f04f65..5500324e 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]); - var exprs = []; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VoltageSensor\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,list(gr_i,0)); + this.exprs = []; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VoltageSensor\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,list(this.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 13759532..31a790d2 100644 --- a/js/Electrical/VoltageSensor.pickle +++ b/js/Electrical/VoltageSensor.pickle @@ -6,8 +6,14 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'gr_i' +p4 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/Electrical/VsourceAC.js b/js/Electrical/VsourceAC.js index 786b4a0b..60e84496 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]); - 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 = standard_define([2,2],this.model,exprs,list(gr_i,0)); + 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 = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -36,18 +36,19 @@ function VsourceAC() { VsourceAC.prototype.set = function VsourceAC() { this.VA = parseFloat(arguments[0]["VA"]) this.FR = parseFloat(arguments[0]["FR"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.VA,this.FR,exprs] = scicos_getvalue("Set voltage source parameter",["Amplitude (Volt)","Frequency (Hz)"],list("vec",-1,"vec",-1),exprs); + [ok,this.VA,this.FR,this.exprs] = scicos_getvalue("Set voltage source parameter",["Amplitude (Volt)","Frequency (Hz)"],list("vec",-1,"vec",-1),this.exprs); if (!ok) { break; } 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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 59a36993..01ffa4e3 100644 --- a/js/Electrical/VsourceAC.pickle +++ b/js/Electrical/VsourceAC.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'VA' p2 -aS'model' +aS'FR' p3 -aS'VA' +aS'exprs' p4 -aS'FR' +aS'gr_i' p5 aS'graphics' p6 -atp7 -Rp8 +aS'x' +p7 +aS'model' +p8 +atp9 +Rp10 .(dp0 S'FR' p1 diff --git a/js/Events/ANDBLK.pickle b/js/Events/ANDBLK.pickle index d6ad874e..28ad2060 100644 --- a/js/Events/ANDBLK.pickle +++ b/js/Events/ANDBLK.pickle @@ -4,8 +4,16 @@ p0 ((lp1 S'x' p2 -atp3 -Rp4 +aS'model' +p3 +aS'gr_i' +p4 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'diagram.objs[1-1]' p1 diff --git a/js/Events/ANDLOG_f.js b/js/Events/ANDLOG_f.js index 64005fef..57909073 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 ScilabDouble([false,false]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ANDLOG_f\",sz(1),sz(2));"]); - this.x = standard_define([3,3],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ANDLOG_f\",sz(1),sz(2));"]); + this.x = standard_define([3,3],this.model,[],this.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 27c4e0b1..a0fc71ec 100644 --- a/js/Events/ANDLOG_f.pickle +++ b/js/Events/ANDLOG_f.pickle @@ -6,8 +6,14 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'gr_i' +p4 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/Events/CLKSOMV_f.js b/js/Events/CLKSOMV_f.js index 1f86339f..4eefd652 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 ScilabDouble([false,false]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKSOMV_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKSOMV_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,[],this.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 b77c7073..809d645f 100644 --- a/js/Events/CLKSOMV_f.pickle +++ b/js/Events/CLKSOMV_f.pickle @@ -6,8 +6,14 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'gr_i' +p4 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/Events/CLKSOM_f.js b/js/Events/CLKSOM_f.js index 44864f88..0c561a9d 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 ScilabDouble([false,false]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKSOM_f\",sz(1),sz(2));"]); - this.x = standard_define([1,1]/1.2,this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKSOM_f\",sz(1),sz(2));"]); + this.x = standard_define([1,1]/1.2,this.model,[],this.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 b77c7073..809d645f 100644 --- a/js/Events/CLKSOM_f.pickle +++ b/js/Events/CLKSOM_f.pickle @@ -6,8 +6,14 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'gr_i' +p4 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/Events/CLKSPLIT_f.pickle b/js/Events/CLKSPLIT_f.pickle index 1c54c2e8..5ae4b378 100644 --- a/js/Events/CLKSPLIT_f.pickle +++ b/js/Events/CLKSPLIT_f.pickle @@ -6,8 +6,14 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'gr_i' +p4 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/Events/END_c.js b/js/Events/END_c.js index e81cdf1c..107988e7 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 ScilabDouble([false,false]); - var exprs = string(this.tf); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"END_c\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = string(this.tf); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"END_c\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } END_c.prototype.details = function END_c() { @@ -25,17 +25,18 @@ function END_c() { } END_c.prototype.set = function END_c() { this.tf = parseFloat(arguments[0]["tf"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.tf,exprs] = scicos_getvalue("Set final simulation time",["Final simulation time"],list("vec",1),exprs); + [ok,this.tf,this.exprs] = scicos_getvalue("Set final simulation time",["Final simulation time"],list("vec",1),this.exprs); if (!ok) { break; } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 a4f46284..c21c176c 100644 --- a/js/Events/END_c.pickle +++ b/js/Events/END_c.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'tf' +S'exprs' p2 -aS'x' +aS'gr_i' p3 -aS'model' -p4 aS'graphics' +p4 +aS'tf' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'model.sim' p1 diff --git a/js/Events/EVTDLY_c.js b/js/Events/EVTDLY_c.js index 7832ad4f..f3bf27b8 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 ScilabDouble([false,false]); - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } EVTDLY_c.prototype.details = function EVTDLY_c() { @@ -29,12 +29,13 @@ function EVTDLY_c() { EVTDLY_c.prototype.set = function EVTDLY_c() { this.dt = parseFloat(arguments[0]["dt"]) this.ff = parseFloat(arguments[0]["ff"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.dt,this.ff,exprs] = scicos_getvalue([["Set Event Delay block parameters"],["Delay is the delay between an input event "],[" and the generated output event"],["Block may initially generate an output event before "],[" any input event. \"Date of initial output event\""],[" gives the date of this event. Set a negative value"],[" to disable any output event."]],["Delay","Date of initial output event"],list("vec",1,"vec",1),exprs); + [ok,this.dt,this.ff,this.exprs] = scicos_getvalue([["Set Event Delay block parameters"],["Delay is the delay between an input event "],[" and the generated output event"],["Block may initially generate an output event before "],[" any input event. \"Date of initial output event\""],[" gives the date of this event. Set a negative value"],[" to disable any output event."]],["Delay","Date of initial output event"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -43,7 +44,7 @@ function EVTDLY_c() { var ok = false; } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 60b471e4..55521043 100644 --- a/js/Events/EVTDLY_c.pickle +++ b/js/Events/EVTDLY_c.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'exprs' p2 -aS'model' +aS'gr_i' p3 -aS'dt' -p4 aS'ff' -p5 +p4 aS'graphics' +p5 +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +aS'dt' +p8 +atp9 +Rp10 .(dp0 S'model.sim' p1 diff --git a/js/Events/EVTDLY_f.js b/js/Events/EVTDLY_f.js index ebf8f365..b3e8f166 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 ScilabDouble([false,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } EVTDLY_f.prototype.details = function EVTDLY_f() { @@ -29,12 +29,13 @@ function EVTDLY_f() { EVTDLY_f.prototype.set = function EVTDLY_f() { this.dt = parseFloat(arguments[0]["dt"]) this.ff = parseFloat(arguments[0]["ff"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.dt,this.ff,exprs] = scicos_getvalue([["Set Event Delay block parameters"],["Delay is the delay between an input event "],[" and the generated output event"],["Block may initially generate an output event before "],[" any input event. \"Date of initial output event\""],[" gives the date of this event. Set a negative value"],[" if no initial event required"]],["Delay","Date of initial output event"],list("vec",1,"vec",1),exprs); + [ok,this.dt,this.ff,this.exprs] = scicos_getvalue([["Set Event Delay block parameters"],["Delay is the delay between an input event "],[" and the generated output event"],["Block may initially generate an output event before "],[" any input event. \"Date of initial output event\""],[" gives the date of this event. Set a negative value"],[" if no initial event required"]],["Delay","Date of initial output event"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -43,7 +44,7 @@ function EVTDLY_f() { var ok = false; } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 55d2d19b..21700f9b 100644 --- a/js/Events/EVTDLY_f.pickle +++ b/js/Events/EVTDLY_f.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'exprs' p2 -aS'model' +aS'gr_i' p3 -aS'dt' -p4 aS'ff' -p5 +p4 aS'graphics' +p5 +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +aS'dt' +p8 +atp9 +Rp10 .(dp0 S'model.sim' p1 diff --git a/js/Events/EVTGEN_f.js b/js/Events/EVTGEN_f.js index b40c24f6..297b0784 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 ScilabDouble([false,false]); - var exprs = string(this.tt); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTGEN_f\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,exprs,gr_i); + this.exprs = string(this.tt); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTGEN_f\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } EVTGEN_f.prototype.details = function EVTGEN_f() { @@ -24,16 +24,17 @@ function EVTGEN_f() { } EVTGEN_f.prototype.set = function EVTGEN_f() { this.tt = parseFloat(arguments[0]["tt"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.tt,exprs] = scicos_getvalue("Set Event time",["Event Time"],list("vec",1),exprs); + [ok,this.tt,this.exprs] = scicos_getvalue("Set Event time",["Event Time"],list("vec",1),this.exprs); if (!ok) { break; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 50c53ccb..ce268c69 100644 --- a/js/Events/EVTGEN_f.pickle +++ b/js/Events/EVTGEN_f.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'tt' p2 -aS'model' +aS'exprs' p3 -aS'tt' +aS'gr_i' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'model.sim' p1 diff --git a/js/Events/EVTVARDLY.js b/js/Events/EVTVARDLY.js index 3c2f451b..8b95fda9 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 ScilabDouble([true,false]); - var exprs = string(this.model.firing); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTVARDLY\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = string(this.model.firing); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTVARDLY\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } EVTVARDLY.prototype.details = function EVTVARDLY() { @@ -25,16 +25,17 @@ function EVTVARDLY() { } EVTVARDLY.prototype.set = function EVTVARDLY() { this.fir = arguments[0]["fir"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.fir,exprs] = scicos_getvalue("Set parameter of variable event delay","Initial event firing time (<0 if absent)",list("vec",1),exprs); + [ok,this.fir,this.exprs] = scicos_getvalue("Set parameter of variable event delay","Initial event firing time (<0 if absent)",list("vec",1),this.exprs); if (!ok) { break; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 9d2598f9..06641b49 100644 --- a/js/Events/EVTVARDLY.pickle +++ b/js/Events/EVTVARDLY.pickle @@ -4,14 +4,18 @@ p0 ((lp1 S'fir' p2 -aS'x' +aS'exprs' p3 -aS'model' +aS'gr_i' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'model.sim' p1 diff --git a/js/Events/HALT_f.js b/js/Events/HALT_f.js index efd0e1f9..18a45667 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 ScilabDouble([false,false]); - var exprs = string(this.n); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"HALT_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = string(this.n); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"HALT_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } HALT_f.prototype.details = function HALT_f() { @@ -25,17 +25,18 @@ function HALT_f() { } HALT_f.prototype.set = function HALT_f() { this.n = parseFloat(arguments[0]["n"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.n,exprs] = scicos_getvalue("Set Halt block parameters",["State on halt"],list("vec",1),exprs); + [ok,this.n,this.exprs] = scicos_getvalue("Set Halt block parameters",["State on halt"],list("vec",1),this.exprs); if (!ok) { break; } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 e639bd1c..d52d6b00 100644 --- a/js/Events/HALT_f.pickle +++ b/js/Events/HALT_f.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'n' p2 -aS'model' +aS'exprs' p3 -aS'n' +aS'gr_i' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'model.sim' p1 diff --git a/js/Events/IFTHEL_f.js b/js/Events/IFTHEL_f.js index 0c4bc116..e489695e 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 ScilabDouble([true,false]); this.model.nmode = new ScilabDouble([1]); this.model.nzcross = new ScilabDouble([1]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IFTHEL_f\",sz(1),sz(2));"]); - var exprs = [[string(this.model.in1)],[string(this.model.nmode)]]; - this.x = standard_define([3,3],this.model,exprs,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IFTHEL_f\",sz(1),sz(2));"]); + this.exprs = [[string(this.model.in1)],[string(this.model.nmode)]]; + this.x = standard_define([3,3],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } IFTHEL_f.prototype.details = function IFTHEL_f() { @@ -31,18 +31,19 @@ function IFTHEL_f() { IFTHEL_f.prototype.set = function IFTHEL_f() { this.inh = inverse(arguments[0]["inh"]) this.nmod = parseFloat(arguments[0]["nmod"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - if (exprs==[]) { - var exprs = string(1); + if (this.exprs==[]) { + this.exprs = string(1); } - if (size(exprs,"*")==1) { - exprs[2-1] = string(1); + if (size(this.exprs,"*")==1) { + this.exprs[2-1] = string(1); } while (true) { - [ok,this.inh,this.nmod,exprs] = scicos_getvalue("Set parameters",["Inherit (1: no, 0: yes)","zero-crossing (0: no, 1: yes)"],list("vec",1,"vec",1),exprs); + [ok,this.inh,this.nmod,this.exprs] = scicos_getvalue("Set parameters",["Inherit (1: no, 0: yes)","zero-crossing (0: no, 1: yes)"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -58,7 +59,7 @@ function IFTHEL_f() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabString([exprs]); + this.graphics.exprs = new ScilabString([this.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 d2685e9e..d83faa7a 100644 --- a/js/Events/IFTHEL_f.pickle +++ b/js/Events/IFTHEL_f.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'nmod' p2 -aS'model' +aS'exprs' p3 -aS'inh' +aS'gr_i' p4 -aS'nmod' +aS'inh' p5 aS'graphics' p6 -atp7 -Rp8 +aS'x' +p7 +aS'model' +p8 +atp9 +Rp10 .(dp0 S'arg1' p1 diff --git a/js/Events/MCLOCK_f.js b/js/Events/MCLOCK_f.js index 0866962b..564d5370 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; - var exprs = [[string(dt)],[string(nn)]]; + this.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 = exprs; + mfclck.graphics.exprs = this.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]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MCLOCK_f\",sz(1),sz(2));"]); + this.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 = gr_i; + this.x.graphics.gr_i = this.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 cd9a7e13..aba4263b 100644 --- a/js/Events/MCLOCK_f.pickle +++ b/js/Events/MCLOCK_f.pickle @@ -2,12 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'exprs' p2 -aS'xxn' +aS'gr_i' p3 -atp4 -Rp5 +aS'graphics' +p4 +aS'x' +p5 +aS'model' +p6 +aS'xxn' +p7 +atp8 +Rp9 .(dp0 S'output_port1.graphics.exprs' p1 diff --git a/js/Events/MFCLCK_f.js b/js/Events/MFCLCK_f.js index 322550c3..3836c88e 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 ScilabDouble([false,false]); - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } MFCLCK_f.prototype.details = function MFCLCK_f() { @@ -31,18 +31,19 @@ function MFCLCK_f() { MFCLCK_f.prototype.set = function MFCLCK_f() { this.dt = parseFloat(arguments[0]["dt"]) this.nn = parseFloat(arguments[0]["nn"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - [ok,this.dt,this.nn,exprs] = scicos_getvalue("Set Multifrequency clock parameters",["basic period (1/f)","multiply by (n)"],list("vec",1,"vec",1),exprs); + [ok,this.dt,this.nn,this.exprs] = scicos_getvalue("Set Multifrequency clock parameters",["basic period (1/f)","multiply by (n)"],list("vec",1,"vec",1),this.exprs); if (ok) { this.model.ipar = new ScilabDouble([this.nn]); this.model.rpar = new ScilabDouble([this.dt]); var hh = this.model.firing; hh[2-1] = 0; this.model.firing = new ScilabDouble(hh); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 ecb4e072..6ecf6b05 100644 --- a/js/Events/MFCLCK_f.pickle +++ b/js/Events/MFCLCK_f.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'nn' p2 -aS'model' +aS'exprs' p3 -aS'dt' +aS'gr_i' p4 -aS'nn' -p5 aS'graphics' +p5 +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +aS'dt' +p8 +atp9 +Rp10 .(dp0 S'model.dstate' p1 diff --git a/js/Events/M_freq.js b/js/Events/M_freq.js index ce96787f..36cb2254 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 ScilabDouble([false,false]); - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } M_freq.prototype.details = function M_freq() { @@ -28,12 +28,13 @@ function M_freq() { M_freq.prototype.set = function M_freq() { this.frequ = inverse(arguments[0]["frequ"]) this.offset = inverse(arguments[0]["offset"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; while (true) { - [ok,this.frequ,this.offset,exprs] = scicos_getvalue("Set block parameters",["Sample time","Offset"],list("vec",-1,"vec",-1),exprs); + [ok,this.frequ,this.offset,this.exprs] = scicos_getvalue("Set block parameters",["Sample time","Offset"],list("vec",-1,"vec",-1),this.exprs); if (!ok) { break; } @@ -74,7 +75,7 @@ function M_freq() { this.graphics.sz = new ScilabDouble([50,40]); } this.model.firing = new ScilabDouble([fir]); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 806b7dbd..5ef62ea6 100644 --- a/js/Events/M_freq.pickle +++ b/js/Events/M_freq.pickle @@ -8,16 +8,20 @@ aS'of' p3 aS'frequ' p4 -aS'graphics' -p5 aS'offset' +p5 +aS'exprs' p6 -aS'x' +aS'gr_i' p7 -aS'model' +aS'graphics' p8 -atp9 -Rp10 +aS'x' +p9 +aS'model' +p10 +atp11 +Rp12 .(dp0 S'arg1' p1 diff --git a/js/Events/VirtualCLK0.js b/js/Events/VirtualCLK0.js index b50db6e2..50b68b16 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 ScilabDouble([false,false]); - var exprs = []; - this.x = standard_define([2,2],this.model,exprs," "); + this.exprs = []; + this.x = standard_define([2,2],this.model,this.exprs," "); return new BasicBlock(this.x); } VirtualCLK0.prototype.details = function VirtualCLK0() { diff --git a/js/Events/VirtualCLK0.pickle b/js/Events/VirtualCLK0.pickle index 7fd6c99d..11feecbd 100644 --- a/js/Events/VirtualCLK0.pickle +++ b/js/Events/VirtualCLK0.pickle @@ -6,8 +6,14 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'gr_i' +p4 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/Events/freq_div.js b/js/Events/freq_div.js index 7e3f8b68..d49a8486 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; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"freq_div\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"freq_div\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,[],this.gr_i); return new BasicBlock(this.x); } freq_div.prototype.details = function freq_div() { @@ -120,6 +120,7 @@ function freq_div() { freq_div.prototype.set = function freq_div() { %ph = parseFloat(arguments[0]["%ph"]) %df = parseFloat(arguments[0]["%df"]) + this.exprs = inverse(arguments[0]["exprs"]) for (i=1;i<=length(arg1.model.rpar.objs);i+=1) { var o = arg1.model.rpar.objs[i-1]; if (typeof(o)=="Block"&&o.gui=="Modulo_Count") { @@ -137,10 +138,10 @@ function freq_div() { var xx = arg1[spath-1]; var xxn = xx; this.graphics = xx.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = xx.model; while (true) { - [ok,%ph,%df,exprs] = scicos_getvalue("Set frequency division block parameters",["Phase (0 to division factor -1)","Division factor"],list("vec",1,"vec",1),exprs); + [ok,%ph,%df,this.exprs] = scicos_getvalue("Set frequency division block parameters",["Phase (0 to division factor -1)","Division factor"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -152,7 +153,7 @@ function freq_div() { if (%ph>%df-1) { %ph = %df-1; } - this.graphics.exprs = new ScilabDouble(exprs); + this.graphics.exprs = new ScilabDouble(this.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 f58dd424..35055817 100644 --- a/js/Events/freq_div.pickle +++ b/js/Events/freq_div.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'%df' p2 -aS'model' +aS'exprs' p3 -aS'%df' +aS'gr_i' p4 aS'%ph' p5 aS'graphics' p6 -atp7 -Rp8 +aS'x' +p7 +aS'model' +p8 +atp9 +Rp10 .(dp0 S'lnk.ct' p1 diff --git a/js/Hydraulics/Bache.js b/js/Hydraulics/Bache.js index cccef914..210d7d51 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.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); - 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 = standard_define([2,2],this.model,exprs,list(gr_i,0)); + 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 = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = [["I"],["I"]]; this.x.graphics.out_implicit = [["I"],["I"],["E"]]; return new BasicBlock(this.x); @@ -61,18 +61,19 @@ function Bache() { this.z0 = parseFloat(arguments[0]["z0"]) this.T0 = parseFloat(arguments[0]["T0"]) this.p_rho = parseFloat(arguments[0]["p_rho"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.Patm,this.A,this.ze1,this.ze2,this.zs1,this.zs2,this.z0,this.T0,this.p_rho,exprs] = scicos_getvalue("Parametres de la bache",["Pression dans le ciel de la bache : Patm (Pa)","Section de la bache : A (m2)","Altitude du piquage d entrée 1: ze1 (m)","Altitude du piquage d entrée 2: ze2 (m)","Altitude du piquage de sortie 1: zs1 (m)","Altitude du piquage de sortie 2: zs2 (m)","Altitude initiale du fluide : z0 (m)","Température initiale du fluide : T0 (K)","Si >0, masse volumique imposée du fluide : p_rho (kg/m3)"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs); + [ok,this.Patm,this.A,this.ze1,this.ze2,this.zs1,this.zs2,this.z0,this.T0,this.p_rho,this.exprs] = scicos_getvalue("Parametres de la bache",["Pression dans le ciel de la bache : Patm (Pa)","Section de la bache : A (m2)","Altitude du piquage d entrée 1: ze1 (m)","Altitude du piquage d entrée 2: ze2 (m)","Altitude du piquage de sortie 1: zs1 (m)","Altitude du piquage de sortie 2: zs2 (m)","Altitude initiale du fluide : z0 (m)","Température initiale du fluide : T0 (K)","Si >0, masse volumique imposée du fluide : p_rho (kg/m3)"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),this.exprs); if (!ok) { break; } 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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 f8030454..e1dd2964 100644 --- a/js/Hydraulics/Bache.pickle +++ b/js/Hydraulics/Bache.pickle @@ -14,20 +14,24 @@ aS'T0' p6 aS'ze2' p7 -aS'ze1' +aS'exprs' p8 -aS'p_rho' +aS'ze1' p9 -aS'graphics' +aS'gr_i' p10 -aS'x' +aS'p_rho' p11 -aS'model' +aS'graphics' p12 -aS'Patm' +aS'x' p13 -atp14 -Rp15 +aS'model' +p14 +aS'Patm' +p15 +atp16 +Rp17 .(dp0 S'arg1' p1 diff --git a/js/Hydraulics/Flowmeter.js b/js/Hydraulics/Flowmeter.js index 8d7a5bbc..6221b688 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)); - var exprs = "1"; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Flowmeter\",sz(1),sz(2));"]); + this.exprs = "1"; + this.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 ScilabDouble([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in1 = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = standard_define([2,2],this.model,exprs,list(gr_i,0)); + this.x = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); @@ -59,19 +59,20 @@ function Flowmeter() { } Flowmeter.prototype.set = function Flowmeter() { this.Qini = arguments[0]["Qini"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; this.x = arg1; - var exprs = this.x.graphics.exprs; + this.exprs = this.x.graphics.exprs; while (false) { - [ok,this.Qini,exprs] = scicos_getvalue([["Set Flowmeter block parameters:"],[""],["Qini: "]],"Qini",list("vec",1),exprs); + [ok,this.Qini,this.exprs] = scicos_getvalue([["Set Flowmeter block parameters:"],[""],["Qini: "]],"Qini",list("vec",1),this.exprs); if (!ok) { break; } this.x.model.equations.parameters[2-1] = list(this.Qini); - this.x.graphics.exprs = exprs; + this.x.graphics.exprs = this.exprs; break; } return new BasicBlock(this.x); diff --git a/js/Hydraulics/Flowmeter.pickle b/js/Hydraulics/Flowmeter.pickle index 7abe7995..6ce9c452 100644 --- a/js/Hydraulics/Flowmeter.pickle +++ b/js/Hydraulics/Flowmeter.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'Qini' p2 -aS'model' +aS'exprs' p3 -aS'Qini' +aS'gr_i' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'x.model.equations.parameters[2-1]' p1 diff --git a/js/Hydraulics/PerteDP.js b/js/Hydraulics/PerteDP.js index dfca2054..728d0f24 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.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); - 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 = standard_define([2,1],this.model,exprs,list(gr_i,0)); + 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 = standard_define([2,1],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -50,18 +50,19 @@ function PerteDP() { this.z1 = parseFloat(arguments[0]["z1"]) this.z2 = parseFloat(arguments[0]["z2"]) this.p_rho = parseFloat(arguments[0]["p_rho"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.L,this.D,this.lambda,this.z1,this.z2,this.p_rho,exprs] = scicos_getvalue("Parametres du tuyau",["Longueur du tube : L (m)","Diamètre interne du tube : D (m)","Coefficient de perte de charge-frottement(S.U) : lambda","Altitude entrée tuyauterie : z1 (m)","Altitude sortie tuyauterie : z2 (m)","Si >0, masse volumique imposée fu fluide : p_rho (kg/m3)"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs); + [ok,this.L,this.D,this.lambda,this.z1,this.z2,this.p_rho,this.exprs] = scicos_getvalue("Parametres du tuyau",["Longueur du tube : L (m)","Diamètre interne du tube : D (m)","Coefficient de perte de charge-frottement(S.U) : lambda","Altitude entrée tuyauterie : z1 (m)","Altitude sortie tuyauterie : z2 (m)","Si >0, masse volumique imposée fu fluide : p_rho (kg/m3)"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1),this.exprs); if (!ok) { break; } 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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 01934a26..1470e585 100644 --- a/js/Hydraulics/PerteDP.pickle +++ b/js/Hydraulics/PerteDP.pickle @@ -6,22 +6,26 @@ S'D' p2 aS'L' p3 -aS'p_rho' +aS'exprs' p4 -aS'graphics' +aS'gr_i' p5 -aS'x' +aS'p_rho' p6 -aS'model' +aS'graphics' p7 -aS'z1' +aS'x' p8 -aS'z2' +aS'model' p9 -aS'lambda' +aS'z1' p10 -atp11 -Rp12 +aS'z2' +p11 +aS'lambda' +p12 +atp13 +Rp14 .(dp0 S'arg1' p1 diff --git a/js/Hydraulics/PuitsP.js b/js/Hydraulics/PuitsP.js index 84d90966..c709e833 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.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); - 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 = standard_define([2.5,2],this.model,exprs,list(gr_i,0)); + 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 = standard_define([2.5,2],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; return new BasicBlock(this.x); } @@ -39,18 +39,19 @@ function PuitsP() { this.T0 = parseFloat(arguments[0]["T0"]) this.H0 = parseFloat(arguments[0]["H0"]) this.option_temperature = parseFloat(arguments[0]["option_temperature"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.P0,this.T0,this.H0,this.option_temperature,exprs] = scicos_getvalue("Paramètres du puits",["Pression de la source : P0 (Pa)","Temperature de la source : T0 (K)","Enthalpie spécifique de la source : H0 (J/kg)","1:température fixée - 2:enthalpie fixée : option_temperature"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs); + [ok,this.P0,this.T0,this.H0,this.option_temperature,this.exprs] = scicos_getvalue("Paramètres du puits",["Pression de la source : P0 (Pa)","Temperature de la source : T0 (K)","Enthalpie spécifique de la source : H0 (J/kg)","1:température fixée - 2:enthalpie fixée : option_temperature"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1),this.exprs); if (!ok) { break; } 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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 11b085ba..24458909 100644 --- a/js/Hydraulics/PuitsP.pickle +++ b/js/Hydraulics/PuitsP.pickle @@ -8,16 +8,20 @@ aS'H0' p3 aS'T0' p4 -aS'graphics' +aS'exprs' p5 -aS'x' +aS'gr_i' p6 -aS'model' +aS'graphics' p7 -aS'option_temperature' +aS'x' p8 -atp9 -Rp10 +aS'model' +p9 +aS'option_temperature' +p10 +atp11 +Rp12 .(dp0 S'arg1' p1 diff --git a/js/Hydraulics/SourceP.js b/js/Hydraulics/SourceP.js index fe20a9fb..e207fede 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.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); - 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 = standard_define([2.5,2],this.model,exprs,list(gr_i,0)); + 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 = standard_define([2.5,2],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); } @@ -41,18 +41,19 @@ function SourceP() { this.T0 = parseFloat(arguments[0]["T0"]) this.H0 = parseFloat(arguments[0]["H0"]) this.option_temperature = parseFloat(arguments[0]["option_temperature"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.P0,this.T0,this.H0,this.option_temperature,exprs] = scicos_getvalue("Paramètres du puits",["Pression de la source : P0 (Pa)","Temperature de la source : T0 (K)","Enthalpie spécifique de la source : H0 (J/kg)","1:température fixée - 2:enthalpie fixée : option_temperature"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1),exprs); + [ok,this.P0,this.T0,this.H0,this.option_temperature,this.exprs] = scicos_getvalue("Paramètres du puits",["Pression de la source : P0 (Pa)","Temperature de la source : T0 (K)","Enthalpie spécifique de la source : H0 (J/kg)","1:température fixée - 2:enthalpie fixée : option_temperature"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1),this.exprs); if (!ok) { break; } 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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 083335be..553aeaec 100644 --- a/js/Hydraulics/SourceP.pickle +++ b/js/Hydraulics/SourceP.pickle @@ -8,16 +8,20 @@ aS'H0' p3 aS'T0' p4 -aS'graphics' +aS'exprs' p5 -aS'x' +aS'gr_i' p6 -aS'model' +aS'graphics' p7 -aS'option_temperature' +aS'x' p8 -atp9 -Rp10 +aS'model' +p9 +aS'option_temperature' +p10 +atp11 +Rp12 .(dp0 S'arg1' p1 diff --git a/js/Hydraulics/VanneReglante.js b/js/Hydraulics/VanneReglante.js index 85b21dfc..d3f2711f 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.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); - 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 = standard_define([2,2],this.model,exprs,list(gr_i,0)); + 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 = standard_define([2,2],this.model,this.exprs,list(this.gr_i,0)); this.x.graphics.in_implicit = [["I"],["E"]]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -38,18 +38,19 @@ function VanneReglante() { VanneReglante.prototype.set = function VanneReglante() { this.Cvmax = parseFloat(arguments[0]["Cvmax"]) this.p_rho = parseFloat(arguments[0]["p_rho"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.Cvmax,this.p_rho,exprs] = scicos_getvalue("Paramètres de la vanne reglante",["Cvmax","p_rho"],list("vec",-1,"vec",-1),exprs); + [ok,this.Cvmax,this.p_rho,this.exprs] = scicos_getvalue("Paramètres de la vanne reglante",["Cvmax","p_rho"],list("vec",-1,"vec",-1),this.exprs); if (!ok) { break; } 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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 ceb85ccf..11c5fb2b 100644 --- a/js/Hydraulics/VanneReglante.pickle +++ b/js/Hydraulics/VanneReglante.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'Cvmax' p2 -aS'model' +aS'exprs' p3 -aS'p_rho' +aS'gr_i' p4 -aS'Cvmax' +aS'p_rho' p5 aS'graphics' p6 -atp7 -Rp8 +aS'x' +p7 +aS'model' +p8 +atp9 +Rp10 .(dp0 S'arg1' p1 diff --git a/js/IntegerOp/BITCLEAR.js b/js/IntegerOp/BITCLEAR.js index 550671b5..0b74931f 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 ScilabDouble([true,false]); - var exprs = [[sci2exp(3)],[sci2exp(0)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BITCLEAR\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,exprs,gr_i); + this.exprs = [[sci2exp(3)],[sci2exp(0)]]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BITCLEAR\",sz(1),sz(2));"]); + this.x = standard_define([4,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } BITCLEAR.prototype.details = function BITCLEAR() { @@ -30,12 +30,13 @@ function BITCLEAR() { BITCLEAR.prototype.set = function BITCLEAR() { this.Datatype = arguments[0]["Datatype"] this.bit = parseFloat(arguments[0]["bit"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.Datatype,this.bit,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","BITCLEAR")],[" "],["Clear a bit"],[" "]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Index of Bit (0 is least significant)"],list("vec",1,"vec",1),exprs); + [ok,this.Datatype,this.bit,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","BITCLEAR")],[" "],["Clear a bit"],[" "]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Index of Bit (0 is least significant)"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -87,7 +88,7 @@ function BITCLEAR() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 24c58589..c8ab7e1e 100644 --- a/js/IntegerOp/BITCLEAR.pickle +++ b/js/IntegerOp/BITCLEAR.pickle @@ -4,16 +4,20 @@ p0 ((lp1 S'Datatype' p2 -aS'x' +aS'exprs' p3 -aS'model' +aS'gr_i' p4 -aS'bit' -p5 aS'graphics' +p5 +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +aS'bit' +p8 +atp9 +Rp10 .(dp0 S'arg1' p1 diff --git a/js/IntegerOp/BITSET.js b/js/IntegerOp/BITSET.js index bee59f69..920214d1 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 ScilabDouble([true,false]); - var exprs = [[sci2exp(3)],[sci2exp(0)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BITSET\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,exprs,gr_i); + this.exprs = [[sci2exp(3)],[sci2exp(0)]]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BITSET\",sz(1),sz(2));"]); + this.x = standard_define([4,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } BITSET.prototype.details = function BITSET() { @@ -30,12 +30,13 @@ function BITSET() { BITSET.prototype.set = function BITSET() { this.Datatype = arguments[0]["Datatype"] this.bit = parseFloat(arguments[0]["bit"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.Datatype,this.bit,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","BITSET")],[" "],["Set a bit"],[" "]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Index of Bit (0 is least significant)"],list("vec",1,"vec",1),exprs); + [ok,this.Datatype,this.bit,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","BITSET")],[" "],["Set a bit"],[" "]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Index of Bit (0 is least significant)"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -85,7 +86,7 @@ function BITSET() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 24c58589..c8ab7e1e 100644 --- a/js/IntegerOp/BITSET.pickle +++ b/js/IntegerOp/BITSET.pickle @@ -4,16 +4,20 @@ p0 ((lp1 S'Datatype' p2 -aS'x' +aS'exprs' p3 -aS'model' +aS'gr_i' p4 -aS'bit' -p5 aS'graphics' +p5 +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +aS'bit' +p8 +atp9 +Rp10 .(dp0 S'arg1' p1 diff --git a/js/IntegerOp/CONVERT.js b/js/IntegerOp/CONVERT.js index dab0ab34..205bf88a 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 ScilabDouble([true,false]); - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CONVERT.prototype.details = function CONVERT() { @@ -34,12 +34,13 @@ function CONVERT() { this.it = parseFloat(arguments[0]["it"]) this.ot = parseFloat(arguments[0]["ot"]) this.np = arguments[0]["np"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; while (true) { - [ok,this.it,this.ot,this.np,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","CONVERT")],[" "],["Type conversion"],[" "]],["Input Type (1:double, 3:int32, 4:int16, 5:int8, ...)","Output Type (1:double, 3:int32, 4:int16, 5:int8, ...)","Do on Overflow (0:Nothing, 1:Saturate, 2:Error)"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.it,this.ot,this.np,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","CONVERT")],[" "],["Type conversion"],[" "]],["Input Type (1:double, 3:int32, 4:int16, 5:int8, ...)","Output Type (1:double, 3:int32, 4:int16, 5:int8, ...)","Do on Overflow (0:Nothing, 1:Saturate, 2:Error)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -374,7 +375,7 @@ function CONVERT() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 7e1aaf37..aaa410ba 100644 --- a/js/IntegerOp/CONVERT.pickle +++ b/js/IntegerOp/CONVERT.pickle @@ -4,18 +4,22 @@ p0 ((lp1 S'it' p2 -aS'graphics' +aS'exprs' p3 -aS'np' +aS'gr_i' p4 -aS'x' +aS'graphics' p5 -aS'model' +aS'np' p6 -aS'ot' +aS'x' p7 -atp8 -Rp9 +aS'model' +p8 +aS'ot' +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/IntegerOp/DFLIPFLOP.js b/js/IntegerOp/DFLIPFLOP.js index bf597aee..da878654 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 ScilabDouble([true,false]); this.model.rpar = new ScilabDouble([scs_m]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DFLIPFLOP\",sz(1),sz(2));"]); - this.x = standard_define([2,3],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DFLIPFLOP\",sz(1),sz(2));"]); + this.x = standard_define([2,3],this.model,[],this.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 f92835f1..37018580 100644 --- a/js/IntegerOp/DFLIPFLOP.pickle +++ b/js/IntegerOp/DFLIPFLOP.pickle @@ -6,8 +6,14 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'gr_i' +p4 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'scs_m_1.objs[9-1]' p1 diff --git a/js/IntegerOp/DLATCH.js b/js/IntegerOp/DLATCH.js index 8dde9f63..e9df7061 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 ScilabDouble([true,false]); this.model.rpar = new ScilabDouble([scs_m]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLATCH\",sz(1),sz(2));"]); - this.x = standard_define([2,3],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLATCH\",sz(1),sz(2));"]); + this.x = standard_define([2,3],this.model,[],this.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 06eaaaef..214e0a39 100644 --- a/js/IntegerOp/DLATCH.pickle +++ b/js/IntegerOp/DLATCH.pickle @@ -6,8 +6,14 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'gr_i' +p4 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/IntegerOp/EXTRACTBITS.js b/js/IntegerOp/EXTRACTBITS.js index 73d29d70..20f3fd8a 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 ScilabDouble([true,false]); - 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 = standard_define([4,2],this.model,exprs,gr_i); + 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 = standard_define([4,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } EXTRACTBITS.prototype.details = function EXTRACTBITS() { @@ -35,12 +35,13 @@ function EXTRACTBITS() { this.rule = parseFloat(arguments[0]["rule"]) this.bit = parseFloat(arguments[0]["bit"]) this.scal = arguments[0]["scal"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.Datatype,this.rule,this.bit,this.scal,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","EXTRACTBITS")],[" "],["Bits Extraction"],[" "],[" - Bits to Extract:"],[" 1 Upper Half"],[" 2 Lower Half"],[" 3 Range from MSB"],[" 4 Range to LSB"],[" 5 Range of Bits"],[" - Number of Bits or Index of bit : Index 0 is LSB"],[" If \'Bits to Extract\' is set to \'Range of bits\': [Start, End]"],[" "]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Bits to extract","Number of Bits or Index of Bit","Treat Bit Field as an Integer (0:No, 1:Yes)"],list("vec",1,"vec",1,"vec",-1,"vec",1),exprs); + [ok,this.Datatype,this.rule,this.bit,this.scal,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","EXTRACTBITS")],[" "],["Bits Extraction"],[" "],[" - Bits to Extract:"],[" 1 Upper Half"],[" 2 Lower Half"],[" 3 Range from MSB"],[" 4 Range to LSB"],[" 5 Range of Bits"],[" - Number of Bits or Index of bit : Index 0 is LSB"],[" If \'Bits to Extract\' is set to \'Range of bits\': [Start, End]"],[" "]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Bits to extract","Number of Bits or Index of Bit","Treat Bit Field as an Integer (0:No, 1:Yes)"],list("vec",1,"vec",1,"vec",-1,"vec",1),this.exprs); if (!ok) { break; } @@ -234,7 +235,7 @@ function EXTRACTBITS() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 c47eb37f..e9c13a5f 100644 --- a/js/IntegerOp/EXTRACTBITS.pickle +++ b/js/IntegerOp/EXTRACTBITS.pickle @@ -8,16 +8,20 @@ aS'Datatype' p3 aS'rule' p4 -aS'graphics' +aS'exprs' p5 -aS'x' +aS'gr_i' p6 -aS'model' +aS'graphics' p7 -aS'bit' +aS'x' p8 -atp9 -Rp10 +aS'model' +p9 +aS'bit' +p10 +atp11 +Rp12 .(dp0 S'arg1' p1 diff --git a/js/IntegerOp/INTMUL.js b/js/IntegerOp/INTMUL.js index 56a654ff..c0f32924 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 ScilabDouble([true,false]); - var exprs = [[sci2exp(3)],[sci2exp(0)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTMUL\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = [[sci2exp(3)],[sci2exp(0)]]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTMUL\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } INTMUL.prototype.details = function INTMUL() { @@ -32,12 +32,13 @@ function INTMUL() { INTMUL.prototype.set = function INTMUL() { this.Datatype = arguments[0]["Datatype"] this.np = arguments[0]["np"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; while (true) { - [ok,this.Datatype,this.np,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","INTMUL")],[" "],["Integer matrix multiplication"],[" "]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Do on Overflow (0:Nothing, 1:Saturate, 2:Error)"],list("vec",1,"vec",1),exprs); + [ok,this.Datatype,this.np,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","INTMUL")],[" "],["Integer matrix multiplication"],[" "]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Do on Overflow (0:Nothing, 1:Saturate, 2:Error)"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -108,7 +109,7 @@ function INTMUL() { } if (ok) { this.model.ipar = new ScilabDouble([this.np]); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 187761c9..28173e09 100644 --- a/js/IntegerOp/INTMUL.pickle +++ b/js/IntegerOp/INTMUL.pickle @@ -4,16 +4,20 @@ p0 ((lp1 S'Datatype' p2 -aS'x' +aS'exprs' p3 -aS'model' +aS'gr_i' p4 -aS'np' -p5 aS'graphics' +p5 +aS'np' p6 -atp7 -Rp8 +aS'x' +p7 +aS'model' +p8 +atp9 +Rp10 .(dp0 S'arg1' p1 diff --git a/js/IntegerOp/JKFLIPFLOP.js b/js/IntegerOp/JKFLIPFLOP.js index 1fb25113..ddd251c0 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 ScilabDouble([true,false]); this.model.rpar = new ScilabDouble([scs_m]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"JKFLIPFLOP\",sz(1),sz(2));"]); - this.x = standard_define([2,3],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"JKFLIPFLOP\",sz(1),sz(2));"]); + this.x = standard_define([2,3],this.model,[],this.gr_i); return new BasicBlock(this.x); } JKFLIPFLOP.prototype.details = function JKFLIPFLOP() { @@ -68,11 +68,11 @@ function JKFLIPFLOP() { } var newpar = list(); var xx = arg1.model.rpar.objs[path-1]; - var exprs = xx.graphics.exprs[1-1]; + this.exprs = xx.graphics.exprs[1-1]; this.model = xx.model; var init_old = this.model.odstate[1-1]; while (true) { - [ok,this.init,this.exprs0] = scicos_getvalue([[msprintf("Set %s block parameters","JKFLIPFLOP")],[" "],["JK flip-flop"],[" "],["The \'Initial Value\' must be 0 or 1 of type int8"],[" - Negative values are considered as int8(0)"],[" - Positive values are considered as int8(1)"],[" "]],"Initial Value",list("vec",1),exprs); + [ok,this.init,this.exprs0] = scicos_getvalue([[msprintf("Set %s block parameters","JKFLIPFLOP")],[" "],["JK flip-flop"],[" "],["The \'Initial Value\' must be 0 or 1 of type int8"],[" - Negative values are considered as int8(0)"],[" - Positive values are considered as int8(1)"],[" "]],"Initial Value",list("vec",1),this.exprs); if (!ok) { break; } diff --git a/js/IntegerOp/JKFLIPFLOP.pickle b/js/IntegerOp/JKFLIPFLOP.pickle index 29deca35..f81681e8 100644 --- a/js/IntegerOp/JKFLIPFLOP.pickle +++ b/js/IntegerOp/JKFLIPFLOP.pickle @@ -2,16 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'exprs0' p2 -aS'model' +aS'exprs' p3 aS'init' p4 -aS'exprs0' +aS'gr_i' p5 -atp6 -Rp7 +aS'graphics' +p6 +aS'x' +p7 +aS'model' +p8 +atp9 +Rp10 .(dp0 S'xx.model' p1 diff --git a/js/IntegerOp/LOGIC.js b/js/IntegerOp/LOGIC.js index 4f2013b8..7a463e3c 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 ScilabDouble([true,false]); - var exprs = [[sci2exp(this.mat)],[sci2exp(0)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOGIC\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = [[sci2exp(this.mat)],[sci2exp(0)]]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOGIC\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } LOGIC.prototype.details = function LOGIC() { @@ -33,12 +33,13 @@ function LOGIC() { LOGIC.prototype.set = function LOGIC() { this.mat = inverse(arguments[0]["mat"]) this.herit = arguments[0]["herit"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.mat,this.herit,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","LOGIC")],[" "],["Combinatorial logic"],[" "],[" Rows of the matrix are the output values"],[" Number of rows must be a power of two."],[" Number of columns gives the number of outputs."],[" "]],["Truth Table (matrix of outputs)","Accepts Inherited Events (0:No, 1:Yes)"],list("mat",[-1,-2],"vec",1),exprs); + [ok,this.mat,this.herit,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","LOGIC")],[" "],["Combinatorial logic"],[" "],[" Rows of the matrix are the output values"],[" Number of rows must be a power of two."],[" Number of columns gives the number of outputs."],[" "]],["Truth Table (matrix of outputs)","Accepts Inherited Events (0:No, 1:Yes)"],list("mat",[-1,-2],"vec",1),this.exprs); if (!ok) { break; } @@ -66,7 +67,7 @@ function LOGIC() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 c2e52def..a7b30e2e 100644 --- a/js/IntegerOp/LOGIC.pickle +++ b/js/IntegerOp/LOGIC.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'herit' p2 -aS'model' +aS'mat' p3 -aS'herit' +aS'exprs' p4 -aS'mat' +aS'gr_i' p5 aS'graphics' p6 -atp7 -Rp8 +aS'x' +p7 +aS'model' +p8 +atp9 +Rp10 .(dp0 S'arg1' p1 diff --git a/js/IntegerOp/SHIFT.js b/js/IntegerOp/SHIFT.js index f7204135..d80d4c1f 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 ScilabDouble([true,false]); - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } SHIFT.prototype.details = function SHIFT() { @@ -35,12 +35,13 @@ function SHIFT() { this.Datatype = arguments[0]["Datatype"] this.nb = arguments[0]["nb"] this.np = arguments[0]["np"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; while (true) { - [ok,this.Datatype,this.nb,this.np,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","SHIFT")],[" "],["Shift/Rotates bits"]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Number of Bits to Shift Left (Negative number to shift right)","Shift Type (0:Arithmetic, 1:Circular)"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.Datatype,this.nb,this.np,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","SHIFT")],[" "],["Shift/Rotates bits"]],[msprintf("Data Type %s","(3:int32, 4:int16, 5:int8, ...)"),"Number of Bits to Shift Left (Negative number to shift right)","Shift Type (0:Arithmetic, 1:Circular)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -125,7 +126,7 @@ function SHIFT() { } if (ok) { this.model.ipar = new ScilabDouble([this.nb]); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 c5cb2ddf..10f24435 100644 --- a/js/IntegerOp/SHIFT.pickle +++ b/js/IntegerOp/SHIFT.pickle @@ -6,16 +6,20 @@ S'Datatype' p2 aS'nb' p3 -aS'graphics' +aS'exprs' p4 -aS'np' +aS'gr_i' p5 -aS'x' +aS'graphics' p6 -aS'model' +aS'np' p7 -atp8 -Rp9 +aS'x' +p8 +aS'model' +p9 +atp10 +Rp11 .(dp0 S'OPER' p1 diff --git a/js/IntegerOp/SRFLIPFLOP.js b/js/IntegerOp/SRFLIPFLOP.js index 99b49370..fd9a0e51 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 ScilabDouble([true,false]); this.model.rpar = new ScilabDouble([scs_m]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SRFLIPFLOP\",sz(1),sz(2));"]); - this.x = standard_define([2,3],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SRFLIPFLOP\",sz(1),sz(2));"]); + this.x = standard_define([2,3],this.model,[],this.gr_i); return new BasicBlock(this.x); } SRFLIPFLOP.prototype.details = function SRFLIPFLOP() { @@ -52,11 +52,11 @@ function SRFLIPFLOP() { } var newpar = list(); var xx = arg1.model.rpar.objs[path-1]; - var exprs = xx.graphics.exprs[1-1]; + this.exprs = xx.graphics.exprs[1-1]; this.model = xx.model; var init_old = this.model.odstate[1-1]; while (true) { - [ok,this.init,this.exprs0] = scicos_getvalue([[msprintf("Set %s block parameters","SRFLIPFLOP")],[" "],["SR flip-flop"],[" "],["The \'Initial Value\' must be 0 or 1 of type int8"],[" - Negative values are considered as int8(0)"],[" - Positive values are considered as int8(1)"],[" "]],"Initial Value",list("vec",1),exprs); + [ok,this.init,this.exprs0] = scicos_getvalue([[msprintf("Set %s block parameters","SRFLIPFLOP")],[" "],["SR flip-flop"],[" "],["The \'Initial Value\' must be 0 or 1 of type int8"],[" - Negative values are considered as int8(0)"],[" - Positive values are considered as int8(1)"],[" "]],"Initial Value",list("vec",1),this.exprs); if (!ok) { break; } diff --git a/js/IntegerOp/SRFLIPFLOP.pickle b/js/IntegerOp/SRFLIPFLOP.pickle index 4bf38a8b..4a6405ff 100644 --- a/js/IntegerOp/SRFLIPFLOP.pickle +++ b/js/IntegerOp/SRFLIPFLOP.pickle @@ -2,16 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'exprs0' p2 -aS'model' +aS'exprs' p3 aS'init' p4 -aS'exprs0' +aS'gr_i' p5 -atp6 -Rp7 +aS'graphics' +p6 +aS'x' +p7 +aS'model' +p8 +atp9 +Rp10 .(dp0 S'xx.model' p1 diff --git a/js/Linear/BIGSOM_f.js b/js/Linear/BIGSOM_f.js index 81ce262a..2305b2bc 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 ScilabDouble([true,false]); - var exprs = sci2exp(this.sgn); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BIGSOM_f\",sz(1),sz(2));"]); - this.x = standard_define([2,3],this.model,exprs,gr_i); + this.exprs = sci2exp(this.sgn); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BIGSOM_f\",sz(1),sz(2));"]); + this.x = standard_define([2,3],this.model,this.exprs,this.gr_i); return new BigSom(this.x); } BIGSOM_f.prototype.details = function BIGSOM_f() { @@ -24,12 +24,13 @@ function BIGSOM_f() { } BIGSOM_f.prototype.set = function BIGSOM_f() { this.sgn = inverse(arguments[0]["sgn"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; while (true) { - [ok,this.sgn,exprs] = scicos_getvalue("Set sum block parameters","Inputs ports signs/gain",list("vec",-1),exprs); + [ok,this.sgn,this.exprs] = scicos_getvalue("Set sum block parameters","Inputs ports signs/gain",list("vec",-1),this.exprs); if (!ok) { break; } @@ -40,7 +41,7 @@ function BIGSOM_f() { var ok = tmpvar0[2]; if (ok) { this.model.rpar = new ScilabDouble(this.sgn.slice()); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 dab5333b..8b298173 100644 --- a/js/Linear/BIGSOM_f.pickle +++ b/js/Linear/BIGSOM_f.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'graphics' p2 -aS'model' +aS'exprs' p3 -aS'sgn' +aS'gr_i' p4 -aS'graphics' +aS'sgn' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'sgn' p1 diff --git a/js/Linear/CLINDUMMY_f.js b/js/Linear/CLINDUMMY_f.js index 13b249d4..ff8a9769 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 ScilabDouble([false,true]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLINDUMMY_f\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLINDUMMY_f\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,[],this.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 90b6cfdc..3927fc87 100644 --- a/js/Linear/CLINDUMMY_f.pickle +++ b/js/Linear/CLINDUMMY_f.pickle @@ -6,8 +6,14 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'gr_i' +p4 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/Linear/CLR.js b/js/Linear/CLR.js index d48d4a76..0ae65202 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; - var exprs = [["1"],["1+s"]]; + this.exprs = [["1"],["1+s"]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["csslti4"]), new ScilabDouble([4])); this.model.in1 = 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 ScilabDouble([false,true]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLR\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,exprs,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLR\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CLR.prototype.details = function CLR() { @@ -32,9 +32,10 @@ function CLR() { CLR.prototype.set = function CLR() { this.num = arguments[0]["num"] this.den = arguments[0]["den"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; var x0 = this.model.state; var rpar = this.model.rpar; @@ -44,7 +45,7 @@ function CLR() { var PREVAR_scicos_context = PREVAR_scicos_context; PREVAR_scicos_context.s = %s; while (true) { - [ok,this.num,this.den,exprs] = scicos_getvalue("Set continuous SISO transfer parameters",["Numerator (s)","Denominator (s)"],list("pol",1,"pol",1),exprs); + [ok,this.num,this.den,this.exprs] = scicos_getvalue("Set continuous SISO transfer parameters",["Numerator (s)","Denominator (s)"],list("pol",1,"pol",1),this.exprs); if (!ok) { break; } @@ -59,7 +60,7 @@ function CLR() { var B = tmpvar0[1]; var C = tmpvar0[2]; var D = tmpvar0[3]; - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 26e70f19..b567f246 100644 --- a/js/Linear/CLR.pickle +++ b/js/Linear/CLR.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'num' p2 -aS'model' +aS'exprs' p3 -aS'num' +aS'gr_i' p4 aS'den' p5 aS'graphics' p6 -atp7 -Rp8 +aS'x' +p7 +aS'model' +p8 +atp9 +Rp10 .(dp0 S'arg1' p1 diff --git a/js/Linear/CLR_f.js b/js/Linear/CLR_f.js index e567e751..b18af850 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; - var exprs = [["1"],["1+s"]]; + this.exprs = [["1"],["1+s"]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["csslti"]), new ScilabDouble([1])); this.model.in1 = 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 ScilabDouble([false,true]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLR_f\",sz(1),sz(2));"]); - this.x = standard_define([2.5,2.5],this.model,exprs,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLR_f\",sz(1),sz(2));"]); + this.x = standard_define([2.5,2.5],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CLR_f.prototype.details = function CLR_f() { @@ -32,9 +32,10 @@ function CLR_f() { CLR_f.prototype.set = function CLR_f() { this.num = arguments[0]["num"] this.den = arguments[0]["den"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; var x0 = this.model.state; var rpar = this.model.rpar; @@ -44,7 +45,7 @@ function CLR_f() { var PREVAR_scicos_context = PREVAR_scicos_context; PREVAR_scicos_context.s = %s; while (true) { - [ok,this.num,this.den,exprs] = scicos_getvalue("Set continuous SISO transfer parameters",["Numerator (s)","Denominator (s)"],list("pol",1,"pol",1),exprs); + [ok,this.num,this.den,this.exprs] = scicos_getvalue("Set continuous SISO transfer parameters",["Numerator (s)","Denominator (s)"],list("pol",1,"pol",1),this.exprs); if (!ok) { break; } @@ -59,7 +60,7 @@ function CLR_f() { var B = tmpvar0[1]; var C = tmpvar0[2]; var D = tmpvar0[3]; - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 26e70f19..b567f246 100644 --- a/js/Linear/CLR_f.pickle +++ b/js/Linear/CLR_f.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'num' p2 -aS'model' +aS'exprs' p3 -aS'num' +aS'gr_i' p4 aS'den' p5 aS'graphics' p6 -atp7 -Rp8 +aS'x' +p7 +aS'model' +p8 +atp9 +Rp10 .(dp0 S'arg1' p1 diff --git a/js/Linear/CLSS.js b/js/Linear/CLSS.js index a5c78f5c..c3aa0444 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 ScilabDouble([false,true]); - var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLSS\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,exprs,gr_i); + 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 = standard_define([4,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CLSS.prototype.details = function CLSS() { @@ -40,15 +40,16 @@ function CLSS() { this.C = parseFloat(arguments[0]["C"]) this.D = parseFloat(arguments[0]["D"]) this.x0 = parseFloat(arguments[0]["x0"]) + this.exprs = parseFloat(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; - if (size(exprs,"*")==7) { - var exprs = exprs[[1:4,7]-1]; + this.exprs = this.graphics.exprs; + if (size(this.exprs,"*")==7) { + this.exprs = this.exprs[[1:4,7]-1]; } this.model = arg1.model; while (true) { - [ok,this.A,this.B,this.C,this.D,this.x0,exprs] = scicos_getvalue("Set continuous linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),exprs); + [ok,this.A,this.B,this.C,this.D,this.x0,this.exprs] = scicos_getvalue("Set continuous linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),this.exprs); if (!ok) { break; } @@ -81,7 +82,7 @@ function CLSS() { this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; if (this.D!=[]) { if (norm(this.D,1)!=0) { diff --git a/js/Linear/CLSS.pickle b/js/Linear/CLSS.pickle index fd7725aa..67df1cc8 100644 --- a/js/Linear/CLSS.pickle +++ b/js/Linear/CLSS.pickle @@ -10,16 +10,20 @@ aS'B' p4 aS'D' p5 -aS'graphics' +aS'exprs' p6 -aS'x' +aS'gr_i' p7 -aS'model' +aS'graphics' p8 -aS'x0' +aS'x' p9 -atp10 -Rp11 +aS'model' +p10 +aS'x0' +p11 +atp12 +Rp13 .(dp0 S'arg1' p1 diff --git a/js/Linear/CLSS_f.js b/js/Linear/CLSS_f.js index df05e986..f1fd411b 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 ScilabDouble([false,true]); - var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLSS_f\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,exprs,gr_i); + 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 = standard_define([4,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CLSS_f.prototype.details = function CLSS_f() { @@ -40,15 +40,16 @@ function CLSS_f() { this.C = parseFloat(arguments[0]["C"]) this.D = parseFloat(arguments[0]["D"]) this.x0 = parseFloat(arguments[0]["x0"]) + this.exprs = parseFloat(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; - if (size(exprs,"*")==7) { - var exprs = exprs[[1:4,7]-1]; + this.exprs = this.graphics.exprs; + if (size(this.exprs,"*")==7) { + this.exprs = this.exprs[[1:4,7]-1]; } this.model = arg1.model; while (true) { - [ok,this.A,this.B,this.C,this.D,this.x0,exprs] = scicos_getvalue("Set continuous linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),exprs); + [ok,this.A,this.B,this.C,this.D,this.x0,this.exprs] = scicos_getvalue("Set continuous linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),this.exprs); if (!ok) { break; } @@ -71,7 +72,7 @@ function CLSS_f() { this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; if (this.D!=[]) { if (norm(this.D,1)!=0) { diff --git a/js/Linear/CLSS_f.pickle b/js/Linear/CLSS_f.pickle index 1746730e..5888cbdb 100644 --- a/js/Linear/CLSS_f.pickle +++ b/js/Linear/CLSS_f.pickle @@ -10,16 +10,20 @@ aS'B' p4 aS'D' p5 -aS'graphics' +aS'exprs' p6 -aS'x' +aS'gr_i' p7 -aS'model' +aS'graphics' p8 -aS'x0' +aS'x' p9 -atp10 -Rp11 +aS'model' +p10 +aS'x0' +p11 +atp12 +Rp13 .(dp0 S'arg1' p1 diff --git a/js/Linear/DELAYV_f.js b/js/Linear/DELAYV_f.js index db1fe8e8..4aaadbfd 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 ScilabDouble([true,false]); - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } DELAYV_f.prototype.details = function DELAYV_f() { @@ -36,16 +36,17 @@ function DELAYV_f() { this.nin = parseFloat(arguments[0]["nin"]) this.zz0 = inverse(arguments[0]["zz0"]) this.T = parseFloat(arguments[0]["T"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; this.nin = this.model.in1[1-1]; var z0 = this.model.dstate; this.zz0 = z0.slice(1-1,$-1); var told = z0[$-1]; while (true) { - [ok,this.nin,this.zz0,this.T,exprs] = scicos_getvalue("Set delay parameters",["Number of inputs","Register initial condition","Max delay"],list("vec",1,"vec",-1,"vec",1),exprs); + [ok,this.nin,this.zz0,this.T,this.exprs] = scicos_getvalue("Set delay parameters",["Number of inputs","Register initial condition","Max delay"],list("vec",1,"vec",-1,"vec",1),this.exprs); if (!ok) { break; } @@ -64,7 +65,7 @@ function DELAYV_f() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 b7b3bf9b..ab2cd3e7 100644 --- a/js/Linear/DELAYV_f.pickle +++ b/js/Linear/DELAYV_f.pickle @@ -6,16 +6,20 @@ S'nin' p2 aS'zz0' p3 -aS'T' +aS'exprs' p4 -aS'graphics' +aS'gr_i' p5 -aS'x' +aS'T' p6 -aS'model' +aS'graphics' p7 -atp8 -Rp9 +aS'x' +p8 +aS'model' +p9 +atp10 +Rp11 .(dp0 S'model.dstate' p1 diff --git a/js/Linear/DELAY_f.js b/js/Linear/DELAY_f.js index dad5fa7c..c80050dc 100644 --- a/js/Linear/DELAY_f.js +++ b/js/Linear/DELAY_f.js @@ -78,6 +78,7 @@ function DELAY_f() { DELAY_f.prototype.set = function DELAY_f() { this.dt = arguments[0]["dt"] this.z0 = arguments[0]["z0"] + this.exprs = inverse(arguments[0]["exprs"]) var ppath = list(0,0); for (i=1;i<=length(arg1.model.rpar.objs);i+=1) { var o = arg1.model.rpar.objs[i-1]; @@ -97,9 +98,9 @@ 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; - var exprs = [[evtdly_exprs[1-1]],[register_exprs]]; + this.exprs = [[evtdly_exprs[1-1]],[register_exprs]]; while (true) { - [ok,this.dt,this.z0,exprs] = scicos_getvalue([["This block implements as a discretized delay"],["it is consist of a shift register and a clock"],["value of the delay is given by;","the discretization time step multiplied by the"],["number-1 of state of the register"]],["Discretization time step","Register initial state"],list("vec",1,"vec",-1),exprs); + [ok,this.dt,this.z0,this.exprs] = scicos_getvalue([["This block implements as a discretized delay"],["it is consist of a shift register and a clock"],["value of the delay is given by;","the discretization time step multiplied by the"],["number-1 of state of the register"]],["Discretization time step","Register initial state"],list("vec",1,"vec",-1),this.exprs); if (!ok) { break; } @@ -115,13 +116,13 @@ function DELAY_f() { if (!ok) { message(mess); } else { - evtdly.graphics.exprs[1-1] = exprs[1-1]; + evtdly.graphics.exprs[1-1] = this.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 = exprs[2-1]; + register.graphics.exprs = this.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 43dbf30a..ecc140bb 100644 --- a/js/Linear/DELAY_f.pickle +++ b/js/Linear/DELAY_f.pickle @@ -2,14 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'exprs' p2 -aS'dt' +aS'gr_i' p3 -aS'z0' +aS'graphics' p4 -atp5 -Rp6 +aS'x' +p5 +aS'model' +p6 +aS'z0' +p7 +aS'dt' +p8 +atp9 +Rp10 .(dp0 S'diagram.objs[1-1]' p1 diff --git a/js/Linear/DERIV.js b/js/Linear/DERIV.js index 4809a060..afac05d0 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 ScilabDouble([true,false]); - var exprs = []; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DERIV\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = []; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DERIV\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.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 2cad4c23..53cb8de0 100644 --- a/js/Linear/DERIV.pickle +++ b/js/Linear/DERIV.pickle @@ -6,8 +6,14 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'gr_i' +p4 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/Linear/DIFF_c.js b/js/Linear/DIFF_c.js index 0583cc59..10147a4d 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 ScilabDouble([false,true]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } DIFF_c.prototype.details = function DIFF_c() { @@ -27,13 +27,14 @@ function DIFF_c() { DIFF_c.prototype.set = function DIFF_c() { this.x0 = inverse(arguments[0]["x0"]) this.xd0 = inverse(arguments[0]["xd0"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { var ask_again = false; - [ok,this.x0,this.xd0,exprs] = scicos_getvalue("Set continuous linear system parameters",["Initial state","Initial Derivative"],list("vec",-1,"vec",-1),exprs); + [ok,this.x0,this.xd0,this.exprs] = scicos_getvalue("Set continuous linear system parameters",["Initial state","Initial Derivative"],list("vec",-1,"vec",-1),this.exprs); if (!ok) { break; } @@ -50,7 +51,7 @@ function DIFF_c() { var ask_again = true; } if (!ask_again) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.state = new ScilabDouble([this.x0],[this.xd0]); this.model.out = new ScilabDouble([N]); this.model.in1 = new ScilabDouble([N]); diff --git a/js/Linear/DIFF_c.pickle b/js/Linear/DIFF_c.pickle index 89e4ed9e..74c91b8e 100644 --- a/js/Linear/DIFF_c.pickle +++ b/js/Linear/DIFF_c.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'xd0' p2 -aS'model' +aS'exprs' p3 -aS'xd0' +aS'gr_i' p4 -aS'x0' -p5 aS'graphics' +p5 +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +aS'x0' +p8 +atp9 +Rp10 .(dp0 S'arg1' p1 diff --git a/js/Linear/DLR.js b/js/Linear/DLR.js index 3ca9726f..cc77c067 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; - var exprs = [["1"],["1+z"]]; + this.exprs = [["1"],["1+z"]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["dsslti4"]), new ScilabDouble([4])); this.model.in1 = 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 ScilabDouble([false,false]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLR\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,exprs,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLR\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } DLR.prototype.details = function DLR() { @@ -33,16 +33,17 @@ function DLR() { DLR.prototype.set = function DLR() { this.num = arguments[0]["num"] this.den = arguments[0]["den"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; var x0 = this.model.dstate; var ns = prod(size(x0)); var PREVAR_scicos_context = PREVAR_scicos_context; PREVAR_scicos_context.z = %z; while (true) { - [ok,this.num,this.den,exprs] = scicos_getvalue("Set discrete SISO transfer parameters",["Numerator (z)","Denominator (z)"],list("pol",1,"pol",1),exprs); + [ok,this.num,this.den,this.exprs] = scicos_getvalue("Set discrete SISO transfer parameters",["Numerator (z)","Denominator (z)"],list("pol",1,"pol",1),this.exprs); if (!ok) { break; } @@ -57,7 +58,7 @@ function DLR() { var B = tmpvar0[1]; var C = tmpvar0[2]; var D = tmpvar0[3]; - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 fb9f58b1..486f8c81 100644 --- a/js/Linear/DLR.pickle +++ b/js/Linear/DLR.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'num' p2 -aS'model' +aS'exprs' p3 -aS'num' +aS'gr_i' p4 aS'den' p5 aS'graphics' p6 -atp7 -Rp8 +aS'x' +p7 +aS'model' +p8 +atp9 +Rp10 .(dp0 S'model.dstate' p1 diff --git a/js/Linear/DLR_f.js b/js/Linear/DLR_f.js index c19a22cc..6cfe981b 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; - var exprs = [["1"],["1+z"]]; + this.exprs = [["1"],["1+z"]]; this.model = scicos_model(); this.model.sim = new ScilabString(["dsslti"]); this.model.in1 = 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 ScilabDouble([false,false]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLR_f\",sz(1),sz(2));"]); - this.x = standard_define([2.5,2.5],this.model,exprs,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLR_f\",sz(1),sz(2));"]); + this.x = standard_define([2.5,2.5],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } DLR_f.prototype.details = function DLR_f() { @@ -33,16 +33,17 @@ function DLR_f() { DLR_f.prototype.set = function DLR_f() { this.num = arguments[0]["num"] this.den = arguments[0]["den"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; var x0 = this.model.dstate; var ns = prod(size(x0)); var PREVAR_scicos_context = PREVAR_scicos_context; PREVAR_scicos_context.z = %z; while (true) { - [ok,this.num,this.den,exprs] = scicos_getvalue("Set discrete SISO transfer parameters",["Numerator (z)","Denominator (z)"],list("pol",1,"pol",1),exprs); + [ok,this.num,this.den,this.exprs] = scicos_getvalue("Set discrete SISO transfer parameters",["Numerator (z)","Denominator (z)"],list("pol",1,"pol",1),this.exprs); if (!ok) { break; } @@ -57,7 +58,7 @@ function DLR_f() { var B = tmpvar0[1]; var C = tmpvar0[2]; var D = tmpvar0[3]; - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 78175358..77ebf7e1 100644 --- a/js/Linear/DLR_f.pickle +++ b/js/Linear/DLR_f.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'num' p2 -aS'model' +aS'exprs' p3 -aS'num' +aS'gr_i' p4 aS'den' p5 aS'graphics' p6 -atp7 -Rp8 +aS'x' +p7 +aS'model' +p8 +atp9 +Rp10 .(dp0 S'model.dstate' p1 diff --git a/js/Linear/DLSS.js b/js/Linear/DLSS.js index 10a7659b..da2bcd88 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 ScilabDouble([false,false]); - var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLSS\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,exprs,gr_i); + 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 = standard_define([4,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } DLSS.prototype.details = function DLSS() { @@ -39,15 +39,16 @@ function DLSS() { this.C = parseFloat(arguments[0]["C"]) this.D = parseFloat(arguments[0]["D"]) this.x0 = parseFloat(arguments[0]["x0"]) + this.exprs = parseFloat(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; - if (size(exprs,"*")==7) { - var exprs = exprs[[1:4,7]-1]; + this.exprs = this.graphics.exprs; + if (size(this.exprs,"*")==7) { + this.exprs = this.exprs[[1:4,7]-1]; } this.model = arg1.model; while (true) { - [ok,this.A,this.B,this.C,this.D,this.x0,exprs] = scicos_getvalue("Set discrete linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),exprs); + [ok,this.A,this.B,this.C,this.D,this.x0,this.exprs] = scicos_getvalue("Set discrete linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),this.exprs); if (!ok) { break; } @@ -80,7 +81,7 @@ function DLSS() { this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; if (this.D!=[]) { if (norm(this.D,1)!=0) { diff --git a/js/Linear/DLSS.pickle b/js/Linear/DLSS.pickle index 00de4180..eb7fb836 100644 --- a/js/Linear/DLSS.pickle +++ b/js/Linear/DLSS.pickle @@ -10,16 +10,20 @@ aS'B' p4 aS'D' p5 -aS'graphics' +aS'exprs' p6 -aS'x' +aS'gr_i' p7 -aS'model' +aS'graphics' p8 -aS'x0' +aS'x' p9 -atp10 -Rp11 +aS'model' +p10 +aS'x0' +p11 +atp12 +Rp13 .(dp0 S'model.dstate' p1 diff --git a/js/Linear/DLSS_f.js b/js/Linear/DLSS_f.js index 5adc3864..1d9f045e 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 ScilabDouble([false,false]); - var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLSS_f\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,exprs,gr_i); + 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 = standard_define([4,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } DLSS_f.prototype.details = function DLSS_f() { @@ -39,15 +39,16 @@ function DLSS_f() { this.C = parseFloat(arguments[0]["C"]) this.D = parseFloat(arguments[0]["D"]) this.x0 = parseFloat(arguments[0]["x0"]) + this.exprs = parseFloat(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; - if (size(exprs,"*")==7) { - var exprs = exprs[[1:4,7]-1]; + this.exprs = this.graphics.exprs; + if (size(this.exprs,"*")==7) { + this.exprs = this.exprs[[1:4,7]-1]; } this.model = arg1.model; while (true) { - [ok,this.A,this.B,this.C,this.D,this.x0,exprs] = scicos_getvalue("Set discrete linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),exprs); + [ok,this.A,this.B,this.C,this.D,this.x0,this.exprs] = scicos_getvalue("Set discrete linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),this.exprs); if (!ok) { break; } @@ -70,7 +71,7 @@ function DLSS_f() { this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; if (this.D!=[]) { if (norm(this.D,1)!=0) { diff --git a/js/Linear/DLSS_f.pickle b/js/Linear/DLSS_f.pickle index d32ef081..d909374f 100644 --- a/js/Linear/DLSS_f.pickle +++ b/js/Linear/DLSS_f.pickle @@ -10,16 +10,20 @@ aS'B' p4 aS'D' p5 -aS'graphics' +aS'exprs' p6 -aS'x' +aS'gr_i' p7 -aS'model' +aS'graphics' p8 -aS'x0' +aS'x' p9 -atp10 -Rp11 +aS'model' +p10 +aS'x0' +p11 +atp12 +Rp13 .(dp0 S'model.dstate' p1 diff --git a/js/Linear/DOLLAR.js b/js/Linear/DOLLAR.js index aa9123cb..a67e959d 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; - var exprs = string([[z],[this.inh]]); + this.exprs = string([[z],[this.inh]]); this.model = scicos_model(); this.model.sim = list(new ScilabString(["dollar4"]), new ScilabDouble([4])); this.model.in1 = 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 ScilabDouble([false,false]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } DOLLAR.prototype.details = function DOLLAR() { @@ -30,15 +30,16 @@ function DOLLAR() { DOLLAR.prototype.set = function DOLLAR() { this.a = arguments[0]["a"] this.inh = parseFloat(arguments[0]["inh"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - if (size(exprs,"*")<2) { - exprs[2-1] = "0"; + if (size(this.exprs,"*")<2) { + this.exprs[2-1] = "0"; } while (true) { - [ok,this.a,this.inh,exprs] = scicos_getvalue("Set 1/z block parameters",["initial condition","Inherit (no:0, yes:1)"],list("mat",[-1,-2],"vec",-1),exprs); + [ok,this.a,this.inh,this.exprs] = scicos_getvalue("Set 1/z block parameters",["initial condition","Inherit (no:0, yes:1)"],list("mat",[-1,-2],"vec",-1),this.exprs); if (!ok) { break; } @@ -92,7 +93,7 @@ function DOLLAR() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 3b29c2b1..70bb77cf 100644 --- a/js/Linear/DOLLAR.pickle +++ b/js/Linear/DOLLAR.pickle @@ -4,18 +4,22 @@ p0 ((lp1 S'a' p2 -aS'inh' +aS'exprs' p3 -aS'graphics' +aS'gr_i' p4 -aS'x' +aS'inh' p5 -aS'model' +aS'graphics' p6 -aS'type' +aS'x' p7 -atp8 -Rp9 +aS'model' +p8 +aS'type' +p9 +atp10 +Rp11 .(dp0 S'model.odstate' p1 diff --git a/js/Linear/DOLLAR_f.js b/js/Linear/DOLLAR_f.js index b817ecc4..ec558ae4 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; - var exprs = string([[z],[this.inh]]); + this.exprs = string([[z],[this.inh]]); this.model = scicos_model(); this.model.sim = new ScilabString(["dollar"]); this.model.in1 = 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 ScilabDouble([false,false]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } DOLLAR_f.prototype.details = function DOLLAR_f() { @@ -30,15 +30,16 @@ function DOLLAR_f() { DOLLAR_f.prototype.set = function DOLLAR_f() { this.a = arguments[0]["a"] this.inh = parseFloat(arguments[0]["inh"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - if (size(exprs,"*")<2) { - exprs[2-1] = "0"; + if (size(this.exprs,"*")<2) { + this.exprs[2-1] = "0"; } while (true) { - [ok,this.a,this.inh,exprs] = scicos_getvalue("Set 1/z block parameters",["initial condition","Inherit (no:0, yes:1)"],list("vec",-1,"vec",-1),exprs); + [ok,this.a,this.inh,this.exprs] = scicos_getvalue("Set 1/z block parameters",["initial condition","Inherit (no:0, yes:1)"],list("vec",-1,"vec",-1),this.exprs); if (!ok) { break; } @@ -54,7 +55,7 @@ function DOLLAR_f() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.dstate = new ScilabDouble([this.a]); this.model.in1 = new ScilabDouble(in1); this.model.out = new ScilabDouble(out); diff --git a/js/Linear/DOLLAR_f.pickle b/js/Linear/DOLLAR_f.pickle index 2d4dde29..ab8ea4a7 100644 --- a/js/Linear/DOLLAR_f.pickle +++ b/js/Linear/DOLLAR_f.pickle @@ -4,16 +4,20 @@ p0 ((lp1 S'a' p2 -aS'x' +aS'exprs' p3 -aS'model' +aS'gr_i' p4 aS'inh' p5 aS'graphics' p6 -atp7 -Rp8 +aS'x' +p7 +aS'model' +p8 +atp9 +Rp10 .(dp0 S'model.dstate' p1 diff --git a/js/Linear/DOLLAR_m.js b/js/Linear/DOLLAR_m.js index bf83bf51..2c0c4398 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; - var exprs = string([[z],[this.inh]]); + this.exprs = string([[z],[this.inh]]); this.model = scicos_model(); this.model.sim = list(new ScilabString(["dollar4"]), new ScilabDouble([4])); this.model.in1 = 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 ScilabDouble([false,false]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR_m\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR_m\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } DOLLAR_m.prototype.details = function DOLLAR_m() { @@ -30,15 +30,16 @@ function DOLLAR_m() { DOLLAR_m.prototype.set = function DOLLAR_m() { this.a = arguments[0]["a"] this.inh = parseFloat(arguments[0]["inh"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - if (size(exprs,"*")<2) { - exprs[2-1] = "0"; + if (size(this.exprs,"*")<2) { + this.exprs[2-1] = "0"; } while (true) { - [ok,this.a,this.inh,exprs] = scicos_getvalue("Set 1/z block parameters",["initial condition","Inherit (no:0, yes:1)"],list("mat",[-1,-2],"vec",-1),exprs); + [ok,this.a,this.inh,this.exprs] = scicos_getvalue("Set 1/z block parameters",["initial condition","Inherit (no:0, yes:1)"],list("mat",[-1,-2],"vec",-1),this.exprs); if (!ok) { break; } @@ -92,7 +93,7 @@ function DOLLAR_m() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 3b29c2b1..70bb77cf 100644 --- a/js/Linear/DOLLAR_m.pickle +++ b/js/Linear/DOLLAR_m.pickle @@ -4,18 +4,22 @@ p0 ((lp1 S'a' p2 -aS'inh' +aS'exprs' p3 -aS'graphics' +aS'gr_i' p4 -aS'x' +aS'inh' p5 -aS'model' +aS'graphics' p6 -aS'type' +aS'x' p7 -atp8 -Rp9 +aS'model' +p8 +aS'type' +p9 +atp10 +Rp11 .(dp0 S'model.odstate' p1 diff --git a/js/Linear/GAINBLK.js b/js/Linear/GAINBLK.js index fa1b00c6..a74d673f 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 ScilabDouble([true,false]); - var exprs = [strcat(sci2exp(this.gain))]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAINBLK\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = [strcat(sci2exp(this.gain))]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAINBLK\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } GAINBLK.prototype.details = function GAINBLK() { @@ -33,15 +33,16 @@ function GAINBLK() { GAINBLK.prototype.set = function GAINBLK() { this.gain = parseFloat(arguments[0]["gain"]) this.over = arguments[0]["over"] + this.exprs = inverse(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - if (size(exprs,"*")==1) { - var exprs = [[exprs],[sci2exp(0)]]; + if (size(this.exprs,"*")==1) { + this.exprs = [[this.exprs],[sci2exp(0)]]; } while (true) { - [ok,this.gain,this.over,exprs] = scicos_getvalue("Set gain block parameters",["Gain","Do On Overflow(0=Nothing 1=Saturate 2=Error)"],list("mat",[-1,-1],"vec",1),exprs); + [ok,this.gain,this.over,this.exprs] = scicos_getvalue("Set gain block parameters",["Gain","Do On Overflow(0=Nothing 1=Saturate 2=Error)"],list("mat",[-1,-1],"vec",1),this.exprs); if (!ok) { break; } @@ -153,7 +154,7 @@ function GAINBLK() { } } if (ok) { - this.graphics.exprs = new ScilabDouble(exprs); + this.graphics.exprs = new ScilabDouble(this.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 f102ec25..b7258a6b 100644 --- a/js/Linear/GAINBLK.pickle +++ b/js/Linear/GAINBLK.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'over' p2 -aS'model' +aS'exprs' p3 -aS'over' +aS'gr_i' p4 aS'gain' p5 aS'graphics' p6 -atp7 -Rp8 +aS'x' +p7 +aS'model' +p8 +atp9 +Rp10 .(dp0 S'arg1' p1 diff --git a/js/Linear/GAINBLK_f.js b/js/Linear/GAINBLK_f.js index df5a51b4..bf0f3b7e 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 ScilabDouble([true,false]); - var exprs = [strcat(sci2exp(this.gain))]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAINBLK_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = [strcat(sci2exp(this.gain))]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAINBLK_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } GAINBLK_f.prototype.details = function GAINBLK_f() { @@ -27,12 +27,13 @@ function GAINBLK_f() { } GAINBLK_f.prototype.set = function GAINBLK_f() { this.gain = parseFloat(arguments[0]["gain"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.gain,exprs] = scicos_getvalue("Set gain block parameters",["Gain"],list("mat",[-1,-1]),exprs[1-1]); + [ok,this.gain,this.exprs] = scicos_getvalue("Set gain block parameters",["Gain"],list("mat",[-1,-1]),this.exprs[1-1]); if (!ok) { break; } @@ -47,7 +48,7 @@ function GAINBLK_f() { this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 093ec5d1..9be62223 100644 --- a/js/Linear/GAINBLK_f.pickle +++ b/js/Linear/GAINBLK_f.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'exprs' p2 -aS'model' +aS'gr_i' p3 aS'gain' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'model.sim' p1 diff --git a/js/Linear/GAIN_f.js b/js/Linear/GAIN_f.js index 14a6fb54..73dcfdba 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 ScilabDouble([true,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } GAIN_f.prototype.details = function GAIN_f() { @@ -27,12 +27,13 @@ function GAIN_f() { } GAIN_f.prototype.set = function GAIN_f() { this.gain = parseFloat(arguments[0]["gain"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.gain,exprs] = scicos_getvalue("Set gain block parameters",["Gain"],list("mat",[-1,-1]),exprs[1-1]); + [ok,this.gain,this.exprs] = scicos_getvalue("Set gain block parameters",["Gain"],list("mat",[-1,-1]),this.exprs[1-1]); if (!ok) { break; } @@ -47,7 +48,7 @@ function GAIN_f() { this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 f5ef8591..b56e466c 100644 --- a/js/Linear/GAIN_f.pickle +++ b/js/Linear/GAIN_f.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'exprs' p2 -aS'model' +aS'gr_i' p3 aS'gain' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'model.sim' p1 diff --git a/js/Linear/INTEGRAL.js b/js/Linear/INTEGRAL.js index 95f66a49..7128c3bb 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 ScilabDouble([false,true]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); this.x.graphics.id = "1/s"; return new BasicBlock(this.x); } @@ -37,12 +37,13 @@ function INTEGRAL() { this.satur = parseFloat(arguments[0]["satur"]) this.maxp = parseFloat(arguments[0]["maxp"]) this.lowp = arguments[0]["lowp"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.x0,this.reinit,this.satur,this.maxp,this.lowp,exprs] = scicos_getvalue("Set Integral block parameters",["Initial Condition","With re-intialization (1:yes, 0:no)","With saturation (1:yes, 0:no)","Upper limit","Lower limit"],list("vec",-1,"vec",1,"vec",1,"vec",-1,"vec",-1),exprs); + [ok,this.x0,this.reinit,this.satur,this.maxp,this.lowp,this.exprs] = scicos_getvalue("Set Integral block parameters",["Initial Condition","With re-intialization (1:yes, 0:no)","With saturation (1:yes, 0:no)","Upper limit","Lower limit"],list("vec",-1,"vec",1,"vec",1,"vec",-1,"vec",-1),this.exprs); if (!ok) { break; } @@ -88,7 +89,7 @@ function INTEGRAL() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 715932be..2c6a4954 100644 --- a/js/Linear/INTEGRAL.pickle +++ b/js/Linear/INTEGRAL.pickle @@ -6,20 +6,24 @@ S'maxp' p2 aS'reinit' p3 -aS'satur' +aS'exprs' p4 -aS'lowp' +aS'gr_i' p5 -aS'graphics' +aS'satur' p6 -aS'x' +aS'lowp' p7 -aS'model' +aS'graphics' p8 -aS'x0' +aS'x' p9 -atp10 -Rp11 +aS'model' +p10 +aS'x0' +p11 +atp12 +Rp13 .(dp0 S'arg1' p1 diff --git a/js/Linear/INTEGRAL_f.js b/js/Linear/INTEGRAL_f.js index bd98770c..36995956 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 ScilabDouble([false,true]); - var exprs = strcat(sci2exp(this.x0)); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = strcat(sci2exp(this.x0)); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } INTEGRAL_f.prototype.details = function INTEGRAL_f() { @@ -24,16 +24,17 @@ function INTEGRAL_f() { } INTEGRAL_f.prototype.set = function INTEGRAL_f() { this.x0 = parseFloat(arguments[0]["x0"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.x0,exprs] = scicos_getvalue("Set continuous linear system parameters","Initial state",list("vec",1),exprs); + [ok,this.x0,this.exprs] = scicos_getvalue("Set continuous linear system parameters","Initial state",list("vec",1),this.exprs); if (!ok) { break; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 9f391ce4..0fd0a5a0 100644 --- a/js/Linear/INTEGRAL_f.pickle +++ b/js/Linear/INTEGRAL_f.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'exprs' p2 -aS'model' +aS'gr_i' p3 -aS'x0' -p4 aS'graphics' +p4 +aS'x' p5 -atp6 -Rp7 +aS'model' +p6 +aS'x0' +p7 +atp8 +Rp9 .(dp0 S'model.sim' p1 diff --git a/js/Linear/INTEGRAL_m.js b/js/Linear/INTEGRAL_m.js index feda531e..07d5480e 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 ScilabDouble([false,true]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } INTEGRAL_m.prototype.details = function INTEGRAL_m() { @@ -38,12 +38,13 @@ function INTEGRAL_m() { this.satur = parseFloat(arguments[0]["satur"]) this.maxp = parseFloat(arguments[0]["maxp"]) this.lowp = parseFloat(arguments[0]["lowp"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.x0,this.reinit,this.satur,this.maxp,this.lowp,exprs] = scicos_getvalue("Set Integral block parameters",["Initial Condition","With re-intialization (1:yes, 0:no)","With saturation (1:yes, 0:no)","Upper limit","Lower limit"],list("mat",[-1,-1],"vec",1,"vec",1,"mat",[-1,-1],"mat",[-1,-1]),exprs); + [ok,this.x0,this.reinit,this.satur,this.maxp,this.lowp,this.exprs] = scicos_getvalue("Set Integral block parameters",["Initial Condition","With re-intialization (1:yes, 0:no)","With saturation (1:yes, 0:no)","Upper limit","Lower limit"],list("mat",[-1,-1],"vec",1,"vec",1,"mat",[-1,-1],"mat",[-1,-1]),this.exprs); if (!ok) { break; } @@ -131,7 +132,7 @@ function INTEGRAL_m() { } } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 70608a46..21951779 100644 --- a/js/Linear/INTEGRAL_m.pickle +++ b/js/Linear/INTEGRAL_m.pickle @@ -6,20 +6,24 @@ S'maxp' p2 aS'reinit' p3 -aS'satur' +aS'exprs' p4 -aS'lowp' +aS'gr_i' p5 -aS'graphics' +aS'satur' p6 -aS'x' +aS'lowp' p7 -aS'model' +aS'graphics' p8 -aS'x0' +aS'x' p9 -atp10 -Rp11 +aS'model' +p10 +aS'x0' +p11 +atp12 +Rp13 .(dp0 S'arg1' p1 diff --git a/js/Linear/PID.js b/js/Linear/PID.js index 037ed7a5..439f4907 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 ScilabDouble([false,false]); this.model.rpar = new ScilabDouble([scs_m]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PID\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PID\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,[],this.gr_i); return new BasicBlock(this.x); } PID.prototype.details = function PID() { @@ -87,17 +87,17 @@ function PID() { } var newpar = list(); var xx1 = arg1.model.rpar.objs[ppath[1-1]-1]; - exprs[1-1] = xx1.graphics.exprs[1-1]; + this.exprs[1-1] = xx1.graphics.exprs[1-1]; var p_old = xx1.model.rpar; var xx2 = arg1.model.rpar.objs[ppath[2-1]-1]; - exprs[2-1] = xx2.graphics.exprs[1-1]; + this.exprs[2-1] = xx2.graphics.exprs[1-1]; var i_old = xx2.model.rpar; var xx3 = arg1.model.rpar.objs[ppath[3-1]-1]; - exprs[3-1] = xx3.graphics.exprs[1-1]; + this.exprs[3-1] = xx3.graphics.exprs[1-1]; var d_old = xx3.model.rpar; var y = 0; while (true) { - [ok,this.p,this.i,this.d,this.exprs0] = scicos_getvalue("Set PID parameters",["Proportional","Integral","Derivation"],list("vec",-1,"vec",-1,"vec",-1),exprs); + [ok,this.p,this.i,this.d,this.exprs0] = scicos_getvalue("Set PID parameters",["Proportional","Integral","Derivation"],list("vec",-1,"vec",-1,"vec",-1),this.exprs); if (!ok) { break; } diff --git a/js/Linear/PID.pickle b/js/Linear/PID.pickle index 102e13cd..f2b15d1a 100644 --- a/js/Linear/PID.pickle +++ b/js/Linear/PID.pickle @@ -4,18 +4,24 @@ p0 ((lp1 S'd' p2 -aS'i' +aS'p' p3 -aS'exprs0' +aS'i' p4 -aS'p' +aS'exprs0' p5 -aS'x' +aS'exprs' p6 -aS'model' +aS'gr_i' p7 -atp8 -Rp9 +aS'graphics' +p8 +aS'x' +p9 +aS'model' +p10 +atp11 +Rp12 .(dp0 S'xx3' p1 diff --git a/js/Linear/REGISTER.js b/js/Linear/REGISTER.js index 85227456..7d0077d3 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 ScilabDouble([false,false]); - var exprs = strcat(string(this.z0),";"); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"REGISTER\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,exprs,gr_i); + this.exprs = strcat(string(this.z0),";"); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"REGISTER\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } REGISTER.prototype.details = function REGISTER() { @@ -28,15 +28,16 @@ function REGISTER() { REGISTER.prototype.set = function REGISTER() { this.z0 = parseFloat(arguments[0]["z0"]) this.it = arguments[0]["it"] + this.exprs = inverse(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - if (size(exprs,1)==1) { - var exprs = [[exprs],[sci2exp(1)]]; + if (size(this.exprs,1)==1) { + this.exprs = [[this.exprs],[sci2exp(1)]]; } while (true) { - [ok,this.z0,this.it,exprs] = scicos_getvalue("Set delay parameters",["Register initial condition","Datatype (1=double 3=int32 ...)"],list("vec",-1,"vec",1),exprs); + [ok,this.z0,this.it,this.exprs] = scicos_getvalue("Set delay parameters",["Register initial condition","Datatype (1=double 3=int32 ...)"],list("vec",-1,"vec",1),this.exprs); if (!ok) { break; } @@ -83,7 +84,7 @@ function REGISTER() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble(exprs); + this.graphics.exprs = new ScilabDouble(this.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 2798b374..8dd4c7e1 100644 --- a/js/Linear/REGISTER.pickle +++ b/js/Linear/REGISTER.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'it' p2 -aS'model' +aS'exprs' p3 -aS'z0' +aS'gr_i' p4 -aS'it' -p5 aS'graphics' +p5 +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +aS'z0' +p8 +atp9 +Rp10 .(dp0 S'model.odstate' p1 diff --git a/js/Linear/REGISTER_f.js b/js/Linear/REGISTER_f.js index 272606f6..478fe1e2 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 ScilabDouble([false,false]); - var exprs = strcat(string(this.z0),";"); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"REGISTER_f\",sz(1),sz(2));"]); - this.x = standard_define([2.5,2.5],this.model,exprs,gr_i); + this.exprs = strcat(string(this.z0),";"); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"REGISTER_f\",sz(1),sz(2));"]); + this.x = standard_define([2.5,2.5],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } REGISTER_f.prototype.details = function REGISTER_f() { @@ -25,12 +25,13 @@ function REGISTER_f() { } REGISTER_f.prototype.set = function REGISTER_f() { this.z0 = parseFloat(arguments[0]["z0"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.z0,exprs] = scicos_getvalue("Set delay parameters","Register initial condition",list("vec",-1),exprs); + [ok,this.z0,this.exprs] = scicos_getvalue("Set delay parameters","Register initial condition",list("vec",-1),this.exprs); if (!ok) { break; } @@ -39,7 +40,7 @@ function REGISTER_f() { var ok = false; } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 f2f06042..0fb58e59 100644 --- a/js/Linear/REGISTER_f.pickle +++ b/js/Linear/REGISTER_f.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'exprs' p2 -aS'model' +aS'gr_i' p3 -aS'z0' -p4 aS'graphics' +p4 +aS'x' p5 -atp6 -Rp7 +aS'model' +p6 +aS'z0' +p7 +atp8 +Rp9 .(dp0 S'model.sim' p1 diff --git a/js/Linear/SAMPHOLD.js b/js/Linear/SAMPHOLD.js index aed7855f..3664af57 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 ScilabDouble([true,false]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPHOLD\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model," ",gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPHOLD\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model," ",this.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 19d5dc6e..32879b77 100644 --- a/js/Linear/SAMPHOLD.pickle +++ b/js/Linear/SAMPHOLD.pickle @@ -6,8 +6,14 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'gr_i' +p4 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/Linear/SAMPHOLD_m.js b/js/Linear/SAMPHOLD_m.js index 3eb05779..07015edf 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 ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPHOLD_m\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPHOLD_m\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } SAMPHOLD_m.prototype.details = function SAMPHOLD_m() { @@ -28,13 +28,14 @@ function SAMPHOLD_m() { } SAMPHOLD_m.prototype.set = function SAMPHOLD_m() { this.it = arguments[0]["it"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.x.model.firing = []; this.graphics = arg1.graphics; var label = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.it,exprs] = scicos_getvalue("Set parameters Block",["Datatype(1=real double 2=Complex 3=int32 ...)"],list("vec",1),label); + [ok,this.it,this.exprs] = scicos_getvalue("Set parameters Block",["Datatype(1=real double 2=Complex 3=int32 ...)"],list("vec",1),label); if (!ok) { break; } @@ -49,7 +50,7 @@ function SAMPHOLD_m() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); arg1.graphics = this.graphics; arg1.model = this.model; this.x = arg1; diff --git a/js/Linear/SAMPHOLD_m.pickle b/js/Linear/SAMPHOLD_m.pickle index 3b628187..9bae4649 100644 --- a/js/Linear/SAMPHOLD_m.pickle +++ b/js/Linear/SAMPHOLD_m.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'it' p2 -aS'model' +aS'exprs' p3 -aS'it' +aS'gr_i' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/Linear/SAMPLEHOLD_f.js b/js/Linear/SAMPLEHOLD_f.js index 7241ba3a..8489ab24 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 ScilabDouble([true,false]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPLEHOLD_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model," ",gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPLEHOLD_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model," ",this.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 cee05e84..8e96cab8 100644 --- a/js/Linear/SAMPLEHOLD_f.pickle +++ b/js/Linear/SAMPLEHOLD_f.pickle @@ -6,8 +6,14 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'gr_i' +p4 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/Linear/SOM_f.js b/js/Linear/SOM_f.js index 1a130333..06f1177f 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 ScilabDouble([true,false]); - var exprs = [[sci2exp(1)],[sci2exp(sgn)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SOM_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = [[sci2exp(1)],[sci2exp(sgn)]]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SOM_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } SOM_f.prototype.details = function SOM_f() { @@ -26,12 +26,12 @@ function SOM_f() { this.x = arg1; this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = this.graphics.exprs; - if (size(exprs,"*")==2) { - var exprs = exprs[2-1]; + this.exprs = this.graphics.exprs; + if (size(this.exprs,"*")==2) { + this.exprs = this.exprs[2-1]; } - if (size(exprs,"*")!=3) { - var exprs = string(this.model.rpar); + if (size(this.exprs,"*")!=3) { + this.exprs = string(this.model.rpar); } if (this.graphics.flip) { var labs = ["down","left","up"]; @@ -39,7 +39,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)+exprs.slice())]]; + var str = [[str],[(part(labs.slice(),1,7)+this.exprs.slice())]]; message(str); return new BasicBlock(this.x); } diff --git a/js/Linear/SOM_f.pickle b/js/Linear/SOM_f.pickle index 4b1a3d37..89465842 100644 --- a/js/Linear/SOM_f.pickle +++ b/js/Linear/SOM_f.pickle @@ -6,10 +6,14 @@ S'x' p2 aS'model' p3 -aS'graphics' +aS'gr_i' p4 -atp5 -Rp6 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/Linear/SUMMATION.js b/js/Linear/SUMMATION.js index f0d68daf..afad8077 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 ScilabDouble([true,false]); - var exprs = sci2exp(this.sgn); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUMMATION\",sz(1),sz(2));"]); - this.x = standard_define([2,3],this.model,exprs,gr_i); + this.exprs = sci2exp(this.sgn); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUMMATION\",sz(1),sz(2));"]); + this.x = standard_define([2,3],this.model,this.exprs,this.gr_i); return new Summation(this.x); } SUMMATION.prototype.details = function SUMMATION() { @@ -31,17 +31,18 @@ function SUMMATION() { this.Datatype = arguments[0]["Datatype"] this.sgn = inverse(arguments[0]["sgn"]) this.satur = arguments[0]["satur"] + this.exprs = inverse(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; this.model = arg1.model; - 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)]]; + 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)]]; } while (true) { - [ok,this.Datatype,this.sgn,this.satur,exprs] = scicos_getvalue("Set sum block parameters",["Datatype (1=real double 2=complex 3=int32 ...)","Number of inputs or sign vector (of +1, -1)","Do on Overflow(0=Nothing 1=Saturate 2=Error)"],list("vec",1,"vec",-1,"vec",1),exprs); + [ok,this.Datatype,this.sgn,this.satur,this.exprs] = scicos_getvalue("Set sum block parameters",["Datatype (1=real double 2=complex 3=int32 ...)","Number of inputs or sign vector (of +1, -1)","Do on Overflow(0=Nothing 1=Saturate 2=Error)"],list("vec",1,"vec",-1,"vec",1),this.exprs); if (!ok) { break; } @@ -141,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(exprs); + this.graphics.exprs = new ScilabDouble(this.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 a06d452b..8539744e 100644 --- a/js/Linear/SUMMATION.pickle +++ b/js/Linear/SUMMATION.pickle @@ -4,18 +4,22 @@ p0 ((lp1 S'Datatype' p2 -aS'graphics' +aS'sgn' p3 -aS'satur' +aS'exprs' p4 -aS'sgn' +aS'gr_i' p5 -aS'x' +aS'satur' p6 -aS'model' +aS'graphics' p7 -atp8 -Rp9 +aS'x' +p8 +aS'model' +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/Linear/SUM_f.js b/js/Linear/SUM_f.js index a80d7b1d..0c134618 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 ScilabDouble([true,false]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUM_f\",sz(1),sz(2));"]); - var exprs = []; - this.x = standard_define([1,1],this.model,exprs,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUM_f\",sz(1),sz(2));"]); + this.exprs = []; + this.x = standard_define([1,1],this.model,this.exprs,this.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 443c5bd9..96074d47 100644 --- a/js/Linear/SUM_f.pickle +++ b/js/Linear/SUM_f.pickle @@ -6,8 +6,14 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'gr_i' +p4 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/Linear/TCLSS.js b/js/Linear/TCLSS.js index 2ffcd2c6..d65a0170 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 ScilabDouble([false,true]); - var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TCLSS\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } TCLSS.prototype.details = function TCLSS() { @@ -42,15 +42,16 @@ function TCLSS() { this.C = parseFloat(arguments[0]["C"]) this.D = parseFloat(arguments[0]["D"]) this.x0 = parseFloat(arguments[0]["x0"]) + this.exprs = parseFloat(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - if (size(exprs,"*")==7) { - var exprs = exprs[[1:4,7]-1]; + if (size(this.exprs,"*")==7) { + this.exprs = this.exprs[[1:4,7]-1]; } while (true) { - [ok,this.A,this.B,this.C,this.D,this.x0,exprs] = scicos_getvalue("Set continuous linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),exprs); + [ok,this.A,this.B,this.C,this.D,this.x0,this.exprs] = scicos_getvalue("Set continuous linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),this.exprs); if (!ok) { break; } @@ -73,7 +74,7 @@ function TCLSS() { this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; if (this.D!=[]) { if (norm(this.D,1)!=0) { diff --git a/js/Linear/TCLSS.pickle b/js/Linear/TCLSS.pickle index bea58fef..79765239 100644 --- a/js/Linear/TCLSS.pickle +++ b/js/Linear/TCLSS.pickle @@ -10,16 +10,20 @@ aS'B' p4 aS'D' p5 -aS'graphics' +aS'exprs' p6 -aS'x' +aS'gr_i' p7 -aS'model' +aS'graphics' p8 -aS'x0' +aS'x' p9 -atp10 -Rp11 +aS'model' +p10 +aS'x0' +p11 +atp12 +Rp13 .(dp0 S'arg1' p1 diff --git a/js/Linear/TCLSS_f.js b/js/Linear/TCLSS_f.js index 282a3f16..c1b6a82f 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 ScilabDouble([false,true]); - var exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TCLSS_f\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } TCLSS_f.prototype.details = function TCLSS_f() { @@ -42,15 +42,16 @@ function TCLSS_f() { this.C = parseFloat(arguments[0]["C"]) this.D = parseFloat(arguments[0]["D"]) this.x0 = parseFloat(arguments[0]["x0"]) + this.exprs = parseFloat(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - if (size(exprs,"*")==7) { - var exprs = exprs[[1:4,7]-1]; + if (size(this.exprs,"*")==7) { + this.exprs = this.exprs[[1:4,7]-1]; } while (true) { - [ok,this.A,this.B,this.C,this.D,this.x0,exprs] = scicos_getvalue("Set continuous linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),exprs); + [ok,this.A,this.B,this.C,this.D,this.x0,this.exprs] = scicos_getvalue("Set continuous linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),this.exprs); if (!ok) { break; } @@ -73,7 +74,7 @@ function TCLSS_f() { this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; if (this.D!=[]) { if (norm(this.D,1)!=0) { diff --git a/js/Linear/TCLSS_f.pickle b/js/Linear/TCLSS_f.pickle index bea58fef..79765239 100644 --- a/js/Linear/TCLSS_f.pickle +++ b/js/Linear/TCLSS_f.pickle @@ -10,16 +10,20 @@ aS'B' p4 aS'D' p5 -aS'graphics' +aS'exprs' p6 -aS'x' +aS'gr_i' p7 -aS'model' +aS'graphics' p8 -aS'x0' +aS'x' p9 -atp10 -Rp11 +aS'model' +p10 +aS'x0' +p11 +atp12 +Rp13 .(dp0 S'arg1' p1 diff --git a/js/Linear/TIME_DELAY.js b/js/Linear/TIME_DELAY.js index b80c8c4e..8401943f 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 ScilabDouble([false,true]); - 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 = standard_define([3.5,2],this.model,exprs,gr_i); + 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 = standard_define([3.5,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } TIME_DELAY.prototype.details = function TIME_DELAY() { @@ -33,13 +33,14 @@ function TIME_DELAY() { this.T = parseFloat(arguments[0]["T"]) this.init = parseFloat(arguments[0]["init"]) this.N = parseFloat(arguments[0]["N"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; var nin = this.model.in1[1-1]; while (true) { - [ok,this.T,this.init,this.N,exprs] = scicos_getvalue("Set delay parameters",["Delay","initial input","Buffer size"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.T,this.init,this.N,this.exprs] = scicos_getvalue("Set delay parameters",["Delay","initial input","Buffer size"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -58,7 +59,7 @@ function TIME_DELAY() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.rpar = new ScilabDouble([this.T],[this.init]); this.model.ipar = new ScilabDouble([this.N]); this.model.dep_ut = new ScilabDouble([false,true]); diff --git a/js/Linear/TIME_DELAY.pickle b/js/Linear/TIME_DELAY.pickle index 6c948019..50fbebef 100644 --- a/js/Linear/TIME_DELAY.pickle +++ b/js/Linear/TIME_DELAY.pickle @@ -4,18 +4,22 @@ p0 ((lp1 S'N' p2 -aS'init' +aS'exprs' p3 -aS'T' +aS'init' p4 -aS'graphics' +aS'gr_i' p5 -aS'x' +aS'T' p6 -aS'model' +aS'graphics' p7 -atp8 -Rp9 +aS'x' +p8 +aS'model' +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/Linear/VARIABLE_DELAY.js b/js/Linear/VARIABLE_DELAY.js index 2dbf9bac..09352e17 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 ScilabDouble([false,false]); - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } VARIABLE_DELAY.prototype.details = function VARIABLE_DELAY() { @@ -33,13 +33,14 @@ function VARIABLE_DELAY() { this.T = parseFloat(arguments[0]["T"]) this.init = parseFloat(arguments[0]["init"]) this.N = parseFloat(arguments[0]["N"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; var nin = this.model.in1[1-1]; while (true) { - [ok,this.T,this.init,this.N,exprs] = scicos_getvalue("Set delay parameters",["Max delay","initial input","Buffer size"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.T,this.init,this.N,this.exprs] = scicos_getvalue("Set delay parameters",["Max delay","initial input","Buffer size"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -58,7 +59,7 @@ function VARIABLE_DELAY() { var ok = tmpvar0[2]; } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 8960040c..175985ac 100644 --- a/js/Linear/VARIABLE_DELAY.pickle +++ b/js/Linear/VARIABLE_DELAY.pickle @@ -4,18 +4,22 @@ p0 ((lp1 S'N' p2 -aS'init' +aS'exprs' p3 -aS'T' +aS'init' p4 -aS'graphics' +aS'gr_i' p5 -aS'x' +aS'T' p6 -aS'model' +aS'graphics' p7 -atp8 -Rp9 +aS'x' +p8 +aS'model' +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/MatrixOp/CUMSUM.js b/js/MatrixOp/CUMSUM.js index db4a4074..085f2dd6 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 ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(0)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CUMSUM\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CUMSUM\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,label,this.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 338fcc0d..8d65b461 100644 --- a/js/MatrixOp/CUMSUM.pickle +++ b/js/MatrixOp/CUMSUM.pickle @@ -4,18 +4,22 @@ p0 ((lp1 S'lab' p2 -aS'graphics' +aS'exprs' p3 -aS'x' +aS'gr_i' p4 -aS'model' +aS'graphics' p5 -aS'typ' +aS'x' p6 -aS'decomptyp' +aS'model' p7 -atp8 -Rp9 +aS'typ' +p8 +aS'decomptyp' +p9 +atp10 +Rp11 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/EXTRACT.js b/js/MatrixOp/EXTRACT.js index a8af7cf2..1278000e 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 ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp([1])],[sci2exp([1])]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACT\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACT\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } EXTRACT.prototype.details = function EXTRACT() { @@ -40,6 +40,7 @@ function EXTRACT() { this.typ = inverse(arguments[0]["typ"]) this.a = inverse(arguments[0]["a"]) this.b = inverse(arguments[0]["b"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; var label = this.graphics.exprs; @@ -48,7 +49,7 @@ function EXTRACT() { label[9-1] = []; } while (true) { - [ok,this.typ,this.a,this.b,exprs] = scicos_getvalue("Set EXTRACT Block",["Datatype (1=real double 2=Complex)","Lines to extract","Columns to extract"],list("vec",1,"mat",[1,-1],"mat",[1,-1]),label); + [ok,this.typ,this.a,this.b,this.exprs] = scicos_getvalue("Set EXTRACT Block",["Datatype (1=real double 2=Complex)","Lines to extract","Columns to extract"],list("vec",1,"mat",[1,-1],"mat",[1,-1]),label); this.a = this.a.slice(); this.b = this.b.slice(); if (!ok) { @@ -89,7 +90,7 @@ function EXTRACT() { var out = [ma,mb]; var funtyp = 4; if (ok) { - var label = exprs; + var label = this.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 6c926aa4..be86bc15 100644 --- a/js/MatrixOp/EXTRACT.pickle +++ b/js/MatrixOp/EXTRACT.pickle @@ -6,16 +6,20 @@ S'a' p2 aS'b' p3 -aS'graphics' +aS'exprs' p4 -aS'x' +aS'gr_i' p5 -aS'model' +aS'graphics' p6 -aS'typ' +aS'x' p7 -atp8 -Rp9 +aS'model' +p8 +aS'typ' +p9 +atp10 +Rp11 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/EXTTRI.js b/js/MatrixOp/EXTTRI.js index 556f7f43..754a7f70 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 ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTTRI\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTTRI\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,label,this.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 3ea8ad2d..1f0d8fe7 100644 --- a/js/MatrixOp/EXTTRI.pickle +++ b/js/MatrixOp/EXTTRI.pickle @@ -4,18 +4,22 @@ p0 ((lp1 S'lab' p2 -aS'graphics' +aS'exprs' p3 -aS'x' +aS'gr_i' p4 -aS'model' +aS'graphics' p5 -aS'typ' +aS'x' p6 -aS'decomptyp' +aS'model' p7 -atp8 -Rp9 +aS'typ' +p8 +aS'decomptyp' +p9 +atp10 +Rp11 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATBKSL.js b/js/MatrixOp/MATBKSL.js index 89af3810..7a73236f 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 ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATBKSL\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATBKSL\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } MATBKSL.prototype.details = function MATBKSL() { @@ -36,6 +36,7 @@ function MATBKSL() { } MATBKSL.prototype.set = function MATBKSL() { this.typ = inverse(arguments[0]["typ"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; var label = this.graphics.exprs; @@ -44,7 +45,7 @@ function MATBKSL() { label[9-1] = []; } while (true) { - [ok,this.typ,exprs] = scicos_getvalue("Set MATBKSL Block",["Datatype (1=real double 2=Complex)"],list("vec",1),label); + [ok,this.typ,this.exprs] = scicos_getvalue("Set MATBKSL Block",["Datatype (1=real double 2=Complex)"],list("vec",1),label); if (!ok) { break; } @@ -64,7 +65,7 @@ function MATBKSL() { var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { - var label = exprs; + var label = this.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 9b1a505d..4b73461e 100644 --- a/js/MatrixOp/MATBKSL.pickle +++ b/js/MatrixOp/MATBKSL.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'exprs' p2 -aS'model' +aS'gr_i' p3 -aS'typ' -p4 aS'graphics' +p4 +aS'x' p5 -atp6 -Rp7 +aS'model' +p6 +aS'typ' +p7 +atp8 +Rp9 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATCATH.js b/js/MatrixOp/MATCATH.js index 38ce63aa..02be8cf8 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 ScilabDouble([true,false]); var label = [sci2exp(2)]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATCATH\",sz(1),sz(2));"]); - this.x = standard_define([2,3],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATCATH\",sz(1),sz(2));"]); + this.x = standard_define([2,3],this.model,label,this.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 e22f5432..d890df42 100644 --- a/js/MatrixOp/MATCATH.pickle +++ b/js/MatrixOp/MATCATH.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'nin' p2 -aS'model' +aS'lab' p3 -aS'nin' +aS'exprs' p4 -aS'lab' +aS'gr_i' p5 aS'graphics' p6 -atp7 -Rp8 +aS'x' +p7 +aS'model' +p8 +atp9 +Rp10 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATCATV.js b/js/MatrixOp/MATCATV.js index 6b587007..7325fb09 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 ScilabDouble([true,false]); var label = [sci2exp(2)]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATCATV\",sz(1),sz(2));"]); - this.x = standard_define([2,3],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATCATV\",sz(1),sz(2));"]); + this.x = standard_define([2,3],this.model,label,this.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 797f7102..6a100159 100644 --- a/js/MatrixOp/MATCATV.pickle +++ b/js/MatrixOp/MATCATV.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'nin' p2 -aS'model' +aS'lab' p3 -aS'nin' +aS'exprs' p4 -aS'lab' +aS'gr_i' p5 aS'graphics' p6 -atp7 -Rp8 +aS'x' +p7 +aS'model' +p8 +atp9 +Rp10 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATDET.js b/js/MatrixOp/MATDET.js index eec51a6d..5393e6ee 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 ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDET\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDET\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } MATDET.prototype.details = function MATDET() { @@ -36,6 +36,7 @@ function MATDET() { } MATDET.prototype.set = function MATDET() { this.typ = inverse(arguments[0]["typ"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; var label = this.graphics.exprs; @@ -44,7 +45,7 @@ function MATDET() { label[9-1] = []; } while (true) { - [ok,this.typ,exprs] = scicos_getvalue("Set MATDET Block",["Datatype(1=real double 2=Complex)"],list("vec",1),label); + [ok,this.typ,this.exprs] = scicos_getvalue("Set MATDET Block",["Datatype(1=real double 2=Complex)"],list("vec",1),label); if (!ok) { break; } @@ -64,7 +65,7 @@ function MATDET() { var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { - var label = exprs; + var label = this.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 c3b2baef..692445f6 100644 --- a/js/MatrixOp/MATDET.pickle +++ b/js/MatrixOp/MATDET.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'exprs' p2 -aS'model' +aS'gr_i' p3 -aS'typ' -p4 aS'graphics' +p4 +aS'x' p5 -atp6 -Rp7 +aS'model' +p6 +aS'typ' +p7 +atp8 +Rp9 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATDIAG.js b/js/MatrixOp/MATDIAG.js index 809caf21..e844f514 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 ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDIAG\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDIAG\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } MATDIAG.prototype.details = function MATDIAG() { @@ -36,6 +36,7 @@ function MATDIAG() { } MATDIAG.prototype.set = function MATDIAG() { this.typ = inverse(arguments[0]["typ"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; var label = this.graphics.exprs; @@ -44,7 +45,7 @@ function MATDIAG() { label[9-1] = []; } while (true) { - [ok,this.typ,exprs] = scicos_getvalue("Set MATDIAG Block",["Datatype (1=real double 2=Complex)"],list("vec",1),label); + [ok,this.typ,this.exprs] = scicos_getvalue("Set MATDIAG Block",["Datatype (1=real double 2=Complex)"],list("vec",1),label); if (!ok) { break; } @@ -64,7 +65,7 @@ function MATDIAG() { var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { - var label = exprs; + var label = this.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 c3b2baef..692445f6 100644 --- a/js/MatrixOp/MATDIAG.pickle +++ b/js/MatrixOp/MATDIAG.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'exprs' p2 -aS'model' +aS'gr_i' p3 -aS'typ' -p4 aS'graphics' +p4 +aS'x' p5 -atp6 -Rp7 +aS'model' +p6 +aS'typ' +p7 +atp8 +Rp9 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATDIV.js b/js/MatrixOp/MATDIV.js index d06e9ddc..5639c8ed 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 ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDIV\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDIV\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } MATDIV.prototype.details = function MATDIV() { @@ -36,6 +36,7 @@ function MATDIV() { } MATDIV.prototype.set = function MATDIV() { this.typ = inverse(arguments[0]["typ"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; var label = this.graphics.exprs; @@ -44,7 +45,7 @@ function MATDIV() { label[9-1] = []; } while (true) { - [ok,this.typ,exprs] = scicos_getvalue("Set MATDIV Block",["Datatype(1=real double 2=Complex)"],list("vec",1),label); + [ok,this.typ,this.exprs] = scicos_getvalue("Set MATDIV Block",["Datatype(1=real double 2=Complex)"],list("vec",1),label); if (!ok) { break; } @@ -64,7 +65,7 @@ function MATDIV() { var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { - var label = exprs; + var label = this.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 9b1a505d..4b73461e 100644 --- a/js/MatrixOp/MATDIV.pickle +++ b/js/MatrixOp/MATDIV.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'exprs' p2 -aS'model' +aS'gr_i' p3 -aS'typ' -p4 aS'graphics' +p4 +aS'x' p5 -atp6 -Rp7 +aS'model' +p6 +aS'typ' +p7 +atp8 +Rp9 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATEIG.js b/js/MatrixOp/MATEIG.js index eb40ea0f..6ab752ec 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 ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATEIG\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATEIG\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,label,this.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 9432c5b4..3ab460e6 100644 --- a/js/MatrixOp/MATEIG.pickle +++ b/js/MatrixOp/MATEIG.pickle @@ -4,18 +4,22 @@ p0 ((lp1 S'lab' p2 -aS'graphics' +aS'exprs' p3 -aS'x' +aS'gr_i' p4 -aS'model' +aS'graphics' p5 -aS'typ' +aS'x' p6 -aS'decomptyp' +aS'model' p7 -atp8 -Rp9 +aS'typ' +p8 +aS'decomptyp' +p9 +atp10 +Rp11 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATEXPM.js b/js/MatrixOp/MATEXPM.js index 1ddaf92d..1c08ba1b 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 ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATEXPM\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATEXPM\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } MATEXPM.prototype.details = function MATEXPM() { @@ -36,6 +36,7 @@ function MATEXPM() { } MATEXPM.prototype.set = function MATEXPM() { this.typ = inverse(arguments[0]["typ"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; var label = this.graphics.exprs; @@ -44,7 +45,7 @@ function MATEXPM() { label[9-1] = []; } while (true) { - [ok,this.typ,exprs] = scicos_getvalue("Set EXPM Block",["Datatype(1=real double 2=Complex)"],list("vec",1),label); + [ok,this.typ,this.exprs] = scicos_getvalue("Set EXPM Block",["Datatype(1=real double 2=Complex)"],list("vec",1),label); if (!ok) { break; } @@ -64,7 +65,7 @@ function MATEXPM() { var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { - var label = exprs; + var label = this.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 c3b2baef..692445f6 100644 --- a/js/MatrixOp/MATEXPM.pickle +++ b/js/MatrixOp/MATEXPM.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'exprs' p2 -aS'model' +aS'gr_i' p3 -aS'typ' -p4 aS'graphics' +p4 +aS'x' p5 -atp6 -Rp7 +aS'model' +p6 +aS'typ' +p7 +atp8 +Rp9 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATINV.js b/js/MatrixOp/MATINV.js index 52f3ce2a..1708660f 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 ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATINV\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATINV\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } MATINV.prototype.details = function MATINV() { @@ -36,6 +36,7 @@ function MATINV() { } MATINV.prototype.set = function MATINV() { this.typ = inverse(arguments[0]["typ"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; var label = this.graphics.exprs; @@ -44,7 +45,7 @@ function MATINV() { label[9-1] = []; } while (true) { - [ok,this.typ,exprs] = scicos_getvalue("Set MATINV Block",["Datatype(1=real double 2=Complex)"],list("vec",1),label); + [ok,this.typ,this.exprs] = scicos_getvalue("Set MATINV Block",["Datatype(1=real double 2=Complex)"],list("vec",1),label); if (!ok) { break; } @@ -64,7 +65,7 @@ function MATINV() { var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { - var label = exprs; + var label = this.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 c3b2baef..692445f6 100644 --- a/js/MatrixOp/MATINV.pickle +++ b/js/MatrixOp/MATINV.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'exprs' p2 -aS'model' +aS'gr_i' p3 -aS'typ' -p4 aS'graphics' +p4 +aS'x' p5 -atp6 -Rp7 +aS'model' +p6 +aS'typ' +p7 +atp8 +Rp9 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATLU.js b/js/MatrixOp/MATLU.js index d18761da..527120df 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 ScilabDouble([true,false]); var label = sci2exp(1); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATLU\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATLU\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,label,this.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 56af5dd5..16367e49 100644 --- a/js/MatrixOp/MATLU.pickle +++ b/js/MatrixOp/MATLU.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'lab' p2 -aS'model' +aS'exprs' p3 -aS'typ' +aS'gr_i' p4 -aS'lab' -p5 aS'graphics' +p5 +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +aS'typ' +p8 +atp9 +Rp10 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATMAGPHI.js b/js/MatrixOp/MATMAGPHI.js index 44bfd55e..5374bd5f 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 ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATMAGPHI\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATMAGPHI\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,label,this.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 df67a466..52acca8a 100644 --- a/js/MatrixOp/MATMAGPHI.pickle +++ b/js/MatrixOp/MATMAGPHI.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'lab' p2 -aS'model' +aS'exprs' p3 -aS'lab' +aS'gr_i' p4 -aS'decomptyp' -p5 aS'graphics' +p5 +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +aS'decomptyp' +p8 +atp9 +Rp10 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATMUL.js b/js/MatrixOp/MATMUL.js index c2c1aaf1..1aa8eeac 100644 --- a/js/MatrixOp/MATMUL.js +++ b/js/MatrixOp/MATMUL.js @@ -10,8 +10,8 @@ function MATMUL() { this.model.dep_ut = new ScilabDouble([true,false]); this.model.ipar = new ScilabDouble([1]); var label = [sci2exp(this.model.ipar)]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATMUL\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATMUL\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } MATMUL.prototype.details = function MATMUL() { @@ -29,6 +29,7 @@ function MATMUL() { this.dtype = arguments[0]["dtype"] this.rule = parseFloat(arguments[0]["rule"]) this.np = parseFloat(arguments[0]["np"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = this.x.graphics; var label = this.graphics.exprs; @@ -43,7 +44,7 @@ function MATMUL() { label[3-1] = sci2exp(1); } while (true) { - [ok,this.dtype,this.rule,this.np,exprs] = scicos_getvalue([["Set MATMUL parameter"],["For the Multipication rule:"],[" 1= Matrix by Matrix"],[" 2= Matrix by Matrix element wise "],[" 3= Matrix by Scalar"],["In the third case the second input will be the scalar"]],["Datatype(1=real double 2=Complex 3=int32 ...)","Multiplication rule","Do on Overflow(0=Nothing 1=Saturate 2=Error)"],list("vec",1,"vec",1,"vec",1),label); + [ok,this.dtype,this.rule,this.np,this.exprs] = scicos_getvalue([["Set MATMUL parameter"],["For the Multipication rule:"],[" 1= Matrix by Matrix"],[" 2= Matrix by Matrix element wise "],[" 3= Matrix by Scalar"],["In the third case the second input will be the scalar"]],["Datatype(1=real double 2=Complex 3=int32 ...)","Multiplication rule","Do on Overflow(0=Nothing 1=Saturate 2=Error)"],list("vec",1,"vec",1,"vec",1),label); if (!ok) { break; } @@ -151,7 +152,7 @@ function MATMUL() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - var label = exprs; + var label = this.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 5c93b78c..cc0f48ba 100644 --- a/js/MatrixOp/MATMUL.pickle +++ b/js/MatrixOp/MATMUL.pickle @@ -6,16 +6,20 @@ S'dtype' p2 aS'rule' p3 -aS'graphics' +aS'exprs' p4 -aS'np' +aS'gr_i' p5 -aS'x' +aS'graphics' p6 -aS'model' +aS'np' p7 -atp8 -Rp9 +aS'x' +p8 +aS'model' +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/MatrixOp/MATPINV.js b/js/MatrixOp/MATPINV.js index 3bd87e74..df098edd 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 ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATPINV\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATPINV\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } MATPINV.prototype.details = function MATPINV() { @@ -36,6 +36,7 @@ function MATPINV() { } MATPINV.prototype.set = function MATPINV() { this.typ = inverse(arguments[0]["typ"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; var label = this.graphics.exprs; @@ -44,7 +45,7 @@ function MATPINV() { label[9-1] = []; } while (true) { - [ok,this.typ,exprs] = scicos_getvalue("Set MATPINV Block",["Datatype(1=real double 2=Complex)"],list("vec",1),label); + [ok,this.typ,this.exprs] = scicos_getvalue("Set MATPINV Block",["Datatype(1=real double 2=Complex)"],list("vec",1),label); if (!ok) { break; } @@ -64,7 +65,7 @@ function MATPINV() { var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { - var label = exprs; + var label = this.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 c3b2baef..692445f6 100644 --- a/js/MatrixOp/MATPINV.pickle +++ b/js/MatrixOp/MATPINV.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'exprs' p2 -aS'model' +aS'gr_i' p3 -aS'typ' -p4 aS'graphics' +p4 +aS'x' p5 -atp6 -Rp7 +aS'model' +p6 +aS'typ' +p7 +atp8 +Rp9 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATRESH.js b/js/MatrixOp/MATRESH.js index 55f610fa..3b9cb604 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 ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp([1,1])],[sci2exp([1,1])]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATRESH\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATRESH\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,label,this.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 7ad4ecdc..202e6e77 100644 --- a/js/MatrixOp/MATRESH.pickle +++ b/js/MatrixOp/MATRESH.pickle @@ -2,22 +2,26 @@ c__builtin__ set p0 ((lp1 -S'graphics' +S'l1' p2 aS'lab' p3 -aS'l1' +aS'exprs' p4 -aS'x' +aS'gr_i' p5 -aS'model' +aS'graphics' p6 -aS'typ' +aS'x' p7 -aS'out' +aS'model' p8 -atp9 -Rp10 +aS'typ' +p9 +aS'out' +p10 +atp11 +Rp12 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATSING.js b/js/MatrixOp/MATSING.js index aad0ca3c..d372a251 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 ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATSING\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATSING\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,label,this.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 9432c5b4..3ab460e6 100644 --- a/js/MatrixOp/MATSING.pickle +++ b/js/MatrixOp/MATSING.pickle @@ -4,18 +4,22 @@ p0 ((lp1 S'lab' p2 -aS'graphics' +aS'exprs' p3 -aS'x' +aS'gr_i' p4 -aS'model' +aS'graphics' p5 -aS'typ' +aS'x' p6 -aS'decomptyp' +aS'model' p7 -atp8 -Rp9 +aS'typ' +p8 +aS'decomptyp' +p9 +atp10 +Rp11 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATSUM.js b/js/MatrixOp/MATSUM.js index 8d1277bf..f6e5631a 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 ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(0)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATSUM\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATSUM\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,label,this.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 338fcc0d..8d65b461 100644 --- a/js/MatrixOp/MATSUM.pickle +++ b/js/MatrixOp/MATSUM.pickle @@ -4,18 +4,22 @@ p0 ((lp1 S'lab' p2 -aS'graphics' +aS'exprs' p3 -aS'x' +aS'gr_i' p4 -aS'model' +aS'graphics' p5 -aS'typ' +aS'x' p6 -aS'decomptyp' +aS'model' p7 -atp8 -Rp9 +aS'typ' +p8 +aS'decomptyp' +p9 +atp10 +Rp11 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATTRAN.js b/js/MatrixOp/MATTRAN.js index e9742920..f66776ed 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 ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATTRAN\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATTRAN\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } MATTRAN.prototype.details = function MATTRAN() { @@ -26,6 +26,7 @@ function MATTRAN() { MATTRAN.prototype.set = function MATTRAN() { this.typ = inverse(arguments[0]["typ"]) this.rule = arguments[0]["rule"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; var label = this.graphics.exprs; @@ -34,7 +35,7 @@ function MATTRAN() { label[2-1] = sci2exp(1); } while (true) { - [ok,this.typ,this.rule,exprs] = scicos_getvalue("Set MATTRAN Block",["Datatype(1=real double 2=Complex)","rule (1=.\' 2=\')"],list("vec",1,"vec",1),label); + [ok,this.typ,this.rule,this.exprs] = scicos_getvalue("Set MATTRAN Block",["Datatype(1=real double 2=Complex)","rule (1=.\' 2=\')"],list("vec",1,"vec",1),label); if (!ok) { break; } @@ -58,7 +59,7 @@ function MATTRAN() { var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { - var label = exprs; + var label = this.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 74052d9a..7ed2495a 100644 --- a/js/MatrixOp/MATTRAN.pickle +++ b/js/MatrixOp/MATTRAN.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'rule' p2 -aS'model' +aS'exprs' p3 -aS'typ' +aS'gr_i' p4 -aS'rule' -p5 aS'graphics' +p5 +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +aS'typ' +p8 +atp9 +Rp10 .(dp0 S'arg1' p1 diff --git a/js/MatrixOp/MATZCONJ.js b/js/MatrixOp/MATZCONJ.js index 1a1851d6..9f91eda7 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 ScilabDouble([true,false]); var label = []; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATZCONJ\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATZCONJ\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,label,this.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 5851b770..eee96938 100644 --- a/js/MatrixOp/MATZCONJ.pickle +++ b/js/MatrixOp/MATZCONJ.pickle @@ -6,8 +6,14 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'gr_i' +p4 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATZREIM.js b/js/MatrixOp/MATZREIM.js index d7bd1ac4..0758fecb 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 ScilabDouble([true,false]); var label = sci2exp(1); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATZREIM\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATZREIM\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,label,this.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 c93ae0ba..7ac4c77e 100644 --- a/js/MatrixOp/MATZREIM.pickle +++ b/js/MatrixOp/MATZREIM.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'lab' p2 -aS'model' +aS'exprs' p3 -aS'lab' +aS'gr_i' p4 -aS'decomptyp' -p5 aS'graphics' +p5 +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +aS'decomptyp' +p8 +atp9 +Rp10 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/RICC.js b/js/MatrixOp/RICC.js index 69517680..50c61ec1 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 ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RICC\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RICC\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } RICC.prototype.details = function RICC() { @@ -38,6 +38,7 @@ function RICC() { RICC.prototype.set = function RICC() { this.tpe = arguments[0]["tpe"] this.mod = arguments[0]["mod"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; var label = this.graphics.exprs; @@ -46,7 +47,7 @@ function RICC() { label[9-1] = []; } while (true) { - [ok,this.tpe,this.mod,exprs] = scicos_getvalue("Set RICC Block",["Type (1=Cont 2=Disc)","Model(1=Schr 2=sign(cont) inv(disc))"],list("vec",1,"vec",1),label); + [ok,this.tpe,this.mod,this.exprs] = scicos_getvalue("Set RICC Block",["Type (1=Cont 2=Disc)","Model(1=Schr 2=sign(cont) inv(disc))"],list("vec",1,"vec",1),label); if (!ok) { break; } @@ -54,7 +55,7 @@ function RICC() { var out = [this.model.out,this.model.out2]; var it = [1,1,1]; var ot = 1; - var label = exprs; + var label = this.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 fe948957..7e047045 100644 --- a/js/MatrixOp/RICC.pickle +++ b/js/MatrixOp/RICC.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'tpe' p2 -aS'model' +aS'exprs' p3 -aS'mod' +aS'gr_i' p4 -aS'tpe' -p5 aS'graphics' +p5 +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +aS'mod' +p8 +atp9 +Rp10 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/ROOTCOEF.js b/js/MatrixOp/ROOTCOEF.js index 99ab2917..de51409f 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 ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ROOTCOEF\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ROOTCOEF\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } ROOTCOEF.prototype.details = function ROOTCOEF() { @@ -38,6 +38,7 @@ function ROOTCOEF() { ROOTCOEF.prototype.set = function ROOTCOEF() { this.typ = inverse(arguments[0]["typ"]) this.inp = arguments[0]["inp"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; var label = this.graphics.exprs; @@ -46,7 +47,7 @@ function ROOTCOEF() { label[9-1] = []; } while (true) { - [ok,this.typ,this.inp,exprs] = scicos_getvalue("Set ROOTCOEF Block",["Datatype(1=real double 2=Complex)","input row size"],list("vec",1,"vec",1),label); + [ok,this.typ,this.inp,this.exprs] = scicos_getvalue("Set ROOTCOEF Block",["Datatype(1=real double 2=Complex)","input row size"],list("vec",1,"vec",1),label); if (!ok) { break; } @@ -66,7 +67,7 @@ function ROOTCOEF() { var out = [this.inp+1,this.model.out2]; var funtyp = 4; if (ok) { - var label = exprs; + var label = this.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 a97ea3e1..5138a17a 100644 --- a/js/MatrixOp/ROOTCOEF.pickle +++ b/js/MatrixOp/ROOTCOEF.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'inp' p2 -aS'model' +aS'exprs' p3 -aS'typ' +aS'gr_i' p4 -aS'inp' -p5 aS'graphics' +p5 +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +aS'typ' +p8 +atp9 +Rp10 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/SQRT.js b/js/MatrixOp/SQRT.js index d0be5533..db55a22b 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 ScilabDouble([true,false]); var label = [sci2exp(1)]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SQRT\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SQRT\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } SQRT.prototype.details = function SQRT() { @@ -26,12 +26,13 @@ function SQRT() { } SQRT.prototype.set = function SQRT() { this.typ = inverse(arguments[0]["typ"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; var label = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.typ,exprs] = scicos_getvalue("Set SQRT Block",["Datatype(1=real double 2=Complex)"],list("vec",1),label); + [ok,this.typ,this.exprs] = scicos_getvalue("Set SQRT Block",["Datatype(1=real double 2=Complex)"],list("vec",1),label); if (!ok) { break; } @@ -49,7 +50,7 @@ function SQRT() { var out = [this.model.out,this.model.out2]; var funtyp = 4; if (ok) { - var label = exprs; + var label = this.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 3955b075..bb5d0c7b 100644 --- a/js/MatrixOp/SQRT.pickle +++ b/js/MatrixOp/SQRT.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'exprs' p2 -aS'model' +aS'gr_i' p3 -aS'typ' -p4 aS'graphics' +p4 +aS'x' p5 -atp6 -Rp7 +aS'model' +p6 +aS'typ' +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/MatrixOp/SUBMAT.js b/js/MatrixOp/SUBMAT.js index 2660bf83..c114440e 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 ScilabDouble([true,false]); var label = [[sci2exp(1)],[sci2exp(1)],[sci2exp(1)],[sci2exp(1)],[sci2exp(1)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUBMAT\",sz(1),sz(2));"]); - this.x = standard_define([2.5,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUBMAT\",sz(1),sz(2));"]); + this.x = standard_define([2.5,2],this.model,label,this.gr_i); return new BasicBlock(this.x); } SUBMAT.prototype.details = function SUBMAT() { @@ -46,6 +46,7 @@ function SUBMAT() { this.c = arguments[0]["c"] this.d = arguments[0]["d"] this.inp = arguments[0]["inp"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; var label = this.graphics.exprs; @@ -54,7 +55,7 @@ function SUBMAT() { label[6-1] = sci2exp([1,1]); } while (true) { - [ok,this.typ,this.a,this.b,this.c,this.d,this.inp,exprs] = scicos_getvalue("Set SUBMAT Block",["Datatype (1=real double 2=Complex)","Starting Row Index","Ending Row Index","Starting Column Index","Ending Column Index","Input Dimensions"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",2),label); + [ok,this.typ,this.a,this.b,this.c,this.d,this.inp,this.exprs] = scicos_getvalue("Set SUBMAT Block",["Datatype (1=real double 2=Complex)","Starting Row Index","Ending Row Index","Starting Column Index","Ending Column Index","Input Dimensions"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",2),label); if (!ok) { break; } @@ -94,7 +95,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 = exprs; + var label = this.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 1f58e269..61bc9841 100644 --- a/js/MatrixOp/SUBMAT.pickle +++ b/js/MatrixOp/SUBMAT.pickle @@ -12,16 +12,20 @@ aS'd' p5 aS'inp' p6 -aS'graphics' +aS'exprs' p7 -aS'x' +aS'gr_i' p8 -aS'model' +aS'graphics' p9 -aS'typ' +aS'x' p10 -atp11 -Rp12 +aS'model' +p11 +aS'typ' +p12 +atp13 +Rp14 .(dp0 S'model.dstate' p1 diff --git a/js/Misc/AUTOMAT.js b/js/Misc/AUTOMAT.js index 41c27a3b..47fd3137 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]; - var exprs = [[string(NMode)],[string(this.Minitial)],[string(NX)],[sci2exp(this.X0)],[sci2exp(this.XP)],[sci2exp(C1)],[sci2exp(C2)]]; + this.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 ScilabDouble([false,true]); this.model.ipar = new ScilabDouble(ipar); this.model.rpar = new ScilabDouble(rpar); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"AUTOMAT\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,exprs,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"AUTOMAT\",sz(1),sz(2));"]); + this.x = standard_define([4,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } AUTOMAT.prototype.details = function AUTOMAT() { @@ -38,7 +38,7 @@ function AUTOMAT() { AUTOMAT.prototype.set = function AUTOMAT() { this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; var ipar = this.model.ipar; var NMode = ipar[1-1]; @@ -60,14 +60,14 @@ function AUTOMAT() { if (!this.ok) { break; } - var NMode_old = size(exprs,"*")-5; + var NMode_old = size(this.exprs,"*")-5; var ModifEncore = false; if ((NMode_old>NMode)) { - exprs.slice(NMode+6-1,NMode_old+5) = []; + this.exprs.slice(NMode+6-1,NMode_old+5) = []; var ModifEncore = true; } if ((NMode_old<NMode)) { - exprs.slice(NMode_old+6-1,NMode+5) = exprs[NMode_old+4-1]; + this.exprs.slice(NMode_old+6-1,NMode+5) = this.exprs[NMode_old+4-1]; var ModifEncore = true; } if ((NX!=size(this.X0,"*"))) { @@ -101,7 +101,7 @@ function AUTOMAT() { var MaxModes = 1; var nzcross = 0; for (i=1;i<=NMode;i+=1) { - var Ci = evstr(exprs[5+i-1]); + var Ci = evstr(this.exprs[5+i-1]); var ipar = [[ipar],[Ci]]; INP[i-1][1-1] = 2*NX+length(Ci); if ((nzcross<length(Ci))) { @@ -132,7 +132,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 c3ca7ffb..f6e87b0c 100644 --- a/js/Misc/AUTOMAT.pickle +++ b/js/Misc/AUTOMAT.pickle @@ -4,20 +4,24 @@ p0 ((lp1 S'ok' p2 -aS'X0' +aS'XP' p3 -aS'graphics' +aS'exprs' p4 -aS'x' +aS'gr_i' p5 -aS'XP' +aS'graphics' p6 -aS'model' +aS'x' p7 -aS'Minitial' +aS'model' p8 -atp9 -Rp10 +aS'X0' +p9 +aS'Minitial' +p10 +atp11 +Rp12 .(dp0 S'NMode_old' p1 diff --git a/js/Misc/BACKLASH.js b/js/Misc/BACKLASH.js index 80d95389..7a97b2bd 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() { - var exprs = [["0"],["1"],["1"]]; + this.exprs = [["0"],["1"],["1"]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["backlash"]), new ScilabDouble([4])); this.model.in1 = 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 ScilabDouble([true,false]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BACKLASH\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,exprs,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BACKLASH\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } BACKLASH.prototype.details = function BACKLASH() { @@ -29,18 +29,19 @@ function BACKLASH() { this.ini = arguments[0]["ini"] this.gap = arguments[0]["gap"] this.zcr = arguments[0]["zcr"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; var rpar = this.model.rpar; while (true) { - [ok,this.ini,this.gap,this.zcr,exprs] = scicos_getvalue("Set backlash parameters",["initial output","gap","use zero-crossing (0:no, 1:yes)"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.ini,this.gap,this.zcr,this.exprs] = scicos_getvalue("Set backlash parameters",["initial output","gap","use zero-crossing (0:no, 1:yes)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 fcfc7b0f..045121b8 100644 --- a/js/Misc/BACKLASH.pickle +++ b/js/Misc/BACKLASH.pickle @@ -4,18 +4,22 @@ p0 ((lp1 S'gap' p2 -aS'ini' +aS'exprs' p3 -aS'zcr' +aS'gr_i' p4 -aS'graphics' +aS'ini' p5 -aS'x' +aS'zcr' p6 -aS'model' +aS'graphics' p7 -atp8 -Rp9 +aS'x' +p8 +aS'model' +p9 +atp10 +Rp11 .(dp0 S'model.sim' p1 diff --git a/js/Misc/BOUNCE.js b/js/Misc/BOUNCE.js index 0c2fa34f..2436898c 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 ScilabDouble([false,true]); - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } BOUNCE.prototype.details = function BOUNCE() { @@ -65,16 +65,17 @@ function BOUNCE() { this.yd = inverse(arguments[0]["yd"]) this.g = parseFloat(arguments[0]["g"]) this.C = parseFloat(arguments[0]["C"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - if (size(exprs,"*")<9) { - exprs[8-1] = "9.81"; - exprs[9-1] = "0"; + if (size(this.exprs,"*")<9) { + this.exprs[8-1] = "9.81"; + this.exprs[9-1] = "0"; } while (true) { - [ok,this.rpar1,this.rpar2,this.walls,this.xt,this.xd,this.y,this.yd,this.g,this.C,exprs] = scicos_getvalue(["Set Bounce Block"],["Mass","Radius","[xmin,xmax,ymin,ymax]","xpos","xdpos","ypos","ydpos","g (gravity)","C (aerodynamic coeff"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",1,"vec",1),exprs); + [ok,this.rpar1,this.rpar2,this.walls,this.xt,this.xd,this.y,this.yd,this.g,this.C,this.exprs] = scicos_getvalue(["Set Bounce Block"],["Mass","Radius","[xmin,xmax,ymin,ymax]","xpos","xdpos","ypos","ydpos","g (gravity)","C (aerodynamic coeff"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -123,7 +124,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 2cc8bc69..d1e22a27 100644 --- a/js/Misc/BOUNCE.pickle +++ b/js/Misc/BOUNCE.pickle @@ -10,24 +10,28 @@ aS'yd' p4 aS'xd' p5 -aS'walls' +aS'exprs' p6 -aS'rpar1' +aS'walls' p7 -aS'rpar2' +aS'gr_i' p8 -aS'graphics' +aS'rpar1' p9 -aS'y' +aS'rpar2' p10 -aS'x' +aS'graphics' p11 -aS'model' +aS'y' p12 -aS'xt' +aS'x' p13 -atp14 -Rp15 +aS'model' +p14 +aS'xt' +p15 +atp16 +Rp17 .(dp0 S'arg1' p1 diff --git a/js/Misc/BOUNCEXY.js b/js/Misc/BOUNCEXY.js index fd4b1222..3039d82b 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 ScilabDouble([false,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } BOUNCEXY.prototype.details = function BOUNCEXY() { @@ -60,13 +60,14 @@ function BOUNCEXY() { this.xmax = parseFloat(arguments[0]["xmax"]) this.ymin = parseFloat(arguments[0]["ymin"]) this.ymax = parseFloat(arguments[0]["ymax"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; var dstate = this.model.dstate; while (true) { - [ok,this.clrs,this.siz,this.win,this.imode,this.xmin,this.xmax,this.ymin,this.ymax,exprs] = scicos_getvalue("Set Scope parameters",["colors","radii","window number (-1 for automatic)","animation mode (0,1)","Xmin","Xmax","Ymin","Ymax"],list("vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs); + [ok,this.clrs,this.siz,this.win,this.imode,this.xmin,this.xmax,this.ymin,this.ymax,this.exprs] = scicos_getvalue("Set Scope parameters",["colors","radii","window number (-1 for automatic)","animation mode (0,1)","Xmin","Xmax","Ymin","Ymax"],list("vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -104,7 +105,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 62742bd1..51806beb 100644 --- a/js/Misc/BOUNCEXY.pickle +++ b/js/Misc/BOUNCEXY.pickle @@ -8,24 +8,28 @@ aS'imode' p3 aS'ymax' p4 -aS'win' +aS'siz' p5 -aS'graphics' +aS'exprs' p6 -aS'xmax' +aS'gr_i' p7 -aS'siz' +aS'xmax' p8 -aS'xmin' +aS'graphics' p9 -aS'x' +aS'xmin' p10 -aS'model' +aS'x' p11 -aS'ymin' +aS'model' p12 -atp13 -Rp14 +aS'ymin' +p13 +aS'win' +p14 +atp15 +Rp16 .(dp0 S'clrs' p1 diff --git a/js/Misc/BPLATFORM.js b/js/Misc/BPLATFORM.js index 00c632f8..59014bfa 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 ScilabDouble([false,false]); - var exprs = string(this.model.rpar); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BPLATFORM\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = string(this.model.rpar); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BPLATFORM\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } BPLATFORM.prototype.details = function BPLATFORM() { @@ -44,13 +44,14 @@ function BPLATFORM() { this.xmax = parseFloat(arguments[0]["xmax"]) this.ymin = parseFloat(arguments[0]["ymin"]) this.ymax = parseFloat(arguments[0]["ymax"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; var dstate = this.model.dstate; while (true) { - [ok,this.plen,this.csiz,this.phi,this.xmin,this.xmax,this.ymin,this.ymax,exprs] = scicos_getvalue("Set Scope parameters",["pendulum length","cart size (square side)","slope","Xmin","Xmax","Ymin","Ymax"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs); + [ok,this.plen,this.csiz,this.phi,this.xmin,this.xmax,this.ymin,this.ymax,this.exprs] = scicos_getvalue("Set Scope parameters",["pendulum length","cart size (square side)","slope","Xmin","Xmax","Ymin","Ymax"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -72,7 +73,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 2987ee09..af17dc6e 100644 --- a/js/Misc/BPLATFORM.pickle +++ b/js/Misc/BPLATFORM.pickle @@ -4,26 +4,30 @@ p0 ((lp1 S'phi' p2 -aS'ymax' -p3 aS'csiz' +p3 +aS'ymax' p4 aS'graphics' p5 -aS'xmax' +aS'exprs' p6 -aS'plen' +aS'gr_i' p7 -aS'xmin' +aS'xmax' p8 -aS'x' +aS'plen' p9 -aS'model' +aS'xmin' p10 -aS'ymin' +aS'x' p11 -atp12 -Rp13 +aS'model' +p12 +aS'ymin' +p13 +atp14 +Rp15 .(dp0 S'model.dstate' p1 diff --git a/js/Misc/CBLOCK.js b/js/Misc/CBLOCK.js index 5f4ab520..9e443562 100644 --- a/js/Misc/CBLOCK.js +++ b/js/Misc/CBLOCK.js @@ -28,8 +28,8 @@ function CBLOCK() { this.model.dep_ut = new ScilabDouble([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"]),[]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CBLOCK\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CBLOCK\",sz(1),sz(2));"]); + this.x = standard_define([4,2],this.model,label,this.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 30384555..af698327 100644 --- a/js/Misc/CBLOCK.pickle +++ b/js/Misc/CBLOCK.pickle @@ -6,40 +6,44 @@ S'impli' p2 aS'co' p3 -aS'i' +aS'dept' p4 -aS'auto0' +aS'i' p5 -aS'ci' +aS'auto0' p6 -aS'o' +aS'ci' p7 -aS'ng' +aS'o' p8 -aS'depu' +aS'ng' p9 -aS'dept' +aS'depu' p10 -aS'xx' +aS'exprs' p11 -aS'rpar' +aS'xx' p12 -aS'lab' +aS'gr_i' p13 -aS'ipar' +aS'rpar' p14 -aS'graphics' +aS'lab' p15 -aS'x' +aS'ipar' p16 -aS'model' +aS'graphics' p17 -aS'z' +aS'x' p18 -aS'function_name' +aS'model' p19 -atp20 -Rp21 +aS'z' +p20 +aS'function_name' +p21 +atp22 +Rp23 .(dp0 S'ci' p1 diff --git a/js/Misc/CBLOCK4.js b/js/Misc/CBLOCK4.js index de732b84..9596ae7c 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 ScilabDouble([true,false]); var label = list([[funam],["n"],[sci2exp([this.model.in1,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"]],[]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CBLOCK4\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CBLOCK4\",sz(1),sz(2));"]); + this.x = standard_define([4,2],this.model,label,this.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 3d6d9b19..aefd22d2 100644 --- a/js/Misc/CBLOCK4.pickle +++ b/js/Misc/CBLOCK4.pickle @@ -14,42 +14,46 @@ aS'auto0' p6 aS'out' p7 -aS'function_name' +aS'dept' p8 -aS'in1' +aS'function_name' p9 -aS'lab' +aS'in1' p10 -aS'it' +aS'lab' p11 -aS'graphics' +aS'it' p12 -aS'nmode' +aS'graphics' p13 -aS'z' +aS'nmode' p14 -aS'xx' +aS'z' p15 -aS'nzcr' +aS'xx' p16 -aS'depu' +aS'nzcr' p17 -aS'dept' +aS'depu' p18 -aS'opar' +aS'exprs' p19 -aS'oz' +aS'gr_i' p20 -aS'ipar' +aS'opar' p21 -aS'x' +aS'oz' p22 -aS'model' +aS'ipar' p23 -aS'ot' +aS'x' p24 -atp25 -Rp26 +aS'model' +p25 +aS'ot' +p26 +atp27 +Rp28 .(dp0 S'model.odstate' p1 diff --git a/js/Misc/CONSTRAINT2_c.js b/js/Misc/CONSTRAINT2_c.js index 8e4b09e8..71667091 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 ScilabDouble([false,true]); - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CONSTRAINT2_c.prototype.details = function CONSTRAINT2_c() { @@ -32,13 +32,14 @@ function CONSTRAINT2_c() { this.x0 = inverse(arguments[0]["x0"]) this.xd0 = inverse(arguments[0]["xd0"]) this.id = inverse(arguments[0]["id"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { var ask_again = false; - [ok,this.x0,this.xd0,this.id,exprs] = scicos_getvalue("Set Constraint block parameters",["Initial guess values of states x","Initial guess values of derivative x\'","Id(i)=1: if x\'(i) is present in the feedback, else Id(i)=0"],list("vec",-1,"vec",-1,"vec",-1),exprs); + [ok,this.x0,this.xd0,this.id,this.exprs] = scicos_getvalue("Set Constraint block parameters",["Initial guess values of states x","Initial guess values of derivative x\'","Id(i)=1: if x\'(i) is present in the feedback, else Id(i)=0"],list("vec",-1,"vec",-1,"vec",-1),this.exprs); if (!ok) { break; } @@ -69,7 +70,7 @@ function CONSTRAINT2_c() { } } if (!ask_again) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.state = new ScilabDouble([this.x0],[this.xd0]); this.model.out = new ScilabDouble([N],[N]); this.model.in1 = new ScilabDouble([N]); diff --git a/js/Misc/CONSTRAINT2_c.pickle b/js/Misc/CONSTRAINT2_c.pickle index 7a2e7cce..44576d32 100644 --- a/js/Misc/CONSTRAINT2_c.pickle +++ b/js/Misc/CONSTRAINT2_c.pickle @@ -2,20 +2,24 @@ c__builtin__ set p0 ((lp1 -S'graphics' +S'xd0' p2 -aS'x0' +aS'id' p3 -aS'xd0' +aS'exprs' p4 -aS'x' +aS'gr_i' p5 -aS'model' +aS'graphics' p6 -aS'id' +aS'x' p7 -atp8 -Rp9 +aS'model' +p8 +aS'x0' +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/Misc/CONSTRAINT_c.js b/js/Misc/CONSTRAINT_c.js index f3bb0aa0..3340e545 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 ScilabDouble([false,true]); - var exprs = "0"; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONSTRAINT_c\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,exprs,gr_i); + this.exprs = "0"; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONSTRAINT_c\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CONSTRAINT_c.prototype.details = function CONSTRAINT_c() { @@ -25,12 +25,13 @@ function CONSTRAINT_c() { } CONSTRAINT_c.prototype.set = function CONSTRAINT_c() { this.x0 = inverse(arguments[0]["x0"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.x0,exprs] = scicos_getvalue("Set solver block parameters","Initial guess values",list("vec",-1),exprs); + [ok,this.x0,this.exprs] = scicos_getvalue("Set solver block parameters","Initial guess values",list("vec",-1),this.exprs); if (!ok) { break; } @@ -44,7 +45,7 @@ function CONSTRAINT_c() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.state = new ScilabDouble([this.x0],[zeros(N,1)]); this.model.out = new ScilabDouble([N]); this.model.in1 = new ScilabDouble([N]); diff --git a/js/Misc/CONSTRAINT_c.pickle b/js/Misc/CONSTRAINT_c.pickle index a9334e1a..40a25edd 100644 --- a/js/Misc/CONSTRAINT_c.pickle +++ b/js/Misc/CONSTRAINT_c.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'exprs' p2 -aS'model' +aS'gr_i' p3 -aS'x0' -p4 aS'graphics' +p4 +aS'x' p5 -atp6 -Rp7 +aS'model' +p6 +aS'x0' +p7 +atp8 +Rp9 .(dp0 S'model.sim' p1 diff --git a/js/Misc/DEADBAND.js b/js/Misc/DEADBAND.js index 6493d594..7feab424 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 ScilabDouble([true,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } DEADBAND.prototype.details = function DEADBAND() { @@ -33,12 +33,13 @@ function DEADBAND() { this.maxp = parseFloat(arguments[0]["maxp"]) this.minp = parseFloat(arguments[0]["minp"]) this.zeroc = arguments[0]["zeroc"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.maxp,this.minp,this.zeroc,exprs] = scicos_getvalue("Set Deadband parameters",["End of dead band","Start of dead band","zero crossing (0:no, 1:yes)"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.maxp,this.minp,this.zeroc,this.exprs] = scicos_getvalue("Set Deadband parameters",["End of dead band","Start of dead band","zero crossing (0:no, 1:yes)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -54,7 +55,7 @@ function DEADBAND() { this.model.nzcross = new ScilabDouble([0]); this.model.nmode = new ScilabDouble([0]); } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 19b594d5..5bc0ae5c 100644 --- a/js/Misc/DEADBAND.pickle +++ b/js/Misc/DEADBAND.pickle @@ -6,16 +6,20 @@ S'zeroc' p2 aS'maxp' p3 -aS'graphics' +aS'exprs' p4 -aS'minp' +aS'gr_i' p5 -aS'x' +aS'graphics' p6 -aS'model' +aS'minp' p7 -atp8 -Rp9 +aS'x' +p8 +aS'model' +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/Misc/DEBUG.js b/js/Misc/DEBUG.js index 3cb017bb..6312c951 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"]); - 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 = standard_define([8,2],this.model,exprs,gr_i); + 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 = standard_define([8,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } DEBUG.prototype.details = function DEBUG() { @@ -20,8 +20,8 @@ function DEBUG() { DEBUG.prototype.set = function DEBUG() { this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; - var textmp = exprs[2-1]; + this.exprs = this.graphics.exprs; + var textmp = this.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); @@ -33,7 +33,7 @@ function DEBUG() { warning("off"); save(this.TMPDIR+"/debug_scicos",this.debug_scicos); warning(warnMode); - exprs[2-1] = txt; + this.exprs[2-1] = txt; if ((scicos_debug()!=2&&scicos_debug()!=3)) { scicos_debug(2); } @@ -47,7 +47,7 @@ function DEBUG() { } } if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; } return new BasicBlock(this.x); diff --git a/js/Misc/DEBUG.pickle b/js/Misc/DEBUG.pickle index 6259a30b..16d1f01c 100644 --- a/js/Misc/DEBUG.pickle +++ b/js/Misc/DEBUG.pickle @@ -4,16 +4,20 @@ p0 ((lp1 S'debug_scicos' p2 -aS'x' +aS'exprs' p3 -aS'model' +aS'gr_i' p4 -aS'TMPDIR' -p5 aS'graphics' +p5 +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +aS'TMPDIR' +p8 +atp9 +Rp10 .(dp0 S'exprs[2-1]' p1 diff --git a/js/Misc/DEBUG_SCICOS.pickle b/js/Misc/DEBUG_SCICOS.pickle index 4fc428a5..c0d8a4c9 100644 --- a/js/Misc/DEBUG_SCICOS.pickle +++ b/js/Misc/DEBUG_SCICOS.pickle @@ -4,8 +4,16 @@ p0 ((lp1 S'x' p2 -atp3 -Rp4 +aS'model' +p3 +aS'gr_i' +p4 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'y' p1 diff --git a/js/Misc/DIFF_f.js b/js/Misc/DIFF_f.js index 630b1ad9..07b59247 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 ScilabDouble([false,true]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } DIFF_f.prototype.details = function DIFF_f() { @@ -27,16 +27,17 @@ function DIFF_f() { DIFF_f.prototype.set = function DIFF_f() { this.x0 = inverse(arguments[0]["x0"]) this.xd0 = arguments[0]["xd0"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.x0,this.xd0,exprs] = scicos_getvalue("Set continuous linear system parameters",["Initial state","Initial Derivative"],list("vec",1,"vec",1),exprs); + [ok,this.x0,this.xd0,this.exprs] = scicos_getvalue("Set continuous linear system parameters",["Initial state","Initial Derivative"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 358c5b5d..a0e81b2c 100644 --- a/js/Misc/DIFF_f.pickle +++ b/js/Misc/DIFF_f.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'xd0' p2 -aS'model' +aS'exprs' p3 -aS'xd0' +aS'gr_i' p4 -aS'x0' -p5 aS'graphics' +p5 +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +aS'x0' +p8 +atp9 +Rp10 .(dp0 S'model.sim' p1 diff --git a/js/Misc/DSUPER.js b/js/Misc/DSUPER.js index 53a54e4c..3773cf7a 100644 --- a/js/Misc/DSUPER.js +++ b/js/Misc/DSUPER.js @@ -20,7 +20,7 @@ function DSUPER() { this.x = arg1; return; } - var exprs = this.graphics.exprs[1-1]; + this.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,$); @@ -53,7 +53,7 @@ function DSUPER() { var needcompile2 = tmpvar1[2]; this.ok = tmpvar1[3]; var y = max(2,this.needcompile,needcompile2); - this.x.graphics.exprs[1-1] = exprs; + this.x.graphics.exprs[1-1] = this.exprs; this.x.model.rpar = sblock; } else { this.x = arg1; diff --git a/js/Misc/DSUPER.pickle b/js/Misc/DSUPER.pickle index dfa49f7f..8d7d2a76 100644 --- a/js/Misc/DSUPER.pickle +++ b/js/Misc/DSUPER.pickle @@ -4,14 +4,20 @@ p0 ((lp1 S'needcompile' p2 -aS'x' -p3 aS'ok' +p3 +aS'exprs' p4 -aS'graphics' +aS'gr_i' p5 -atp6 -Rp7 +aS'graphics' +p6 +aS'x' +p7 +aS'model' +p8 +atp9 +Rp10 .(dp0 S'bitems' p1 diff --git a/js/Misc/EDGETRIGGER.js b/js/Misc/EDGETRIGGER.js index f9e0ceac..6c27dd25 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 ScilabDouble([true,false]); - var exprs = [string(this.edge)]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EDGETRIGGER\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,exprs,gr_i); + this.exprs = [string(this.edge)]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EDGETRIGGER\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } EDGETRIGGER.prototype.details = function EDGETRIGGER() { @@ -27,17 +27,18 @@ function EDGETRIGGER() { } EDGETRIGGER.prototype.set = function EDGETRIGGER() { this.edge = parseFloat(arguments[0]["edge"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.edge,exprs] = scicos_getvalue("Set edge trigger block parameters",["rising (1), falling (-1), both (0)"],list("vec",1),exprs); + [ok,this.edge,this.exprs] = scicos_getvalue("Set edge trigger block parameters",["rising (1), falling (-1), both (0)"],list("vec",1),this.exprs); if (!ok) { break; } this.model.ipar = new ScilabDouble([sign(this.edge)]); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 eed22757..a3f569ae 100644 --- a/js/Misc/EDGETRIGGER.pickle +++ b/js/Misc/EDGETRIGGER.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'edge' p2 -aS'model' +aS'exprs' p3 -aS'edge' +aS'gr_i' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'model.sim' p1 diff --git a/js/Misc/EDGE_TRIGGER.js b/js/Misc/EDGE_TRIGGER.js index c3fae1b5..1288a52d 100644 --- a/js/Misc/EDGE_TRIGGER.js +++ b/js/Misc/EDGE_TRIGGER.js @@ -77,8 +77,8 @@ function EDGE_TRIGGER() { this.model.in1 = new ScilabDouble([1]); this.model.evtout = new ScilabDouble([1]); this.model.rpar = scs_m_1; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EDGE_TRIGGER\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EDGE_TRIGGER\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,[],this.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 5601c50f..66a780dd 100644 --- a/js/Misc/EDGE_TRIGGER.pickle +++ b/js/Misc/EDGE_TRIGGER.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'exprs' p2 -aS'model' +aS'gr_i' p3 -aS'xxn' -p4 aS'graphics' +p4 +aS'x' p5 -atp6 -Rp7 +aS'model' +p6 +aS'xxn' +p7 +atp8 +Rp9 .(dp0 S'lnk.ct' p1 diff --git a/js/Misc/ENDBLK.js b/js/Misc/ENDBLK.js index a3e1b18d..21116c3a 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()); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ENDBLK\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ENDBLK\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,[],this.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 bdf4b19b..88f10dfc 100644 --- a/js/Misc/ENDBLK.pickle +++ b/js/Misc/ENDBLK.pickle @@ -2,14 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'exprs' p2 -aS'model' +aS'gr_i' p3 -aS'xxn' +aS'graphics' p4 -atp5 -Rp6 +aS'x' +p5 +aS'model' +p6 +aS'xxn' +p7 +atp8 +Rp9 .(dp0 S'ppath' p1 diff --git a/js/Misc/EXPRESSION.pickle b/js/Misc/EXPRESSION.pickle index f1744afe..9ecf333f 100644 --- a/js/Misc/EXPRESSION.pickle +++ b/js/Misc/EXPRESSION.pickle @@ -2,26 +2,30 @@ c__builtin__ set p0 ((lp1 -S'%nin' +S'PREVAR_foo' p2 -aS'PREVAR_foo' -p3 aS'getfield' -p4 +p3 aS'PREVAR_scicos_context' -p5 +p4 aS'%exx' +p5 +aS'exprs' p6 -aS'%usenz' +aS'gr_i' p7 -aS'graphics' +aS'%nin' p8 -aS'x' +aS'graphics' p9 -aS'model' +aS'x' p10 -atp11 -Rp12 +aS'model' +p11 +aS'%usenz' +p12 +atp13 +Rp14 .(dp0 S'arg1' p1 diff --git a/js/Misc/Extract_Activation.js b/js/Misc/Extract_Activation.js index 67abe3fb..c832f96f 100644 --- a/js/Misc/Extract_Activation.js +++ b/js/Misc/Extract_Activation.js @@ -82,8 +82,8 @@ function Extract_Activation() { this.model.in1 = new ScilabDouble([1]); this.model.evtout = new ScilabDouble([1]); this.model.rpar = scs_m_1; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Extract_Activation\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Extract_Activation\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,[],this.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 9278cfaa..ec0f50df 100644 --- a/js/Misc/Extract_Activation.pickle +++ b/js/Misc/Extract_Activation.pickle @@ -6,10 +6,14 @@ S'x' p2 aS'model' p3 -aS'graphics' +aS'gr_i' p4 -atp5 -Rp6 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'lnk.ct' p1 diff --git a/js/Misc/HYSTHERESIS.js b/js/Misc/HYSTHERESIS.js index 1df3ee97..a4ef4c44 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 ScilabDouble([true,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } HYSTHERESIS.prototype.details = function HYSTHERESIS() { @@ -38,19 +38,20 @@ function HYSTHERESIS() { this.out_high = arguments[0]["out_high"] this.out_low = arguments[0]["out_low"] this.nzz = parseFloat(arguments[0]["nzz"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.high_lim,this.low_lim,this.out_high,this.out_low,this.nzz,exprs] = scicos_getvalue("Set parameters",["switch on at","switch off at","output when on","output when off","use zero crossing: yes (1), no (0)"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs); + [ok,this.high_lim,this.low_lim,this.out_high,this.out_low,this.nzz,this.exprs] = scicos_getvalue("Set parameters",["switch on at","switch off at","output when on","output when off","use zero crossing: yes (1), no (0)"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } if (this.low_lim>this.high_lim) { message("switch on value must be larger than switch off value"); } else { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 82d4a7f2..22118741 100644 --- a/js/Misc/HYSTHERESIS.pickle +++ b/js/Misc/HYSTHERESIS.pickle @@ -2,24 +2,28 @@ c__builtin__ set p0 ((lp1 -S'low_lim' +S'out_low' p2 -aS'out_low' +aS'low_lim' p3 -aS'nzz' +aS'out_high' p4 -aS'graphics' +aS'nzz' p5 -aS'out_high' +aS'graphics' p6 -aS'high_lim' +aS'exprs' p7 -aS'x' +aS'gr_i' p8 -aS'model' +aS'high_lim' p9 -atp10 -Rp11 +aS'x' +p10 +aS'model' +p11 +atp12 +Rp13 .(dp0 S'arg1' p1 diff --git a/js/Misc/IMPSPLIT_f.pickle b/js/Misc/IMPSPLIT_f.pickle index 5a701c06..c3f3ee9a 100644 --- a/js/Misc/IMPSPLIT_f.pickle +++ b/js/Misc/IMPSPLIT_f.pickle @@ -6,8 +6,14 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'gr_i' +p4 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/Misc/LOGICAL_OP.js b/js/Misc/LOGICAL_OP.js index 0e1735d8..4910a7b4 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 ScilabDouble([true,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } LOGICAL_OP.prototype.details = function LOGICAL_OP() { @@ -33,15 +33,16 @@ function LOGICAL_OP() { this.rule = parseFloat(arguments[0]["rule"]) this.Datatype = arguments[0]["Datatype"] this.tp = parseFloat(arguments[0]["tp"]) + this.exprs = inverse(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - if (size(exprs,1)==2) { - var exprs = [[exprs],[sci2exp(1)],[sci2exp(0)]]; + if (size(this.exprs,1)==2) { + this.exprs = [[this.exprs],[sci2exp(1)],[sci2exp(0)]]; } while (true) { - [ok,this.nin,this.rule,this.Datatype,this.tp,exprs] = scicos_getvalue("Set parameters",["number of inputs","Operator: AND (0), OR (1), NAND (2), NOR (3), XOR (4), NOT (5)","Datatype (1=double 3=int32 ...)","Bitwise Rule(0=No 1=yes)"],list("vec",1,"vec",1,"vec",1,"vec",1),exprs); + [ok,this.nin,this.rule,this.Datatype,this.tp,this.exprs] = scicos_getvalue("Set parameters",["number of inputs","Operator: AND (0), OR (1), NAND (2), NOR (3), XOR (4), NOT (5)","Datatype (1=double 3=int32 ...)","Bitwise Rule(0=No 1=yes)"],list("vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -119,7 +120,7 @@ function LOGICAL_OP() { } else if (this.rule==5) { var label = "NOT"; } - this.graphics.exprs = new ScilabDouble(exprs); + this.graphics.exprs = new ScilabDouble(this.exprs); this.graphics.style = new ScilabDouble(["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 41d014ca..59b44b2a 100644 --- a/js/Misc/LOGICAL_OP.pickle +++ b/js/Misc/LOGICAL_OP.pickle @@ -8,16 +8,20 @@ aS'Datatype' p3 aS'rule' p4 -aS'tp' +aS'exprs' p5 -aS'graphics' +aS'gr_i' p6 -aS'x' +aS'tp' p7 -aS'model' +aS'graphics' p8 -atp9 -Rp10 +aS'x' +p9 +aS'model' +p10 +atp11 +Rp12 .(dp0 S'arg1' p1 diff --git a/js/Misc/MBLOCK.js b/js/Misc/MBLOCK.js index c1f54e5f..e1ee5947 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"; - 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.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 ScilabDouble([false,true]); @@ -26,8 +26,8 @@ function MBLOCK() { this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"r"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"r"),1)]); this.model.equations = mo; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MBLOCK\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,exprs,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MBLOCK\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,this.exprs,this.gr_i); this.x.graphics.in_implicit = this.intype; this.x.graphics.out_implicit = this.outtype; return new BasicBlock(this.x); @@ -59,18 +59,18 @@ function MBLOCK() { this.x = arg1; this.model = arg1.model; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; - if (this.type[exprs-1]==15) { + this.exprs = this.graphics.exprs; + if (this.type[this.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; } - 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.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]); } - this.lab_1 = list(exprs.in1,exprs.intype,exprs.out,exprs.outtype,exprs.param,exprs.pprop,exprs.nameF); - var lab_2 = exprs.paramv; + this.lab_1 = list(this.exprs.in1,this.exprs.intype,this.exprs.out,this.exprs.outtype,this.exprs.param,this.exprs.pprop,this.exprs.nameF); + var lab_2 = this.exprs.paramv; while (true) { [ok,this.Tin,this.Tintype,this.Tout,this.Touttype,this.Tparam,this.pprop,this.Tfunam,this.lab_1] = scicos_getvalue("Set Modelica generic block parameters",["Input variables: ","Input variables types: ","Output variables: ","Output variables types:","Parameters in Modelica:","Parameters properties: ","Function name: "],list("str",-1,"str",-1,"str",-1,"str",-1,"str",-1,"vec",-1,"str",-1),this.lab_1); if (!ok) { @@ -225,7 +225,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 = exprs.paramv; + var lab_2 = this.exprs.paramv; } } } @@ -239,7 +239,7 @@ function MBLOCK() { if (extF==".mo"&&fileinfo(this.funam)!=[]) { var tt = mgetl(this.funam); } else { - var tt = exprs.funtxt; + var tt = this.exprs.funtxt; var mo = this.model.equations; if (mo.model!=nameF) { var tt = []; @@ -268,31 +268,31 @@ function MBLOCK() { this.model.rpar = new ScilabDouble([this.model.rpar],[paramv[i-1].slice()]); } this.model.sim[1-1] = new ScilabDouble([this.funam]); - exprs.in1 = 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(); + this.exprs.in1 = 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(); if (Tparam_sz!=0) { if (this.type[lab_2-1]==15) { for (i=1;i<=lstsize(lab_2);i+=1) { - exprs.paramv[i-1] = lab_2[i-1]; + this.exprs.paramv[i-1] = lab_2[i-1]; } } else { for (i=1;i<=size(lab_2,"*");i+=1) { - exprs.paramv[i-1] = lab_2[i-1]; + this.exprs.paramv[i-1] = lab_2[i-1]; } } } - exprs.pprop = this.lab_1[6-1]; - exprs.nameF = this.lab_1[7-1]; - exprs.funtxt = tt; + this.exprs.pprop = this.lab_1[6-1]; + this.exprs.nameF = this.lab_1[7-1]; + this.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 ScilabDouble(this.intype); this.graphics.out_implicit = new ScilabDouble(this.outtype); - this.graphics.exprs = exprs; + this.graphics.exprs = this.exprs; this.x.graphics = this.graphics; break; } diff --git a/js/Misc/MBLOCK.pickle b/js/Misc/MBLOCK.pickle index 0f22e232..cb0d67a2 100644 --- a/js/Misc/MBLOCK.pickle +++ b/js/Misc/MBLOCK.pickle @@ -6,38 +6,42 @@ S'Touttype' p2 aS'lab_1' p3 -aS'Tparam' +aS'outtype' p4 -aS'intype' +aS'Tparam' p5 -aS'in1' +aS'intype' p6 -aS'Tin' +aS'in1' p7 -aS'outtype' +aS'exprs' p8 -aS'Tout' +aS'Tin' p9 -aS'pprop' +aS'gr_i' p10 -aS'graphics' +aS'Tout' p11 -aS'funam' +aS'pprop' p12 -aS'x' +aS'graphics' p13 -aS'model' +aS'funam' p14 -aS'out' +aS'x' p15 -aS'type' +aS'model' p16 -aS'Tintype' +aS'out' p17 -aS'Tfunam' +aS'type' p18 -atp19 -Rp20 +aS'Tintype' +p19 +aS'Tfunam' +p20 +atp21 +Rp22 .(dp0 S'rhs_txt' p1 diff --git a/js/Misc/MEMORY_f.js b/js/Misc/MEMORY_f.js index 53979f34..684e0463 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; - var exprs = [[string(z)],[string(1)]]; + this.exprs = [[string(z)],[string(1)]]; this.model = scicos_model(); this.model.sim = new ScilabString(["memo"]); this.model.in1 = 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 ScilabDouble([false,false]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MEMORY_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MEMORY_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } MEMORY_f.prototype.details = function MEMORY_f() { @@ -30,12 +30,13 @@ function MEMORY_f() { MEMORY_f.prototype.set = function MEMORY_f() { this.a = arguments[0]["a"] this.inh = parseFloat(arguments[0]["inh"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.a,this.inh,exprs] = scicos_getvalue("Set memory block parameters",["initial condition","Inherit (1: no, 0: yes)"],list("vec",-1,"vec",1),exprs); + [ok,this.a,this.inh,this.exprs] = scicos_getvalue("Set memory block parameters",["initial condition","Inherit (1: no, 0: yes)"],list("vec",-1,"vec",1),this.exprs); if (!ok) { break; } @@ -55,7 +56,7 @@ function MEMORY_f() { } var in1 = out; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.rpar = new ScilabDouble([this.a]); this.model.in1 = new ScilabDouble([in1]); this.model.out = new ScilabDouble([out]); diff --git a/js/Misc/MEMORY_f.pickle b/js/Misc/MEMORY_f.pickle index da5cef6a..b10dd11b 100644 --- a/js/Misc/MEMORY_f.pickle +++ b/js/Misc/MEMORY_f.pickle @@ -4,16 +4,20 @@ p0 ((lp1 S'a' p2 -aS'x' +aS'exprs' p3 -aS'model' +aS'gr_i' p4 aS'inh' p5 aS'graphics' p6 -atp7 -Rp8 +aS'x' +p7 +aS'model' +p8 +atp9 +Rp10 .(dp0 S'model.dstate' p1 diff --git a/js/Misc/MPBLOCK.js b/js/Misc/MPBLOCK.js index ba6669ae..7570905b 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"; - 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.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 ScilabDouble([true,true]); @@ -26,8 +26,8 @@ function MPBLOCK() { this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"r"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"r"),1)]); this.model.equations = mo; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MPBLOCK\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,exprs,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MPBLOCK\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,this.exprs,this.gr_i); this.x.graphics.in_implicit = this.intype; this.x.graphics.out_implicit = this.outtype; return new BasicBlock(this.x); @@ -44,18 +44,18 @@ function MPBLOCK() { this.x = arg1; this.model = arg1.model; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; - if (this.type[exprs-1]==15) { + this.exprs = this.graphics.exprs; + if (this.type[this.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; } - 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]); + 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 lab_1 = list(exprs.in1,exprs.intype,exprs.out,exprs.outtype,exprs.param,exprs.pprop,exprs.nameF); - var lab_2 = exprs.paramv; + var lab_1 = list(this.exprs.in1,this.exprs.intype,this.exprs.out,this.exprs.outtype,this.exprs.param,this.exprs.pprop,this.exprs.nameF); + var lab_2 = this.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]; @@ -193,7 +193,7 @@ function MPBLOCK() { var lab_2_tmp = list(); if (Tparam_sz!=0) { for (i=1;i<=Tparam_sz;i+=1) { - var ee = evstr(exprs.param); + var ee = evstr(this.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]; @@ -224,7 +224,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 = exprs.paramv; + var lab_2 = this.exprs.paramv; } } } @@ -252,31 +252,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]); - exprs.in1 = 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(); + this.exprs.in1 = 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(); if (Tparam_sz!=0) { if (this.type[lab_2-1]==15) { for (i=1;i<=lstsize(lab_2);i+=1) { - exprs.paramv[i-1] = lab_2[i-1]; + this.exprs.paramv[i-1] = lab_2[i-1]; } } else { for (i=1;i<=size(lab_2,"*");i+=1) { - exprs.paramv[i-1] = lab_2[i-1]; + this.exprs.paramv[i-1] = lab_2[i-1]; } } } - exprs.pprop = lab_1[6-1]; - exprs.nameF = lab_1[7-1]; - exprs.funtxt = ""; + this.exprs.pprop = lab_1[6-1]; + this.exprs.nameF = lab_1[7-1]; + this.exprs.funtxt = ""; this.x.model = this.model; this.graphics.gr_i[1-1][1-1] = new ScilabString(["txt=[\' "+nameF+" \'];"]); this.graphics.in_implicit = new ScilabDouble(this.intype); this.graphics.out_implicit = new ScilabDouble(this.outtype); - this.graphics.exprs = exprs; + this.graphics.exprs = this.exprs; this.x.graphics = this.graphics; break; } diff --git a/js/Misc/MPBLOCK.pickle b/js/Misc/MPBLOCK.pickle index f70422fe..f7e22d8c 100644 --- a/js/Misc/MPBLOCK.pickle +++ b/js/Misc/MPBLOCK.pickle @@ -2,26 +2,30 @@ c__builtin__ set p0 ((lp1 -S'intype' +S'outtype' p2 -aS'in1' +aS'intype' p3 -aS'outtype' +aS'in1' p4 -aS'graphics' +aS'exprs' p5 -aS'funam' +aS'gr_i' p6 -aS'x' +aS'graphics' p7 -aS'model' +aS'funam' p8 -aS'type' +aS'x' p9 -aS'out' +aS'model' p10 -atp11 -Rp12 +aS'type' +p11 +aS'out' +p12 +atp13 +Rp14 .(dp0 S'rhs_txt' p1 diff --git a/js/Misc/PAL_f.js b/js/Misc/PAL_f.js index f57e5b93..22da4d26 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 ScilabDouble([false,false]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PAL_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PAL_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,[],this.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 1851d7a7..50b9152f 100644 --- a/js/Misc/PAL_f.pickle +++ b/js/Misc/PAL_f.pickle @@ -6,8 +6,14 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'gr_i' +p4 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/Misc/PENDULUM_ANIM.js b/js/Misc/PENDULUM_ANIM.js index 0e265168..1faf9f7f 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 ScilabDouble([false,false]); - var exprs = string(this.model.rpar); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PENDULUM_ANIM\",sz(1),sz(2));"]); - this.x = standard_define([3,3],this.model,exprs,gr_i); + this.exprs = string(this.model.rpar); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PENDULUM_ANIM\",sz(1),sz(2));"]); + this.x = standard_define([3,3],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } PENDULUM_ANIM.prototype.details = function PENDULUM_ANIM() { @@ -44,13 +44,14 @@ function PENDULUM_ANIM() { this.xmax = parseFloat(arguments[0]["xmax"]) this.ymin = parseFloat(arguments[0]["ymin"]) this.ymax = parseFloat(arguments[0]["ymax"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; var dstate = this.model.dstate; while (true) { - [ok,this.plen,this.csiz,this.phi,this.xmin,this.xmax,this.ymin,this.ymax,exprs] = scicos_getvalue("Set Scope parameters",["pendulum length","cart size (square side)","slope","Xmin","Xmax","Ymin","Ymax"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs); + [ok,this.plen,this.csiz,this.phi,this.xmin,this.xmax,this.ymin,this.ymax,this.exprs] = scicos_getvalue("Set Scope parameters",["pendulum length","cart size (square side)","slope","Xmin","Xmax","Ymin","Ymax"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -72,7 +73,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 2987ee09..af17dc6e 100644 --- a/js/Misc/PENDULUM_ANIM.pickle +++ b/js/Misc/PENDULUM_ANIM.pickle @@ -4,26 +4,30 @@ p0 ((lp1 S'phi' p2 -aS'ymax' -p3 aS'csiz' +p3 +aS'ymax' p4 aS'graphics' p5 -aS'xmax' +aS'exprs' p6 -aS'plen' +aS'gr_i' p7 -aS'xmin' +aS'xmax' p8 -aS'x' +aS'plen' p9 -aS'model' +aS'xmin' p10 -aS'ymin' +aS'x' p11 -atp12 -Rp13 +aS'model' +p12 +aS'ymin' +p13 +atp14 +Rp15 .(dp0 S'model.dstate' p1 diff --git a/js/Misc/RATELIMITER.js b/js/Misc/RATELIMITER.js index d4a0b090..dd065a28 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 ScilabDouble([true,false]); - 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 = standard_define([3.5,2],this.model,exprs,gr_i); + 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 = standard_define([3.5,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } RATELIMITER.prototype.details = function RATELIMITER() { @@ -29,12 +29,13 @@ function RATELIMITER() { RATELIMITER.prototype.set = function RATELIMITER() { this.maxp = parseFloat(arguments[0]["maxp"]) this.minp = parseFloat(arguments[0]["minp"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.maxp,this.minp,exprs] = scicos_getvalue("Set rate limiter parameters",["max slope","min slope"],list("vec",1,"vec",1),exprs); + [ok,this.maxp,this.minp,this.exprs] = scicos_getvalue("Set rate limiter parameters",["max slope","min slope"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -43,7 +44,7 @@ function RATELIMITER() { } else { var rpar = [[this.maxp],[this.minp]]; this.model.rpar = new ScilabDouble(rpar); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 8e7301aa..e089b9bc 100644 --- a/js/Misc/RATELIMITER.pickle +++ b/js/Misc/RATELIMITER.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'minp' +S'maxp' p2 -aS'x' +aS'exprs' p3 -aS'model' +aS'gr_i' p4 -aS'maxp' -p5 aS'graphics' +p5 +aS'minp' p6 -atp7 -Rp8 +aS'x' +p7 +aS'model' +p8 +atp9 +Rp10 .(dp0 S'model.sim' p1 diff --git a/js/Misc/RELATIONALOP.js b/js/Misc/RELATIONALOP.js index 4f4a8e2f..aa9801f3 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 ScilabDouble([true,false]); - var exprs = [[string(ipar)],[string(0)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RELATIONALOP\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = [[string(ipar)],[string(0)]]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RELATIONALOP\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); this.x.graphics.style = ["fontSize=13;fontStyle=1;displayedLabel="+label]; return new BasicBlock(this.x); } @@ -31,15 +31,16 @@ function RELATIONALOP() { this.rule = parseFloat(arguments[0]["rule"]) this.zcr = parseFloat(arguments[0]["zcr"]) this.Datatype = arguments[0]["Datatype"] + this.exprs = inverse(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - if (size(exprs,1)==2) { - var exprs = [[exprs],[sci2exp(1)]]; + if (size(this.exprs,1)==2) { + this.exprs = [[this.exprs],[sci2exp(1)]]; } while (true) { - [ok,this.rule,this.zcr,this.Datatype,exprs] = scicos_getvalue("Set parameters",["Operator: == (0), ~= (1), < (2), <= (3), > (4), >= (5)","Use zero crossing (no: 0), (yes: 1)","Datatype (1=double 3=int32 ...)"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.rule,this.zcr,this.Datatype,this.exprs] = scicos_getvalue("Set parameters",["Operator: == (0), ~= (1), < (2), <= (3), > (4), >= (5)","Use zero crossing (no: 0), (yes: 1)","Datatype (1=double 3=int32 ...)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -93,7 +94,7 @@ function RELATIONALOP() { } else if (this.rule==5) { var label = "≥"; } - this.graphics.exprs = new ScilabDouble(exprs); + this.graphics.exprs = new ScilabDouble(this.exprs); this.graphics.style = new ScilabDouble(["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 179d5848..9387c264 100644 --- a/js/Misc/RELATIONALOP.pickle +++ b/js/Misc/RELATIONALOP.pickle @@ -6,16 +6,20 @@ S'Datatype' p2 aS'rule' p3 -aS'zcr' +aS'exprs' p4 -aS'graphics' +aS'gr_i' p5 -aS'x' +aS'zcr' p6 -aS'model' +aS'graphics' p7 -atp8 -Rp9 +aS'x' +p8 +aS'model' +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/Misc/SPLIT_f.pickle b/js/Misc/SPLIT_f.pickle index 79869450..90f5dbc2 100644 --- a/js/Misc/SPLIT_f.pickle +++ b/js/Misc/SPLIT_f.pickle @@ -6,8 +6,14 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'gr_i' +p4 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/Misc/SUPER_f.js b/js/Misc/SUPER_f.js index c1829e59..9ffae6bb 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 ScilabDouble([false,false]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUPER_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUPER_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,[],this.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 869f3e19..28d079d5 100644 --- a/js/Misc/SUPER_f.pickle +++ b/js/Misc/SUPER_f.pickle @@ -6,8 +6,14 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'gr_i' +p4 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/Misc/TEXT_f.js b/js/Misc/TEXT_f.js index 85b433f9..77de720a 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]); - var exprs = [["Text"],[string(this.font)],[string(this.siz)]]; + this.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(exprs); + this.graphics.exprs = new ScilabDouble(this.exprs); this.x = mlist(["Text","graphics","model","void","gui"],this.graphics,this.model," ","TEXT_f"); return new TextBlock(this.x); } @@ -30,16 +30,17 @@ function TEXT_f() { this.txt = arguments[0]["txt"] this.font = parseFloat(arguments[0]["font"]) this.siz = parseFloat(arguments[0]["siz"]) + this.exprs = inverse(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; var orig = this.graphics.orig; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - if (size(exprs,"*")==1) { - var exprs = [[exprs],["3"],["1"]]; + if (size(this.exprs,"*")==1) { + this.exprs = [[this.exprs],["3"],["1"]]; } while (true) { - [ok,this.txt,this.font,this.siz,exprs] = scicos_getvalue("Set Text block parameters",["Text","Font number","Font size"],list("str",-1,"vec",1,"vec",1),exprs); + [ok,this.txt,this.font,this.siz,this.exprs] = scicos_getvalue("Set Text block parameters",["Text","Font number","Font size"],list("str",-1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -52,14 +53,14 @@ function TEXT_f() { var ok = false; } if (ok) { - this.graphics.exprs = new ScilabDouble(exprs); + this.graphics.exprs = new ScilabDouble(this.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,exprs[1-1],evstr(exprs[2-1]),evstr(exprs[3-1])); + var r = xstringl(0,0,this.exprs[1-1],evstr(this.exprs[2-1]),evstr(this.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 b2499d4f..47e16643 100644 --- a/js/Misc/TEXT_f.pickle +++ b/js/Misc/TEXT_f.pickle @@ -2,20 +2,24 @@ c__builtin__ set p0 ((lp1 -S'txt' +S'font' p2 aS'siz' p3 -aS'graphics' +aS'exprs' p4 -aS'x' +aS'gr_i' p5 -aS'model' +aS'graphics' p6 -aS'font' +aS'x' p7 -atp8 -Rp9 +aS'model' +p8 +aS'txt' +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/Misc/c_block.js b/js/Misc/c_block.js index 7cfb272a..82443e22 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 ScilabDouble([true,false]); var label = list([[sci2exp(in1)],[sci2exp(out)],[strcat(sci2exp(this.rpar))],[this.funam]],list([])); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"c_block\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"c_block\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,label,this.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 6845a147..ed1b3b80 100644 --- a/js/Misc/c_block.pickle +++ b/js/Misc/c_block.pickle @@ -8,18 +8,22 @@ aS'o' p3 aS'rpar' p4 -aS'lab' +aS'exprs' p5 -aS'graphics' +aS'gr_i' p6 -aS'funam' +aS'lab' p7 -aS'x' +aS'graphics' p8 -aS'model' +aS'funam' p9 -atp10 -Rp11 +aS'x' +p10 +aS'model' +p11 +atp12 +Rp13 .(dp0 S'label[1-1]' p1 diff --git a/js/Misc/fortran_block.js b/js/Misc/fortran_block.js index 494609d6..af2470bc 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 ScilabDouble([true,false]); this.funam = "forty"; var label = list([[sci2exp(this.model.in1)],[sci2exp(this.model.out)],[strcat(sci2exp(this.model.rpar))],[this.funam]],list([])); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"fortran_block\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"fortran_block\",sz(1),sz(2));"]); + this.x = standard_define([4,2],this.model,label,this.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 9de91dea..3c9327de 100644 --- a/js/Misc/fortran_block.pickle +++ b/js/Misc/fortran_block.pickle @@ -8,18 +8,22 @@ aS'o' p3 aS'rpar' p4 -aS'lab' +aS'exprs' p5 -aS'graphics' +aS'gr_i' p6 -aS'funam' +aS'lab' p7 -aS'x' +aS'graphics' p8 -aS'model' +aS'funam' p9 -atp10 -Rp11 +aS'x' +p10 +aS'model' +p11 +atp12 +Rp13 .(dp0 S'label[1-1]' p1 diff --git a/js/Misc/func_block.js b/js/Misc/func_block.js index 2d7c76fc..20190ebe 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 ScilabDouble([true,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } func_block.prototype.details = function func_block() { @@ -23,16 +23,16 @@ function func_block() { func_block.prototype.set = function func_block() { this.model = arg1.model; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.x = arg1; this.model = this.x.model; - var tmpvar0 = genfunc(exprs); + var tmpvar0 = genfunc(this.exprs); var ok = tmpvar0[0]; var mac = tmpvar0[1]; - var exprs = tmpvar0[2]; + this.exprs = tmpvar0[2]; if (ok) { this.model.sim = new ScilabDouble([mac]); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 e2ed9d64..1c7eb85f 100644 --- a/js/Misc/func_block.pickle +++ b/js/Misc/func_block.pickle @@ -6,10 +6,14 @@ S'x' p2 aS'model' p3 -aS'graphics' +aS'gr_i' p4 -atp5 -Rp6 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/Misc/generic_block.js b/js/Misc/generic_block.js index 20e68c23..ecab32f5 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 ScilabDouble([true,false]); var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp(this.model.in1)],[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"]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,label,this.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 a1061530..e0a29524 100644 --- a/js/Misc/generic_block.pickle +++ b/js/Misc/generic_block.pickle @@ -6,38 +6,42 @@ S'ci' p2 aS'co' p3 -aS'i' +aS'dept' p4 -aS'auto0' +aS'i' p5 -aS'o' +aS'auto0' p6 -aS'rpar' +aS'o' p7 -aS'depu' +aS'rpar' p8 -aS'dept' +aS'depu' p9 -aS'xx' +aS'exprs' p10 -aS'funtyp' +aS'xx' p11 -aS'lab' +aS'gr_i' p12 -aS'ipar' +aS'funtyp' p13 -aS'graphics' +aS'lab' p14 -aS'x' +aS'ipar' p15 -aS'model' +aS'graphics' p16 -aS'z' +aS'x' p17 -aS'function_name' +aS'model' p18 -atp19 -Rp20 +aS'z' +p19 +aS'function_name' +p20 +atp21 +Rp22 .(dp0 S'ci' p1 diff --git a/js/Misc/generic_block2.js b/js/Misc/generic_block2.js index 74bd3ca9..71079407 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 ScilabDouble([true,false]); var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp(this.model.in1)],[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"]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block2\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block2\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,label,this.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 3eaae94d..93899811 100644 --- a/js/Misc/generic_block2.pickle +++ b/js/Misc/generic_block2.pickle @@ -4,44 +4,48 @@ p0 ((lp1 S'ci' p2 -aS'co' +aS'nzcr' p3 -aS'i' +aS'co' p4 -aS'auto0' +aS'dept' p5 -aS'o' +aS'i' p6 -aS'rpar' +aS'auto0' p7 -aS'depu' +aS'o' p8 -aS'dept' +aS'rpar' p9 -aS'xx' +aS'depu' p10 -aS'nzcr' +aS'exprs' p11 -aS'funtyp' +aS'xx' p12 -aS'lab' +aS'gr_i' p13 -aS'ipar' +aS'funtyp' p14 -aS'graphics' +aS'lab' p15 -aS'x' +aS'ipar' p16 -aS'model' +aS'graphics' p17 -aS'z' +aS'x' p18 -aS'nmode' +aS'model' p19 -aS'function_name' +aS'z' p20 -atp21 -Rp22 +aS'nmode' +p21 +aS'function_name' +p22 +atp23 +Rp24 .(dp0 S'ci' p1 diff --git a/js/Misc/generic_block3.js b/js/Misc/generic_block3.js index 9d28b43c..92f07aba 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 ScilabDouble([true,false]); var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp([this.model.in1,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"]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block3\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block3\",sz(1),sz(2));"]); + this.x = standard_define([4,2],this.model,label,this.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 2d480e2d..769cacf9 100644 --- a/js/Misc/generic_block3.pickle +++ b/js/Misc/generic_block3.pickle @@ -16,42 +16,46 @@ aS'funtyp' p7 aS'out' p8 -aS'type' +aS'dept' p9 -aS'function_name' +aS'type' p10 -aS'in1' +aS'function_name' p11 -aS'lab' +aS'in1' p12 -aS'graphics' +aS'lab' p13 -aS'nmode' +aS'graphics' p14 -aS'z' +aS'nmode' p15 -aS'xx' +aS'z' p16 -aS'nzcr' +aS'xx' p17 -aS'depu' +aS'nzcr' p18 -aS'dept' +aS'depu' p19 -aS'opar' +aS'exprs' p20 -aS'oz' +aS'gr_i' p21 -aS'ipar' +aS'opar' p22 -aS'x' +aS'oz' p23 -aS'model' +aS'ipar' p24 -aS'ot' +aS'x' p25 -atp26 -Rp27 +aS'model' +p26 +aS'ot' +p27 +atp28 +Rp29 .(dp0 S'model.odstate' p1 diff --git a/js/Misc/scifunc_block.js b/js/Misc/scifunc_block.js index 2676a016..1b119b75 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 ScilabDouble([true,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } scifunc_block.prototype.details = function scifunc_block() { @@ -61,16 +61,16 @@ function scifunc_block() { this.x = arg1; this.model = arg1.model; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; - if (size(exprs[1-1],"*")==8) { - exprs[1-1][9-1] = "0"; + this.exprs = this.graphics.exprs; + if (size(this.exprs[1-1],"*")==8) { + this.exprs[1-1][9-1] = "0"; } while (true) { - [ok,this.i,this.o,this.ci,this.co,this.xx,this.z,this.rpar,this.auto0,this.deptime,this.lab] = scicos_getvalue([["Set scifunc_block parameters"],["only regular blocks supported"]],["input ports sizes","output port sizes","input event ports sizes","output events ports sizes","initial continuous state","initial discrete state","System parameters vector","initial firing vector (<0 for no firing)","is block always active (0:no, 1:yes)"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec","sum(%4)","vec",1),exprs[1-1]); + [ok,this.i,this.o,this.ci,this.co,this.xx,this.z,this.rpar,this.auto0,this.deptime,this.lab] = scicos_getvalue([["Set scifunc_block parameters"],["only regular blocks supported"]],["input ports sizes","output port sizes","input event ports sizes","output events ports sizes","initial continuous state","initial discrete state","System parameters vector","initial firing vector (<0 for no firing)","is block always active (0:no, 1:yes)"],list("vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec","sum(%4)","vec",1),this.exprs[1-1]); if (!ok) { break; } - exprs[1-1] = this.lab; + this.exprs[1-1] = this.lab; this.xx = this.xx.slice(); this.z = this.z.slice(); this.rpar = this.rpar.slice(); @@ -83,7 +83,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(exprs[2-1],this.i,this.o,nci,nco,size(this.xx,1),size(this.z,1),nrp,"c"); + var tmpvar0 = genfunc1(this.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]; @@ -111,8 +111,8 @@ function scifunc_block() { this.model.firing = new ScilabDouble([auto]); this.model.dep_ut = new ScilabDouble([dep_ut]); this.x.model = this.model; - exprs[2-1] = tt; - this.graphics.exprs = new ScilabDouble([exprs]); + this.exprs[2-1] = tt; + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; break; } diff --git a/js/Misc/scifunc_block.pickle b/js/Misc/scifunc_block.pickle index 8544551d..62d40dcc 100644 --- a/js/Misc/scifunc_block.pickle +++ b/js/Misc/scifunc_block.pickle @@ -16,20 +16,24 @@ aS'o' p7 aS'rpar' p8 -aS'xx' +aS'exprs' p9 -aS'lab' +aS'xx' p10 -aS'graphics' +aS'gr_i' p11 -aS'x' +aS'lab' p12 -aS'model' +aS'graphics' p13 -aS'z' +aS'x' p14 -atp15 -Rp16 +aS'model' +p15 +aS'z' +p16 +atp17 +Rp18 .(dp0 S'exprs[1-1]' p1 diff --git a/js/Misc/scifunc_block_m.js b/js/Misc/scifunc_block_m.js index b4a8cb3b..b895df36 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 ScilabDouble([true,false]); - 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 = standard_define([4,2],this.model,exprs,gr_i); + 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 = standard_define([4,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } scifunc_block_m.prototype.details = function scifunc_block_m() { @@ -66,13 +66,13 @@ function scifunc_block_m() { this.x = arg1; this.model = arg1.model; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; while (true) { - [ok,this.i,this.o,this.ci,this.co,this.xx,this.z,this.rpar,this.auto0,this.deptime,this.lab] = scicos_getvalue([["Set scifunc_block parameters"],["only regular blocks supported"]],["input ports sizes","output port sizes","input event ports sizes","output events ports sizes","initial continuous state","initial discrete state","System parameters vector","initial firing vector (<0 for no firing)","is block always active (0:no, 1:yes)"],list("mat",[-1,2],"mat",[-2,2],"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",1),exprs[1-1]); + [ok,this.i,this.o,this.ci,this.co,this.xx,this.z,this.rpar,this.auto0,this.deptime,this.lab] = scicos_getvalue([["Set scifunc_block parameters"],["only regular blocks supported"]],["input ports sizes","output port sizes","input event ports sizes","output events ports sizes","initial continuous state","initial discrete state","System parameters vector","initial firing vector (<0 for no firing)","is block always active (0:no, 1:yes)"],list("mat",[-1,2],"mat",[-2,2],"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",1),this.exprs[1-1]); if (!ok) { break; } - exprs[1-1] = this.lab; + this.exprs[1-1] = this.lab; this.xx = this.xx.slice(); this.z = this.z.slice(); this.rpar = this.rpar.slice(); @@ -85,7 +85,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(exprs[2-1],this.i,this.o,nci,nco,size(this.xx,1),size(this.z,1),nrp,"c"); + var tmpvar0 = genfunc2(this.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]; @@ -113,8 +113,8 @@ function scifunc_block_m() { this.model.firing = new ScilabDouble([auto]); this.model.dep_ut = new ScilabDouble([dep_ut]); this.x.model = this.model; - exprs[2-1] = tt; - this.graphics.exprs = new ScilabDouble([exprs]); + this.exprs[2-1] = tt; + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; break; } diff --git a/js/Misc/scifunc_block_m.pickle b/js/Misc/scifunc_block_m.pickle index bd1bc27d..626c343d 100644 --- a/js/Misc/scifunc_block_m.pickle +++ b/js/Misc/scifunc_block_m.pickle @@ -16,20 +16,24 @@ aS'o' p7 aS'rpar' p8 -aS'xx' +aS'exprs' p9 -aS'lab' +aS'xx' p10 -aS'graphics' +aS'gr_i' p11 -aS'x' +aS'lab' p12 -aS'model' +aS'graphics' p13 -aS'z' +aS'x' p14 -atp15 -Rp16 +aS'model' +p15 +aS'z' +p16 +atp17 +Rp18 .(dp0 S'exprs[1-1]' p1 diff --git a/js/NonLinear/ABSBLK_f.js b/js/NonLinear/ABSBLK_f.js index d46d66b6..fe09aa27 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 ScilabDouble([true,false]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ABSBLK_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ABSBLK_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,[],this.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 a573ca29..0b2f3527 100644 --- a/js/NonLinear/ABSBLK_f.pickle +++ b/js/NonLinear/ABSBLK_f.pickle @@ -6,8 +6,14 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'gr_i' +p4 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/NonLinear/ABS_VALUE.js b/js/NonLinear/ABS_VALUE.js index 3b72f272..ecb60264 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 ScilabDouble([true,false]); - var exprs = [string([1])]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ABS_VALUE\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = [string([1])]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ABS_VALUE\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } ABS_VALUE.prototype.details = function ABS_VALUE() { @@ -26,16 +26,17 @@ function ABS_VALUE() { } ABS_VALUE.prototype.set = function ABS_VALUE() { this.zcr = arguments[0]["zcr"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.zcr,exprs] = scicos_getvalue("Set block parameters",["use zero_crossing (1: yes) (0:no)"],list("vec",1),exprs); + [ok,this.zcr,this.exprs] = scicos_getvalue("Set block parameters",["use zero_crossing (1: yes) (0:no)"],list("vec",1),this.exprs); if (!ok) { break; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 9c94a754..c72016a5 100644 --- a/js/NonLinear/ABS_VALUE.pickle +++ b/js/NonLinear/ABS_VALUE.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'exprs' p2 -aS'model' +aS'gr_i' p3 aS'zcr' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'model.sim' p1 diff --git a/js/NonLinear/COSBLK_f.js b/js/NonLinear/COSBLK_f.js index 05c80a02..ced1c488 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 ScilabDouble([true,false]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"COSBLK_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"COSBLK_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,[],this.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 84c2e7e0..32033c36 100644 --- a/js/NonLinear/COSBLK_f.pickle +++ b/js/NonLinear/COSBLK_f.pickle @@ -6,8 +6,14 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'gr_i' +p4 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/NonLinear/DLRADAPT_f.js b/js/NonLinear/DLRADAPT_f.js index 4e27387d..d8ed79dc 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 ScilabDouble([true,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } DLRADAPT_f.prototype.details = function DLRADAPT_f() { @@ -44,12 +44,13 @@ function DLRADAPT_f() { this.g = inverse(arguments[0]["g"]) this.last_u = inverse(arguments[0]["last_u"]) this.last_y = inverse(arguments[0]["last_y"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.p,this.rn,this.rd,this.g,this.last_u,this.last_y,exprs] = scicos_getvalue("Set block parameters",["Vector of p mesh points","Numerator roots (one line for each mesh)","Denominator roots (one line for each mesh)","Vector of gain at mesh points","past inputs (Num degree values)","past outputs (Den degree values)"],list("vec",-1,"mat",[-1,-1],"mat",["size(%1,\'*\')","-1"],"vec","size(%1,\'*\')","vec","size(%2,2)","vec","size(%3,2)"),exprs); + [ok,this.p,this.rn,this.rd,this.g,this.last_u,this.last_y,this.exprs] = scicos_getvalue("Set block parameters",["Vector of p mesh points","Numerator roots (one line for each mesh)","Denominator roots (one line for each mesh)","Vector of gain at mesh points","past inputs (Num degree values)","past outputs (Den degree values)"],list("vec",-1,"mat",[-1,-1],"mat",["size(%1,\'*\')","-1"],"vec","size(%1,\'*\')","vec","size(%2,2)","vec","size(%3,2)"),this.exprs); if (!ok) { break; } @@ -67,7 +68,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 b513715b..8e6f3e4d 100644 --- a/js/NonLinear/DLRADAPT_f.pickle +++ b/js/NonLinear/DLRADAPT_f.pickle @@ -6,22 +6,26 @@ S'last_y' p2 aS'g' p3 -aS'last_u' +aS'p' p4 -aS'rd' +aS'last_u' p5 -aS'p' +aS'rd' p6 -aS'graphics' +aS'exprs' p7 -aS'x' +aS'gr_i' p8 -aS'model' +aS'graphics' p9 -aS'rn' +aS'x' p10 -atp11 -Rp12 +aS'model' +p11 +aS'rn' +p12 +atp13 +Rp14 .(dp0 S'model.dstate' p1 diff --git a/js/NonLinear/EXPBLK_f.js b/js/NonLinear/EXPBLK_f.js index db3fdc0f..fb9cc031 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 ScilabDouble([true,false]); - var exprs = ["%e"]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXPBLK_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = ["%e"]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXPBLK_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } EXPBLK_f.prototype.details = function EXPBLK_f() { @@ -25,22 +25,23 @@ function EXPBLK_f() { } EXPBLK_f.prototype.set = function EXPBLK_f() { this.a = parseFloat(arguments[0]["a"]) + this.exprs = parseFloat(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - if (size(exprs,"*")==2) { - var exprs = exprs[2-1]; + if (size(this.exprs,"*")==2) { + this.exprs = this.exprs[2-1]; } while (true) { - [ok,this.a,exprs] = scicos_getvalue("Set a^u block parameters","a (>0)",list("vec",1),exprs); + [ok,this.a,this.exprs] = scicos_getvalue("Set a^u block parameters","a (>0)",list("vec",1),this.exprs); if (!ok) { break; } if (or(this.a<=0)) { message("a^u : a must be positive"); } else { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 38028473..c74f3125 100644 --- a/js/NonLinear/EXPBLK_f.pickle +++ b/js/NonLinear/EXPBLK_f.pickle @@ -4,14 +4,18 @@ p0 ((lp1 S'a' p2 -aS'x' +aS'exprs' p3 -aS'model' +aS'gr_i' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'a' p1 diff --git a/js/NonLinear/EXPBLK_m.js b/js/NonLinear/EXPBLK_m.js index a974ab01..7b19a711 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 ScilabDouble([true,false]); - var exprs = ["%e"]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXPBLK_m\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = ["%e"]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXPBLK_m\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } EXPBLK_m.prototype.details = function EXPBLK_m() { @@ -29,22 +29,23 @@ function EXPBLK_m() { } EXPBLK_m.prototype.set = function EXPBLK_m() { this.a = parseFloat(arguments[0]["a"]) + this.exprs = parseFloat(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - if (size(exprs,"*")==2) { - var exprs = exprs[2-1]; + if (size(this.exprs,"*")==2) { + this.exprs = this.exprs[2-1]; } while (true) { - [ok,this.a,exprs] = scicos_getvalue("Set a^u block parameters","a (>0)",list("vec",1),exprs); + [ok,this.a,this.exprs] = scicos_getvalue("Set a^u block parameters","a (>0)",list("vec",1),this.exprs); if (!ok) { break; } if (or(this.a<=0)) { message("a^u : a must be positive"); } else { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 64a42830..ce1d5ea1 100644 --- a/js/NonLinear/EXPBLK_m.pickle +++ b/js/NonLinear/EXPBLK_m.pickle @@ -4,14 +4,18 @@ p0 ((lp1 S'a' p2 -aS'x' +aS'exprs' p3 -aS'model' +aS'gr_i' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/NonLinear/FSV_f.js b/js/NonLinear/FSV_f.js index 3f636cad..e6b3904e 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 ScilabDouble([true,false]); - var exprs = " "; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FSV_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = " "; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FSV_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.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 1f2f5137..a647fcc2 100644 --- a/js/NonLinear/FSV_f.pickle +++ b/js/NonLinear/FSV_f.pickle @@ -6,8 +6,14 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'gr_i' +p4 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/NonLinear/INTRP2BLK_f.js b/js/NonLinear/INTRP2BLK_f.js index 44c9ee59..655d7ca9 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 ScilabDouble([true,false]); - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } INTRP2BLK_f.prototype.details = function INTRP2BLK_f() { @@ -32,12 +32,13 @@ function INTRP2BLK_f() { this.a = inverse(arguments[0]["a"]) this.b = inverse(arguments[0]["b"]) this.c = inverse(arguments[0]["c"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.a,this.b,this.c,exprs] = scicos_getvalue("Set Interpolation block parameters",["X coord.","Y coord.","Z values"],list("vec",-1,"vec",-1,"mat",[-1,-1]),exprs); + [ok,this.a,this.b,this.c,this.exprs] = scicos_getvalue("Set Interpolation block parameters",["X coord.","Y coord.","Z values"],list("vec",-1,"vec",-1,"mat",[-1,-1]),this.exprs); if (!ok) { break; } @@ -47,7 +48,7 @@ function INTRP2BLK_f() { message("X and Y must be strictly increasing"); } else { if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 1faaf822..7ae82279 100644 --- a/js/NonLinear/INTRP2BLK_f.pickle +++ b/js/NonLinear/INTRP2BLK_f.pickle @@ -8,14 +8,18 @@ aS'c' p3 aS'b' p4 -aS'graphics' +aS'exprs' p5 -aS'x' +aS'gr_i' p6 -aS'model' +aS'graphics' p7 -atp8 -Rp9 +aS'x' +p8 +aS'model' +p9 +atp10 +Rp11 .(dp0 S'a' p1 diff --git a/js/NonLinear/INTRPLBLK_f.js b/js/NonLinear/INTRPLBLK_f.js index bff54205..3a9a9aff 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 ScilabDouble([true,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } INTRPLBLK_f.prototype.details = function INTRPLBLK_f() { @@ -28,12 +28,13 @@ function INTRPLBLK_f() { INTRPLBLK_f.prototype.set = function INTRPLBLK_f() { this.a = inverse(arguments[0]["a"]) this.b = inverse(arguments[0]["b"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.a,this.b,exprs] = scicos_getvalue("Set Interpolation block parameters",["X coord.","Y coord."],list("vec",-1,"vec",-1),exprs); + [ok,this.a,this.b,this.exprs] = scicos_getvalue("Set Interpolation block parameters",["X coord.","Y coord."],list("vec",-1,"vec",-1),this.exprs); if (!ok) { break; } @@ -43,7 +44,7 @@ function INTRPLBLK_f() { message("X must be strictly increasing"); } else { if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 d26f9032..5d54b94c 100644 --- a/js/NonLinear/INTRPLBLK_f.pickle +++ b/js/NonLinear/INTRPLBLK_f.pickle @@ -4,16 +4,20 @@ p0 ((lp1 S'a' p2 -aS'x' +aS'b' p3 -aS'model' +aS'exprs' p4 -aS'b' +aS'gr_i' p5 aS'graphics' p6 -atp7 -Rp8 +aS'x' +p7 +aS'model' +p8 +atp9 +Rp10 .(dp0 S'a' p1 diff --git a/js/NonLinear/INVBLK.js b/js/NonLinear/INVBLK.js index 77748cae..002fe2a4 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 ScilabDouble([true,false]); - var exprs = " "; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INVBLK\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = " "; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INVBLK\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.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 1f2f5137..a647fcc2 100644 --- a/js/NonLinear/INVBLK.pickle +++ b/js/NonLinear/INVBLK.pickle @@ -6,8 +6,14 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'gr_i' +p4 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/NonLinear/INVBLK_f.js b/js/NonLinear/INVBLK_f.js index 029a9191..ffd7a4a4 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 ScilabDouble([true,false]); - var exprs = " "; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INVBLK_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = " "; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INVBLK_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.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 465556a6..b5941377 100644 --- a/js/NonLinear/INVBLK_f.pickle +++ b/js/NonLinear/INVBLK_f.pickle @@ -6,8 +6,14 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'gr_i' +p4 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/NonLinear/LOGBLK_f.js b/js/NonLinear/LOGBLK_f.js index cfaf50af..e4f7dc45 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 ScilabDouble([true,false]); - var exprs = "%e"; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOGBLK_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = "%e"; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOGBLK_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } LOGBLK_f.prototype.details = function LOGBLK_f() { @@ -25,15 +25,16 @@ function LOGBLK_f() { } LOGBLK_f.prototype.set = function LOGBLK_f() { this.a = parseFloat(arguments[0]["a"]) + this.exprs = parseFloat(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - if (size(exprs,"*")==2) { - var exprs = exprs[2-1]; + if (size(this.exprs,"*")==2) { + this.exprs = this.exprs[2-1]; } while (true) { - [ok,this.a,exprs] = scicos_getvalue("Set log block parameters","Basis (>1)",list("vec",1),exprs); + [ok,this.a,this.exprs] = scicos_getvalue("Set log block parameters","Basis (>1)",list("vec",1),this.exprs); if (!ok) { break; } @@ -41,7 +42,7 @@ function LOGBLK_f() { message("Basis must be larger than 1"); } else { if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 f07254d3..61ad1ed0 100644 --- a/js/NonLinear/LOGBLK_f.pickle +++ b/js/NonLinear/LOGBLK_f.pickle @@ -4,14 +4,18 @@ p0 ((lp1 S'a' p2 -aS'x' +aS'exprs' p3 -aS'model' +aS'gr_i' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'a' p1 diff --git a/js/NonLinear/LOOKUP2D.js b/js/NonLinear/LOOKUP2D.js index 978b14ad..1495a39e 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 ScilabDouble([true,false]); - 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 = standard_define([2.5,2],this.model,exprs,gr_i); + 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 = standard_define([2.5,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } LOOKUP2D.prototype.details = function LOOKUP2D() { @@ -40,15 +40,16 @@ function LOOKUP2D() { this.zz = inverse(arguments[0]["zz"]) this.Method = parseFloat(arguments[0]["Method"]) this.graf = arguments[0]["graf"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.model = arg1.model; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; var ok = false; var SaveExit = false; while (true) { var Ask_again = false; - [ok,this.xx,this.yy,this.zz,this.Method,this.graf,exprs] = scicos_getvalue("2D Lookup table parameters",["Row index input values","Column index input values","Table data","Lookup method(1..5)","Launch graphic window(y/n)?"],list("vec",-1,"vec",-1,"mat",[-1,-1],"vec",1,"str",1),exprs); + [ok,this.xx,this.yy,this.zz,this.Method,this.graf,this.exprs] = scicos_getvalue("2D Lookup table parameters",["Row index input values","Column index input values","Table data","Lookup method(1..5)","Launch graphic window(y/n)?"],list("vec",-1,"vec",-1,"mat",[-1,-1],"vec",1,"str",1),this.exprs); if (!ok) { break; } @@ -62,8 +63,8 @@ function LOOKUP2D() { if (this.graf!="y"&&this.graf!="Y") { this.graf = "n"; } - exprs[5-1] = "n"; - exprs[4-1] = sci2exp(mtd); + this.exprs[5-1] = "n"; + this.exprs[4-1] = sci2exp(mtd); var METHOD = getmethod(mtd); if (!Ask_again) { this.xx = this.xx.slice(); @@ -111,7 +112,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 d4217e44..0ee74d21 100644 --- a/js/NonLinear/LOOKUP2D.pickle +++ b/js/NonLinear/LOOKUP2D.pickle @@ -6,22 +6,26 @@ S'order' p2 aS'yy' p3 -aS'xx' +aS'exprs' p4 -aS'zz' +aS'xx' p5 -aS'graphics' +aS'gr_i' p6 -aS'x' +aS'zz' p7 -aS'model' +aS'graphics' p8 -aS'Method' +aS'x' p9 -aS'graf' +aS'model' p10 -atp11 -Rp12 +aS'Method' +p11 +aS'graf' +p12 +atp13 +Rp14 .(dp0 S'exprs[4-1]' p1 diff --git a/js/NonLinear/LOOKUP_c.js b/js/NonLinear/LOOKUP_c.js index 6dd7284d..5a351f6d 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]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } LOOKUP_c.prototype.details = function LOOKUP_c() { @@ -45,15 +45,16 @@ function LOOKUP_c() { this.yy = inverse(arguments[0]["yy"]) this.extrapo = parseFloat(arguments[0]["extrapo"]) this.graf = arguments[0]["graf"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.model = arg1.model; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; var ok = false; var SaveExit = false; while (true) { var Ask_again = false; - [ok,this.Method,this.xx,this.yy,this.extrapo,this.graf,exprs] = scicos_getvalue("Lookup table parameters",["Spline Interpolation method (0..9)","x","y","Extrapolate method (0,1)","Launch graphic window(y/n)?"],list("vec",1,"vec",-1,"vec",-1,"vec",1,"str",1),exprs); + [ok,this.Method,this.xx,this.yy,this.extrapo,this.graf,this.exprs] = scicos_getvalue("Lookup table parameters",["Spline Interpolation method (0..9)","x","y","Extrapolate method (0,1)","Launch graphic window(y/n)?"],list("vec",1,"vec",-1,"vec",-1,"vec",1,"str",1),this.exprs); if (!ok) { break; } @@ -97,7 +98,7 @@ function LOOKUP_c() { var tmpvar2 = cleandata(this.xy); this.xy = tmpvar2[0]; var N = size(this.xy,"r"); - exprs[5-1] = "n"; + this.exprs[5-1] = "n"; if (this.graf=="y"||this.graf=="Y") { var ipar = [[N],[mtd],[PO],[this.extrapo]]; var rpar = []; @@ -130,11 +131,11 @@ function LOOKUP_c() { var DChange = true; } if (DChange) { - exprs[2-1] = strcat(sci2exp(xy2.slice()[1-1])); - exprs[3-1] = strcat(sci2exp(xy2.slice()[2-1])); + this.exprs[2-1] = strcat(sci2exp(xy2.slice()[1-1])); + this.exprs[3-1] = strcat(sci2exp(xy2.slice()[2-1])); } - exprs[1-1] = sci2exp(New_methhod); - exprs[4-1] = sci2exp(oipar[4-1]); + this.exprs[1-1] = sci2exp(New_methhod); + this.exprs[4-1] = sci2exp(oipar[4-1]); if (oipar[3-1]==1) { var perop = "y"; } else { @@ -156,7 +157,7 @@ function LOOKUP_c() { var orpar = [[this.xy.slice()[1-1]],[this.xy.slice()[2-1]]]; } } - exprs[1-1] = sci2exp(mtd); + this.exprs[1-1] = sci2exp(mtd); var oipar = [[N],[mtd],[PO],[this.extrapo]]; var SaveExit = true; } @@ -170,7 +171,7 @@ function LOOKUP_c() { } this.model.rpar = new ScilabDouble(orpar); this.model.ipar = new ScilabDouble(oipar); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 8ec3e322..b190057a 100644 --- a/js/NonLinear/LOOKUP_c.pickle +++ b/js/NonLinear/LOOKUP_c.pickle @@ -10,7 +10,7 @@ aS'inrpar' p4 aS'extrapo' p5 -aS'graphics' +aS'wp' p6 aS'Pd3' p7 @@ -46,106 +46,110 @@ aS'xt' p22 aS'sample5' p23 -aS'Pulse_exprs2' +aS'sTp2' p24 -aS'Cx' +aS'Pulse_exprs2' p25 -aS'filen' +aS'Cx' p26 -aS'xa' +aS'filen' p27 -aS'random_u_exprs2' +aS'sample4' p28 -aS'sAmp2' +aS'xa' p29 -aS'zok' +aS'random_u_exprs2' p30 -aS'offset' +aS'sAmp2' p31 -aS'yt' +aS'zok' p32 -aS'sdelay' +aS'offset' p33 -aS'ixy' +aS'yt' p34 -aS'seed4' +aS'sdelay' p35 -aS'seed5' +aS'ixy' p36 -aS'Sawt2_exprs2' +aS'seed4' p37 -aS'Amp' +aS'seed5' p38 -aS'sok' +aS'Sawt2_exprs2' p39 -aS'var4' +aS'Amp' p40 -aS'ymx1' +aS'sok' p41 -aS'Cformat' +aS'var4' p42 -aS'ya' +aS'ymx1' p43 -aS'Bias3' +aS'Cformat' p44 -aS'xls_open' +aS'ya' p45 -aS'myans' +aS'Bias3' p46 -aS'xmx1' +aS'xls_open' p47 -aS'inipar' +aS'myans' p48 -aS'xls_read' +aS'xmx1' p49 -aS'sTp' +aS'inipar' p50 -aS'Sin_exprs2' +aS'xls_read' p51 -aS'argn' +aS'sTp' p52 -aS'wp' +aS'Sin_exprs2' p53 -aS'phase' +aS'argn' p54 -aS'iipar' +aS'graphics' p55 -aS'min5' +aS'phase' p56 -aS'mok' +aS'iipar' p57 -aS'Pw3' +aS'min5' p58 -aS'sheetN' +aS'mok' p59 -aS'xgetmouse' +aS'Pw3' p60 -aS'max5' +aS'sheetN' p61 -aS'rparin' +aS'xgetmouse' p62 -aS'sample4' +aS'max5' p63 -aS'Cy' +aS'rparin' p64 -aS'sTp2' +aS'exprs' p65 -aS'yy' +aS'Cy' p66 -aS'x' +aS'gr_i' p67 -aS'model' +aS'yy' p68 -aS'ORDER2' +aS'x' p69 -aS'irpar' +aS'model' p70 -aS'graf' +aS'ORDER2' p71 -aS'xye' +aS'irpar' p72 -atp73 -Rp74 +aS'graf' +p73 +aS'xye' +p74 +atp75 +Rp76 .(dp0 S'mean4' p1 diff --git a/js/NonLinear/LOOKUP_f.js b/js/NonLinear/LOOKUP_f.js index dc93f4a8..986ab6d5 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 ScilabDouble([true,false]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOOKUP_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOOKUP_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,[],this.gr_i); return new BasicBlock(this.x); } LOOKUP_f.prototype.details = function LOOKUP_f() { @@ -23,7 +23,7 @@ function LOOKUP_f() { LOOKUP_f.prototype.set = function LOOKUP_f() { this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; var rpar = this.model.rpar; var n = size(rpar,"*")/2; diff --git a/js/NonLinear/LOOKUP_f.pickle b/js/NonLinear/LOOKUP_f.pickle index bc3d2e3b..6d86ebed 100644 --- a/js/NonLinear/LOOKUP_f.pickle +++ b/js/NonLinear/LOOKUP_f.pickle @@ -6,10 +6,14 @@ S'x' p2 aS'model' p3 -aS'graphics' +aS'gr_i' p4 -atp5 -Rp6 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/NonLinear/MAXMIN.js b/js/NonLinear/MAXMIN.js index 925000a4..9401773e 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 ScilabDouble([true,false]); this.model.ipar = new ScilabDouble([0]); - var exprs = [string(transpose([2,1,1]))]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MAXMIN\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = [string(transpose([2,1,1]))]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MAXMIN\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); this.x.graphics.style = "MAXMIN;displayedLabel=MAX"; return new BasicBlock(this.x); } @@ -29,12 +29,13 @@ function MAXMIN() { this.mm = parseFloat(arguments[0]["mm"]) this.nin = arguments[0]["nin"] this.zcr = parseFloat(arguments[0]["zcr"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.mm,this.nin,this.zcr,exprs] = scicos_getvalue("Set Max/Min block parameters",["Min (1) or Max (2) ","Number of input vectors (1 or 2)","zero-crossing (1: yes, 0;no)"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.mm,this.nin,this.zcr,this.exprs] = scicos_getvalue("Set Max/Min block parameters",["Min (1) or Max (2) ","Number of input vectors (1 or 2)","zero-crossing (1: yes, 0;no)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -75,7 +76,7 @@ function MAXMIN() { var label = "MAX"; } this.graphics.style = new ScilabString(["MAXMIN;displayedLabel="+label]); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 80bf6393..bc411026 100644 --- a/js/NonLinear/MAXMIN.pickle +++ b/js/NonLinear/MAXMIN.pickle @@ -6,16 +6,20 @@ S'nin' p2 aS'mm' p3 -aS'zcr' +aS'exprs' p4 -aS'graphics' +aS'gr_i' p5 -aS'x' +aS'zcr' p6 -aS'model' +aS'graphics' p7 -atp8 -Rp9 +aS'x' +p8 +aS'model' +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/NonLinear/MAX_f.js b/js/NonLinear/MAX_f.js index 8b2696db..7184504d 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 ScilabDouble([true,false]); - var exprs = " "; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MAX_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = " "; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MAX_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.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 c5fee5b1..6107ebd6 100644 --- a/js/NonLinear/MAX_f.pickle +++ b/js/NonLinear/MAX_f.pickle @@ -6,8 +6,14 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'gr_i' +p4 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/NonLinear/MIN_f.js b/js/NonLinear/MIN_f.js index 43bdfa9f..4656728b 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 ScilabDouble([true,false]); - var exprs = sci2exp(in1); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MIN_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = sci2exp(in1); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MIN_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.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 c5fee5b1..6107ebd6 100644 --- a/js/NonLinear/MIN_f.pickle +++ b/js/NonLinear/MIN_f.pickle @@ -6,8 +6,14 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'gr_i' +p4 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/NonLinear/POWBLK_f.js b/js/NonLinear/POWBLK_f.js index aa76d51a..fa90ed98 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 ScilabDouble([true,false]); - var exprs = string(this.a); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"POWBLK_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = string(this.a); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"POWBLK_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } POWBLK_f.prototype.details = function POWBLK_f() { @@ -25,19 +25,20 @@ function POWBLK_f() { } POWBLK_f.prototype.set = function POWBLK_f() { this.a = parseFloat(arguments[0]["a"]) + this.exprs = parseFloat(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - if (size(exprs,"*")==2) { - var exprs = exprs[2-1]; + if (size(this.exprs,"*")==2) { + this.exprs = this.exprs[2-1]; } while (true) { - [ok,this.a,exprs] = scicos_getvalue("Set u^a block parameters","to the power of",list("vec",1),exprs); + [ok,this.a,this.exprs] = scicos_getvalue("Set u^a block parameters","to the power of",list("vec",1),this.exprs); if (!ok) { break; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 07b394df..0fc9dbc5 100644 --- a/js/NonLinear/POWBLK_f.pickle +++ b/js/NonLinear/POWBLK_f.pickle @@ -4,14 +4,18 @@ p0 ((lp1 S'a' p2 -aS'x' +aS'exprs' p3 -aS'model' +aS'gr_i' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'a' p1 diff --git a/js/NonLinear/PRODUCT.js b/js/NonLinear/PRODUCT.js index 238557d3..c9d3706e 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 ScilabDouble([true,false]); - var exprs = sci2exp(this.sgn); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PRODUCT\",sz(1),sz(2));"]); - this.x = standard_define([2,3],this.model,exprs,gr_i); + this.exprs = sci2exp(this.sgn); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PRODUCT\",sz(1),sz(2));"]); + this.x = standard_define([2,3],this.model,this.exprs,this.gr_i); return new Product(this.x); } PRODUCT.prototype.details = function PRODUCT() { @@ -24,12 +24,13 @@ function PRODUCT() { } PRODUCT.prototype.set = function PRODUCT() { this.sgn = inverse(arguments[0]["sgn"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; while (true) { - [ok,this.sgn,exprs] = scicos_getvalue([[" Set multiplication block parameters"],["(multiplication is set with + 1, division with -1)"],[""]],"Number of inputs or sign vector",list("vec",-1),exprs); + [ok,this.sgn,this.exprs] = scicos_getvalue([[" Set multiplication block parameters"],["(multiplication is set with + 1, division with -1)"],[""]],"Number of inputs or sign vector",list("vec",-1),this.exprs); if (!ok) { break; } @@ -64,7 +65,7 @@ function PRODUCT() { } if (ok) { this.model.ipar = new ScilabDouble([this.sgn]); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 b56abb21..e6c6e3e4 100644 --- a/js/NonLinear/PRODUCT.pickle +++ b/js/NonLinear/PRODUCT.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'graphics' p2 -aS'model' +aS'exprs' p3 -aS'sgn' +aS'gr_i' p4 -aS'graphics' +aS'sgn' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'model.sim' p1 diff --git a/js/NonLinear/PROD_f.pickle b/js/NonLinear/PROD_f.pickle index d522d32f..1a26bbb9 100644 --- a/js/NonLinear/PROD_f.pickle +++ b/js/NonLinear/PROD_f.pickle @@ -6,8 +6,14 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'gr_i' +p4 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/NonLinear/QUANT_f.js b/js/NonLinear/QUANT_f.js index 4772a8b7..e893d104 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 ScilabDouble([true,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } QUANT_f.prototype.details = function QUANT_f() { @@ -29,12 +29,13 @@ function QUANT_f() { QUANT_f.prototype.set = function QUANT_f() { this.pas = parseFloat(arguments[0]["pas"]) this.meth = parseFloat(arguments[0]["meth"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.pas,this.meth,exprs] = scicos_getvalue("Set parameters",["Step","Quantization Type (1-4)"],list("vec",1,"vec",1),exprs); + [ok,this.pas,this.meth,this.exprs] = scicos_getvalue("Set parameters",["Step","Quantization Type (1-4)"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -54,7 +55,7 @@ function QUANT_f() { case 4: this.model.sim = new ScilabString(["qzcel"]); } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 9cbf36b1..e5bb9a9e 100644 --- a/js/NonLinear/QUANT_f.pickle +++ b/js/NonLinear/QUANT_f.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'pas' p2 -aS'model' +aS'exprs' p3 -aS'pas' +aS'gr_i' p4 -aS'meth' -p5 aS'graphics' +p5 +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +aS'meth' +p8 +atp9 +Rp10 .(dp0 S'model.sim' p1 diff --git a/js/NonLinear/SATURATION.js b/js/NonLinear/SATURATION.js index 67ecd358..75a5713c 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 ScilabDouble([true,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } SATURATION.prototype.details = function SATURATION() { @@ -33,12 +33,13 @@ function SATURATION() { this.maxp = parseFloat(arguments[0]["maxp"]) this.minp = parseFloat(arguments[0]["minp"]) this.zeroc = arguments[0]["zeroc"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.maxp,this.minp,this.zeroc,exprs] = scicos_getvalue("Set Saturation parameters",["Upper limit","Lower limit","zero crossing (0:no, 1:yes)"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.maxp,this.minp,this.zeroc,this.exprs] = scicos_getvalue("Set Saturation parameters",["Upper limit","Lower limit","zero crossing (0:no, 1:yes)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -54,7 +55,7 @@ function SATURATION() { this.model.nzcross = new ScilabDouble([0]); this.model.nmode = new ScilabDouble([0]); } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 19b594d5..5bc0ae5c 100644 --- a/js/NonLinear/SATURATION.pickle +++ b/js/NonLinear/SATURATION.pickle @@ -6,16 +6,20 @@ S'zeroc' p2 aS'maxp' p3 -aS'graphics' +aS'exprs' p4 -aS'minp' +aS'gr_i' p5 -aS'x' +aS'graphics' p6 -aS'model' +aS'minp' p7 -atp8 -Rp9 +aS'x' +p8 +aS'model' +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/NonLinear/SAT_f.js b/js/NonLinear/SAT_f.js index 30ea8cd8..9fc71471 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 ScilabDouble([true,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } SAT_f.prototype.details = function SAT_f() { @@ -33,12 +33,13 @@ function SAT_f() { this.minp = parseFloat(arguments[0]["minp"]) this.maxp = parseFloat(arguments[0]["maxp"]) this.pente = arguments[0]["pente"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.minp,this.maxp,this.pente,exprs] = scicos_getvalue("Set Saturation parameters",["Min","Max","Slope"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.minp,this.maxp,this.pente,this.exprs] = scicos_getvalue("Set Saturation parameters",["Min","Max","Slope"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -50,7 +51,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 f573fc63..10e2a264 100644 --- a/js/NonLinear/SAT_f.pickle +++ b/js/NonLinear/SAT_f.pickle @@ -4,18 +4,22 @@ p0 ((lp1 S'maxp' p2 -aS'pente' +aS'exprs' p3 -aS'graphics' +aS'gr_i' p4 -aS'minp' +aS'pente' p5 -aS'x' +aS'graphics' p6 -aS'model' +aS'minp' p7 -atp8 -Rp9 +aS'x' +p8 +aS'model' +p9 +atp10 +Rp11 .(dp0 S'slope' p1 diff --git a/js/NonLinear/SIGNUM.js b/js/NonLinear/SIGNUM.js index 39de5c1b..b6b26b91 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 ScilabDouble([true,false]); - var exprs = [string([1])]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SIGNUM\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = [string([1])]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SIGNUM\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } SIGNUM.prototype.details = function SIGNUM() { @@ -26,16 +26,17 @@ function SIGNUM() { } SIGNUM.prototype.set = function SIGNUM() { this.zcr = arguments[0]["zcr"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.zcr,exprs] = scicos_getvalue("Set block parameters",["use zero_crossing (1: yes) (0:no)"],list("vec",1),exprs); + [ok,this.zcr,this.exprs] = scicos_getvalue("Set block parameters",["use zero_crossing (1: yes) (0:no)"],list("vec",1),this.exprs); if (!ok) { break; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 9c94a754..c72016a5 100644 --- a/js/NonLinear/SIGNUM.pickle +++ b/js/NonLinear/SIGNUM.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'exprs' p2 -aS'model' +aS'gr_i' p3 aS'zcr' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'model.sim' p1 diff --git a/js/NonLinear/SINBLK_f.js b/js/NonLinear/SINBLK_f.js index 44b797f8..523f8bc0 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 ScilabDouble([true,false]); - var exprs = " "; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SINBLK_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = " "; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SINBLK_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.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 a48dbb00..d782f7c8 100644 --- a/js/NonLinear/SINBLK_f.pickle +++ b/js/NonLinear/SINBLK_f.pickle @@ -6,8 +6,14 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'gr_i' +p4 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/NonLinear/TANBLK_f.js b/js/NonLinear/TANBLK_f.js index 7b52966d..a1976325 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 ScilabDouble([true,false]); - var exprs = sci2exp(in1); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TANBLK_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = sci2exp(in1); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TANBLK_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.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 ae1d7e81..e86bebae 100644 --- a/js/NonLinear/TANBLK_f.pickle +++ b/js/NonLinear/TANBLK_f.pickle @@ -6,8 +6,14 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'gr_i' +p4 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/NonLinear/TrigFun.js b/js/NonLinear/TrigFun.js index 4787574e..29e03a50 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 ScilabDouble([true,false]); - var exprs = "sin"; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TrigFun\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,exprs,gr_i); + this.exprs = "sin"; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TrigFun\",sz(1),sz(2));"]); + this.x = standard_define([4,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } TrigFun.prototype.details = function TrigFun() { @@ -22,21 +22,22 @@ function TrigFun() { } TrigFun.prototype.set = function TrigFun() { this.fun = arguments[0]["fun"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; 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) { - [ok,this.fun,exprs] = scicos_getvalue(PREVAR_GG,"Function",list("str",1),exprs); + [ok,this.fun,this.exprs] = scicos_getvalue(PREVAR_GG,"Function",list("str",1),this.exprs); if (!ok) { break; } if (find(PREVAR_FF==this.fun)==[]) { message("Sorry but "+this.fun+" is not in the list!"); } else { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 525f10cf..08bf3277 100644 --- a/js/NonLinear/TrigFun.pickle +++ b/js/NonLinear/TrigFun.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'fun' +S'exprs' p2 -aS'x' +aS'gr_i' p3 -aS'model' -p4 aS'graphics' +p4 +aS'fun' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'model.sim' p1 diff --git a/js/PDE/PDE.js b/js/PDE/PDE.js index bb49d986..c3b3fa93 100644 --- a/js/PDE/PDE.js +++ b/js/PDE/PDE.js @@ -10,8 +10,8 @@ function PDE() { this.model.dep_ut = new ScilabDouble([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,[],""); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PDE\",sz(1),sz(2));"]); - this.x = standard_define([3,3],this.model,label,gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PDE\",sz(1),sz(2));"]); + this.x = standard_define([3,3],this.model,label,this.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 ce7cc36e..f9f438cf 100644 --- a/js/PDE/PDE.pickle +++ b/js/PDE/PDE.pickle @@ -2,20 +2,24 @@ c__builtin__ set p0 ((lp1 -S'okk' +S'lab' p2 -aS'lab' +aS'rdnom' p3 -aS'graphics' +aS'exprs' p4 -aS'x' +aS'gr_i' p5 -aS'model' +aS'graphics' p6 -aS'rdnom' +aS'x' p7 -atp8 -Rp9 +aS'model' +p8 +aS'okk' +p9 +atp10 +Rp11 .(dp0 S'params_pde' p1 diff --git a/js/Sinks/AFFICH_m.js b/js/Sinks/AFFICH_m.js index c1551c3b..257cff45 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 ScilabDouble([true,false]); this.model.label = new ScilabString([""]); - var exprs = [[sci2exp([this.model.in1,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 = standard_define([3,2],this.model,exprs,gr_i); + this.exprs = [[sci2exp([this.model.in1,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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new AfficheBlock(this.x); } AFFICH_m.prototype.details = function AFFICH_m() { @@ -46,12 +46,13 @@ function AFFICH_m() { this.nt = parseFloat(arguments[0]["nt"]) this.nd = parseFloat(arguments[0]["nd"]) this.herit = arguments[0]["herit"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.in1,this.font,this.fontsize,this.colr,this.nt,this.nd,this.herit,exprs] = scicos_getvalue("Set parameters",["Input Size","Font number","Font size","Color","Total number of digits","Number of rational part digits","Block inherits (1) or not (0)"],list("mat",[1,2],"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs); + [ok,this.in1,this.font,this.fontsize,this.colr,this.nt,this.nd,this.herit,this.exprs] = scicos_getvalue("Set parameters",["Input Size","Font number","Font size","Color","Total number of digits","Number of rational part digits","Block inherits (1) or not (0)"],list("mat",[1,2],"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -92,7 +93,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 2ac10bbb..f2197601 100644 --- a/js/Sinks/AFFICH_m.pickle +++ b/js/Sinks/AFFICH_m.pickle @@ -10,20 +10,24 @@ aS'colr' p4 aS'in1' p5 -aS'fontsize' +aS'exprs' p6 -aS'graphics' +aS'gr_i' p7 -aS'x' +aS'fontsize' p8 -aS'model' +aS'graphics' p9 -aS'font' +aS'x' p10 -aS'nt' +aS'model' p11 -atp12 -Rp13 +aS'font' +p12 +aS'nt' +p13 +atp14 +Rp15 .(dp0 S'model.dstate' p1 diff --git a/js/Sinks/BARXY.js b/js/Sinks/BARXY.js index 2420f48a..c7f144bc 100644 --- a/js/Sinks/BARXY.js +++ b/js/Sinks/BARXY.js @@ -40,12 +40,13 @@ function BARXY() { this.ymin = parseFloat(arguments[0]["ymin"]) this.ymax = parseFloat(arguments[0]["ymax"]) this.thickness = arguments[0]["thickness"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.xmin,this.xmax,this.ymin,this.ymax,this.thickness,exprs] = scicos_getvalue("Set Scope parameters",["Xmin","Xmax","Ymin","Ymax","Segs Thickness"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs); + [ok,this.xmin,this.xmax,this.ymin,this.ymax,this.thickness,this.exprs] = scicos_getvalue("Set Scope parameters",["Xmin","Xmax","Ymin","Ymax","Segs Thickness"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -67,7 +68,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 4f52b098..324d5e98 100644 --- a/js/Sinks/BARXY.pickle +++ b/js/Sinks/BARXY.pickle @@ -6,20 +6,24 @@ S'ymax' p2 aS'thickness' p3 -aS'xmax' +aS'exprs' p4 -aS'graphics' +aS'gr_i' p5 -aS'xmin' +aS'xmax' p6 -aS'x' +aS'graphics' p7 -aS'model' +aS'xmin' p8 -aS'ymin' +aS'x' p9 -atp10 -Rp11 +aS'model' +p10 +aS'ymin' +p11 +atp12 +Rp13 .(dp0 S'arg1' p1 diff --git a/js/Sinks/CANIMXY.js b/js/Sinks/CANIMXY.js index 550fa4ae..552889b4 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 ScilabDouble([false,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CANIMXY.prototype.details = function CANIMXY() { @@ -59,12 +59,13 @@ function CANIMXY() { this.ymin = parseFloat(arguments[0]["ymin"]) this.ymax = parseFloat(arguments[0]["ymax"]) this.N = parseFloat(arguments[0]["N"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.nbr_curves,this.clrs,this.siz,this.win,this.wpos,this.wdim,this.xmin,this.xmax,this.ymin,this.ymax,this.N,exprs] = scicos_getvalue("Set Scope parameters",["Number of Curves","color (>0) or mark (<0)","line or mark size","Output window number (-1 for automatic)","Output window position","Output window sizes","Xmin","Xmax","Ymin","Ymax","Buffer size"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs); + [ok,this.nbr_curves,this.clrs,this.siz,this.win,this.wpos,this.wdim,this.xmin,this.xmax,this.ymin,this.ymax,this.N,this.exprs] = scicos_getvalue("Set Scope parameters",["Number of Curves","color (>0) or mark (<0)","line or mark size","Output window number (-1 for automatic)","Output window position","Output window sizes","Xmin","Xmax","Ymin","Ymax","Buffer size"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -120,7 +121,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 02f5d9a9..0a699534 100644 --- a/js/Sinks/CANIMXY.pickle +++ b/js/Sinks/CANIMXY.pickle @@ -16,22 +16,26 @@ aS'wdim' p7 aS'N' p8 -aS'xmax' +aS'exprs' p9 -aS'graphics' +aS'gr_i' p10 -aS'xmin' +aS'xmax' p11 -aS'x' +aS'graphics' p12 -aS'model' +aS'xmin' p13 -aS'nbr_curves' +aS'x' p14 -aS'win' +aS'model' p15 -atp16 -Rp17 +aS'nbr_curves' +p16 +aS'win' +p17 +atp18 +Rp19 .(dp0 S'clrs' p1 diff --git a/js/Sinks/CANIMXY3D.js b/js/Sinks/CANIMXY3D.js index 8a8f5924..9c481615 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 ScilabDouble([false,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CANIMXY3D.prototype.details = function CANIMXY3D() { @@ -59,12 +59,13 @@ function CANIMXY3D() { this.vec_z = inverse(arguments[0]["vec_z"]) this.param3ds = inverse(arguments[0]["param3ds"]) this.N = parseFloat(arguments[0]["N"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.nbr_curves,this.clrs,this.siz,this.win,this.wpos,this.wdim,this.vec_x,this.vec_y,this.vec_z,this.param3ds,this.N,exprs] = scicos_getvalue("Set Scope parameters",["Number of curves","color (>0) or mark (<0)","line or mark size","Output window number (-1 for automatic)","Output window position","Output window sizes","Xmin and Xmax","Ymin and Ymax","Zmin and Zmax","Alpha and Theta","Buffer size"],list("vec",1,"vec",-1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",1),exprs); + [ok,this.nbr_curves,this.clrs,this.siz,this.win,this.wpos,this.wdim,this.vec_x,this.vec_y,this.vec_z,this.param3ds,this.N,this.exprs] = scicos_getvalue("Set Scope parameters",["Number of curves","color (>0) or mark (<0)","line or mark size","Output window number (-1 for automatic)","Output window position","Output window sizes","Xmin and Xmax","Ymin and Ymax","Zmin and Zmax","Alpha and Theta","Buffer size"],list("vec",1,"vec",-1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",1),this.exprs); if (!ok) { break; } @@ -137,7 +138,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 67189920..7c476fb5 100644 --- a/js/Sinks/CANIMXY3D.pickle +++ b/js/Sinks/CANIMXY3D.pickle @@ -20,18 +20,22 @@ aS'param3ds' p9 aS'N' p10 -aS'graphics' +aS'exprs' p11 -aS'x' +aS'gr_i' p12 -aS'model' +aS'graphics' p13 -aS'nbr_curves' +aS'x' p14 -aS'win' +aS'model' p15 -atp16 -Rp17 +aS'nbr_curves' +p16 +aS'win' +p17 +atp18 +Rp19 .(dp0 S'clrs' p1 diff --git a/js/Sinks/CEVENTSCOPE.js b/js/Sinks/CEVENTSCOPE.js index cccb59fd..499e2e08 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 ScilabDouble([false,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CEVENTSCOPE.prototype.details = function CEVENTSCOPE() { @@ -40,12 +40,13 @@ function CEVENTSCOPE() { this.wpos = inverse(arguments[0]["wpos"]) this.wdim = inverse(arguments[0]["wdim"]) this.per = parseFloat(arguments[0]["per"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.nclock,this.clrs,this.win,this.wpos,this.wdim,this.per,exprs] = scicos_getvalue("Set Scope parameters",["Number of event inputs","colors c (>0) or mark (<0)","Output window number (-1 for automatic)","Output window position","Output window sizes","Refresh period"],list("vec",1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec",1),exprs); + [ok,this.nclock,this.clrs,this.win,this.wpos,this.wdim,this.per,this.exprs] = scicos_getvalue("Set Scope parameters",["Number of event inputs","colors c (>0) or mark (<0)","Output window number (-1 for automatic)","Output window position","Output window sizes","Refresh period"],list("vec",1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec",1),this.exprs); this.nclock = int(this.nclock); this.clrs = int(this.clrs); this.win = int(this.win); @@ -96,7 +97,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 36f3ee38..64eb8f7d 100644 --- a/js/Sinks/CEVENTSCOPE.pickle +++ b/js/Sinks/CEVENTSCOPE.pickle @@ -12,16 +12,20 @@ aS'wdim' p5 aS'per' p6 -aS'graphics' +aS'exprs' p7 -aS'x' +aS'gr_i' p8 -aS'model' +aS'graphics' p9 -aS'nclock' +aS'x' p10 -atp11 -Rp12 +aS'model' +p11 +aS'nclock' +p12 +atp13 +Rp14 .(dp0 S'clrs' p1 diff --git a/js/Sinks/CFSCOPE.js b/js/Sinks/CFSCOPE.js index 50515568..48ed64d8 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 ScilabDouble([true,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CFSCOPE.prototype.details = function CFSCOPE() { @@ -48,12 +48,13 @@ function CFSCOPE() { this.per = parseFloat(arguments[0]["per"]) this.N = parseFloat(arguments[0]["N"]) this.wu = arguments[0]["wu"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.clrs,this.win,this.wpos,this.wdim,this.ymin,this.ymax,this.per,this.N,this.wu,exprs] = scicos_getvalue("Set Scope parameters",["Color (>0) or mark (<0) vector (8 entries)","Output window number (-1 for automatic)","Output window position","Output window sizes","Ymin","Ymax","Refresh period","Buffer size","Links to view"],list("vec",8,"vec",1,"vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",-1),exprs); + [ok,this.clrs,this.win,this.wpos,this.wdim,this.ymin,this.ymax,this.per,this.N,this.wu,this.exprs] = scicos_getvalue("Set Scope parameters",["Color (>0) or mark (<0) vector (8 entries)","Output window number (-1 for automatic)","Output window position","Output window sizes","Ymin","Ymax","Refresh period","Buffer size","Links to view"],list("vec",8,"vec",1,"vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",-1),this.exprs); if (!ok) { break; } @@ -108,7 +109,7 @@ function CFSCOPE() { this.model.ipar = new ScilabDouble(ipar); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 ee6af05a..83bea367 100644 --- a/js/Sinks/CFSCOPE.pickle +++ b/js/Sinks/CFSCOPE.pickle @@ -16,18 +16,22 @@ aS'per' p7 aS'N' p8 -aS'wu' +aS'exprs' p9 -aS'graphics' +aS'wu' p10 -aS'x' +aS'gr_i' p11 -aS'model' +aS'graphics' p12 -aS'ymin' +aS'x' p13 -atp14 -Rp15 +aS'model' +p14 +aS'ymin' +p15 +atp16 +Rp17 .(dp0 S'clrs' p1 diff --git a/js/Sinks/CLKOUTV_f.js b/js/Sinks/CLKOUTV_f.js index 1b371a2b..2d336c14 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 ScilabDouble([false,false]); - var exprs = string(this.prt); - this.x = standard_define([1,1],this.model,exprs," "); + this.exprs = string(this.prt); + this.x = standard_define([1,1],this.model,this.exprs," "); return new EventOutBlock(this.x); } CLKOUTV_f.prototype.details = function CLKOUTV_f() { @@ -23,12 +23,13 @@ function CLKOUTV_f() { } CLKOUTV_f.prototype.set = function CLKOUTV_f() { this.prt = arguments[0]["prt"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; while (true) { - [ok,this.prt,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","CLKOUTV_f")],[" "],["Event output port"]],"Port number",list("vec",1),exprs); + [ok,this.prt,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","CLKOUTV_f")],[" "],["Event output port"]],"Port number",list("vec",1),this.exprs); if (!ok) { break; } @@ -38,7 +39,7 @@ function CLKOUTV_f() { } else { this.model.ipar = new ScilabDouble([this.prt]); this.model.evtin = new ScilabDouble([1]); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -78,9 +79,9 @@ 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; - var gr_i = arg1.graphics.gr_i; - if (this.type[gr_i-1]==15) { - var coli = gr_i[2-1]; + this.gr_i = arg1.graphics.gr_i; + if (this.type[this.gr_i-1]==15) { + var coli = this.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 7bfad8e2..755b92c2 100644 --- a/js/Sinks/CLKOUTV_f.pickle +++ b/js/Sinks/CLKOUTV_f.pickle @@ -2,24 +2,28 @@ c__builtin__ set p0 ((lp1 -S'diag' +S'prt' p2 -aS'default_color' +aS'diag' p3 -aS'prt' +aS'default_color' p4 -aS'graphics' +aS'exprs' p5 -aS'x' +aS'gr_i' p6 -aS'model' +aS'graphics' p7 -aS'type' +aS'x' p8 -aS'options' +aS'model' p9 -atp10 -Rp11 +aS'type' +p10 +aS'options' +p11 +atp12 +Rp13 .(dp0 S'xo' p1 diff --git a/js/Sinks/CLKOUT_f.js b/js/Sinks/CLKOUT_f.js index e94f0ce3..1dc5d670 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 ScilabDouble([false,false]); - var exprs = string(this.prt); - this.x = standard_define([1,1],this.model,exprs," "); + this.exprs = string(this.prt); + this.x = standard_define([1,1],this.model,this.exprs," "); return new BasicBlock(this.x); } CLKOUT_f.prototype.details = function CLKOUT_f() { @@ -23,13 +23,14 @@ function CLKOUT_f() { } CLKOUT_f.prototype.set = function CLKOUT_f() { this.prt = parseFloat(arguments[0]["prt"]) + this.exprs = parseFloat(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = this.graphics.exprs; - var exprs = exprs[1-1]; + this.exprs = this.graphics.exprs; + this.exprs = this.exprs[1-1]; while (true) { - [ok,this.prt,exprs] = scicos_getvalue("Set Event Output block parameters","Port number",list("vec",1),exprs); + [ok,this.prt,this.exprs] = scicos_getvalue("Set Event Output block parameters","Port number",list("vec",1),this.exprs); if (!ok) { break; } @@ -40,7 +41,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 0297746c..12ffba1c 100644 --- a/js/Sinks/CLKOUT_f.pickle +++ b/js/Sinks/CLKOUT_f.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'prt' +S'exprs' p2 -aS'x' +aS'prt' p3 -aS'model' +aS'gr_i' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'model.sim' p1 diff --git a/js/Sinks/CMAT3D.js b/js/Sinks/CMAT3D.js index eb6e8e42..61bbdb86 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 ScilabDouble([true,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CMAT3D.prototype.details = function CMAT3D() { @@ -43,12 +43,13 @@ function CMAT3D() { this.colormap = parseFloat(arguments[0]["colormap"]) this.cmin = parseFloat(arguments[0]["cmin"]) this.cmax = parseFloat(arguments[0]["cmax"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.vec_x,this.vec_y,this.colormap,this.cmin,this.cmax,exprs] = scicos_getvalue("Set Scope parameters",["Bounds Vector X (-1 for standard)","Bounds Vector Y (-1 for standard)","ColorMap","Zmin","Zmax"],list("vec",-1,"vec",-1,"vec",-1,"vec",1,"vec",1),exprs); + [ok,this.vec_x,this.vec_y,this.colormap,this.cmin,this.cmax,this.exprs] = scicos_getvalue("Set Scope parameters",["Bounds Vector X (-1 for standard)","Bounds Vector Y (-1 for standard)","ColorMap","Zmin","Zmax"],list("vec",-1,"vec",-1,"vec",-1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -71,7 +72,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 dfee6d03..dbb67d12 100644 --- a/js/Sinks/CMAT3D.pickle +++ b/js/Sinks/CMAT3D.pickle @@ -8,18 +8,22 @@ aS'vec_x' p3 aS'vec_y' p4 -aS'graphics' +aS'exprs' p5 -aS'x' +aS'gr_i' p6 -aS'model' +aS'graphics' p7 -aS'cmax' +aS'x' p8 -aS'cmin' +aS'model' p9 -atp10 -Rp11 +aS'cmax' +p10 +aS'cmin' +p11 +atp12 +Rp13 .(dp0 S'cmin' p1 diff --git a/js/Sinks/CMATVIEW.js b/js/Sinks/CMATVIEW.js index 40a2edb9..e9e77c5d 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 ScilabDouble([true,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CMATVIEW.prototype.details = function CMATVIEW() { @@ -37,12 +37,13 @@ function CMATVIEW() { this.colormap = parseFloat(arguments[0]["colormap"]) this.cmin = parseFloat(arguments[0]["cmin"]) this.cmax = parseFloat(arguments[0]["cmax"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.colormap,this.cmin,this.cmax,exprs] = scicos_getvalue("Set Scope parameters",["ColorMap","Minimum level range","Maximum level range"],list("vec",-1,"vec",1,"vec",1),exprs); + [ok,this.colormap,this.cmin,this.cmax,this.exprs] = scicos_getvalue("Set Scope parameters",["ColorMap","Minimum level range","Maximum level range"],list("vec",-1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -63,7 +64,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 bd5b84e9..b5cb593d 100644 --- a/js/Sinks/CMATVIEW.pickle +++ b/js/Sinks/CMATVIEW.pickle @@ -2,20 +2,24 @@ c__builtin__ set p0 ((lp1 -S'cmin' +S'colormap' p2 -aS'graphics' +aS'exprs' p3 -aS'x' +aS'gr_i' p4 -aS'model' +aS'graphics' p5 -aS'cmax' +aS'x' p6 -aS'colormap' +aS'model' p7 -atp8 -Rp9 +aS'cmax' +p8 +aS'cmin' +p9 +atp10 +Rp11 .(dp0 S'cmin' p1 diff --git a/js/Sinks/CMSCOPE.js b/js/Sinks/CMSCOPE.js index a906fe15..c4811853 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 ScilabDouble([true,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CMSCOPE.prototype.details = function CMSCOPE() { @@ -58,12 +58,13 @@ function CMSCOPE() { this.N = parseFloat(arguments[0]["N"]) this.heritance = arguments[0]["heritance"] this.nom = arguments[0]["nom"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.in1,this.clrs,this.win,this.wpos,this.wdim,this.ymin,this.ymax,this.per,this.N,this.heritance,this.nom,exprs] = scicos_getvalue("Set Scope parameters",["Input ports sizes","Drawing colors (>0) or mark (<0)","Output window number (-1 for automatic)","Output window position","Output window sizes","Ymin vector","Ymax vector","Refresh period","Buffer size","Accept herited events 0/1","Name of Scope (label&Id)"],list("vec",-1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec","size(%1,\'*\')","vec","size(%1,\'*\')","vec","size(%1,\'*\')","vec",1,"vec",1,"str",1),exprs); + [ok,this.in1,this.clrs,this.win,this.wpos,this.wdim,this.ymin,this.ymax,this.per,this.N,this.heritance,this.nom,this.exprs] = scicos_getvalue("Set Scope parameters",["Input ports sizes","Drawing colors (>0) or mark (<0)","Output window number (-1 for automatic)","Output window position","Output window sizes","Ymin vector","Ymax vector","Refresh period","Buffer size","Accept herited events 0/1","Name of Scope (label&Id)"],list("vec",-1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec","size(%1,\'*\')","vec","size(%1,\'*\')","vec","size(%1,\'*\')","vec",1,"vec",1,"str",1),this.exprs); if (!ok) { break; } @@ -145,7 +146,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 40dc6977..7daa4956 100644 --- a/js/Sinks/CMSCOPE.pickle +++ b/js/Sinks/CMSCOPE.pickle @@ -20,18 +20,22 @@ aS'per' p9 aS'N' p10 -aS'graphics' +aS'exprs' p11 -aS'x' +aS'gr_i' p12 -aS'model' +aS'graphics' p13 -aS'ymin' +aS'x' p14 -aS'heritance' +aS'model' p15 -atp16 -Rp17 +aS'ymin' +p16 +aS'heritance' +p17 +atp18 +Rp19 .(dp0 S'clrs' p1 diff --git a/js/Sinks/CSCOPE.js b/js/Sinks/CSCOPE.js index 6944e857..f708ea28 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 ScilabDouble([true,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CSCOPE.prototype.details = function CSCOPE() { @@ -52,12 +52,13 @@ function CSCOPE() { this.N = parseFloat(arguments[0]["N"]) this.heritance = arguments[0]["heritance"] this.nom = arguments[0]["nom"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.clrs,this.win,this.wpos,this.wdim,this.ymin,this.ymax,this.per,this.N,this.heritance,this.nom,exprs] = scicos_getvalue("Set Scope parameters",["Color (>0) or mark (<0) vector (8 entries)","Output window number (-1 for automatic)","Output window position","Output window sizes","Ymin","Ymax","Refresh period","Buffer size","Accept herited events 0/1","Name of Scope (label&Id)"],list("vec",8,"vec",1,"vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"str",1),exprs); + [ok,this.clrs,this.win,this.wpos,this.wdim,this.ymin,this.ymax,this.per,this.N,this.heritance,this.nom,this.exprs] = scicos_getvalue("Set Scope parameters",["Color (>0) or mark (<0) vector (8 entries)","Output window number (-1 for automatic)","Output window position","Output window sizes","Ymin","Ymax","Refresh period","Buffer size","Accept herited events 0/1","Name of Scope (label&Id)"],list("vec",8,"vec",1,"vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"str",1),this.exprs); if (!ok) { break; } @@ -113,7 +114,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 91210470..628431d5 100644 --- a/js/Sinks/CSCOPE.pickle +++ b/js/Sinks/CSCOPE.pickle @@ -18,18 +18,22 @@ aS'per' p8 aS'N' p9 -aS'graphics' +aS'exprs' p10 -aS'x' +aS'gr_i' p11 -aS'model' +aS'graphics' p12 -aS'ymin' +aS'x' p13 -aS'heritance' +aS'model' p14 -atp15 -Rp16 +aS'ymin' +p15 +aS'heritance' +p16 +atp17 +Rp18 .(dp0 S'clrs' p1 diff --git a/js/Sinks/CSCOPXY.js b/js/Sinks/CSCOPXY.js index 22a8be18..7d104223 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 ScilabDouble([false,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CSCOPXY.prototype.details = function CSCOPXY() { @@ -58,12 +58,13 @@ function CSCOPXY() { this.ymin = parseFloat(arguments[0]["ymin"]) this.ymax = parseFloat(arguments[0]["ymax"]) this.N = parseFloat(arguments[0]["N"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.nbr_curves,this.clrs,this.siz,this.win,this.wpos,this.wdim,this.xmin,this.xmax,this.ymin,this.ymax,this.N,exprs] = scicos_getvalue("Set Scope parameters",["Number of Curves","color (>0) or mark (<0)","line or mark size","Output window number (-1 for automatic)","Output window position","Output window sizes","Xmin","Xmax","Ymin","Ymax","Buffer size"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs); + [ok,this.nbr_curves,this.clrs,this.siz,this.win,this.wpos,this.wdim,this.xmin,this.xmax,this.ymin,this.ymax,this.N,this.exprs] = scicos_getvalue("Set Scope parameters",["Number of Curves","color (>0) or mark (<0)","line or mark size","Output window number (-1 for automatic)","Output window position","Output window sizes","Xmin","Xmax","Ymin","Ymax","Buffer size"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -119,7 +120,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 a11b6b9c..f16dc117 100644 --- a/js/Sinks/CSCOPXY.pickle +++ b/js/Sinks/CSCOPXY.pickle @@ -16,22 +16,26 @@ aS'wdim' p7 aS'N' p8 -aS'xmax' +aS'exprs' p9 -aS'graphics' +aS'gr_i' p10 -aS'xmin' +aS'xmax' p11 -aS'x' +aS'graphics' p12 -aS'model' +aS'xmin' p13 -aS'nbr_curves' +aS'x' p14 -aS'win' +aS'model' p15 -atp16 -Rp17 +aS'nbr_curves' +p16 +aS'win' +p17 +atp18 +Rp19 .(dp0 S'clrs' p1 diff --git a/js/Sinks/CSCOPXY3D.js b/js/Sinks/CSCOPXY3D.js index 88152fe3..ba2eb57d 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 ScilabDouble([false,false]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CSCOPXY3D.prototype.details = function CSCOPXY3D() { @@ -58,12 +58,13 @@ function CSCOPXY3D() { this.vec_z = inverse(arguments[0]["vec_z"]) this.param3ds = inverse(arguments[0]["param3ds"]) this.N = parseFloat(arguments[0]["N"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.nbr_curves,this.clrs,this.siz,this.win,this.wpos,this.wdim,this.vec_x,this.vec_y,this.vec_z,this.param3ds,this.N,exprs] = scicos_getvalue("Set Scope parameters",["Number of curves","color (>0) or mark (<0)","Line or Mark Size","Output window number (-1 for automatic)","Output window position","Output window sizes","Xmin and Xmax","Ymin and Ymax","Zmin and Zmax","Alpha and Theta","Buffer size"],list("vec",1,"vec",-1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec",2,"vec",2,"vec",2,"vec",2,"vec",1),exprs); + [ok,this.nbr_curves,this.clrs,this.siz,this.win,this.wpos,this.wdim,this.vec_x,this.vec_y,this.vec_z,this.param3ds,this.N,this.exprs] = scicos_getvalue("Set Scope parameters",["Number of curves","color (>0) or mark (<0)","Line or Mark Size","Output window number (-1 for automatic)","Output window position","Output window sizes","Xmin and Xmax","Ymin and Ymax","Zmin and Zmax","Alpha and Theta","Buffer size"],list("vec",1,"vec",-1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec",2,"vec",2,"vec",2,"vec",2,"vec",1),this.exprs); if (!ok) { break; } @@ -130,7 +131,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 3361fa70..891332f9 100644 --- a/js/Sinks/CSCOPXY3D.pickle +++ b/js/Sinks/CSCOPXY3D.pickle @@ -20,18 +20,22 @@ aS'param3ds' p9 aS'N' p10 -aS'graphics' +aS'exprs' p11 -aS'x' +aS'gr_i' p12 -aS'model' +aS'graphics' p13 -aS'nbr_curves' +aS'x' p14 -aS'win' +aS'model' p15 -atp16 -Rp17 +aS'nbr_curves' +p16 +aS'win' +p17 +atp18 +Rp19 .(dp0 S'clrs' p1 diff --git a/js/Sinks/OUTIMPL_f.js b/js/Sinks/OUTIMPL_f.js index 4dd97b21..de52222b 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]); - var exprs = "1"; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OUTIMPL_f\",sz(1),sz(2));"]); - this.x = standard_define([1,1],this.model,exprs,gr_i); + this.exprs = "1"; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OUTIMPL_f\",sz(1),sz(2));"]); + this.x = standard_define([1,1],this.model,this.exprs,this.gr_i); this.x.graphics.in_implicit = ["I"]; return new ImplicitOutBlock(this.x); } @@ -29,15 +29,16 @@ function OUTIMPL_f() { } OUTIMPL_f.prototype.set = function OUTIMPL_f() { this.prt = parseFloat(arguments[0]["prt"]) + this.exprs = parseFloat(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - if (size(exprs,"*")==2) { - var exprs = exprs[1-1]; + if (size(this.exprs,"*")==2) { + this.exprs = this.exprs[1-1]; } while (true) { - [ok,this.prt,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","OUTIMPL_f")],[" "],["Implicit output port"]],"Port number",list("vec",1),exprs); + [ok,this.prt,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","OUTIMPL_f")],[" "],["Implicit output port"]],"Port number",list("vec",1),this.exprs); if (!ok) { break; } @@ -50,7 +51,7 @@ function OUTIMPL_f() { var y = needcompile; } this.model.ipar = new ScilabDouble([this.prt]); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 a4f815d4..394f3d4f 100644 --- a/js/Sinks/OUTIMPL_f.pickle +++ b/js/Sinks/OUTIMPL_f.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'prt' +S'exprs' p2 -aS'x' +aS'prt' p3 -aS'model' +aS'gr_i' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/Sinks/OUT_f.js b/js/Sinks/OUT_f.js index bce3dd16..968ceb1b 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 ScilabDouble([false,false]); - var exprs = string(this.prt); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OUT_f\",sz(1),sz(2));"]); - this.x = standard_define([1,1],this.model,exprs,gr_i); + this.exprs = string(this.prt); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OUT_f\",sz(1),sz(2));"]); + this.x = standard_define([1,1],this.model,this.exprs,this.gr_i); return new ExplicitOutBlock(this.x); } OUT_f.prototype.details = function OUT_f() { @@ -26,15 +26,16 @@ function OUT_f() { } OUT_f.prototype.set = function OUT_f() { this.prt = parseFloat(arguments[0]["prt"]) + this.exprs = parseFloat(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = this.graphics.exprs; - if (size(exprs,"*")==2) { - var exprs = exprs[1-1]; + this.exprs = this.graphics.exprs; + if (size(this.exprs,"*")==2) { + this.exprs = this.exprs[1-1]; } while (true) { - [ok,this.prt,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","OUT_f")],[" "],["Regular output port"]],"Port number",list("vec",1),exprs); + [ok,this.prt,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","OUT_f")],[" "],["Regular output port"]],"Port number",list("vec",1),this.exprs); if (!ok) { break; } @@ -43,7 +44,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 d77fba8a..44e3674f 100644 --- a/js/Sinks/OUT_f.pickle +++ b/js/Sinks/OUT_f.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'prt' +S'exprs' p2 -aS'x' +aS'prt' p3 -aS'model' +aS'gr_i' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'model.in2' p1 diff --git a/js/Sinks/TOWS_c.js b/js/Sinks/TOWS_c.js index ad6cdcb1..8ebbb85e 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 ScilabDouble([false,false]); - 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 = standard_define([4,2],this.model,exprs,gr_i); + 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 = standard_define([4,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } TOWS_c.prototype.details = function TOWS_c() { @@ -38,12 +38,13 @@ function TOWS_c() { this.nz = parseFloat(arguments[0]["nz"]) this.varnam = arguments[0]["varnam"] this.herit = parseFloat(arguments[0]["herit"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; while (true) { - [ok,this.nz,this.varnam,this.herit,exprs] = scicos_getvalue("Set Xcos buffer block",["Size of buffer","Scilab variable name","Inherit (no:0, yes:1)"],list("vec",1,"str",1,"vec",1),exprs); + [ok,this.nz,this.varnam,this.herit,this.exprs] = scicos_getvalue("Set Xcos buffer block",["Size of buffer","Scilab variable name","Inherit (no:0, yes:1)"],list("vec",1,"str",1,"vec",1),this.exprs); if (!ok) { break; } @@ -69,7 +70,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 31ff78a2..458ab931 100644 --- a/js/Sinks/TOWS_c.pickle +++ b/js/Sinks/TOWS_c.pickle @@ -4,20 +4,24 @@ p0 ((lp1 S'herit' p2 -aS'nz' +aS'exprs' p3 -aS'graphics' +aS'nz' p4 -aS'x' +aS'gr_i' p5 -aS'model' +aS'graphics' p6 -aS'ascii' +aS'x' p7 -aS'varnam' +aS'model' p8 -atp9 -Rp10 +aS'ascii' +p9 +aS'varnam' +p10 +atp11 +Rp12 .(dp0 S'arg1' p1 diff --git a/js/Sinks/TRASH_f.js b/js/Sinks/TRASH_f.js index 2f2bc5a5..7ef3e6ad 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 ScilabDouble([false,false]); - var exprs = " "; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TRASH_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = " "; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TRASH_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.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 e5dde935..12da9c14 100644 --- a/js/Sinks/TRASH_f.pickle +++ b/js/Sinks/TRASH_f.pickle @@ -6,8 +6,14 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'gr_i' +p4 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/Sinks/WFILE_f.js b/js/Sinks/WFILE_f.js index 4c919d7a..62ea59fb 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 ScilabDouble([true,false]); - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } WFILE_f.prototype.details = function WFILE_f() { @@ -37,6 +37,7 @@ function WFILE_f() { this.fname1 = parseFloat(arguments[0]["fname1"]) this.frmt1 = parseFloat(arguments[0]["frmt1"]) this.N = parseFloat(arguments[0]["N"]) + this.exprs = arguments[0]["exprs"] warnobsolete("WRITEC_f","6.0.0"); var warnMessage = msprintf(_("Feature %s is obsolete."),"WFILE_f"); var warnAdvise = msprintf(_("Please use %s instead."),"WRITEC_f"); @@ -44,14 +45,14 @@ function WFILE_f() { warnBlockByUID(arg1.model.label,warnXcosMessage); this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; var dstate = this.model.dstate; var lunit = dstate[2-1]; - var fname = exprs[2-1]; - var frmt = exprs[3-1]; + var fname = this.exprs[2-1]; + var frmt = this.exprs[3-1]; while (true) { - [ok,this.in1,this.fname1,this.frmt1,this.N,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","WFILE_f")],[" "],["Write to output file"],[" "],["Write is done on:"],[" - A binary file if no format given"],[" - A formatted text file if a format (Fortran type) is given"]],["Input Size","Output File Name","Output Format","Buffer Size"],list("vec",1,"str",1,"str",1,"vec",1),exprs); + [ok,this.in1,this.fname1,this.frmt1,this.N,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","WFILE_f")],[" "],["Write to output file"],[" "],["Write is done on:"],[" - A binary file if no format given"],[" - A formatted text file if a format (Fortran type) is given"]],["Input Size","Output File Name","Output Format","Buffer Size"],list("vec",1,"str",1,"str",1,"vec",1),this.exprs); if (!ok) { break; } @@ -96,7 +97,7 @@ function WFILE_f() { this.model.dstate = new ScilabDouble(dstate); this.model.ipar = new ScilabDouble(ipar); this.model.dep_ut = new ScilabDouble([true,false]); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 41c6ea25..2a1970d6 100644 --- a/js/Sinks/WFILE_f.pickle +++ b/js/Sinks/WFILE_f.pickle @@ -6,22 +6,26 @@ S'isdir' p2 aS'_str2code' p3 -aS'frmt1' +aS'in1' p4 aS'fname1' p5 -aS'in1' +aS'frmt1' p6 -aS'graphics' +aS'exprs' p7 -aS'x' +aS'gr_i' p8 -aS'model' +aS'graphics' p9 -aS'N' +aS'x' p10 -atp11 -Rp12 +aS'model' +p11 +aS'N' +p12 +atp13 +Rp14 .(dp0 S'model.dstate' p1 diff --git a/js/Sinks/WRITEAU_f.js b/js/Sinks/WRITEAU_f.js index 5765e7a6..d9bfa994 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 ScilabDouble([true,false]); - 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 = standard_define([4,2],this.model,exprs,gr_i); + 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 = standard_define([4,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } WRITEAU_f.prototype.details = function WRITEAU_f() { @@ -34,15 +34,16 @@ function WRITEAU_f() { WRITEAU_f.prototype.set = function WRITEAU_f() { this.N = parseFloat(arguments[0]["N"]) this.swap = parseFloat(arguments[0]["swap"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; var ipar = this.model.ipar; var dstate = this.model.dstate; var lunit = dstate[2-1]; while (true) { - [ok,this.N,this.swap,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","WRITEAU_f")],[" "],["Write \'.au\' sound file on audio device"]],["Buffer Size","Swap Mode (0:No, 1:Yes)"],list("vec",1,"vec",1),exprs); + [ok,this.N,this.swap,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","WRITEAU_f")],[" "],["Write \'.au\' sound file on audio device"]],["Buffer Size","Swap Mode (0:No, 1:Yes)"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -68,7 +69,7 @@ function WRITEAU_f() { this.model.in1 = new ScilabDouble([1]); this.model.dstate = new ScilabDouble(dstate); this.model.ipar = new ScilabDouble(ipar); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 45165388..f3a19a0a 100644 --- a/js/Sinks/WRITEAU_f.pickle +++ b/js/Sinks/WRITEAU_f.pickle @@ -6,18 +6,22 @@ S'_str2code' p2 aS'N' p3 -aS'swap' +aS'exprs' p4 -aS'graphics' +aS'gr_i' p5 -aS'x' +aS'swap' p6 -aS'model' +aS'graphics' p7 -aS'alreadyran' +aS'x' p8 -atp9 -Rp10 +aS'model' +p9 +aS'alreadyran' +p10 +atp11 +Rp12 .(dp0 S'model.dstate' p1 diff --git a/js/Sinks/WRITEC_f.js b/js/Sinks/WRITEC_f.js index b92975c2..358c89bc 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 ScilabDouble([true,false]); - 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 = standard_define([4,2],this.model,exprs,gr_i); + 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 = standard_define([4,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } WRITEC_f.prototype.details = function WRITEC_f() { @@ -40,17 +40,18 @@ function WRITEC_f() { this.frmt1 = arguments[0]["frmt1"] this.N = parseFloat(arguments[0]["N"]) this.swap = parseFloat(arguments[0]["swap"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; var ipar = this.model.ipar; var dstate = this.model.dstate; var lunit = dstate[2-1]; - var fname = exprs[2-1]; - var frmt = exprs[3-1]; + var fname = this.exprs[2-1]; + var frmt = this.exprs[3-1]; while (true) { - [ok,this.in1,this.fname1,this.frmt1,this.N,this.swap,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","WRITEC_f")],[" "],["Write to C binary file"]],["Input Size","Output File Name","Output Format","Buffer Size","Swap Mode (0:No, 1:Yes)"],list("vec",1,"str",1,"str",1,"vec",1,"vec",1),exprs); + [ok,this.in1,this.fname1,this.frmt1,this.N,this.swap,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","WRITEC_f")],[" "],["Write to C binary file"]],["Input Size","Output File Name","Output Format","Buffer Size","Swap Mode (0:No, 1:Yes)"],list("vec",1,"str",1,"str",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -98,7 +99,7 @@ function WRITEC_f() { this.model.in1 = new ScilabDouble([nin]); this.model.dstate = new ScilabDouble(dstate); this.model.ipar = new ScilabDouble(ipar); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 1aa169a0..b482fa90 100644 --- a/js/Sinks/WRITEC_f.pickle +++ b/js/Sinks/WRITEC_f.pickle @@ -6,26 +6,30 @@ S'isdir' p2 aS'_str2code' p3 -aS'frmt1' +aS'in1' p4 aS'fname1' p5 -aS'in1' +aS'frmt1' p6 -aS'swap' +aS'exprs' p7 -aS'graphics' +aS'gr_i' p8 -aS'x' +aS'swap' p9 -aS'model' +aS'graphics' p10 -aS'N' +aS'x' p11 -aS'alreadyran' +aS'model' p12 -atp13 -Rp14 +aS'N' +p13 +aS'alreadyran' +p14 +atp15 +Rp16 .(dp0 S'model.dstate' p1 diff --git a/js/Sources/CLKINV_f.js b/js/Sources/CLKINV_f.js index 12ff04eb..a36af2c0 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 ScilabDouble([false,false]); - var exprs = string(this.prt); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKINV_f\",sz(1),sz(2));"]); - this.x = standard_define([1,1],this.model,exprs,gr_i); + this.exprs = string(this.prt); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKINV_f\",sz(1),sz(2));"]); + this.x = standard_define([1,1],this.model,this.exprs,this.gr_i); return new EventInBlock(this.x); } CLKINV_f.prototype.details = function CLKINV_f() { @@ -24,13 +24,14 @@ function CLKINV_f() { } CLKINV_f.prototype.set = function CLKINV_f() { this.prt = parseFloat(arguments[0]["prt"]) + this.exprs = parseFloat(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = this.graphics.exprs; - var exprs = exprs[1-1]; + this.exprs = this.graphics.exprs; + this.exprs = this.exprs[1-1]; while (true) { - [ok,this.prt,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","CLKINV_f")],[" "],["Event input port"],[" "]],"Port Number",list("vec",1),exprs); + [ok,this.prt,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","CLKINV_f")],[" "],["Event input port"],[" "]],"Port Number",list("vec",1),this.exprs); this.prt = int(this.prt); if (!ok) { break; @@ -41,7 +42,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 f8dde500..fc4275e0 100644 --- a/js/Sources/CLKINV_f.pickle +++ b/js/Sources/CLKINV_f.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'prt' +S'exprs' p2 -aS'x' +aS'prt' p3 -aS'model' +aS'gr_i' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'model.sim' p1 diff --git a/js/Sources/CLKIN_f.js b/js/Sources/CLKIN_f.js index 849ee2f2..7d77c8f0 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 ScilabDouble([false,false]); - var exprs = string(this.prt); - this.x = standard_define([1,1],this.model,exprs," "); + this.exprs = string(this.prt); + this.x = standard_define([1,1],this.model,this.exprs," "); return new BasicBlock(this.x); } CLKIN_f.prototype.details = function CLKIN_f() { @@ -23,13 +23,14 @@ function CLKIN_f() { } CLKIN_f.prototype.set = function CLKIN_f() { this.prt = parseFloat(arguments[0]["prt"]) + this.exprs = parseFloat(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = this.graphics.exprs; - var exprs = exprs[1-1]; + this.exprs = this.graphics.exprs; + this.exprs = this.exprs[1-1]; while (true) { - [ok,this.prt,exprs] = scicos_getvalue("Set Event Input block parameters","Port number",list("vec",1),exprs); + [ok,this.prt,this.exprs] = scicos_getvalue("Set Event Input block parameters","Port number",list("vec",1),this.exprs); this.prt = int(this.prt); if (!ok) { break; @@ -40,7 +41,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 e733f1cb..c480a912 100644 --- a/js/Sources/CLKIN_f.pickle +++ b/js/Sources/CLKIN_f.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'prt' +S'exprs' p2 -aS'x' +aS'prt' p3 -aS'model' +aS'gr_i' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'model.sim' p1 diff --git a/js/Sources/CLOCK_c.js b/js/Sources/CLOCK_c.js index 4010f34a..259f09de 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]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLOCK_c\",sz(1),sz(2));"]); + this.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 = gr_i; + this.x.graphics.gr_i = this.gr_i; this.x.graphics.peout = 0; this.x.model.sim = "csuper"; this.x.model.evtout = 1; @@ -65,13 +65,13 @@ function CLOCK_c() { } var newpar = list(); var xx = arg1.model.rpar.objs[path-1]; - var exprs = xx.graphics.exprs; + this.exprs = xx.graphics.exprs; this.model = xx.model; var t0_old = this.model.firing; var dt_old = this.model.rpar[1-1]; var model_n = this.model; while (true) { - [ok,this.dt,this.t0,this.exprs0] = scicos_getvalue([[msprintf("Set %s block parameters","CLOCK_c")],[" "],["Event clock generator"],[" "],[" Do not start if \'Initialisation Time\' is negative"],[" "]],["Period","Initialisation Time"],list("vec",1,"vec",1),exprs); + [ok,this.dt,this.t0,this.exprs0] = scicos_getvalue([[msprintf("Set %s block parameters","CLOCK_c")],[" "],["Event clock generator"],[" "],[" Do not start if \'Initialisation Time\' is negative"],[" "]],["Period","Initialisation Time"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } diff --git a/js/Sources/CLOCK_c.pickle b/js/Sources/CLOCK_c.pickle index 5e7b423d..628a2fc5 100644 --- a/js/Sources/CLOCK_c.pickle +++ b/js/Sources/CLOCK_c.pickle @@ -2,18 +2,24 @@ c__builtin__ set p0 ((lp1 -S'x' +S'exprs0' p2 -aS'model' +aS't0' p3 -aS'dt' +aS'exprs' p4 -aS't0' +aS'gr_i' p5 -aS'exprs0' +aS'graphics' p6 -atp7 -Rp8 +aS'x' +p7 +aS'model' +p8 +aS'dt' +p9 +atp10 +Rp11 .(dp0 S'diagram.objs[1-1]' p1 diff --git a/js/Sources/CLOCK_f.js b/js/Sources/CLOCK_f.js index c071dc88..8783f17d 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]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLOCK_f\",sz(1),sz(2));"]); + this.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 = gr_i; + this.x.graphics.gr_i = this.gr_i; this.x.graphics.peout = 0; this.x.model.sim = "csuper"; this.x.model.evtout = 1; @@ -65,13 +65,13 @@ function CLOCK_f() { } var newpar = list(); var xx = arg1.model.rpar.objs[path-1]; - var exprs = xx.graphics.exprs; + this.exprs = xx.graphics.exprs; this.model = xx.model; var t0_old = this.model.firing; var dt_old = this.model.rpar; var model_n = this.model; while (true) { - [ok,this.dt,this.t0,this.exprs0] = scicos_getvalue("Set Clock block parameters",["Period","Init time"],list("vec",1,"vec",1),exprs); + [ok,this.dt,this.t0,this.exprs0] = scicos_getvalue("Set Clock block parameters",["Period","Init time"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -88,7 +88,7 @@ function CLOCK_f() { break; } } - if (!and([t0_old,dt_old]==[this.t0,this.dt])||!and(this.exprs0==exprs)) { + if (!and([t0_old,dt_old]==[this.t0,this.dt])||!and(this.exprs0==this.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 c46d28aa..0947595e 100644 --- a/js/Sources/CLOCK_f.pickle +++ b/js/Sources/CLOCK_f.pickle @@ -2,18 +2,24 @@ c__builtin__ set p0 ((lp1 -S'x' +S'exprs0' p2 -aS'model' +aS't0' p3 -aS'dt' +aS'exprs' p4 -aS't0' +aS'gr_i' p5 -aS'exprs0' +aS'graphics' p6 -atp7 -Rp8 +aS'x' +p7 +aS'model' +p8 +aS'dt' +p9 +atp10 +Rp11 .(dp0 S'diagram.objs[1-1]' p1 diff --git a/js/Sources/CONST.js b/js/Sources/CONST.js index 8465ca55..f3a25e18 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 ScilabDouble([false,false]); - var exprs = strcat(sci2exp(this.C)); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = strcat(sci2exp(this.C)); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CONST.prototype.details = function CONST() { @@ -24,12 +24,13 @@ function CONST() { } CONST.prototype.set = function CONST() { this.C = parseFloat(arguments[0]["C"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.C,exprs] = scicos_getvalue(["Set Contant Block"],"Constant",list("vec",-1),exprs); + [ok,this.C,this.exprs] = scicos_getvalue(["Set Contant Block"],"Constant",list("vec",-1),this.exprs); if (!ok) { break; } @@ -42,7 +43,7 @@ function CONST() { } else { this.model.rpar = new ScilabDouble(this.C.slice()); this.model.out = new ScilabDouble([nout]); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 ed25e5f0..4820fb4d 100644 --- a/js/Sources/CONST.pickle +++ b/js/Sources/CONST.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'C' p2 -aS'model' +aS'exprs' p3 -aS'C' +aS'gr_i' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'sz' p1 diff --git a/js/Sources/CONST_f.js b/js/Sources/CONST_f.js index abe2b3c8..518831b3 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 ScilabDouble([false,false]); - var exprs = strcat(sci2exp(this.C)); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = strcat(sci2exp(this.C)); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CONST_f.prototype.details = function CONST_f() { @@ -24,12 +24,13 @@ function CONST_f() { } CONST_f.prototype.set = function CONST_f() { this.C = parseFloat(arguments[0]["C"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.C,exprs] = scicos_getvalue(["Set Contant Block"],"Constant",list("vec",-1),exprs); + [ok,this.C,this.exprs] = scicos_getvalue(["Set Contant Block"],"Constant",list("vec",-1),this.exprs); if (!ok) { break; } @@ -39,7 +40,7 @@ function CONST_f() { } else { this.model.rpar = new ScilabDouble(this.C.slice()); this.model.out = new ScilabDouble([nout]); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 4c58ae17..473b5774 100644 --- a/js/Sources/CONST_f.pickle +++ b/js/Sources/CONST_f.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'C' p2 -aS'model' +aS'exprs' p3 -aS'C' +aS'gr_i' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'model.sim' p1 diff --git a/js/Sources/CONST_m.js b/js/Sources/CONST_m.js index 3a207f1c..ea17b2c4 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 ScilabDouble([false,false]); - var exprs = sci2exp(this.C); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST_m\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = sci2exp(this.C); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST_m\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CONST_m.prototype.details = function CONST_m() { @@ -27,12 +27,13 @@ function CONST_m() { } CONST_m.prototype.set = function CONST_m() { this.C = inverse(arguments[0]["C"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.C,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","CONST_m")],[" "],["Constant value generator"],[" "]],"Constant Value",list("vec",-1),exprs); + [ok,this.C,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","CONST_m")],[" "],["Constant value generator"],[" "]],"Constant Value",list("vec",-1),this.exprs); if (!ok) { break; } @@ -70,7 +71,7 @@ function CONST_m() { this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 6b37f902..5ada7cb9 100644 --- a/js/Sources/CONST_m.pickle +++ b/js/Sources/CONST_m.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'C' p2 -aS'model' +aS'exprs' p3 -aS'type' +aS'gr_i' p4 -aS'C' -p5 aS'graphics' +p5 +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +aS'type' +p8 +atp9 +Rp10 .(dp0 S'arg1' p1 diff --git a/js/Sources/CURVE_c.js b/js/Sources/CURVE_c.js index a8827ea6..3bd5134d 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]); - 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 = standard_define([2,2],this.model,exprs,gr_i); + 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 = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CURVE_c.prototype.details = function CURVE_c() { @@ -42,22 +42,23 @@ function CURVE_c() { this.yy = inverse(arguments[0]["yy"]) this.PeriodicOption = arguments[0]["PeriodicOption"] this.graf = arguments[0]["graf"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.model = arg1.model; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; var ok = false; var SaveExit = false; while (true) { var Ask_again = false; - [ok,this.Method,this.xx,this.yy,this.PeriodicOption,this.graf,exprs] = scicos_getvalue("Spline data",["Spline Method (0..7)","x","y","Periodic signal(y/n)?","Launch graphic window(y/n)?"],list("vec",1,"vec",-1,"vec",-1,"str",1,"str",1),exprs); + [ok,this.Method,this.xx,this.yy,this.PeriodicOption,this.graf,this.exprs] = scicos_getvalue("Spline data",["Spline Method (0..7)","x","y","Periodic signal(y/n)?","Launch graphic window(y/n)?"],list("vec",1,"vec",-1,"vec",-1,"str",1,"str",1),this.exprs); if (!ok) { break; } if (this.PeriodicOption=="y"||this.PeriodicOption=="Y") { var PO = 1; } else { - exprs[4-1] = "n"; + this.exprs[4-1] = "n"; var PO = 0; } var mtd = int(this.Method); @@ -87,7 +88,7 @@ function CURVE_c() { var tmpvar2 = cleandata(this.xy); this.xy = tmpvar2[0]; var N = size(this.xy,"r"); - exprs[5-1] = "n"; + this.exprs[5-1] = "n"; if (this.graf=="y"||this.graf=="Y") { var ipar = [[N],[mtd],[PO]]; var rpar = []; @@ -118,16 +119,16 @@ function CURVE_c() { var DChange = true; } if (DChange) { - exprs[2-1] = strcat(sci2exp(xy2.slice()[1-1])); - exprs[3-1] = strcat(sci2exp(xy2.slice()[2-1])); + this.exprs[2-1] = strcat(sci2exp(xy2.slice()[1-1])); + this.exprs[3-1] = strcat(sci2exp(xy2.slice()[2-1])); } - exprs[1-1] = sci2exp(New_methhod); + this.exprs[1-1] = sci2exp(New_methhod); if (oipar[3-1]==1) { var perop = "y"; } else { var perop = "n"; } - exprs[4-1] = perop; + this.exprs[4-1] = perop; var SaveExit = true; } else { var tmpvar4 = Do_Spline(N,mtd,this.xy.slice()[1-1],this.xy.slice()[2-1]); @@ -144,7 +145,7 @@ function CURVE_c() { var orpar = [[this.xy.slice()[1-1]],[this.xy.slice()[2-1]]]; } } - exprs[1-1] = sci2exp(mtd); + this.exprs[1-1] = sci2exp(mtd); var oipar = [[N],[mtd],[PO]]; var SaveExit = true; } @@ -158,7 +159,7 @@ function CURVE_c() { } this.model.rpar = new ScilabDouble(orpar); this.model.ipar = new ScilabDouble(oipar); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 19b20933..c186f931 100644 --- a/js/Sources/CURVE_c.pickle +++ b/js/Sources/CURVE_c.pickle @@ -10,7 +10,7 @@ aS'inrpar' p4 aS'sok' p5 -aS'graphics' +aS'wp' p6 aS'Pd3' p7 @@ -46,106 +46,110 @@ aS'xt' p22 aS'sample5' p23 -aS'Pulse_exprs2' +aS'sTp2' p24 -aS'Cx' +aS'Pulse_exprs2' p25 -aS'filen' +aS'Cx' p26 -aS'xa' +aS'filen' p27 -aS'random_u_exprs2' +aS'sample4' p28 -aS'sAmp2' +aS'xa' p29 -aS'zok' +aS'random_u_exprs2' p30 -aS'offset' +aS'sAmp2' p31 -aS'yt' +aS'zok' p32 -aS'sdelay' +aS'offset' p33 -aS'ixy' +aS'yt' p34 -aS'seed4' +aS'sdelay' p35 -aS'seed5' +aS'ixy' p36 -aS'Sawt2_exprs2' +aS'seed4' p37 -aS'Amp' +aS'seed5' p38 -aS'PeriodicOption' +aS'Sawt2_exprs2' p39 -aS'var4' +aS'Amp' p40 -aS'ymx1' +aS'PeriodicOption' p41 -aS'Cformat' +aS'var4' p42 -aS'ya' +aS'ymx1' p43 -aS'Bias3' +aS'Cformat' p44 -aS'xls_open' +aS'ya' p45 -aS'myans' +aS'Bias3' p46 -aS'xmx1' +aS'xls_open' p47 -aS'inipar' +aS'myans' p48 -aS'xls_read' +aS'xmx1' p49 -aS'sTp' +aS'inipar' p50 -aS'Sin_exprs2' +aS'xls_read' p51 -aS'argn' +aS'sTp' p52 -aS'wp' +aS'Sin_exprs2' p53 -aS'phase' +aS'argn' p54 -aS'iipar' +aS'graphics' p55 -aS'min5' +aS'phase' p56 -aS'mok' +aS'iipar' p57 -aS'Pw3' +aS'min5' p58 -aS'sheetN' +aS'mok' p59 -aS'xgetmouse' +aS'Pw3' p60 -aS'max5' +aS'sheetN' p61 -aS'rparin' +aS'xgetmouse' p62 -aS'sample4' +aS'max5' p63 -aS'Cy' +aS'rparin' p64 -aS'sTp2' +aS'exprs' p65 -aS'yy' +aS'Cy' p66 -aS'x' +aS'gr_i' p67 -aS'model' +aS'yy' p68 -aS'ORDER2' +aS'x' p69 -aS'irpar' +aS'model' p70 -aS'graf' +aS'ORDER2' p71 -aS'xye' +aS'irpar' p72 -atp73 -Rp74 +aS'graf' +p73 +aS'xye' +p74 +atp75 +Rp76 .(dp0 S'mean4' p1 diff --git a/js/Sources/CURV_f.js b/js/Sources/CURV_f.js index ce2f2207..c7e3fd39 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 ScilabDouble([false,true]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CURV_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CURV_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,[],this.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 d4d844a0..3d37146b 100644 --- a/js/Sources/CURV_f.pickle +++ b/js/Sources/CURV_f.pickle @@ -6,10 +6,14 @@ S'x' p2 aS'model' p3 -aS'graphics' +aS'gr_i' p4 -atp5 -Rp6 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/Sources/Counter.js b/js/Sources/Counter.js index de94c91f..26085612 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 ScilabDouble([false,false]); - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } Counter.prototype.details = function Counter() { @@ -33,12 +33,13 @@ function Counter() { this.minim = parseFloat(arguments[0]["minim"]) this.maxim = parseFloat(arguments[0]["maxim"]) this.rule = parseFloat(arguments[0]["rule"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.minim,this.maxim,this.rule,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","Counter")],[" "],["Integer counter generator"],[" "]],["Minimum","Maximum","Rule (1:Increment, 2:Decrement)"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.minim,this.maxim,this.rule,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","Counter")],[" "],["Integer counter generator"],[" "]],["Minimum","Maximum","Rule (1:Increment, 2:Decrement)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -49,7 +50,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 eabc335f..cbddeb7d 100644 --- a/js/Sources/Counter.pickle +++ b/js/Sources/Counter.pickle @@ -8,14 +8,18 @@ aS'maxim' p3 aS'rule' p4 -aS'graphics' +aS'exprs' p5 -aS'x' +aS'gr_i' p6 -aS'model' +aS'graphics' p7 -atp8 -Rp9 +aS'x' +p8 +aS'model' +p9 +atp10 +Rp11 .(dp0 S'model.dstate' p1 diff --git a/js/Sources/FROMWSB.js b/js/Sources/FROMWSB.js index 9d1ab635..2c8e6e64 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()); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMWSB\",sz(1),sz(2));"]); - this.x = standard_define([5,2],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMWSB\",sz(1),sz(2));"]); + this.x = standard_define([5,2],this.model,[],this.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 165976fe..6a6d8bcd 100644 --- a/js/Sources/FROMWSB.pickle +++ b/js/Sources/FROMWSB.pickle @@ -2,14 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'exprs' p2 -aS'model' +aS'gr_i' p3 -aS'xxn' +aS'graphics' p4 -atp5 -Rp6 +aS'x' +p5 +aS'model' +p6 +aS'xxn' +p7 +atp8 +Rp9 .(dp0 S'ppath' p1 diff --git a/js/Sources/FROMWS_c.js b/js/Sources/FROMWS_c.js index 0626ae40..02a6c352 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 ScilabDouble([false,true]); - 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 = standard_define([3.5,2],this.model,exprs,gr_i); + 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 = standard_define([3.5,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } FROMWS_c.prototype.details = function FROMWS_c() { @@ -38,12 +38,13 @@ function FROMWS_c() { this.Method = parseFloat(arguments[0]["Method"]) this.ZC = parseFloat(arguments[0]["ZC"]) this.OutEnd = parseFloat(arguments[0]["OutEnd"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.varnam,this.Method,this.ZC,this.OutEnd,exprs] = scicos_getvalue("Set From_Workspace block parameters",["Variable name","Interpolation Method","Enable zero crossing(0:No, 1:Yes)?","Output at end(0:Zero, 1:Hold, 2:Repeat)"],list("str",1,"vec",1,"vec",1,"vec",1),exprs); + [ok,this.varnam,this.Method,this.ZC,this.OutEnd,this.exprs] = scicos_getvalue("Set From_Workspace block parameters",["Variable name","Interpolation Method","Enable zero crossing(0:No, 1:Yes)?","Output at end(0:Zero, 1:Hold, 2:Repeat)"],list("str",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -72,7 +73,7 @@ function FROMWS_c() { this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 e3017752..817652dd 100644 --- a/js/Sources/FROMWS_c.pickle +++ b/js/Sources/FROMWS_c.pickle @@ -6,20 +6,24 @@ S'_str2code' p2 aS'ZC' p3 -aS'OutEnd' +aS'exprs' p4 -aS'graphics' +aS'gr_i' p5 -aS'x' +aS'OutEnd' p6 -aS'model' +aS'graphics' p7 -aS'Method' +aS'x' p8 -aS'varnam' +aS'model' p9 -atp10 -Rp11 +aS'Method' +p10 +aS'varnam' +p11 +atp12 +Rp13 .(dp0 S'arg1' p1 diff --git a/js/Sources/GENSIN_f.js b/js/Sources/GENSIN_f.js index ff8153de..9a9f29eb 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 ScilabDouble([false,true]); - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } GENSIN_f.prototype.details = function GENSIN_f() { @@ -31,12 +31,13 @@ function GENSIN_f() { this.M = arguments[0]["M"] this.F = arguments[0]["F"] this.P = arguments[0]["P"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.M,this.F,this.P,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","GENSIN_f")],[" "],["Sine wave generator"],[" "]],["Magnitude","Frequency (rad/s)","Phase (rad)"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.M,this.F,this.P,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","GENSIN_f")],[" "],["Sine wave generator"],[" "]],["Magnitude","Frequency (rad/s)","Phase (rad)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -52,7 +53,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 2058c781..2043a20b 100644 --- a/js/Sources/GENSIN_f.pickle +++ b/js/Sources/GENSIN_f.pickle @@ -2,20 +2,24 @@ c__builtin__ set p0 ((lp1 -S'F' +S'P' p2 -aS'M' +aS'F' p3 -aS'P' +aS'M' p4 -aS'graphics' +aS'exprs' p5 -aS'x' +aS'gr_i' p6 -aS'model' +aS'graphics' p7 -atp8 -Rp9 +aS'x' +p8 +aS'model' +p9 +atp10 +Rp11 .(dp0 S'model.sim' p1 diff --git a/js/Sources/GENSQR_f.js b/js/Sources/GENSQR_f.js index 3c0b2f65..162dbe83 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 ScilabDouble([false,false]); - var exprs = string(this.Amplitude); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GENSQR_f\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,exprs,gr_i); + this.exprs = string(this.Amplitude); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GENSQR_f\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } GENSQR_f.prototype.details = function GENSQR_f() { @@ -27,19 +27,20 @@ function GENSQR_f() { } GENSQR_f.prototype.set = function GENSQR_f() { this.Amplitude = parseFloat(arguments[0]["Amplitude"]) + this.exprs = parseFloat(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - if (size(exprs,"*")==2) { - var exprs = exprs[2-1]; + if (size(this.exprs,"*")==2) { + this.exprs = this.exprs[2-1]; } while (true) { - [ok,this.Amplitude,exprs] = scicos_getvalue(["Set Square generator block parameters"],["Amplitude"],list("vec",1),exprs); + [ok,this.Amplitude,this.exprs] = scicos_getvalue(["Set Square generator block parameters"],["Amplitude"],list("vec",1),this.exprs); if (!ok) { break; } - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 b2ee098e..ddab6644 100644 --- a/js/Sources/GENSQR_f.pickle +++ b/js/Sources/GENSQR_f.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'exprs' p2 -aS'model' +aS'gr_i' p3 aS'Amplitude' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'model.sim' p1 diff --git a/js/Sources/GEN_SQR.js b/js/Sources/GEN_SQR.js index 0ed8569e..f119e1dc 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; - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } GEN_SQR.prototype.details = function GEN_SQR() { @@ -63,11 +63,12 @@ function GEN_SQR() { scicos_context.Amax = arguments[0]["scicos_context.Amax"] scicos_context.rule = arguments[0]["scicos_context.rule"] scicos_context.F = arguments[0]["scicos_context.F"] + this.exprs = arguments[0]["exprs"] var y = this.needcompile; arg1.model.ipar = 1; var typ = list(); this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; var Btitre = "Set GEN_SQR parameters"; var Exprs0 = [["Amin"],["Amax"],["rule"],["F"]]; var Bitems = [["Minimum Value"],["Maximum Value"],["Initial Value( 1= Minimum Value 2= Maximum Value)"],["Period (sec)"]]; @@ -76,7 +77,7 @@ function GEN_SQR() { this.x = arg1; var ok = false; while (!ok) { - [ok,scicos_context.Amin,scicos_context.Amax,scicos_context.rule,scicos_context.F,exprs] = scicos_getvalue(Btitre,Bitems,Ss,exprs); + [ok,scicos_context.Amin,scicos_context.Amax,scicos_context.rule,scicos_context.F,this.exprs] = scicos_getvalue(Btitre,Bitems,Ss,this.exprs); if (!ok) { return; } @@ -93,7 +94,7 @@ function GEN_SQR() { var ok = tmpvar1[3]; if (ok) { var y = max(2,this.needcompile,needcompile2); - this.x.graphics.exprs = exprs; + this.x.graphics.exprs = this.exprs; this.x.model.rpar = sblock; break; } diff --git a/js/Sources/GEN_SQR.pickle b/js/Sources/GEN_SQR.pickle index 2f6fdb8a..fce61f2d 100644 --- a/js/Sources/GEN_SQR.pickle +++ b/js/Sources/GEN_SQR.pickle @@ -8,18 +8,22 @@ aS'scicos_context.Amax' p3 aS'scicos_context.rule' p4 -aS'graphics' +aS'exprs' p5 -aS'x' +aS'gr_i' p6 -aS'scicos_context.Amin' +aS'graphics' p7 -aS'scicos_context.F' +aS'x' p8 aS'model' p9 -atp10 -Rp11 +aS'scicos_context.F' +p10 +aS'scicos_context.Amin' +p11 +atp12 +Rp13 .(dp0 S'model.odstate' p1 diff --git a/js/Sources/Ground_g.js b/js/Sources/Ground_g.js index 343fe0c4..b30d73e8 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 ScilabDouble([false,false]); - var exprs = []; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Ground_g\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = []; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Ground_g\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.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 4ff6abff..12e7a77c 100644 --- a/js/Sources/Ground_g.pickle +++ b/js/Sources/Ground_g.pickle @@ -6,8 +6,14 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'gr_i' +p4 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/Sources/INIMPL_f.js b/js/Sources/INIMPL_f.js index bfcbde45..75664e3c 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; - var exprs = "1"; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INIMPL_f\",sz(1),sz(2));"]); - this.x = standard_define([1,1],this.model,exprs,gr_i); + this.exprs = "1"; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INIMPL_f\",sz(1),sz(2));"]); + this.x = standard_define([1,1],this.model,this.exprs,this.gr_i); this.x.graphics.out_implicit = ["I"]; return new ImplicitInBlock(this.x); } @@ -29,15 +29,16 @@ function INIMPL_f() { } INIMPL_f.prototype.set = function INIMPL_f() { this.prt = parseFloat(arguments[0]["prt"]) + this.exprs = parseFloat(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - if (size(exprs,"*")==2) { - var exprs = exprs[1-1]; + if (size(this.exprs,"*")==2) { + this.exprs = this.exprs[1-1]; } while (true) { - [ok,this.prt,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","INIMPL_f")],[" "],["Implicit input port"],[" "]],"Port Number",list("vec",1),exprs); + [ok,this.prt,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","INIMPL_f")],[" "],["Implicit input port"],[" "]],"Port Number",list("vec",1),this.exprs); if (!ok) { break; } @@ -50,7 +51,7 @@ function INIMPL_f() { var y = needcompile; } this.model.ipar = new ScilabDouble([this.prt]); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 7a3db6b1..737ac91e 100644 --- a/js/Sources/INIMPL_f.pickle +++ b/js/Sources/INIMPL_f.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'prt' +S'exprs' p2 -aS'x' +aS'prt' p3 -aS'model' +aS'gr_i' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/Sources/IN_f.js b/js/Sources/IN_f.js index d1b6534d..6ff481fa 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 ScilabDouble([false,false]); - var exprs = sci2exp(prt); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IN_f\",sz(1),sz(2));"]); - this.x = standard_define([1,1],this.model,exprs,gr_i); + this.exprs = sci2exp(prt); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IN_f\",sz(1),sz(2));"]); + this.x = standard_define([1,1],this.model,this.exprs,this.gr_i); return new ExplicitInBlock(this.x); } IN_f.prototype.details = function IN_f() { @@ -27,20 +27,20 @@ function IN_f() { this.x = arg1; this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = this.graphics.exprs; - if (size(exprs,"*")==2) { - var exprs = exprs[1-1]; + this.exprs = this.graphics.exprs; + if (size(this.exprs,"*")==2) { + this.exprs = this.exprs[1-1]; } - if (size(exprs,"*")==1) { - var exprs = [[exprs[1-1]],["[-1 -2]"],["-1"]]; + if (size(this.exprs,"*")==1) { + this.exprs = [[this.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),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),this.exprs); var ok = tmpvar0[0]; var prt = tmpvar0[1]; var otsz = tmpvar0[2]; var ot = tmpvar0[3]; - var exprs = tmpvar0[4]; + this.exprs = tmpvar0[4]; if (!ok) { break; } @@ -61,7 +61,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(exprs); + this.graphics.exprs = new ScilabDouble(this.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 3594fa55..c3788a09 100644 --- a/js/Sources/IN_f.pickle +++ b/js/Sources/IN_f.pickle @@ -6,10 +6,14 @@ S'x' p2 aS'model' p3 -aS'graphics' +aS'gr_i' p4 -atp5 -Rp6 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'needcompile' p1 diff --git a/js/Sources/Modulo_Count.js b/js/Sources/Modulo_Count.js index d2ada870..22d253bb 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 ScilabDouble([false,false]); - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } Modulo_Count.prototype.details = function Modulo_Count() { @@ -29,12 +29,13 @@ function Modulo_Count() { Modulo_Count.prototype.set = function Modulo_Count() { this.ini_c = parseFloat(arguments[0]["ini_c"]) this.base = parseFloat(arguments[0]["base"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.ini_c,this.base,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","Modulo_Count")],[" "],["Modulo counter (0 to N counter)"],[" "]],["Initial State (zero or positive number)","Upper Limit (positive number)"],list("vec",1,"vec",1),exprs); + [ok,this.ini_c,this.base,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","Modulo_Count")],[" "],["Modulo counter (0 to N counter)"],[" "]],["Initial State (zero or positive number)","Upper Limit (positive number)"],list("vec",1,"vec",1),this.exprs); this.ini_c = int(this.ini_c); this.base = int(this.base); if (!ok) { @@ -45,7 +46,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 5f0e8a6d..b331cc4a 100644 --- a/js/Sources/Modulo_Count.pickle +++ b/js/Sources/Modulo_Count.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'ini_c' p2 -aS'model' +aS'exprs' p3 -aS'ini_c' +aS'gr_i' p4 aS'base' p5 aS'graphics' p6 -atp7 -Rp8 +aS'x' +p7 +aS'model' +p8 +atp9 +Rp10 .(dp0 S'model.sim' p1 diff --git a/js/Sources/PULSE_SC.js b/js/Sources/PULSE_SC.js index 0048829d..796d4e50 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; - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } PULSE_SC.prototype.details = function PULSE_SC() { @@ -58,11 +58,12 @@ function PULSE_SC() { scicos_context.W = arguments[0]["scicos_context.W"] scicos_context.F = arguments[0]["scicos_context.F"] scicos_context.A = arguments[0]["scicos_context.A"] + this.exprs = arguments[0]["exprs"] var y = this.needcompile; arg1.model.ipar = 1; var typ = list(); this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; var Btitre = "Set Pulse Generator parameters"; var Exprs0 = [["E"],["W"],["F"],["A"]]; var Bitems = [["Phase delay (secs):"],["Pulse Width (% of period):"],["Period (secs):"],["Amplitude:"]]; @@ -71,7 +72,7 @@ function PULSE_SC() { this.x = arg1; var ok = false; while (!ok) { - [ok,scicos_context.E,scicos_context.W,scicos_context.F,scicos_context.A,exprs] = scicos_getvalue(Btitre,Bitems,Ss,exprs); + [ok,scicos_context.E,scicos_context.W,scicos_context.F,scicos_context.A,this.exprs] = scicos_getvalue(Btitre,Bitems,Ss,this.exprs); if (!ok) { return; } @@ -88,7 +89,7 @@ function PULSE_SC() { var ok = tmpvar1[3]; if (ok) { var y = max(2,this.needcompile,needcompile2); - this.x.graphics.exprs = exprs; + this.x.graphics.exprs = this.exprs; this.x.model.rpar = sblock; break; } diff --git a/js/Sources/PULSE_SC.pickle b/js/Sources/PULSE_SC.pickle index 40948305..7cd361a3 100644 --- a/js/Sources/PULSE_SC.pickle +++ b/js/Sources/PULSE_SC.pickle @@ -6,20 +6,24 @@ S'needcompile' p2 aS'scicos_context.W' p3 -aS'graphics' +aS'exprs' p4 -aS'x' +aS'gr_i' p5 -aS'model' +aS'graphics' p6 -aS'scicos_context.A' +aS'x' p7 -aS'scicos_context.F' +aS'model' p8 -aS'scicos_context.E' +aS'scicos_context.A' p9 -atp10 -Rp11 +aS'scicos_context.F' +p10 +aS'scicos_context.E' +p11 +atp12 +Rp13 .(dp0 S'model.odstate' p1 diff --git a/js/Sources/RAMP.js b/js/Sources/RAMP.js index d0d6e161..3ac0a879 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 ScilabDouble([false,true]); - var exprs = [string(rpar)]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAMP\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = [string(rpar)]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAMP\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } RAMP.prototype.details = function RAMP() { @@ -34,12 +34,13 @@ function RAMP() { this.slope = parseFloat(arguments[0]["slope"]) this.stt = parseFloat(arguments[0]["stt"]) this.iout = parseFloat(arguments[0]["iout"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.slope,this.stt,this.iout,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","RAMP")],[" "],["Ramp function"],[" "]],["Slope","Start Time","Initial Value"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.slope,this.stt,this.iout,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","RAMP")],[" "],["Ramp function"],[" "]],["Slope","Start Time","Initial Value"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -47,7 +48,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 90ce1880..ec96548a 100644 --- a/js/Sources/RAMP.pickle +++ b/js/Sources/RAMP.pickle @@ -8,14 +8,18 @@ aS'iout' p3 aS'stt' p4 -aS'graphics' +aS'exprs' p5 -aS'x' +aS'gr_i' p6 -aS'model' +aS'graphics' p7 -atp8 -Rp9 +aS'x' +p8 +aS'model' +p9 +atp10 +Rp11 .(dp0 S'slope' p1 diff --git a/js/Sources/RAND_f.js b/js/Sources/RAND_f.js index 9e4444cb..73084f93 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 ScilabDouble([false,false]); - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } RAND_f.prototype.details = function RAND_f() { @@ -37,18 +37,19 @@ function RAND_f() { this.a = parseFloat(arguments[0]["a"]) this.b = parseFloat(arguments[0]["b"]) this.seed_c = arguments[0]["seed_c"] + this.exprs = inverse(arguments[0]["exprs"]) this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - if (size(exprs,"*")==5) { - var exprs = exprs.slice(1-1,3); + if (size(this.exprs,"*")==5) { + this.exprs = this.exprs.slice(1-1,3); } - if (size(exprs,"*")==3) { - var exprs = [[exprs],[string(this.model.dstate[1-1])]]; + if (size(this.exprs,"*")==3) { + this.exprs = [[this.exprs],[string(this.model.dstate[1-1])]]; } while (true) { - [ok,this.flag,this.a,this.b,this.seed_c,exprs] = scicos_getvalue([["Set Random generator block parameters"],["flag = 0 : Uniform distribution A is min and A+B max"],["flag = 1 : Normal distribution A is mean and B deviation"],[" "],["A and B must be vector with equal sizes"],["seed is the seed of random number generator (integer<2**31)"]],["flag","A","B","seed"],list("vec",1,"vec",-1,"vec","size(%2,\'*\')","vec",1),exprs); + [ok,this.flag,this.a,this.b,this.seed_c,this.exprs] = scicos_getvalue([["Set Random generator block parameters"],["flag = 0 : Uniform distribution A is min and A+B max"],["flag = 1 : Normal distribution A is mean and B deviation"],[" "],["A and B must be vector with equal sizes"],["seed is the seed of random number generator (integer<2**31)"]],["flag","A","B","seed"],list("vec",1,"vec",-1,"vec","size(%2,\'*\')","vec",1),this.exprs); if (!ok) { break; } @@ -56,7 +57,7 @@ function RAND_f() { message("flag must be equal to 1 or 0"); } else { var nout = size(this.a,"*"); - this.graphics.exprs = new ScilabDouble(exprs); + this.graphics.exprs = new ScilabDouble(this.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 3810200f..7e695747 100644 --- a/js/Sources/RAND_f.pickle +++ b/js/Sources/RAND_f.pickle @@ -8,16 +8,20 @@ aS'b' p3 aS'seed_c' p4 -aS'flag' +aS'exprs' p5 -aS'graphics' +aS'flag' p6 -aS'x' +aS'gr_i' p7 -aS'model' +aS'graphics' p8 -atp9 -Rp10 +aS'x' +p9 +aS'model' +p10 +atp11 +Rp12 .(dp0 S'model.dstate' p1 diff --git a/js/Sources/RAND_m.js b/js/Sources/RAND_m.js index f7d0217b..56333efc 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 ScilabDouble([false,false]); - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } RAND_m.prototype.details = function RAND_m() { @@ -48,15 +48,16 @@ function RAND_m() { this.a = parseFloat(arguments[0]["a"]) this.b = parseFloat(arguments[0]["b"]) this.seed_c = arguments[0]["seed_c"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - if (size(exprs,"*")==14) { - exprs[9-1] = []; + if (size(this.exprs,"*")==14) { + this.exprs[9-1] = []; } while (true) { - [ok,this.typ,this.flag,this.a,this.b,this.seed_c,exprs] = scicos_getvalue([["Set Random generator block parameters"],["flag = 0 : Uniform distribution A is min and A+B max"],["flag = 1 : Normal distribution A is mean and B deviation"],[" "],["A and B must be matrix with equal sizes"]],["Datatype(1=real double 2=complex)","flag","A","B","SEED"],list("vec",1,"vec",1,"mat",[-1,-2],"mat","[-1 -2]","mat",[1,2]),exprs); + [ok,this.typ,this.flag,this.a,this.b,this.seed_c,this.exprs] = scicos_getvalue([["Set Random generator block parameters"],["flag = 0 : Uniform distribution A is min and A+B max"],["flag = 1 : Normal distribution A is mean and B deviation"],[" "],["A and B must be matrix with equal sizes"]],["Datatype(1=real double 2=complex)","flag","A","B","SEED"],list("vec",1,"vec",1,"mat",[-1,-2],"mat","[-1 -2]","mat",[1,2]),this.exprs); if (!ok) { break; } @@ -85,7 +86,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 06b6608f..bd5f8157 100644 --- a/js/Sources/RAND_m.pickle +++ b/js/Sources/RAND_m.pickle @@ -8,18 +8,22 @@ aS'b' p3 aS'seed_c' p4 -aS'flag' +aS'exprs' p5 -aS'graphics' +aS'flag' p6 -aS'x' +aS'gr_i' p7 -aS'model' +aS'graphics' p8 -aS'typ' +aS'x' p9 -atp10 -Rp11 +aS'model' +p10 +aS'typ' +p11 +atp12 +Rp13 .(dp0 S'model.dstate' p1 diff --git a/js/Sources/READAU_f.js b/js/Sources/READAU_f.js index dd7d168d..76498f48 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 ScilabDouble([false,false]); - 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 = standard_define([5,2],this.model,exprs,gr_i); + 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 = standard_define([5,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } READAU_f.prototype.details = function READAU_f() { @@ -40,9 +40,10 @@ function READAU_f() { this.fname1 = parseFloat(arguments[0]["fname1"]) this.N = parseFloat(arguments[0]["N"]) this.swap = parseFloat(arguments[0]["swap"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; var out = this.model.out; var dstate = this.model.dstate; @@ -50,9 +51,9 @@ function READAU_f() { var imask = 9+ipar[1-1]; var tmask = ipar[imask-1]; var lunit = dstate[3-1]; - var fname = exprs[1-1]; + var fname = this.exprs[1-1]; while (true) { - [ok,this.fname1,this.N,this.swap,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","READAU_f")],[" "],["(Read Audio File)"],[" "],["Read is done on a binary \'.au\' file"]],["Input File Name","Buffer size","Swap Mode (0:No, 1:Yes)"],list("str",1,"vec",1,"vec",1),exprs); + [ok,this.fname1,this.N,this.swap,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","READAU_f")],[" "],["(Read Audio File)"],[" "],["Read is done on a binary \'.au\' file"]],["Input File Name","Buffer size","Swap Mode (0:No, 1:Yes)"],list("str",1,"vec",1,"vec",1),this.exprs); var tmask1 = []; var outmask = 1; var frmt1 = "uc"; @@ -86,7 +87,7 @@ function READAU_f() { } this.model.dstate = new ScilabDouble(dstate); this.model.ipar = new ScilabDouble(ipar); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 c112ea3e..429a17d5 100644 --- a/js/Sources/READAU_f.pickle +++ b/js/Sources/READAU_f.pickle @@ -8,18 +8,22 @@ aS'fname1' p3 aS'N' p4 -aS'swap' +aS'exprs' p5 -aS'graphics' +aS'gr_i' p6 -aS'x' +aS'swap' p7 -aS'model' +aS'graphics' p8 -aS'alreadyran' +aS'x' p9 -atp10 -Rp11 +aS'model' +p10 +aS'alreadyran' +p11 +atp12 +Rp13 .(dp0 S'tmask' p1 diff --git a/js/Sources/READC_f.js b/js/Sources/READC_f.js index 4a11e2ae..0e72d59d 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 ScilabDouble([false,false]); - 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 = standard_define([4,2],this.model,exprs,gr_i); + 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 = standard_define([4,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } READC_f.prototype.details = function READC_f() { @@ -54,20 +54,21 @@ function READC_f() { this.N = parseFloat(arguments[0]["N"]) this.offset = parseFloat(arguments[0]["offset"]) this.swap = parseFloat(arguments[0]["swap"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.model = this.x.model; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.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 = exprs[3-1]; - var frmt = exprs[4-1]; + var fname = this.exprs[3-1]; + var frmt = this.exprs[4-1]; while (true) { - [ok,this.tmask1,this.outmask,this.fname1,this.frmt1,this.M,this.N,this.offset,this.swap,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","READC_f")],[" "],["Read from C binary file"]],["Time Record Selection","Outputs Record Selection","Input File Name","Input Format","Record Size","Buffer Size","Initial Record Index","Swap Mode (0:No, 1:Yes)"],list("vec",-1,"vec",-1,"str",1,"str",1,"vec",1,"vec",1,"vec",1,"vec",1),exprs); + [ok,this.tmask1,this.outmask,this.fname1,this.frmt1,this.M,this.N,this.offset,this.swap,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","READC_f")],[" "],["Read from C binary file"]],["Time Record Selection","Outputs Record Selection","Input File Name","Input Format","Record Size","Buffer Size","Initial Record Index","Swap Mode (0:No, 1:Yes)"],list("vec",-1,"vec",-1,"str",1,"str",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -130,7 +131,7 @@ function READC_f() { } this.model.dstate = new ScilabDouble(dstate); this.model.ipar = new ScilabDouble(ipar); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 635dc478..7c21df9c 100644 --- a/js/Sources/READC_f.pickle +++ b/js/Sources/READC_f.pickle @@ -14,22 +14,26 @@ aS'fname1' p6 aS'N' p7 -aS'swap' +aS'exprs' p8 -aS'offset' +aS'gr_i' p9 -aS'graphics' +aS'swap' p10 -aS'x' +aS'offset' p11 -aS'model' +aS'graphics' p12 -aS'tmask1' +aS'x' p13 -aS'alreadyran' +aS'model' p14 -atp15 -Rp16 +aS'tmask1' +p15 +aS'alreadyran' +p16 +atp17 +Rp18 .(dp0 S'tmask' p1 diff --git a/js/Sources/RFILE_f.js b/js/Sources/RFILE_f.js index 4c5b6c2e..4cc3f634 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 ScilabDouble([false,false]); - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } RFILE_f.prototype.details = function RFILE_f() { @@ -44,9 +44,10 @@ function RFILE_f() { this.fname1 = parseFloat(arguments[0]["fname1"]) this.frmt1 = parseFloat(arguments[0]["frmt1"]) this.N = parseFloat(arguments[0]["N"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; var dstate = this.model.dstate; var ipar = this.model.ipar; @@ -55,13 +56,13 @@ function RFILE_f() { var imask = 5+ipar[1-1]+ipar[2-1]; var tmask = ipar[imask-1]; var lunit = dstate[3-1]; - var fname = exprs[3-1]; - var frmt = exprs[4-1]; - if (size(exprs,"*")>5) { - exprs[6-1] = []; + var fname = this.exprs[3-1]; + var frmt = this.exprs[4-1]; + if (size(this.exprs,"*")>5) { + this.exprs[6-1] = []; } while (true) { - [ok,this.tmask1,this.outmask,this.fname1,this.frmt1,this.N,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","RFILE_f")],[" "],["Read from an input file"],[" "],["Read is done on:"],[" - A binary file if no format given"],[" - A formatted text file if a format (fortran type) is given"]],["Time Record Selection","Outputs Record Selection","Input File Name","Input Format","Buffer Size"],list("vec",-1,"vec",-1,"str",1,"str",1,"vec",1),exprs); + [ok,this.tmask1,this.outmask,this.fname1,this.frmt1,this.N,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","RFILE_f")],[" "],["Read from an input file"],[" "],["Read is done on:"],[" - A binary file if no format given"],[" - A formatted text file if a format (fortran type) is given"]],["Time Record Selection","Outputs Record Selection","Input File Name","Input Format","Buffer Size"],list("vec",-1,"vec",-1,"str",1,"str",1,"vec",1),this.exprs); if (!ok) { break; } @@ -113,7 +114,7 @@ function RFILE_f() { } this.model.dstate = new ScilabDouble(dstate); this.model.ipar = new ScilabDouble(ipar); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 8be76902..a3cf5177 100644 --- a/js/Sources/RFILE_f.pickle +++ b/js/Sources/RFILE_f.pickle @@ -12,16 +12,20 @@ aS'fname1' p5 aS'N' p6 -aS'graphics' +aS'exprs' p7 -aS'x' +aS'gr_i' p8 -aS'model' +aS'graphics' p9 -aS'tmask1' +aS'x' p10 -atp11 -Rp12 +aS'model' +p11 +aS'tmask1' +p12 +atp13 +Rp14 .(dp0 S'tmask' p1 diff --git a/js/Sources/SAWTOOTH_f.js b/js/Sources/SAWTOOTH_f.js index b3ec717e..2cfae4d2 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 ScilabDouble([false,true]); - var exprs = " "; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAWTOOTH_f\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,exprs,gr_i); + this.exprs = " "; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAWTOOTH_f\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,this.exprs,this.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 40c4ca73..0fd8076d 100644 --- a/js/Sources/SAWTOOTH_f.pickle +++ b/js/Sources/SAWTOOTH_f.pickle @@ -6,8 +6,14 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'gr_i' +p4 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/Sources/STEP.js b/js/Sources/STEP.js index 972a8fe3..c5d93cd3 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 ScilabDouble([false,false]); - var exprs = [[string(1)],[string(rpar)]]; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"STEP\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = [[string(1)],[string(rpar)]]; + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"STEP\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } STEP.prototype.details = function STEP() { @@ -33,12 +33,13 @@ function STEP() { this.temps = arguments[0]["temps"] this.in1 = arguments[0]["in1"] this.fi = arguments[0]["fi"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.temps,this.in1,this.fi,exprs] = scicos_getvalue([[msprintf("Set %s block parameters","STEP_FUNCTION")],[" "],["Step Function"],[" "]],["Step Time","Initial Value","Final Value"],list("vec",1,"vec",-1,"vec",-1),exprs); + [ok,this.temps,this.in1,this.fi,this.exprs] = scicos_getvalue([[msprintf("Set %s block parameters","STEP_FUNCTION")],[" "],["Step Function"],[" "]],["Step Time","Initial Value","Final Value"],list("vec",1,"vec",-1,"vec",-1),this.exprs); if (!ok) { break; } @@ -70,7 +71,7 @@ function STEP() { var rpar = [[this.in1],[this.fi]]; } this.model.rpar = new ScilabDouble(rpar); - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 e49533dc..e522ccd5 100644 --- a/js/Sources/STEP.pickle +++ b/js/Sources/STEP.pickle @@ -2,20 +2,24 @@ c__builtin__ set p0 ((lp1 -S'graphics' +S'fi' p2 aS'in1' p3 aS'temps' p4 -aS'fi' +aS'exprs' p5 -aS'x' +aS'gr_i' p6 -aS'model' +aS'graphics' p7 -atp8 -Rp9 +aS'x' +p8 +aS'model' +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/Sources/STEP_FUNCTION.js b/js/Sources/STEP_FUNCTION.js index f79a4986..5d81952f 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; - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"STEP_FUNCTION\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"STEP_FUNCTION\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,[],this.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 50a906e4..0f17e3e0 100644 --- a/js/Sources/STEP_FUNCTION.pickle +++ b/js/Sources/STEP_FUNCTION.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'exprs' p2 -aS'model' +aS'gr_i' p3 -aS'xxn' -p4 aS'graphics' +p4 +aS'x' p5 -atp6 -Rp7 +aS'model' +p6 +aS'xxn' +p7 +atp8 +Rp9 .(dp0 S'lnk.ct' p1 diff --git a/js/Sources/SampleCLK.js b/js/Sources/SampleCLK.js index f09912f7..4fe2eb15 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 ScilabDouble([false,false]); - var exprs = [[sci2exp(1)],[sci2exp(0)]]; - this.x = standard_define([2,2],this.model,exprs," "); + this.exprs = [[sci2exp(1)],[sci2exp(0)]]; + this.x = standard_define([2,2],this.model,this.exprs," "); return new BasicBlock(this.x); } SampleCLK.prototype.details = function SampleCLK() { @@ -25,12 +25,13 @@ function SampleCLK() { SampleCLK.prototype.set = function SampleCLK() { this.frequ = arguments[0]["frequ"] this.offset = arguments[0]["offset"] + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; while (true) { - [ok,this.frequ,this.offset,exprs] = scicos_getvalue("Set block parameters",["Sample time","Offset"],list("vec",1,"vec",1),exprs); + [ok,this.frequ,this.offset,this.exprs] = scicos_getvalue("Set block parameters",["Sample time","Offset"],list("vec",1,"vec",1),this.exprs); if (!ok) { break; } @@ -50,7 +51,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 1f55629a..91e03ca2 100644 --- a/js/Sources/SampleCLK.pickle +++ b/js/Sources/SampleCLK.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'frequ' p2 -aS'model' -p3 aS'offset' +p3 +aS'exprs' p4 -aS'frequ' +aS'gr_i' p5 aS'graphics' p6 -atp7 -Rp8 +aS'x' +p7 +aS'model' +p8 +atp9 +Rp10 .(dp0 S'needcompile' p1 diff --git a/js/Sources/Sigbuilder.js b/js/Sources/Sigbuilder.js index 1a558e26..96c8d9b7 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()); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Sigbuilder\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Sigbuilder\",sz(1),sz(2));"]); + this.x = standard_define([3,2],this.model,[],this.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 f22a37dd..b46e3a46 100644 --- a/js/Sources/Sigbuilder.pickle +++ b/js/Sources/Sigbuilder.pickle @@ -2,22 +2,28 @@ c__builtin__ set p0 ((lp1 -S'xxn' +S'N' p2 -aS'y' +aS'exprs' p3 -aS'x' +aS'gr_i' p4 -aS'model' +aS'graphics' p5 -aS'N' +aS'y' p6 -aS'ORDER2' +aS'x' p7 -aS'order' +aS'model' p8 -atp9 -Rp10 +aS'order' +p9 +aS'ORDER2' +p10 +aS'xxn' +p11 +atp12 +Rp13 .(dp0 S'Y[j-1]' p1 diff --git a/js/Sources/TIME_f.js b/js/Sources/TIME_f.js index 86f44525..1cb47909 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 ScilabDouble([false,true]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TIME_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TIME_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,[],this.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 8cc9b048..edb635fb 100644 --- a/js/Sources/TIME_f.pickle +++ b/js/Sources/TIME_f.pickle @@ -6,8 +6,14 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'gr_i' +p4 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/Sources/TKSCALE.js b/js/Sources/TKSCALE.js index b132a0e6..ec4bba02 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 ScilabDouble([false,false]); - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } TKSCALE.prototype.details = function TKSCALE() { @@ -31,13 +31,14 @@ function TKSCALE() { this.a = parseFloat(arguments[0]["a"]) this.b = parseFloat(arguments[0]["b"]) this.f = parseFloat(arguments[0]["f"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; - [ok,this.a,this.b,this.f,exprs] = scicos_getvalue("Set scale block parameters",["Min value","Max value","Normalization"],list("vec",1,"vec",1,"vec",1),exprs); + [ok,this.a,this.b,this.f,this.exprs] = scicos_getvalue("Set scale block parameters",["Min value","Max value","Normalization"],list("vec",1,"vec",1,"vec",1),this.exprs); if (ok) { - this.graphics.exprs = new ScilabDouble([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 4547b11f..61242ea0 100644 --- a/js/Sources/TKSCALE.pickle +++ b/js/Sources/TKSCALE.pickle @@ -8,14 +8,18 @@ aS'b' p3 aS'f' p4 -aS'graphics' +aS'exprs' p5 -aS'x' +aS'gr_i' p6 -aS'model' +aS'graphics' p7 -atp8 -Rp9 +aS'x' +p8 +aS'model' +p9 +atp10 +Rp11 .(dp0 S'a' p1 diff --git a/js/Threshold/GENERAL_f.js b/js/Threshold/GENERAL_f.js index 8079bbc7..210e3760 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 ScilabDouble([true,false]); - 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 = standard_define([3,2],this.model,exprs,gr_i); + 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 = standard_define([3,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } GENERAL_f.prototype.details = function GENERAL_f() { @@ -31,16 +31,17 @@ function GENERAL_f() { GENERAL_f.prototype.set = function GENERAL_f() { this.in1 = parseFloat(arguments[0]["in1"]) this.out = parseFloat(arguments[0]["out"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; var rpar = this.model.rpar; this.in1 = this.model.in1; this.out = this.model.evtout; var nin = sum(this.in1); var nout = sum(this.out); - [ok,this.in1,this.out,exprs] = scicos_getvalue("Set General Zero-Crossing parameters",["Input size","Number of event output"],list("vec",1,"vec",1),exprs); + [ok,this.in1,this.out,this.exprs] = scicos_getvalue("Set General Zero-Crossing parameters",["Input size","Number of event output"],list("vec",1,"vec",1),this.exprs); if (ok) { var tmpvar0 = check_io(this.model,this.graphics,this.in1,[],[],ones(this.out,1)); this.model = tmpvar0[0]; @@ -61,7 +62,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.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 9b35bd87..6b56ff54 100644 --- a/js/Threshold/GENERAL_f.pickle +++ b/js/Threshold/GENERAL_f.pickle @@ -2,18 +2,22 @@ c__builtin__ set p0 ((lp1 -S'x' +S'in1' p2 -aS'model' +aS'exprs' p3 -aS'out' +aS'gr_i' p4 -aS'in1' -p5 aS'graphics' +p5 +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +aS'out' +p8 +atp9 +Rp10 .(dp0 S'arg1' p1 diff --git a/js/Threshold/NEGTOPOS_f.js b/js/Threshold/NEGTOPOS_f.js index 81414ce2..9079f107 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 ScilabDouble([true,false]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NEGTOPOS_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NEGTOPOS_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,[],this.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 0116d67f..c9626baf 100644 --- a/js/Threshold/NEGTOPOS_f.pickle +++ b/js/Threshold/NEGTOPOS_f.pickle @@ -6,8 +6,14 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'gr_i' +p4 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/Threshold/POSTONEG_f.js b/js/Threshold/POSTONEG_f.js index a6981a8c..db0e654e 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 ScilabDouble([true,false]); this.model.firing = new ScilabDouble([-1]); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"POSTONEG_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,[],gr_i); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"POSTONEG_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,[],this.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 2560cc83..6e98a2b8 100644 --- a/js/Threshold/POSTONEG_f.pickle +++ b/js/Threshold/POSTONEG_f.pickle @@ -6,8 +6,14 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'gr_i' +p4 +aS'exprs' +p5 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.sim' p1 diff --git a/js/Threshold/ZCROSS_f.js b/js/Threshold/ZCROSS_f.js index e96ef207..288e89e9 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 ScilabDouble([true,false]); - var exprs = strcat(sci2exp(this.in1)); - var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ZCROSS_f\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,exprs,gr_i); + this.exprs = strcat(sci2exp(this.in1)); + this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ZCROSS_f\",sz(1),sz(2));"]); + this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } ZCROSS_f.prototype.details = function ZCROSS_f() { @@ -27,12 +27,13 @@ function ZCROSS_f() { } ZCROSS_f.prototype.set = function ZCROSS_f() { this.in1 = parseFloat(arguments[0]["in1"]) + this.exprs = arguments[0]["exprs"] this.x = arg1; this.graphics = arg1.graphics; - var exprs = this.graphics.exprs; + this.exprs = this.graphics.exprs; this.model = arg1.model; while (true) { - [ok,this.in1,exprs] = scicos_getvalue([["Set Zero-Crossing parameters"],["All surfaces must cross together"]],"Input size",list("vec",1),exprs); + [ok,this.in1,this.exprs] = scicos_getvalue([["Set Zero-Crossing parameters"],["All surfaces must cross together"]],"Input size",list("vec",1),this.exprs); if (!ok) { break; } @@ -45,7 +46,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([exprs]); + this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.in1 = 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 ece29a05..95285053 100644 --- a/js/Threshold/ZCROSS_f.pickle +++ b/js/Threshold/ZCROSS_f.pickle @@ -2,16 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'in1' p2 -aS'model' +aS'exprs' p3 -aS'in1' +aS'gr_i' p4 aS'graphics' p5 -atp6 -Rp7 +aS'x' +p6 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/sci2jsyacc.py b/sci2jsyacc.py index 00f3d542..5844b431 100755 --- a/sci2jsyacc.py +++ b/sci2jsyacc.py @@ -57,7 +57,13 @@ JOB_BLOCKS = {} FUNCTION_VARS = set() LOCAL_VARS = set() -GLOBAL_VARS = {'x'} +GLOBAL_VARS = { + 'exprs', + 'gr_i', + 'graphics', + 'model', + 'x', +} VAR_TYPES = {} @@ -530,7 +536,7 @@ def p_lterm_assignment_expression(p): else: prefix = '' value = p[3][0] - if var == 'gr_i' and value == '[]': + if var == 'this.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 ' |