diff options
Diffstat (limited to 'js/Branching')
44 files changed, 627 insertions, 618 deletions
diff --git a/js/Branching/CLKFROM.js b/js/Branching/CLKFROM.js index b3a992b0..b705f634 100644 --- a/js/Branching/CLKFROM.js +++ b/js/Branching/CLKFROM.js @@ -8,7 +8,7 @@ function CLKFROM() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = [false,false]; - exprs = "A"; + var exprs = "A"; this.x = standard_define([2,1],this.model,exprs," "); this.x.graphics.id = "From"; return new BasicBlock(this.x); @@ -24,17 +24,17 @@ function CLKFROM() { CLKFROM.prototype.set = function CLKFROM() { this.tag = arguments[0]["tag"] this.x = arg1; - graphics = arg1.graphics; + var graphics = arg1.graphics; this.model = arg1.model; - exprs = graphics.exprs; + var exprs = graphics.exprs; while (true) { [ok,this.tag,exprs] = scicos_getvalue("Set block parameters","Tag",list("str",-1),exprs); if (!ok) { break; } if (this.model.opar!=list(this.tag)) { - needcompile = 4; - y = needcompile; + var needcompile = 4; + var y = needcompile; } this.model.opar = list(new ScilabDouble([this.tag])); this.model.evtout = new ScilabDouble([1]); diff --git a/js/Branching/CLKGOTO.js b/js/Branching/CLKGOTO.js index 55d9edba..75320022 100644 --- a/js/Branching/CLKGOTO.js +++ b/js/Branching/CLKGOTO.js @@ -9,7 +9,7 @@ function CLKGOTO() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = [false,false]; - exprs = [["A"],[sci2exp(1)]]; + var exprs = [["A"],[sci2exp(1)]]; this.x = standard_define([2,1],this.model,exprs," "); this.x.graphics.id = "Goto"; return new BasicBlock(this.x); @@ -28,9 +28,9 @@ function CLKGOTO() { this.tag = arguments[0]["tag"] this.tagvis = parseFloat(arguments[0]["tagvis"]) this.x = arg1; - graphics = arg1.graphics; + var graphics = arg1.graphics; this.model = arg1.model; - exprs = graphics.exprs; + var exprs = 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); if (!ok) { @@ -38,13 +38,13 @@ function CLKGOTO() { } if (((this.tagvis<1)||(this.tagvis>3))) { message("Tag Visibility must be between 1 and 3"); - ok = false; + var ok = false; } this.tagvis = int(this.tagvis); if (ok) { if (((this.model.opar!=list(this.tag))||(this.model.ipar!=this.tagvis))) { - needcompile = 4; - y = needcompile; + var needcompile = 4; + var y = needcompile; } this.model.opar = list(new ScilabDouble([this.tag])); this.model.ipar = new ScilabDouble([this.tagvis]); diff --git a/js/Branching/CLKGotoTagVisibility.js b/js/Branching/CLKGotoTagVisibility.js index 1104d22b..6b7e5fb8 100644 --- a/js/Branching/CLKGotoTagVisibility.js +++ b/js/Branching/CLKGotoTagVisibility.js @@ -14,8 +14,8 @@ function CLKGotoTagVisibility() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = [false,false]; - exprs = "A"; - gr_i = []; + var exprs = "A"; + var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -31,8 +31,8 @@ function CLKGotoTagVisibility() { CLKGotoTagVisibility.prototype.set = function CLKGotoTagVisibility() { this.tag = arguments[0]["tag"] this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = graphics.exprs; this.model = arg1.model; while (true) { [ok,this.tag,exprs] = scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),exprs); @@ -41,8 +41,8 @@ function CLKGotoTagVisibility() { } if (ok) { if (this.model.opar!=list(this.tag)) { - needcompile = 4; - y = needcompile; + var needcompile = 4; + var y = needcompile; } graphics.exprs = exprs; this.model.opar = list(new ScilabDouble([this.tag])); diff --git a/js/Branching/DEMUX.js b/js/Branching/DEMUX.js index 7879bc31..4d1da68d 100644 --- a/js/Branching/DEMUX.js +++ b/js/Branching/DEMUX.js @@ -10,8 +10,8 @@ function DEMUX() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = []; this.model.dep_ut = [true,false]; - exprs = string(this.out); - gr_i = []; + var exprs = string(this.out); + var gr_i = []; this.x = standard_define([.5,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -27,8 +27,8 @@ function DEMUX() { DEMUX.prototype.set = function DEMUX() { this.out = parseFloat(arguments[0]["out"]) this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = 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); @@ -38,21 +38,27 @@ function DEMUX() { if (size(this.out,"*")==1) { if (this.out<2||this.out>31) { message("Block must have at least 2 and at most 31 output ports"); - ok = false; + var ok = false; } else { - [this.model,graphics,ok] = check_io(this.model,graphics,0,-transpose([1:this.out]),[],[]); + var tmpvar0 = check_io(this.model,graphics,0,-transpose([1:this.out]),[],[]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; } } else { if (size(this.out,"*")<2||or(this.out==0)||size(this.out,"*")>31) { message([["Block must have at least 2 and at most 31 output ports"],["size 0 is not allowed"]]); - ok = false; + var ok = false; } else { if (min(this.out)<0) { - nin = 0; + var nin = 0; } else { - nin = sum(this.out); + var nin = sum(this.out); } - [this.model,graphics,ok] = check_io(this.model,graphics,nin,this.out.slice(),[],[]); + var tmpvar1 = check_io(this.model,graphics,nin,this.out.slice(),[],[]) + this.model = tmpvar1[0] + var graphics = tmpvar1[1] + var ok = tmpvar1[2]; if (ok) { this.out = size(this.out,"*"); } diff --git a/js/Branching/DEMUX.pickle b/js/Branching/DEMUX.pickle index d1d8f41f..b740b0b4 100644 --- a/js/Branching/DEMUX.pickle +++ b/js/Branching/DEMUX.pickle @@ -11,74 +11,71 @@ p4 atp5 Rp6 .(dp0 -S'arg1' +S'model.sim' p1 -S'object' +S'list' p2 -sS'graphics' +sS'model.in1' p3 -g2 -sS'x.model' +S'double' p4 -NsS'model.out' +sS'ok' p5 -S'vector' +S'boolean' p6 -sS'out' +sS'model.blocktype' p7 -S'double' +S'string' p8 -sS'model.in1' -p9 -g8 sS'x.graphics' +p9 +S'object' p10 -g2 -sS'model.firing' +sS'arg1' p11 -g6 -sS'model.sim' +g10 +sS'graphics.exprs' p12 -S'list' +NsS'nin' p13 -sS'nin' +g4 +sS'model.out' p14 -g8 -sS'[this.model,graphics,ok]' +S'vector' p15 -g13 -sS'graphics.exprs' +sS'exprs' p16 -NsS'model.ipar' -p17 g8 -sS'typ' +sS'x.model' +p17 +NsS'gr_i' p18 -g6 -sS'ok' +g15 +sS'model.dep_ut' p19 -S'boolean' +g15 +sS'graphics' p20 -sS'model.blocktype' +g10 +sS'y' p21 -S'string' +g15 +sS'x' p22 -sS'model.dep_ut' +g4 +sS'model' p23 -g6 -sS'exprs' +g10 +sS'model.ipar' p24 -g22 -sS'gr_i' +g4 +sS'typ' p25 -g6 -sS'y' +g15 +sS'model.firing' p26 -g6 -sS'x' +g15 +sS'out' p27 -g8 -sS'model' -p28 -g2 +g4 s.
\ No newline at end of file diff --git a/js/Branching/DEMUX_f.js b/js/Branching/DEMUX_f.js index a1176764..f9ada1b0 100644 --- a/js/Branching/DEMUX_f.js +++ b/js/Branching/DEMUX_f.js @@ -10,8 +10,8 @@ function DEMUX_f() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = []; this.model.dep_ut = [true,false]; - exprs = string(this.out); - gr_i = []; + var exprs = string(this.out); + var gr_i = []; this.x = standard_define([.5,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -27,8 +27,8 @@ function DEMUX_f() { DEMUX_f.prototype.set = function DEMUX_f() { this.out = parseFloat(arguments[0]["out"]) this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = 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); @@ -38,21 +38,27 @@ function DEMUX_f() { if (size(this.out,"*")==1) { if (this.out<2||this.out>8) { message("Block must have at least 2 and at most 8 output ports"); - ok = false; + var ok = false; } else { - [this.model,graphics,ok] = check_io(this.model,graphics,0,-transpose([1:this.out]),[],[]); + var tmpvar0 = check_io(this.model,graphics,0,-transpose([1:this.out]),[],[]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; } } else { if (size(this.out,"*")<2||size(this.out,"*")>8||or(this.out==0)) { message([["Block must have at least 2 and at most 8 output ports"],["and size 0 is not allowed"]]); - ok = false; + var ok = false; } else { if (min(this.out)<0) { - nin = 0; + var nin = 0; } else { - nin = sum(this.out); + var nin = sum(this.out); } - [this.model,graphics,ok] = check_io(this.model,graphics,nin,this.out.slice(),[],[]); + var tmpvar1 = check_io(this.model,graphics,nin,this.out.slice(),[],[]) + this.model = tmpvar1[0] + var graphics = tmpvar1[1] + var ok = tmpvar1[2]; if (ok) { this.out = size(this.out,"*"); } diff --git a/js/Branching/DEMUX_f.pickle b/js/Branching/DEMUX_f.pickle index d1d8f41f..b740b0b4 100644 --- a/js/Branching/DEMUX_f.pickle +++ b/js/Branching/DEMUX_f.pickle @@ -11,74 +11,71 @@ p4 atp5 Rp6 .(dp0 -S'arg1' +S'model.sim' p1 -S'object' +S'list' p2 -sS'graphics' +sS'model.in1' p3 -g2 -sS'x.model' +S'double' p4 -NsS'model.out' +sS'ok' p5 -S'vector' +S'boolean' p6 -sS'out' +sS'model.blocktype' p7 -S'double' +S'string' p8 -sS'model.in1' -p9 -g8 sS'x.graphics' +p9 +S'object' p10 -g2 -sS'model.firing' +sS'arg1' p11 -g6 -sS'model.sim' +g10 +sS'graphics.exprs' p12 -S'list' +NsS'nin' p13 -sS'nin' +g4 +sS'model.out' p14 -g8 -sS'[this.model,graphics,ok]' +S'vector' p15 -g13 -sS'graphics.exprs' +sS'exprs' p16 -NsS'model.ipar' -p17 g8 -sS'typ' +sS'x.model' +p17 +NsS'gr_i' p18 -g6 -sS'ok' +g15 +sS'model.dep_ut' p19 -S'boolean' +g15 +sS'graphics' p20 -sS'model.blocktype' +g10 +sS'y' p21 -S'string' +g15 +sS'x' p22 -sS'model.dep_ut' +g4 +sS'model' p23 -g6 -sS'exprs' +g10 +sS'model.ipar' p24 -g22 -sS'gr_i' +g4 +sS'typ' p25 -g6 -sS'y' +g15 +sS'model.firing' p26 -g6 -sS'x' +g15 +sS'out' p27 -g8 -sS'model' -p28 -g2 +g4 s.
\ No newline at end of file diff --git a/js/Branching/ESELECT_f.js b/js/Branching/ESELECT_f.js index a8945df6..310344e5 100644 --- a/js/Branching/ESELECT_f.js +++ b/js/Branching/ESELECT_f.js @@ -14,8 +14,8 @@ function ESELECT_f() { this.model.dep_ut = [true,false]; this.model.nmode = new ScilabDouble([0]); this.model.nzcross = new ScilabDouble([0]); - gr_i = []; - exprs = [[string(this.out)],[string(1)],[string(this.model.nmode)]]; + var gr_i = []; + var exprs = [[string(this.out)],[string(1)],[string(this.model.nmode)]]; this.x = standard_define([4,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -35,8 +35,8 @@ function ESELECT_f() { this.inh = parseFloat(arguments[0]["inh"]) this.nmod = parseFloat(arguments[0]["nmod"]) this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = graphics.exprs; if (size(exprs,"*")==1) { exprs[2-1] = string(1); } @@ -61,7 +61,10 @@ function ESELECT_f() { if (this.out<2) { message("Block must have at least two output ports"); } else { - [this.model,graphics,ok] = check_io(this.model,graphics,1,[],this.inh,[ones(this.out,1)]); + var tmpvar0 = check_io(this.model,graphics,1,[],this.inh,[ones(this.out,1)]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; if (ok) { graphics.exprs = exprs; this.model.evtout = new ScilabDouble([ones(this.out,1)]); diff --git a/js/Branching/ESELECT_f.pickle b/js/Branching/ESELECT_f.pickle index 1e92bdca..b97e8d58 100644 --- a/js/Branching/ESELECT_f.pickle +++ b/js/Branching/ESELECT_f.pickle @@ -67,40 +67,37 @@ p20 sS'model.evtout' p21 g6 -sS'[this.model,graphics,ok]' -p22 -g20 sS'model.nmode' -p23 +p22 g6 sS'exprs[3-1]' -p24 +p23 g17 sS'graphics.exprs' -p25 +p24 NsS'model.nzcross' -p26 +p25 g6 sS'model.blocktype' -p27 +p26 g17 sS'nmod' -p28 +p27 g6 sS'exprs' -p29 +p28 S'matrix' -p30 +p29 sS'gr_i' -p31 +p30 g9 sS'y' -p32 +p31 g9 sS'x' -p33 +p32 g6 sS'model' -p34 +p33 g2 s.
\ No newline at end of file diff --git a/js/Branching/EXTRACTOR.js b/js/Branching/EXTRACTOR.js index c4e5d731..8eeeb581 100644 --- a/js/Branching/EXTRACTOR.js +++ b/js/Branching/EXTRACTOR.js @@ -9,8 +9,8 @@ function EXTRACTOR() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [true,false]; this.model.ipar = new ScilabDouble([this.ind]); - exprs = [sci2exp(this.ind)]; - gr_i = []; + var exprs = [sci2exp(this.ind)]; + var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -26,8 +26,8 @@ function EXTRACTOR() { EXTRACTOR.prototype.set = function EXTRACTOR() { this.ind = parseFloat(arguments[0]["ind"]) this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = graphics.exprs; this.model = arg1.model; while (true) { [ok,this.ind,exprs] = scicos_getvalue("Set block parameters",["indices to extract"],list("vec",-1),exprs); @@ -36,7 +36,10 @@ function EXTRACTOR() { } this.ind = int(this.ind); this.ind = this.ind.slice(); - [this.model,graphics,ok] = check_io(this.model,graphics,[-1],size(this.ind,1),[],[]); + var tmpvar0 = check_io(this.model,graphics,[-1],size(this.ind,1),[],[]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; if (ok) { this.model.ipar = this.ind; graphics.exprs = exprs; diff --git a/js/Branching/EXTRACTOR.pickle b/js/Branching/EXTRACTOR.pickle index 26a63660..c3f89749 100644 --- a/js/Branching/EXTRACTOR.pickle +++ b/js/Branching/EXTRACTOR.pickle @@ -30,45 +30,42 @@ p8 sS'arg1' p9 g8 -sS'[this.model,graphics,ok]' -p10 -g2 sS'graphics.exprs' -p11 +p10 NsS'x.model' -p12 +p11 NsS'model.out' -p13 +p12 g4 sS'exprs' -p14 +p13 S'vector' -p15 +p14 sS'ind' -p16 +p15 g4 sS'gr_i' -p17 -g15 +p16 +g14 sS'model.dep_ut' -p18 -g15 +p17 +g14 sS'graphics' -p19 +p18 g8 sS'y' -p20 -g15 +p19 +g14 sS'x' -p21 +p20 g4 sS'model' -p22 +p21 g8 sS'model.ipar' -p23 +p22 g4 sS'typ' -p24 -g15 +p23 +g14 s.
\ No newline at end of file diff --git a/js/Branching/FROM.js b/js/Branching/FROM.js index 49334ffd..edb2d8b7 100644 --- a/js/Branching/FROM.js +++ b/js/Branching/FROM.js @@ -13,8 +13,8 @@ function FROM() { this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [false,false]; - exprs = ["A"]; - gr_i = []; + var exprs = ["A"]; + var gr_i = []; this.x = standard_define([2,1],this.model,exprs,gr_i); this.x.graphics.id = "From"; return new BasicBlock(this.x); @@ -31,8 +31,8 @@ function FROM() { FROM.prototype.set = function FROM() { this.tag = arguments[0]["tag"] this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = graphics.exprs; this.model = arg1.model; while (true) { [ok,this.tag,exprs] = scicos_getvalue("Set parameters",["Tag"],list("str",-1),exprs); @@ -41,8 +41,8 @@ function FROM() { } if (ok) { if (this.model.opar!=list(this.tag)) { - needcompile = 4; - y = needcompile; + var needcompile = 4; + var y = needcompile; } graphics.exprs = exprs; this.model.opar = list(new ScilabDouble([this.tag])); diff --git a/js/Branching/FROMMO.js b/js/Branching/FROMMO.js index 9f2f6582..7563b8d0 100644 --- a/js/Branching/FROMMO.js +++ b/js/Branching/FROMMO.js @@ -13,11 +13,11 @@ function FROMMO() { this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [false,false]; - mo = modelica(); + var mo = modelica(); mo.model = "frommo"; mo.outputs = "n"; - exprs = ["A"]; - gr_i = []; + var exprs = ["A"]; + var gr_i = []; this.x = standard_define([2,1],this.model,exprs,gr_i); this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -34,8 +34,8 @@ function FROMMO() { FROMMO.prototype.set = function FROMMO() { this.tag = arguments[0]["tag"] this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = graphics.exprs; this.model = arg1.model; while (true) { [ok,this.tag,exprs] = scicos_getvalue("Set parameters",["Tag"],list("str",-1),exprs); @@ -44,8 +44,8 @@ function FROMMO() { } if (ok) { if (this.model.opar!=list(this.tag)) { - needcompile = 4; - y = needcompile; + var needcompile = 4; + var y = needcompile; } graphics.exprs = exprs; this.model.opar = list(new ScilabDouble([this.tag])); diff --git a/js/Branching/GOTO.js b/js/Branching/GOTO.js index 383adc99..24549a07 100644 --- a/js/Branching/GOTO.js +++ b/js/Branching/GOTO.js @@ -13,8 +13,8 @@ function GOTO() { this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [false,false]; - exprs = [["A"],[sci2exp(1)]]; - gr_i = []; + var exprs = [["A"],[sci2exp(1)]]; + var gr_i = []; this.x = standard_define([2,1],this.model,exprs,gr_i); this.x.graphics.id = "Goto"; return new BasicBlock(this.x); @@ -33,8 +33,8 @@ function GOTO() { this.tag = arguments[0]["tag"] this.tagvis = parseFloat(arguments[0]["tagvis"]) this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = 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); @@ -44,19 +44,19 @@ function GOTO() { this.tagvis = int(this.tagvis); if (((this.tagvis<1)||(this.tagvis>3))) { message("Tag Visibility must be between 1 and 3"); - ok = false; + var ok = false; } if (ok) { if (((this.model.ipar!=this.tagvis)||(this.model.opar!=list(this.tag)))) { - needcompile = 4; - y = needcompile; + var needcompile = 4; + var y = needcompile; } graphics.exprs = exprs; this.model.opar = list(new ScilabDouble([this.tag])); this.model.ipar = new ScilabDouble([this.tagvis]); this.x.model = this.model; this.x.graphics = graphics; - arg1 = this.x; + var arg1 = this.x; break; } } diff --git a/js/Branching/GOTOMO.js b/js/Branching/GOTOMO.js index 81683fcd..473bfd8c 100644 --- a/js/Branching/GOTOMO.js +++ b/js/Branching/GOTOMO.js @@ -13,11 +13,11 @@ function GOTOMO() { this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [false,false]; - mo = modelica(); + var mo = modelica(); mo.model = "gotomo"; mo.inputs = "p"; - exprs = [["A"],[sci2exp(1)]]; - gr_i = []; + var exprs = [["A"],[sci2exp(1)]]; + var gr_i = []; this.x = standard_define([2,1],this.model,exprs,gr_i); this.x.graphics.in_implicit = ["I"]; return new BasicBlock(this.x); @@ -36,8 +36,8 @@ function GOTOMO() { this.tag = arguments[0]["tag"] this.tagvis = parseFloat(arguments[0]["tagvis"]) this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = 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); @@ -47,19 +47,19 @@ function GOTOMO() { this.tagvis = int(this.tagvis); if (((this.tagvis<1)||(this.tagvis>3))) { message("Tag Visibility must be between 1 and 3"); - ok = false; + var ok = false; } if (ok) { if (((this.model.ipar!=this.tagvis)||(this.model.opar!=list(this.tag)))) { - needcompile = 4; - y = needcompile; + var needcompile = 4; + var y = needcompile; } graphics.exprs = exprs; this.model.opar = list(new ScilabDouble([this.tag])); this.model.ipar = new ScilabDouble([this.tagvis]); this.x.model = this.model; this.x.graphics = graphics; - arg1 = this.x; + var arg1 = this.x; break; } } diff --git a/js/Branching/GotoTagVisibility.js b/js/Branching/GotoTagVisibility.js index 7010e090..87317add 100644 --- a/js/Branching/GotoTagVisibility.js +++ b/js/Branching/GotoTagVisibility.js @@ -14,8 +14,8 @@ function GotoTagVisibility() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = [false,false]; - exprs = "A"; - gr_i = []; + var exprs = "A"; + var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -31,8 +31,8 @@ function GotoTagVisibility() { GotoTagVisibility.prototype.set = function GotoTagVisibility() { this.tag = arguments[0]["tag"] this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = graphics.exprs; this.model = arg1.model; while (true) { [ok,this.tag,exprs] = scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),exprs); @@ -41,8 +41,8 @@ function GotoTagVisibility() { } if (ok) { if (this.model.opar!=list(this.tag)) { - needcompile = 4; - y = needcompile; + var needcompile = 4; + var y = needcompile; } graphics.exprs = exprs; this.model.opar = list(new ScilabDouble([this.tag])); diff --git a/js/Branching/GotoTagVisibilityMO.js b/js/Branching/GotoTagVisibilityMO.js index fdacf43e..95c5ae7b 100644 --- a/js/Branching/GotoTagVisibilityMO.js +++ b/js/Branching/GotoTagVisibilityMO.js @@ -14,8 +14,8 @@ function GotoTagVisibilityMO() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabBoolean([false]); this.model.dep_ut = [false,false]; - exprs = "A"; - gr_i = []; + var exprs = "A"; + var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -31,8 +31,8 @@ function GotoTagVisibilityMO() { GotoTagVisibilityMO.prototype.set = function GotoTagVisibilityMO() { this.tag = arguments[0]["tag"] this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = graphics.exprs; this.model = arg1.model; while (true) { [ok,this.tag,exprs] = scicos_getvalue("Set parameters",["GotoTag"],list("str",-1),exprs); @@ -41,8 +41,8 @@ function GotoTagVisibilityMO() { } if (ok) { if (this.model.opar!=list(this.tag)) { - needcompile = 4; - y = needcompile; + var needcompile = 4; + var y = needcompile; } graphics.exprs = exprs; this.model.opar = list(new ScilabDouble([this.tag])); diff --git a/js/Branching/ISELECT_f.js b/js/Branching/ISELECT_f.js index 456dd661..f06d1bb5 100644 --- a/js/Branching/ISELECT_f.js +++ b/js/Branching/ISELECT_f.js @@ -2,7 +2,7 @@ function ISELECT_f() { ISELECT_f.prototype.define = function ISELECT_f() { this.z0 = 0; - out = [[-1],[-1]]; + var out = [[-1],[-1]]; this.nout = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["selector"]), new ScilabDouble([2])); @@ -12,8 +12,8 @@ function ISELECT_f() { this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [true,false]; - exprs = [[string(this.nout)],[string(this.z0+1)]]; - gr_i = []; + var exprs = [[string(this.nout)],[string(this.z0+1)]]; + var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -31,8 +31,8 @@ function ISELECT_f() { this.nout = parseFloat(arguments[0]["nout"]) this.z0 = parseFloat(arguments[0]["z0"]) this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = 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); @@ -42,7 +42,10 @@ function ISELECT_f() { if (this.z0>this.nout||this.z0<=0) { message("initial connected input is not a valid input port number"); } else { - [this.model,graphics,ok] = check_io(this.model,graphics,-1,-ones(this.nout,1),ones(this.nout,1),[]); + var tmpvar0 = check_io(this.model,graphics,-1,-ones(this.nout,1),ones(this.nout,1),[]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; if (ok) { graphics.exprs = exprs; this.model.dstate = new ScilabDouble([this.z0-1]); diff --git a/js/Branching/ISELECT_f.pickle b/js/Branching/ISELECT_f.pickle index 948a2c26..9790452a 100644 --- a/js/Branching/ISELECT_f.pickle +++ b/js/Branching/ISELECT_f.pickle @@ -13,74 +13,71 @@ p5 atp6 Rp7 .(dp0 -S'model.dstate' +S'model.sim' p1 -S'double' +S'list' p2 -sS'arg1' +sS'model.in1' p3 -S'object' +S'double' p4 -sS'graphics' +sS'model.dstate' p5 g4 -sS'x.model' +sS'model.evtin' p6 -NsS'model.out' +g4 +sS'x.graphics' p7 -S'matrix' +S'object' p8 -sS'out' +sS'arg1' p9 g8 -sS'model.in1' +sS'graphics.exprs' p10 -g2 -sS'x.graphics' +NsS'model.out' p11 -g4 -sS'typ' +S'matrix' p12 -S'vector' +sS'model.blocktype' p13 -sS'model.evtin' +S'string' p14 -g2 -sS'model.sim' +sS'exprs' p15 -S'list' +g12 +sS'x.model' p16 -sS'[this.model,graphics,ok]' +NsS'gr_i' p17 -g16 -sS'graphics.exprs' +S'vector' p18 -NsS'z0' +sS'z0' p19 -g2 -sS'model.blocktype' +g4 +sS'model.dep_ut' p20 -S'string' +g18 +sS'graphics' p21 -sS'model.dep_ut' +g8 +sS'y' p22 -g13 -sS'exprs' +g18 +sS'x' p23 -g8 -sS'gr_i' +g4 +sS'model' p24 -g13 -sS'y' +g8 +sS'typ' p25 -g13 -sS'x' +g18 +sS'nout' p26 -g2 -sS'model' -p27 g4 -sS'nout' -p28 -g2 +sS'out' +p27 +g12 s.
\ No newline at end of file diff --git a/js/Branching/ISELECT_m.js b/js/Branching/ISELECT_m.js index 5ec93016..6334bf7d 100644 --- a/js/Branching/ISELECT_m.js +++ b/js/Branching/ISELECT_m.js @@ -20,8 +20,8 @@ function ISELECT_m() { this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [true,false]; - exprs = [[sci2exp(1)],[sci2exp(this.nout)],[sci2exp(this.z0)]]; - gr_i = []; + var exprs = [[sci2exp(1)],[sci2exp(this.nout)],[sci2exp(this.z0)]]; + var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -41,8 +41,8 @@ function ISELECT_m() { this.nout = parseFloat(arguments[0]["nout"]) this.z0 = parseFloat(arguments[0]["z0"]) this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = 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); @@ -53,14 +53,17 @@ function ISELECT_m() { message("initial connected input is not a valid input port number"); } else if (((this.typ<1)||(this.typ>8))) { message("Datatype is not supported"); - ok = false; + var ok = false; } else { - it = this.typ; - ot = this.typ*ones(1,this.nout); + var it = this.typ; + var ot = this.typ*ones(1,this.nout); if (ok) { - out = [-ones(this.nout,1),-2*ones(this.nout,1)]; - in1 = [-1,-2]; - [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),ones(this.nout,1),[]); + var out = [-ones(this.nout,1),-2*ones(this.nout,1)]; + var in1 = [-1,-2]; + var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),ones(this.nout,1),[]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; if (ok) { graphics.exprs = exprs; this.model.dstate = new ScilabDouble([this.z0]); diff --git a/js/Branching/ISELECT_m.pickle b/js/Branching/ISELECT_m.pickle index 59aa7a37..f1b30901 100644 --- a/js/Branching/ISELECT_m.pickle +++ b/js/Branching/ISELECT_m.pickle @@ -67,62 +67,59 @@ p20 sS'model.evtout' p21 g7 -sS'[this.model,graphics,ok]' -p22 -g2 sS'model.out2' -p23 +p22 g11 sS'in1' -p24 +p23 g7 sS'model.rpar' -p25 +p24 g7 sS'model.outtyp' -p26 +p25 g2 sS'model.state' -p27 +p26 g7 sS'graphics.exprs' -p28 +p27 NsS'model.ipar' -p29 +p28 g7 sS'z0' -p30 +p29 g2 sS'ok' -p31 +p30 S'boolean' -p32 +p31 sS'model.blocktype' -p33 +p32 S'string' -p34 +p33 sS'model.dep_ut' -p35 +p34 g7 sS'exprs' -p36 +p35 g11 sS'gr_i' -p37 +p36 g7 sS'y' -p38 +p37 g7 sS'x' -p39 +p38 g2 sS'model' -p40 +p39 g4 sS'ot' -p41 -g34 +p40 +g33 sS'nout' -p42 +p41 g2 s.
\ No newline at end of file diff --git a/js/Branching/MUX.js b/js/Branching/MUX.js index 0b29058d..b16966b4 100644 --- a/js/Branching/MUX.js +++ b/js/Branching/MUX.js @@ -9,8 +9,8 @@ function MUX() { this.model.ipar = new ScilabDouble([this.in1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [true,false]; - exprs = string(this.in1); - gr_i = []; + var exprs = string(this.in1); + var gr_i = []; this.x = standard_define([.5,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -25,8 +25,8 @@ function MUX() { MUX.prototype.set = function MUX() { this.in1 = parseFloat(arguments[0]["in1"]) this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = 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); @@ -36,21 +36,27 @@ function MUX() { if (size(this.in1,"*")==1) { if (this.in1<2||this.in1>31) { message("Block must have at least two input ports and at most 31"); - ok = false; + var ok = false; } else { - [this.model,graphics,ok] = check_io(this.model,graphics,-transpose([1:this.in1]),0,[],[]); + var tmpvar0 = check_io(this.model,graphics,-transpose([1:this.in1]),0,[],[]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; } } else { if (size(this.in1,"*")<2||or(this.in1==0)||size(this.in1,"*")>31) { message([["Block must have at least two input ports"],["and at most 31. Size 0 is not allowed. "]]); - ok = false; + var ok = false; } else { if (min(this.in1)<0) { - nout = 0; + var nout = 0; } else { - nout = sum(this.in1); + var nout = sum(this.in1); } - [this.model,graphics,ok] = check_io(this.model,graphics,this.in1.slice(),nout,[],[]); + var tmpvar1 = check_io(this.model,graphics,this.in1.slice(),nout,[],[]) + this.model = tmpvar1[0] + var graphics = tmpvar1[1] + var ok = tmpvar1[2]; if (ok) { this.in1 = size(this.in1,"*"); } diff --git a/js/Branching/MUX.pickle b/js/Branching/MUX.pickle index e4cd0711..2dbb6528 100644 --- a/js/Branching/MUX.pickle +++ b/js/Branching/MUX.pickle @@ -34,48 +34,45 @@ p10 sS'arg1' p11 g10 -sS'[this.model,graphics,ok]' -p12 -g2 sS'graphics.exprs' -p13 +p12 NsS'in1' -p14 +p13 S'double' -p15 +p14 sS'model.out' -p16 -g15 +p15 +g14 sS'exprs' -p17 +p16 g8 sS'x.model' -p18 +p17 NsS'gr_i' -p19 +p18 g4 sS'model.dep_ut' -p20 +p19 g4 sS'graphics' -p21 +p20 g10 sS'y' -p22 +p21 g4 sS'x' -p23 -g15 +p22 +g14 sS'model' -p24 +p23 g10 sS'model.ipar' -p25 -g15 +p24 +g14 sS'typ' -p26 +p25 g4 sS'nout' -p27 -g15 +p26 +g14 s.
\ No newline at end of file diff --git a/js/Branching/MUX_f.js b/js/Branching/MUX_f.js index 5dcbbd19..65fc7db3 100644 --- a/js/Branching/MUX_f.js +++ b/js/Branching/MUX_f.js @@ -9,8 +9,8 @@ function MUX_f() { this.model.ipar = new ScilabDouble([this.in1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [true,false]; - exprs = string(this.in1); - gr_i = []; + var exprs = string(this.in1); + var gr_i = []; this.x = standard_define([0.5,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -25,8 +25,8 @@ function MUX_f() { MUX_f.prototype.set = function MUX_f() { this.in1 = parseFloat(arguments[0]["in1"]) this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = 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); @@ -36,21 +36,27 @@ function MUX_f() { if (size(this.in1,"*")==1) { if (this.in1<2||this.in1>8) { message("Block must have at least two input ports and at most eight"); - ok = false; + var ok = false; } else { - [this.model,graphics,ok] = check_io(this.model,graphics,-transpose([1:this.in1]),0,[],[]); + var tmpvar0 = check_io(this.model,graphics,-transpose([1:this.in1]),0,[],[]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; } } else { if (size(this.in1,"*")<2||size(this.in1,"*")>8||or(this.in1==0)) { message([["Block must have at least two input ports"],["and at most eight, and size 0 is not allowed. "]]); - ok = false; + var ok = false; } else { if (min(this.in1)<0) { - nout = 0; + var nout = 0; } else { - nout = sum(this.in1); + var nout = sum(this.in1); } - [this.model,graphics,ok] = check_io(this.model,graphics,this.in1.slice(),nout,[],[]); + var tmpvar1 = check_io(this.model,graphics,this.in1.slice(),nout,[],[]) + this.model = tmpvar1[0] + var graphics = tmpvar1[1] + var ok = tmpvar1[2]; if (ok) { this.in1 = size(this.in1,"*"); } diff --git a/js/Branching/MUX_f.pickle b/js/Branching/MUX_f.pickle index e4cd0711..2dbb6528 100644 --- a/js/Branching/MUX_f.pickle +++ b/js/Branching/MUX_f.pickle @@ -34,48 +34,45 @@ p10 sS'arg1' p11 g10 -sS'[this.model,graphics,ok]' -p12 -g2 sS'graphics.exprs' -p13 +p12 NsS'in1' -p14 +p13 S'double' -p15 +p14 sS'model.out' -p16 -g15 +p15 +g14 sS'exprs' -p17 +p16 g8 sS'x.model' -p18 +p17 NsS'gr_i' -p19 +p18 g4 sS'model.dep_ut' -p20 +p19 g4 sS'graphics' -p21 +p20 g10 sS'y' -p22 +p21 g4 sS'x' -p23 -g15 +p22 +g14 sS'model' -p24 +p23 g10 sS'model.ipar' -p25 -g15 +p24 +g14 sS'typ' -p26 +p25 g4 sS'nout' -p27 -g15 +p26 +g14 s.
\ No newline at end of file diff --git a/js/Branching/M_SWITCH.js b/js/Branching/M_SWITCH.js index 093f2f54..30bbaee4 100644 --- a/js/Branching/M_SWITCH.js +++ b/js/Branching/M_SWITCH.js @@ -1,8 +1,8 @@ /* autogenerated from "macros/Branching/M_SWITCH.sci" */ function M_SWITCH() { M_SWITCH.prototype.define = function M_SWITCH() { - in1 = [[1],[-1],[-1]]; - ipar = [[1],[3]]; + var in1 = [[1],[-1],[-1]]; + var ipar = [[1],[3]]; this.nin = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["mswitch"]), new ScilabDouble([4])); @@ -11,8 +11,8 @@ function M_SWITCH() { this.model.ipar = new ScilabDouble(ipar); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [true,false]; - exprs = [[string(this.nin)],[string(ipar)]]; - gr_i = []; + var exprs = [[string(this.nin)],[string(ipar)]]; + var gr_i = []; this.x = standard_define([2.5,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -32,8 +32,8 @@ function M_SWITCH() { this.base = parseFloat(arguments[0]["base"]) this.rule = arguments[0]["rule"] this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = 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); @@ -50,17 +50,20 @@ function M_SWITCH() { message("incorrect rounding rule"); } else { if (this.nin==1) { - in1 = [[1,1],[-1,1]]; - out = [1,1]; + var in1 = [[1,1],[-1,1]]; + var out = [1,1]; } else { - in1 = [[1],[-ones(this.nin,1)]]; - in2 = [[1],[-2*ones(this.nin,1)]]; - in1 = [in1,in2]; - out = [-1,-2]; + var in1 = [[1],[-ones(this.nin,1)]]; + var in2 = [[1],[-2*ones(this.nin,1)]]; + var in1 = [in1,in2]; + var out = [-1,-2]; } - it = [[-1],[-2*ones(this.nin,1)]]; - ot = -2; - [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); + var it = [[-1],[-2*ones(this.nin,1)]]; + var ot = -2; + var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; if (ok) { graphics.exprs = exprs; this.model.ipar = new ScilabDouble([this.base],[this.rule]); diff --git a/js/Branching/M_SWITCH.pickle b/js/Branching/M_SWITCH.pickle index 396fdd0d..2736cffb 100644 --- a/js/Branching/M_SWITCH.pickle +++ b/js/Branching/M_SWITCH.pickle @@ -49,52 +49,49 @@ p14 sS'nin' p15 g8 -sS'[this.model,graphics,ok]' -p16 -g8 sS'in1' -p17 +p16 g5 sS'in2' -p18 +p17 g5 sS'base' -p19 +p18 g8 sS'graphics.exprs' -p20 +p19 NsS'model.ipar' -p21 +p20 g5 sS'typ' -p22 +p21 g10 sS'model.blocktype' -p23 +p22 S'string' -p24 +p23 sS'model.dep_ut' -p25 +p24 g10 sS'exprs' -p26 +p25 g5 sS'gr_i' -p27 +p26 g10 sS'ipar' -p28 +p27 g5 sS'y' -p29 +p28 g10 sS'x' -p30 +p29 g8 sS'model' -p31 +p30 g2 sS'ot' -p32 +p31 g8 s.
\ No newline at end of file diff --git a/js/Branching/NRMSOM_f.js b/js/Branching/NRMSOM_f.js index 8414f30f..c2765c61 100644 --- a/js/Branching/NRMSOM_f.js +++ b/js/Branching/NRMSOM_f.js @@ -1,7 +1,7 @@ /* autogenerated from "macros/Branching/NRMSOM_f.sci" */ function NRMSOM_f() { NRMSOM_f.prototype.define = function NRMSOM_f() { - in1 = [[-1],[-1]]; + var in1 = [[-1],[-1]]; this.nin = 2; this.model = scicos_model(); this.model.sim = new ScilabString(["junk"]); @@ -9,8 +9,8 @@ function NRMSOM_f() { this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [true,false]; - exprs = [string(this.nin)]; - gr_i = []; + var exprs = [string(this.nin)]; + var gr_i = []; this.x = standard_define([.2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -26,15 +26,18 @@ function NRMSOM_f() { NRMSOM_f.prototype.set = function NRMSOM_f() { this.nin = parseFloat(arguments[0]["nin"]) this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = graphics.exprs; this.model = arg1.model; while (true) { [ok,this.nin,exprs] = scicos_getvalue("Set parameters",["number of inputs"],list("vec",1),exprs); if (!ok) { break; } - [this.model,graphics,ok] = check_io(this.model,graphics,-ones(this.nin,1),-1,[],[]); + var tmpvar0 = check_io(this.model,graphics,-ones(this.nin,1),-1,[],[]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; if (ok) { graphics.exprs = exprs; this.x.graphics = graphics; diff --git a/js/Branching/NRMSOM_f.pickle b/js/Branching/NRMSOM_f.pickle index a36e67ea..20fb9bc4 100644 --- a/js/Branching/NRMSOM_f.pickle +++ b/js/Branching/NRMSOM_f.pickle @@ -33,43 +33,39 @@ p9 sS'arg1' p10 g9 -sS'[this.model,graphics,ok]' -p11 -S'list' -p12 sS'graphics.exprs' -p13 +p11 NsS'in1' -p14 +p12 g4 sS'model.out' -p15 +p13 g6 sS'exprs' -p16 +p14 S'vector' -p17 +p15 sS'x.model' -p18 +p16 NsS'gr_i' -p19 -g17 +p17 +g15 sS'model.dep_ut' -p20 -g17 +p18 +g15 sS'graphics' -p21 +p19 g9 sS'y' -p22 -g17 +p20 +g15 sS'x' -p23 +p21 g6 sS'model' -p24 +p22 g9 sS'typ' -p25 -g17 +p23 +g15 s.
\ No newline at end of file diff --git a/js/Branching/RELAY_f.js b/js/Branching/RELAY_f.js index a6e811d7..69020ac6 100644 --- a/js/Branching/RELAY_f.js +++ b/js/Branching/RELAY_f.js @@ -1,8 +1,8 @@ /* autogenerated from "macros/Branching/RELAY_f.sci" */ function RELAY_f() { RELAY_f.prototype.define = function RELAY_f() { - i0 = 0; - in1 = [[-1],[-1]]; + var i0 = 0; + var in1 = [[-1],[-1]]; this.nin = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["relay"]), new ScilabDouble([2])); @@ -13,8 +13,8 @@ function RELAY_f() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = []; this.model.dep_ut = [true,true]; - exprs = [[string(this.nin)],[string(i0+1)]]; - gr_i = []; + var exprs = [[string(this.nin)],[string(i0+1)]]; + var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -32,10 +32,10 @@ function RELAY_f() { this.nin = parseFloat(arguments[0]["nin"]) this.z0 = arguments[0]["z0"] this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = graphics.exprs; this.model = arg1.model; - ipar = this.model.ipar; + 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); if (!ok) { @@ -44,7 +44,10 @@ function RELAY_f() { if (this.z0>this.nin||this.z0<=0) { message("initial connected input is not a valid input port number"); } else { - [this.model,graphics,ok] = check_io(this.model,graphics,-ones(this.nin,1),-1,ones(this.nin,1),[]); + var tmpvar0 = check_io(this.model,graphics,-ones(this.nin,1),-1,ones(this.nin,1),[]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; if (ok) { graphics.exprs = exprs; this.model.dstate = new ScilabString([this.z0-1]); diff --git a/js/Branching/RELAY_f.pickle b/js/Branching/RELAY_f.pickle index fdcdc500..8e77d212 100644 --- a/js/Branching/RELAY_f.pickle +++ b/js/Branching/RELAY_f.pickle @@ -54,39 +54,36 @@ g2 sS'i0' p17 g2 -sS'[this.model,graphics,ok]' -p18 -g15 sS'in1' -p19 +p18 g9 sS'graphics.exprs' -p20 +p19 NsS'typ' -p21 +p20 g13 sS'model.blocktype' -p22 +p21 S'string' -p23 +p22 sS'model.dep_ut' -p24 +p23 g13 sS'exprs' -p25 +p24 g9 sS'gr_i' -p26 +p25 g13 sS'ipar' -p27 +p26 NsS'y' -p28 +p27 g13 sS'x' -p29 +p28 g2 sS'model' -p30 +p29 g4 s.
\ No newline at end of file diff --git a/js/Branching/SCALAR2VECTOR.js b/js/Branching/SCALAR2VECTOR.js index ec798670..004add07 100644 --- a/js/Branching/SCALAR2VECTOR.js +++ b/js/Branching/SCALAR2VECTOR.js @@ -8,8 +8,8 @@ function SCALAR2VECTOR() { this.model.in1 = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [true,false]; - exprs = [string([this.nout])]; - gr_i = []; + var exprs = [string([this.nout])]; + var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -25,8 +25,8 @@ function SCALAR2VECTOR() { SCALAR2VECTOR.prototype.set = function SCALAR2VECTOR() { this.nout = parseFloat(arguments[0]["nout"]) this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = 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); @@ -36,10 +36,13 @@ function SCALAR2VECTOR() { this.nout = int(this.nout); if ((this.nout!=-1&&(this.nout<=0))) { message("size of output must be -1 or >0"); - ok = false; + var ok = false; } if (ok) { - [this.model,graphics,ok] = check_io(this.model,graphics,[1],this.nout,[],[]); + var tmpvar0 = check_io(this.model,graphics,[1],this.nout,[],[]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; } if (ok) { graphics.exprs = exprs; diff --git a/js/Branching/SCALAR2VECTOR.pickle b/js/Branching/SCALAR2VECTOR.pickle index 9cfd21be..d1ff3945 100644 --- a/js/Branching/SCALAR2VECTOR.pickle +++ b/js/Branching/SCALAR2VECTOR.pickle @@ -34,42 +34,39 @@ p10 sS'arg1' p11 g10 -sS'[this.model,graphics,ok]' -p12 -g2 sS'graphics.exprs' -p13 +p12 NsS'model.in1' -p14 +p13 g4 sS'model.dep_ut' -p15 +p14 S'vector' -p16 +p15 sS'exprs' -p17 -g16 +p16 +g15 sS'x.model' -p18 +p17 NsS'gr_i' -p19 -g16 +p18 +g15 sS'graphics' -p20 +p19 g10 sS'y' -p21 -g16 +p20 +g15 sS'x' -p22 +p21 g4 sS'model' -p23 +p22 g10 sS'typ' -p24 -g16 +p23 +g15 sS'nout' -p25 +p24 g4 s.
\ No newline at end of file diff --git a/js/Branching/SELECT_f.js b/js/Branching/SELECT_f.js index a5527aa8..34b3e65d 100644 --- a/js/Branching/SELECT_f.js +++ b/js/Branching/SELECT_f.js @@ -2,7 +2,7 @@ function SELECT_f() { SELECT_f.prototype.define = function SELECT_f() { this.z0 = 0; - in1 = [[-1],[-1]]; + var in1 = [[-1],[-1]]; this.nin = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["selector"]), new ScilabDouble([2])); @@ -12,8 +12,8 @@ function SELECT_f() { this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [true,false]; - exprs = [[string(this.nin)],[string(this.z0+1)]]; - gr_i = []; + var exprs = [[string(this.nin)],[string(this.z0+1)]]; + var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -31,8 +31,8 @@ function SELECT_f() { this.nin = parseFloat(arguments[0]["nin"]) this.z0 = parseFloat(arguments[0]["z0"]) this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = 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); @@ -42,7 +42,10 @@ function SELECT_f() { if (this.z0>this.nin||this.z0<=0) { message("initial connected input is not a valid input port number"); } else { - [this.model,graphics,ok] = check_io(this.model,graphics,-ones(this.nin,1),-1,ones(this.nin,1),[]); + var tmpvar0 = check_io(this.model,graphics,-ones(this.nin,1),-1,ones(this.nin,1),[]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; if (ok) { graphics.exprs = exprs; this.model.dstate = new ScilabDouble([this.z0-1]); diff --git a/js/Branching/SELECT_f.pickle b/js/Branching/SELECT_f.pickle index 3e105200..8a09ab8c 100644 --- a/js/Branching/SELECT_f.pickle +++ b/js/Branching/SELECT_f.pickle @@ -13,74 +13,71 @@ p5 atp6 Rp7 .(dp0 -S'model.dstate' +S'model.sim' p1 -S'double' +S'list' p2 -sS'arg1' +sS'model.in1' p3 -S'object' +S'matrix' p4 -sS'graphics' +sS'model.dstate' p5 -g4 -sS'x.model' +S'double' p6 -NsS'model.out' +sS'model.evtin' p7 -g2 -sS'model.in1' +g6 +sS'x.graphics' p8 -S'matrix' +S'object' p9 -sS'x.graphics' +sS'arg1' p10 -g4 -sS'typ' +g9 +sS'graphics.exprs' p11 -S'vector' +NsS'nin' p12 -sS'model.evtin' +g6 +sS'in1' p13 -g2 -sS'model.sim' +g4 +sS'model.out' p14 -S'list' +g6 +sS'exprs' p15 -sS'nin' +g4 +sS'x.model' p16 -g2 -sS'[this.model,graphics,ok]' +NsS'gr_i' p17 -g15 -sS'in1' +S'vector' p18 -g9 -sS'graphics.exprs' +sS'z0' p19 -NsS'z0' +g6 +sS'model.dep_ut' p20 -g2 -sS'model.blocktype' +g18 +sS'graphics' p21 -S'string' +g9 +sS'y' p22 -sS'model.dep_ut' +g18 +sS'x' p23 -g12 -sS'exprs' +g6 +sS'model' p24 g9 -sS'gr_i' +sS'typ' p25 -g12 -sS'y' +g18 +sS'model.blocktype' p26 -g12 -sS'x' +S'string' p27 -g2 -sS'model' -p28 -g4 s.
\ No newline at end of file diff --git a/js/Branching/SELECT_m.js b/js/Branching/SELECT_m.js index 6f05f7ca..c59ee23f 100644 --- a/js/Branching/SELECT_m.js +++ b/js/Branching/SELECT_m.js @@ -20,8 +20,8 @@ function SELECT_m() { this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [true,false]; - exprs = [[sci2exp(1)],[sci2exp(this.nin)],[sci2exp(this.z0)]]; - gr_i = []; + var exprs = [[sci2exp(1)],[sci2exp(this.nin)],[sci2exp(this.z0)]]; + var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -41,8 +41,8 @@ function SELECT_m() { this.nin = parseFloat(arguments[0]["nin"]) this.z0 = parseFloat(arguments[0]["z0"]) this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = 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); @@ -53,14 +53,17 @@ function SELECT_m() { message("initial connected input is not a valid input port number"); } else if (((this.typ<1)||(this.typ>8))&&(this.typ!=-1)) { message("Datatype is not supported"); - ok = false; + var ok = false; } else { - it = this.typ*ones(1,this.nin); - ot = this.typ; + var it = this.typ*ones(1,this.nin); + var ot = this.typ; if (ok) { - in1 = [-ones(this.nin,1),-2*ones(this.nin,1)]; - out = [-1,-2]; - [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),ones(this.nin,1),[]); + var in1 = [-ones(this.nin,1),-2*ones(this.nin,1)]; + var out = [-1,-2]; + var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),ones(this.nin,1),[]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; if (ok) { graphics.exprs = exprs; this.model.dstate = new ScilabDouble([this.z0]); diff --git a/js/Branching/SELECT_m.pickle b/js/Branching/SELECT_m.pickle index 4eea246b..5c1a1a33 100644 --- a/js/Branching/SELECT_m.pickle +++ b/js/Branching/SELECT_m.pickle @@ -71,58 +71,55 @@ g12 sS'nin' p23 g2 -sS'[this.model,graphics,ok]' -p24 -g2 sS'model.out2' -p25 +p24 g2 sS'in1' -p26 +p25 g12 sS'model.rpar' -p27 +p26 g12 sS'model.outtyp' -p28 +p27 g2 sS'model.state' -p29 +p28 g12 sS'graphics.exprs' -p30 +p29 NsS'model.ipar' -p31 +p30 g12 sS'z0' -p32 +p31 g2 sS'ok' -p33 +p32 S'boolean' -p34 +p33 sS'model.blocktype' -p35 +p34 g7 sS'model.dep_ut' -p36 +p35 g12 sS'exprs' -p37 +p36 g14 sS'gr_i' -p38 +p37 g12 sS'y' -p39 +p38 g12 sS'x' -p40 +p39 g2 sS'model' -p41 +p40 g4 sS'ot' -p42 +p41 g12 s.
\ No newline at end of file diff --git a/js/Branching/SELF_SWITCH.js b/js/Branching/SELF_SWITCH.js index 93975975..eca2147d 100644 --- a/js/Branching/SELF_SWITCH.js +++ b/js/Branching/SELF_SWITCH.js @@ -13,7 +13,7 @@ function SELF_SWITCH() { this.x.model.out = 1; this.x.model.blocktype = "h"; this.x.model.dep_ut = [false,false]; - this.x.model.rpar = this.genSwitchInnerDiagram[this.stateOpen-1]; + this.x.model.rpar = genSwitchInnerDiagram(this.stateOpen); this.x.model.opar = list(this.stateOpen); this.x.graphics.in_implicit = ["E"]; this.x.graphics.in_style = ""; @@ -33,10 +33,10 @@ function SELF_SWITCH() { SELF_SWITCH.prototype.set = function SELF_SWITCH() { this.x = arg1; this.stateOpen = this.x.model.opar[1-1]; - this.x.model.rpar = this.genSwitchInnerDiagram[!this.stateOpen-1]; + this.x.model.rpar = genSwitchInnerDiagram(!this.stateOpen); this.x.model.opar = list(!this.stateOpen); - y = 0; - typ = list(); + var y = 0; + var typ = list(); if (this.stateOpen==false) { this.x.graphics.style = "SELF_SWITCH_OFF"; } else { diff --git a/js/Branching/SELF_SWITCH.pickle b/js/Branching/SELF_SWITCH.pickle index f13830df..df5cf582 100644 --- a/js/Branching/SELF_SWITCH.pickle +++ b/js/Branching/SELF_SWITCH.pickle @@ -6,10 +6,8 @@ S'x' p2 aS'stateOpen' p3 -aS'genSwitchInnerDiagram' -p4 -atp5 -Rp6 +atp4 +Rp5 .(dp0 S'diagram.objs[1-1]' p1 diff --git a/js/Branching/SWITCH2.js b/js/Branching/SWITCH2.js index 5b80f243..ad4e6b15 100644 --- a/js/Branching/SWITCH2.js +++ b/js/Branching/SWITCH2.js @@ -1,10 +1,10 @@ /* autogenerated from "macros/Branching/SWITCH2.sci" */ function SWITCH2() { SWITCH2.prototype.define = function SWITCH2() { - in1 = [[-1],[1],[-1]]; - ipar = [0]; + var in1 = [[-1],[1],[-1]]; + var ipar = [0]; this.nzz = 1; - rpar = 0; + var rpar = 0; this.model = scicos_model(); this.model.sim = list(new ScilabString(["switch2"]), new ScilabDouble([4])); this.model.in1 = new ScilabDouble(in1); @@ -15,8 +15,8 @@ function SWITCH2() { this.model.nmode = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [true,false]; - exprs = [[string(ipar)],[string(rpar)],[string(this.nzz)]]; - gr_i = []; + var exprs = [[string(ipar)],[string(rpar)],[string(this.nzz)]]; + var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -36,8 +36,8 @@ function SWITCH2() { this.thra = arguments[0]["thra"] this.nzz = parseFloat(arguments[0]["nzz"]) this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = 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); diff --git a/js/Branching/SWITCH2_m.js b/js/Branching/SWITCH2_m.js index 8dbaa1e6..e49aa38c 100644 --- a/js/Branching/SWITCH2_m.js +++ b/js/Branching/SWITCH2_m.js @@ -1,9 +1,9 @@ /* autogenerated from "macros/Branching/SWITCH2_m.sci" */ function SWITCH2_m() { SWITCH2_m.prototype.define = function SWITCH2_m() { - ipar = [0]; + var ipar = [0]; this.nzz = 1; - rpar = 0; + var rpar = 0; this.model = scicos_model(); this.model.sim = list(new ScilabString(["switch2_m"]), new ScilabDouble([4])); this.model.in1 = new ScilabDouble([-1],[1],[-1]); @@ -18,8 +18,8 @@ function SWITCH2_m() { this.model.nmode = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [true,false]; - exprs = [[sci2exp(1)],[string(ipar)],[string(rpar)],[string(this.nzz)]]; - gr_i = []; + var exprs = [[sci2exp(1)],[string(ipar)],[string(rpar)],[string(this.nzz)]]; + var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -41,8 +41,8 @@ function SWITCH2_m() { this.thra = arguments[0]["thra"] this.nzz = parseFloat(arguments[0]["nzz"]) this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = 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); @@ -68,15 +68,18 @@ function SWITCH2_m() { } if (((this.ot<1)||(this.ot>8))&&(this.ot!=-1)) { message("Datatype is not supported"); - ok = false; + var ok = false; } if (ok) { it[1-1] = this.ot; it[2-1] = 1; it[3-1] = this.ot; - in1 = [this.model.in1,this.model.in2]; - out = [this.model.out,this.model.out2]; - [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,this.ot),[],[]); + var in1 = [this.model.in1,this.model.in2]; + var out = [this.model.out,this.model.out2]; + var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,this.ot),[],[]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; } if (ok) { this.x.graphics = graphics; diff --git a/js/Branching/SWITCH2_m.pickle b/js/Branching/SWITCH2_m.pickle index ecc77338..5b66bbf0 100644 --- a/js/Branching/SWITCH2_m.pickle +++ b/js/Branching/SWITCH2_m.pickle @@ -66,64 +66,61 @@ sS'model.sim' p19 S'list' p20 -sS'[this.model,graphics,ok]' -p21 -g5 sS'model.out2' -p22 +p21 g5 sS'model.nmode' -p23 +p22 g5 sS'model.rpar' -p24 +p23 g5 sS'in1' -p25 +p24 g9 sS'model.outtyp' -p26 +p25 g5 sS'graphics.exprs' -p27 +p26 NsS'model.ipar' -p28 +p27 g9 sS'model.nzcross' -p29 +p28 g5 sS'ok' -p30 +p29 S'boolean' -p31 +p30 sS'model.blocktype' -p32 +p31 S'string' -p33 +p32 sS'nzz' -p34 +p33 g5 sS'rule' -p35 +p34 g5 sS'exprs' -p36 +p35 g14 sS'gr_i' -p37 +p36 g9 sS'ipar' -p38 +p37 g9 sS'y' -p39 +p38 g9 sS'x' -p40 +p39 g5 sS'model' -p41 +p40 g2 sS'it[1-1]' -p42 +p41 Ns.
\ No newline at end of file diff --git a/js/Branching/SWITCH_f.js b/js/Branching/SWITCH_f.js index 1b4846f9..45393eba 100644 --- a/js/Branching/SWITCH_f.js +++ b/js/Branching/SWITCH_f.js @@ -1,8 +1,8 @@ /* autogenerated from "macros/Branching/SWITCH_f.sci" */ function SWITCH_f() { SWITCH_f.prototype.define = function SWITCH_f() { - i0 = 0; - in1 = [[-1],[-1]]; + var i0 = 0; + var in1 = [[-1],[-1]]; this.nin = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["switchn"]), new ScilabDouble([2])); @@ -12,8 +12,8 @@ function SWITCH_f() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = []; this.model.dep_ut = [true,true]; - exprs = [[string(this.nin)],[string(i0+1)]]; - gr_i = []; + var exprs = [[string(this.nin)],[string(i0+1)]]; + var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -31,10 +31,10 @@ function SWITCH_f() { this.nin = parseFloat(arguments[0]["nin"]) this.z0 = arguments[0]["z0"] this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = graphics.exprs; this.model = arg1.model; - ipar = this.model.ipar; + 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); if (!ok) { @@ -43,7 +43,10 @@ function SWITCH_f() { if (this.z0>this.nin||this.z0<=0) { message("initial connected input is not a valid input port number"); } else { - [this.model,graphics,ok] = check_io(this.model,graphics,-ones(this.nin,1),-1,[],[]); + var tmpvar0 = check_io(this.model,graphics,-ones(this.nin,1),-1,[],[]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; if (ok) { graphics.exprs = exprs; this.model.ipar = new ScilabString([this.z0-1]); diff --git a/js/Branching/SWITCH_f.pickle b/js/Branching/SWITCH_f.pickle index 241bf0da..aa8254c3 100644 --- a/js/Branching/SWITCH_f.pickle +++ b/js/Branching/SWITCH_f.pickle @@ -48,42 +48,39 @@ g6 sS'i0' p15 g6 -sS'[this.model,graphics,ok]' -p16 -g13 sS'in1' -p17 +p16 g8 sS'graphics.exprs' -p18 +p17 NsS'model.ipar' -p19 +p18 g6 sS'typ' -p20 +p19 g11 sS'model.blocktype' -p21 +p20 S'string' -p22 +p21 sS'model.dep_ut' -p23 +p22 g11 sS'exprs' -p24 +p23 g8 sS'gr_i' -p25 +p24 g11 sS'ipar' -p26 +p25 NsS'y' -p27 +p26 g11 sS'x' -p28 +p27 g6 sS'model' -p29 +p28 g2 s.
\ No newline at end of file |