diff options
Diffstat (limited to 'js/Branching')
34 files changed, 411 insertions, 249 deletions
diff --git a/js/Branching/DEMUX.js b/js/Branching/DEMUX.js index f477a529..7879bc31 100644 --- a/js/Branching/DEMUX.js +++ b/js/Branching/DEMUX.js @@ -40,7 +40,7 @@ function DEMUX() { message("Block must have at least 2 and at most 31 output ports"); ok = false; } else { - [model,graphics,ok] = check_io(this.model,graphics,0,-transpose([1:this.out]),[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,0,-transpose([1:this.out]),[],[]); } } else { if (size(this.out,"*")<2||or(this.out==0)||size(this.out,"*")>31) { @@ -52,7 +52,7 @@ function DEMUX() { } else { nin = sum(this.out); } - [model,graphics,ok] = check_io(this.model,graphics,nin,this.out.slice(),[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,nin,this.out.slice(),[],[]); if (ok) { this.out = size(this.out,"*"); } diff --git a/js/Branching/DEMUX.pickle b/js/Branching/DEMUX.pickle index 0457a4f9..c677bac8 100644 --- a/js/Branching/DEMUX.pickle +++ b/js/Branching/DEMUX.pickle @@ -44,17 +44,17 @@ p13 sS'nin' p14 g8 -sS'graphics.exprs' +sS'[this.model,graphics,ok]' p15 -NsS'model.ipar' +g8 +sS'graphics.exprs' p16 +NsS'model.ipar' +p17 g8 sS'typ' -p17 -g6 -sS'[model,graphics,ok]' p18 -g8 +g6 sS'ok' p19 S'boolean' diff --git a/js/Branching/DEMUX_f.js b/js/Branching/DEMUX_f.js index 3ef295d7..a1176764 100644 --- a/js/Branching/DEMUX_f.js +++ b/js/Branching/DEMUX_f.js @@ -40,7 +40,7 @@ function DEMUX_f() { message("Block must have at least 2 and at most 8 output ports"); ok = false; } else { - [model,graphics,ok] = check_io(this.model,graphics,0,-transpose([1:this.out]),[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,0,-transpose([1:this.out]),[],[]); } } else { if (size(this.out,"*")<2||size(this.out,"*")>8||or(this.out==0)) { @@ -52,7 +52,7 @@ function DEMUX_f() { } else { nin = sum(this.out); } - [model,graphics,ok] = check_io(this.model,graphics,nin,this.out.slice(),[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,nin,this.out.slice(),[],[]); if (ok) { this.out = size(this.out,"*"); } diff --git a/js/Branching/DEMUX_f.pickle b/js/Branching/DEMUX_f.pickle index 0457a4f9..c677bac8 100644 --- a/js/Branching/DEMUX_f.pickle +++ b/js/Branching/DEMUX_f.pickle @@ -44,17 +44,17 @@ p13 sS'nin' p14 g8 -sS'graphics.exprs' +sS'[this.model,graphics,ok]' p15 -NsS'model.ipar' +g8 +sS'graphics.exprs' p16 +NsS'model.ipar' +p17 g8 sS'typ' -p17 -g6 -sS'[model,graphics,ok]' p18 -g8 +g6 sS'ok' p19 S'boolean' diff --git a/js/Branching/ESELECT_f.js b/js/Branching/ESELECT_f.js index faca22b4..a8945df6 100644 --- a/js/Branching/ESELECT_f.js +++ b/js/Branching/ESELECT_f.js @@ -61,7 +61,7 @@ function ESELECT_f() { if (this.out<2) { message("Block must have at least two output ports"); } else { - [model,graphics,ok] = check_io(this.model,graphics,1,[],this.inh,[ones(this.out,1)]); + [this.model,graphics,ok] = check_io(this.model,graphics,1,[],this.inh,[ones(this.out,1)]); 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 94cd7c79..d1c81601 100644 --- a/js/Branching/ESELECT_f.pickle +++ b/js/Branching/ESELECT_f.pickle @@ -67,18 +67,18 @@ p20 sS'model.evtout' p21 g6 -sS'model.nmode' +sS'[this.model,graphics,ok]' p22 g6 -sS'exprs[3-1]' +sS'model.nmode' p23 +g6 +sS'exprs[3-1]' +p24 g17 sS'graphics.exprs' -p24 -NsS'model.nzcross' p25 -g6 -sS'[model,graphics,ok]' +NsS'model.nzcross' p26 g6 sS'model.blocktype' diff --git a/js/Branching/EXTRACTOR.js b/js/Branching/EXTRACTOR.js index ddfad024..c4e5d731 100644 --- a/js/Branching/EXTRACTOR.js +++ b/js/Branching/EXTRACTOR.js @@ -36,7 +36,7 @@ function EXTRACTOR() { } this.ind = int(this.ind); this.ind = this.ind.slice(); - [model,graphics,ok] = check_io(this.model,graphics,[-1],size(this.ind,1),[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,[-1],size(this.ind,1),[],[]); if (ok) { this.model.ipar = this.ind; graphics.exprs = exprs; diff --git a/js/Branching/EXTRACTOR.pickle b/js/Branching/EXTRACTOR.pickle index a17dfdb8..9be76d9e 100644 --- a/js/Branching/EXTRACTOR.pickle +++ b/js/Branching/EXTRACTOR.pickle @@ -11,64 +11,64 @@ p4 atp5 Rp6 .(dp0 -S'[model,graphics,ok]' +S'model.sim' p1 -S'double' +S'list' p2 sS'model.in1' p3 -g2 -sS'model.blocktype' +S'double' p4 -S'string' +sS'model.blocktype' p5 -sS'x.graphics' +S'string' p6 -S'object' +sS'x.graphics' p7 -sS'arg1' +S'object' p8 -g7 -sS'graphics.exprs' +sS'arg1' p9 -NsS'x.model' +g8 +sS'[this.model,graphics,ok]' p10 -NsS'model.out' +g4 +sS'graphics.exprs' p11 -g2 -sS'exprs' +NsS'x.model' p12 -S'vector' +NsS'model.out' p13 -sS'ind' +g4 +sS'exprs' p14 -g2 -sS'gr_i' +S'vector' p15 -g13 -sS'model.dep_ut' +sS'ind' p16 -g13 -sS'graphics' +g4 +sS'gr_i' p17 -g7 -sS'y' +g15 +sS'model.dep_ut' p18 -g13 -sS'x' +g15 +sS'graphics' p19 -g2 -sS'model' +g8 +sS'y' p20 -g7 -sS'model.ipar' +g15 +sS'x' p21 -g2 -sS'typ' +g4 +sS'model' p22 -g13 -sS'model.sim' +g8 +sS'model.ipar' p23 -S'list' +g4 +sS'typ' p24 +g15 s.
\ No newline at end of file diff --git a/js/Branching/ISELECT_f.js b/js/Branching/ISELECT_f.js index adaf51f0..1ed5f874 100644 --- a/js/Branching/ISELECT_f.js +++ b/js/Branching/ISELECT_f.js @@ -42,7 +42,7 @@ function ISELECT_f() { if (this.z0>this.nout||this.z0<=0) { message("initial connected input is not a valid input port number"); } else { - [model,graphics,ok] = check_io(this.model,graphics,-1,-ones(this.nout,1),ones(this.nout,1),[]); + [this.model,graphics,ok] = check_io(this.model,graphics,-1,-ones(this.nout,1),ones(this.nout,1),[]); 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 52099783..06398aa7 100644 --- a/js/Branching/ISELECT_f.pickle +++ b/js/Branching/ISELECT_f.pickle @@ -50,12 +50,12 @@ sS'model.sim' p15 S'list' p16 -sS'graphics.exprs' +sS'[this.model,graphics,ok]' p17 -NsS'z0' -p18 g2 -sS'[model,graphics,ok]' +sS'graphics.exprs' +p18 +NsS'z0' p19 g2 sS'model.blocktype' diff --git a/js/Branching/ISELECT_m.js b/js/Branching/ISELECT_m.js index 7a82ad23..c7506d3a 100644 --- a/js/Branching/ISELECT_m.js +++ b/js/Branching/ISELECT_m.js @@ -60,7 +60,7 @@ function ISELECT_m() { if (ok) { out = [-ones(this.nout,1),-2*ones(this.nout,1)]; in1 = [-1,-2]; - [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),ones(this.nout,1),[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),ones(this.nout,1),[]); 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 b33f24bc..59aa7a37 100644 --- a/js/Branching/ISELECT_m.pickle +++ b/js/Branching/ISELECT_m.pickle @@ -67,30 +67,30 @@ p20 sS'model.evtout' p21 g7 -sS'model.out2' +sS'[this.model,graphics,ok]' p22 +g2 +sS'model.out2' +p23 g11 sS'in1' -p23 +p24 g7 sS'model.rpar' -p24 +p25 g7 sS'model.outtyp' -p25 +p26 g2 sS'model.state' -p26 +p27 g7 sS'graphics.exprs' -p27 -NsS'model.ipar' p28 +NsS'model.ipar' +p29 g7 sS'z0' -p29 -g2 -sS'[model,graphics,ok]' p30 g2 sS'ok' diff --git a/js/Branching/MUX.js b/js/Branching/MUX.js index 523f8f2d..0b29058d 100644 --- a/js/Branching/MUX.js +++ b/js/Branching/MUX.js @@ -38,7 +38,7 @@ function MUX() { message("Block must have at least two input ports and at most 31"); ok = false; } else { - [model,graphics,ok] = check_io(this.model,graphics,-transpose([1:this.in1]),0,[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,-transpose([1:this.in1]),0,[],[]); } } else { if (size(this.in1,"*")<2||or(this.in1==0)||size(this.in1,"*")>31) { @@ -50,7 +50,7 @@ function MUX() { } else { nout = sum(this.in1); } - [model,graphics,ok] = check_io(this.model,graphics,this.in1.slice(),nout,[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,this.in1.slice(),nout,[],[]); if (ok) { this.in1 = size(this.in1,"*"); } diff --git a/js/Branching/MUX.pickle b/js/Branching/MUX.pickle index 445d4e46..5d0e28dd 100644 --- a/js/Branching/MUX.pickle +++ b/js/Branching/MUX.pickle @@ -11,9 +11,9 @@ p4 atp5 Rp6 .(dp0 -S'[model,graphics,ok]' +S'model.sim' p1 -S'double' +S'list' p2 sS'model.in1' p3 @@ -34,48 +34,48 @@ p10 sS'arg1' p11 g10 -sS'graphics.exprs' +sS'[this.model,graphics,ok]' p12 -NsS'in1' +S'double' p13 -g2 -sS'model.out' +sS'graphics.exprs' p14 -g2 -sS'exprs' +NsS'in1' p15 +g13 +sS'model.out' +p16 +g13 +sS'exprs' +p17 g8 sS'x.model' -p16 +p18 NsS'gr_i' -p17 +p19 g4 sS'model.dep_ut' -p18 +p20 g4 sS'graphics' -p19 +p21 g10 sS'y' -p20 +p22 g4 sS'x' -p21 -g2 +p23 +g13 sS'model' -p22 +p24 g10 sS'model.ipar' -p23 -g2 +p25 +g13 sS'typ' -p24 +p26 g4 sS'nout' -p25 -g2 -sS'model.sim' -p26 -S'list' p27 +g13 s.
\ No newline at end of file diff --git a/js/Branching/MUX_f.js b/js/Branching/MUX_f.js index 1e197b51..5dcbbd19 100644 --- a/js/Branching/MUX_f.js +++ b/js/Branching/MUX_f.js @@ -38,7 +38,7 @@ function MUX_f() { message("Block must have at least two input ports and at most eight"); ok = false; } else { - [model,graphics,ok] = check_io(this.model,graphics,-transpose([1:this.in1]),0,[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,-transpose([1:this.in1]),0,[],[]); } } else { if (size(this.in1,"*")<2||size(this.in1,"*")>8||or(this.in1==0)) { @@ -50,7 +50,7 @@ function MUX_f() { } else { nout = sum(this.in1); } - [model,graphics,ok] = check_io(this.model,graphics,this.in1.slice(),nout,[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,this.in1.slice(),nout,[],[]); if (ok) { this.in1 = size(this.in1,"*"); } diff --git a/js/Branching/MUX_f.pickle b/js/Branching/MUX_f.pickle index 445d4e46..5d0e28dd 100644 --- a/js/Branching/MUX_f.pickle +++ b/js/Branching/MUX_f.pickle @@ -11,9 +11,9 @@ p4 atp5 Rp6 .(dp0 -S'[model,graphics,ok]' +S'model.sim' p1 -S'double' +S'list' p2 sS'model.in1' p3 @@ -34,48 +34,48 @@ p10 sS'arg1' p11 g10 -sS'graphics.exprs' +sS'[this.model,graphics,ok]' p12 -NsS'in1' +S'double' p13 -g2 -sS'model.out' +sS'graphics.exprs' p14 -g2 -sS'exprs' +NsS'in1' p15 +g13 +sS'model.out' +p16 +g13 +sS'exprs' +p17 g8 sS'x.model' -p16 +p18 NsS'gr_i' -p17 +p19 g4 sS'model.dep_ut' -p18 +p20 g4 sS'graphics' -p19 +p21 g10 sS'y' -p20 +p22 g4 sS'x' -p21 -g2 +p23 +g13 sS'model' -p22 +p24 g10 sS'model.ipar' -p23 -g2 +p25 +g13 sS'typ' -p24 +p26 g4 sS'nout' -p25 -g2 -sS'model.sim' -p26 -S'list' p27 +g13 s.
\ No newline at end of file diff --git a/js/Branching/M_SWITCH.js b/js/Branching/M_SWITCH.js index 93b27c32..e62e2877 100644 --- a/js/Branching/M_SWITCH.js +++ b/js/Branching/M_SWITCH.js @@ -60,7 +60,7 @@ function M_SWITCH() { } it = [[-1],[-2*ones(this.nin,1)]]; ot = -2; - [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); if (ok) { graphics.exprs = exprs; this.model.ipar = [[this.base],[this.rule]]; diff --git a/js/Branching/M_SWITCH.pickle b/js/Branching/M_SWITCH.pickle index 83a55023..396fdd0d 100644 --- a/js/Branching/M_SWITCH.pickle +++ b/js/Branching/M_SWITCH.pickle @@ -49,26 +49,26 @@ p14 sS'nin' p15 g8 -sS'in1' +sS'[this.model,graphics,ok]' p16 +g8 +sS'in1' +p17 g5 sS'in2' -p17 +p18 g5 sS'base' -p18 +p19 g8 sS'graphics.exprs' -p19 -NsS'model.ipar' p20 +NsS'model.ipar' +p21 g5 sS'typ' -p21 -g10 -sS'[model,graphics,ok]' p22 -g8 +g10 sS'model.blocktype' p23 S'string' diff --git a/js/Branching/NRMSOM_f.js b/js/Branching/NRMSOM_f.js index 98d295c9..21cbd5ce 100644 --- a/js/Branching/NRMSOM_f.js +++ b/js/Branching/NRMSOM_f.js @@ -34,7 +34,7 @@ function NRMSOM_f() { if (!ok) { break; } - [model,graphics,ok] = check_io(this.model,graphics,-ones(this.nin,1),-1,[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,-ones(this.nin,1),-1,[],[]); if (ok) { graphics.exprs = exprs; this.x.graphics = graphics; diff --git a/js/Branching/NRMSOM_f.pickle b/js/Branching/NRMSOM_f.pickle index 22db145e..6d5e890b 100644 --- a/js/Branching/NRMSOM_f.pickle +++ b/js/Branching/NRMSOM_f.pickle @@ -11,9 +11,9 @@ p4 atp5 Rp6 .(dp0 -S'[model,graphics,ok]' +S'model.sim' p1 -S'double' +S'string' p2 sS'model.in1' p3 @@ -21,11 +21,11 @@ S'matrix' p4 sS'nin' p5 -g2 -sS'model.blocktype' +S'double' p6 -S'string' +sS'model.blocktype' p7 +g2 sS'x.graphics' p8 S'object' @@ -33,42 +33,42 @@ p9 sS'arg1' p10 g9 -sS'graphics.exprs' +sS'[this.model,graphics,ok]' p11 -NsS'in1' +g6 +sS'graphics.exprs' p12 +NsS'in1' +p13 g4 sS'model.out' -p13 -g2 -sS'exprs' p14 -S'vector' +g6 +sS'exprs' p15 -sS'x.model' +S'vector' p16 -NsS'gr_i' +sS'x.model' p17 -g15 -sS'model.dep_ut' +NsS'gr_i' p18 -g15 -sS'graphics' +g16 +sS'model.dep_ut' p19 +g16 +sS'graphics' +p20 g9 sS'y' -p20 -g15 -sS'x' p21 -g2 -sS'model' +g16 +sS'x' p22 -g9 -sS'model.sim' +g6 +sS'model' p23 -g7 +g9 sS'typ' p24 -g15 +g16 s.
\ No newline at end of file diff --git a/js/Branching/RELAY_f.js b/js/Branching/RELAY_f.js index 32e0ee29..910ce11e 100644 --- a/js/Branching/RELAY_f.js +++ b/js/Branching/RELAY_f.js @@ -44,7 +44,7 @@ function RELAY_f() { if (this.z0>this.nin||this.z0<=0) { message("initial connected input is not a valid input port number"); } else { - [model,graphics,ok] = check_io(this.model,graphics,-ones(this.nin,1),-1,ones(this.nin,1),[]); + [this.model,graphics,ok] = check_io(this.model,graphics,-ones(this.nin,1),-1,ones(this.nin,1),[]); 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 95b11b18..ad561191 100644 --- a/js/Branching/RELAY_f.pickle +++ b/js/Branching/RELAY_f.pickle @@ -54,17 +54,17 @@ g2 sS'i0' p17 g2 -sS'in1' +sS'[this.model,graphics,ok]' p18 +g2 +sS'in1' +p19 g9 sS'graphics.exprs' -p19 -NsS'typ' p20 -g13 -sS'[model,graphics,ok]' +NsS'typ' p21 -g2 +g13 sS'model.blocktype' p22 S'string' diff --git a/js/Branching/SCALAR2VECTOR.js b/js/Branching/SCALAR2VECTOR.js index ec37f19e..ec798670 100644 --- a/js/Branching/SCALAR2VECTOR.js +++ b/js/Branching/SCALAR2VECTOR.js @@ -39,7 +39,7 @@ function SCALAR2VECTOR() { ok = false; } if (ok) { - [model,graphics,ok] = check_io(this.model,graphics,[1],this.nout,[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,[1],this.nout,[],[]); } if (ok) { graphics.exprs = exprs; diff --git a/js/Branching/SCALAR2VECTOR.pickle b/js/Branching/SCALAR2VECTOR.pickle index 851c289e..60e23e74 100644 --- a/js/Branching/SCALAR2VECTOR.pickle +++ b/js/Branching/SCALAR2VECTOR.pickle @@ -11,65 +11,65 @@ p4 atp5 Rp6 .(dp0 -S'[model,graphics,ok]' +S'model.sim' p1 -S'double' +S'list' p2 sS'model.out' p3 -g2 -sS'ok' +S'double' p4 -S'boolean' +sS'ok' p5 -sS'model.blocktype' +S'boolean' p6 -S'string' +sS'model.blocktype' p7 -sS'x.graphics' +S'string' p8 -S'object' +sS'x.graphics' p9 -sS'arg1' +S'object' p10 -g9 -sS'graphics.exprs' +sS'arg1' p11 -NsS'model.in1' +g10 +sS'[this.model,graphics,ok]' p12 -g2 -sS'model.dep_ut' +g4 +sS'graphics.exprs' p13 -S'vector' +NsS'model.in1' p14 -sS'exprs' +g4 +sS'model.dep_ut' p15 -g14 -sS'x.model' +S'vector' p16 -NsS'gr_i' +sS'exprs' p17 -g14 -sS'graphics' +g16 +sS'x.model' p18 -g9 -sS'y' +NsS'gr_i' p19 -g14 -sS'x' +g16 +sS'graphics' p20 -g2 -sS'model' +g10 +sS'y' p21 -g9 -sS'model.sim' +g16 +sS'x' p22 -S'list' +g4 +sS'model' p23 +g10 sS'typ' p24 -g14 +g16 sS'nout' p25 -g2 +g4 s.
\ No newline at end of file diff --git a/js/Branching/SELECT_f.js b/js/Branching/SELECT_f.js index 4b287f3a..bf3a26de 100644 --- a/js/Branching/SELECT_f.js +++ b/js/Branching/SELECT_f.js @@ -42,7 +42,7 @@ function SELECT_f() { if (this.z0>this.nin||this.z0<=0) { message("initial connected input is not a valid input port number"); } else { - [model,graphics,ok] = check_io(this.model,graphics,-ones(this.nin,1),-1,ones(this.nin,1),[]); + [this.model,graphics,ok] = check_io(this.model,graphics,-ones(this.nin,1),-1,ones(this.nin,1),[]); 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 6e826cff..a7a1fa4b 100644 --- a/js/Branching/SELECT_f.pickle +++ b/js/Branching/SELECT_f.pickle @@ -50,15 +50,15 @@ p15 sS'nin' p16 g2 -sS'in1' +sS'[this.model,graphics,ok]' p17 +g2 +sS'in1' +p18 g9 sS'graphics.exprs' -p18 -NsS'z0' p19 -g2 -sS'[model,graphics,ok]' +NsS'z0' p20 g2 sS'model.blocktype' diff --git a/js/Branching/SELECT_m.js b/js/Branching/SELECT_m.js index 3fffd8e7..97f56b9e 100644 --- a/js/Branching/SELECT_m.js +++ b/js/Branching/SELECT_m.js @@ -60,7 +60,7 @@ function SELECT_m() { if (ok) { in1 = [-ones(this.nin,1),-2*ones(this.nin,1)]; out = [-1,-2]; - [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),ones(this.nin,1),[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),ones(this.nin,1),[]); 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 4a32d368..4eea246b 100644 --- a/js/Branching/SELECT_m.pickle +++ b/js/Branching/SELECT_m.pickle @@ -71,30 +71,30 @@ g12 sS'nin' p23 g2 -sS'model.out2' +sS'[this.model,graphics,ok]' p24 g2 -sS'in1' +sS'model.out2' p25 +g2 +sS'in1' +p26 g12 sS'model.rpar' -p26 +p27 g12 sS'model.outtyp' -p27 +p28 g2 sS'model.state' -p28 +p29 g12 sS'graphics.exprs' -p29 -NsS'model.ipar' p30 +NsS'model.ipar' +p31 g12 sS'z0' -p31 -g2 -sS'[model,graphics,ok]' p32 g2 sS'ok' diff --git a/js/Branching/SELF_SWITCH.js b/js/Branching/SELF_SWITCH.js index 4133e106..93975975 100644 --- a/js/Branching/SELF_SWITCH.js +++ b/js/Branching/SELF_SWITCH.js @@ -1,3 +1,47 @@ -Syntax error in input LexToken(DOT,'.',1,644) /* autogenerated from "macros/Branching/SELF_SWITCH.sci" */ -None +function SELF_SWITCH() { + SELF_SWITCH.prototype.define = function SELF_SWITCH() { + this.stateOpen = true; + this.x = scicos_block(); + this.x.gui = "SELF_SWITCH"; + this.x.graphics.sz = [2,2]; + this.x.graphics.gr_i = []; + this.x.graphics.pin = 0; + this.x.graphics.pout = 0; + this.x.model.sim = "csuper"; + this.x.model.in1 = 1; + 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.opar = list(this.stateOpen); + this.x.graphics.in_implicit = ["E"]; + this.x.graphics.in_style = ""; + this.x.graphics.out_implicit = ["E"]; + this.x.graphics.out_style = ""; + this.x.graphics.style = "SELF_SWITCH_OFF"; + return new BasicBlock(this.x); + } + SELF_SWITCH.prototype.details = function SELF_SWITCH() { + return this.x; + } + SELF_SWITCH.prototype.get = function SELF_SWITCH() { + var options = { + } + return options; + } + 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.opar = list(!this.stateOpen); + y = 0; + typ = list(); + if (this.stateOpen==false) { + this.x.graphics.style = "SELF_SWITCH_OFF"; + } else { + this.x.graphics.style = "SELF_SWITCH_ON"; + } + return new BasicBlock(this.x); + } +} diff --git a/js/Branching/SELF_SWITCH.pickle b/js/Branching/SELF_SWITCH.pickle index 930a0fe1..f13830df 100644 --- a/js/Branching/SELF_SWITCH.pickle +++ b/js/Branching/SELF_SWITCH.pickle @@ -6,15 +6,133 @@ S'x' p2 aS'stateOpen' p3 -atp4 -Rp5 +aS'genSwitchInnerDiagram' +p4 +atp5 +Rp6 .(dp0 -S'diagram' +S'diagram.objs[1-1]' p1 -S'double' +S'object' p2 -sS'diagram.objs[1-1]' +sS'diagram.objs[4-1].model.ipar' p3 -S'object' +S'double' p4 +sS'x.model.dep_ut' +p5 +S'vector' +p6 +sS'diagram.objs[1-1].graphics.pout' +p7 +g4 +sS'x.graphics.out_style' +p8 +S'string' +p9 +sS'x.model' +p10 +g2 +sS'x.model.rpar' +p11 +g4 +sS'x.model.in1' +p12 +g4 +sS'x.model.out' +p13 +g4 +sS'diagram.objs[3-1]' +p14 +g2 +sS'diagram.objs[2-1]' +p15 +g2 +sS'x.graphics.gr_i' +p16 +g6 +sS'x.graphics.pout' +p17 +g4 +sS'diagram.objs[3-1].graphics.pout' +p18 +g4 +sS'x.model.blocktype' +p19 +g9 +sS'diagram.objs[2-1].graphics.pin' +p20 +g4 +sS'diagram.objs[7-1]' +p21 +g4 +sS'diagram.objs[6-1]' +p22 +g4 +sS'diagram.objs[5-1]' +p23 +g4 +sS'x.graphics.in_implicit' +p24 +g6 +sS'diagram.objs[3-1].model.rpar' +p25 +g4 +sS'diagram.objs[4-1]' +p26 +g2 +sS'x.graphics.in_style' +p27 +g9 +sS'stateOpen' +p28 +S'boolean' +p29 +sS'x.graphics.out_implicit' +p30 +g6 +sS'diagram.objs[4-1].graphics.pout' +p31 +g4 +sS'diagram' +p32 +g4 +sS'x.graphics.pin' +p33 +g4 +sS'x.model.opar' +p34 +S'list' +p35 +sS'typ' +p36 +g35 +sS'x.model.sim' +p37 +g9 +sS'diagram.objs[4-1].graphics.pin' +p38 +g6 +sS'x.graphics.style' +p39 +g9 +sS'diagram.objs[3-1].graphics.exprs' +p40 +g9 +sS'x.gui' +p41 +g9 +sS'x.graphics.sz' +p42 +g6 +sS'diagram.objs[4-1].graphics.exprs' +p43 +S'matrix' +p44 +sS'y' +p45 +g4 +sS'x' +p46 +g4 s.
\ No newline at end of file diff --git a/js/Branching/SWITCH2_m.js b/js/Branching/SWITCH2_m.js index d83240fb..c557205a 100644 --- a/js/Branching/SWITCH2_m.js +++ b/js/Branching/SWITCH2_m.js @@ -76,7 +76,7 @@ function SWITCH2_m() { it[3-1] = this.ot; in1 = [this.model.in1,this.model.in2]; out = [this.model.out,this.model.out2]; - [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,this.ot),[],[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,this.ot),[],[]); } if (ok) { this.x.graphics = graphics; diff --git a/js/Branching/SWITCH2_m.pickle b/js/Branching/SWITCH2_m.pickle index 8387667c..ecc77338 100644 --- a/js/Branching/SWITCH2_m.pickle +++ b/js/Branching/SWITCH2_m.pickle @@ -66,30 +66,30 @@ sS'model.sim' p19 S'list' p20 -sS'model.out2' +sS'[this.model,graphics,ok]' p21 g5 -sS'model.nmode' +sS'model.out2' p22 g5 -sS'model.rpar' +sS'model.nmode' p23 g5 -sS'in1' +sS'model.rpar' p24 +g5 +sS'in1' +p25 g9 sS'model.outtyp' -p25 +p26 g5 sS'graphics.exprs' -p26 -NsS'model.ipar' p27 +NsS'model.ipar' +p28 g9 sS'model.nzcross' -p28 -g5 -sS'[model,graphics,ok]' p29 g5 sS'ok' diff --git a/js/Branching/SWITCH_f.js b/js/Branching/SWITCH_f.js index c4e2b75a..dbd37d01 100644 --- a/js/Branching/SWITCH_f.js +++ b/js/Branching/SWITCH_f.js @@ -43,7 +43,7 @@ function SWITCH_f() { if (this.z0>this.nin||this.z0<=0) { message("initial connected input is not a valid input port number"); } else { - [model,graphics,ok] = check_io(this.model,graphics,-ones(this.nin,1),-1,[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,-ones(this.nin,1),-1,[],[]); 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 01f06e92..941bb77c 100644 --- a/js/Branching/SWITCH_f.pickle +++ b/js/Branching/SWITCH_f.pickle @@ -48,20 +48,20 @@ g6 sS'i0' p15 g6 -sS'in1' +sS'[this.model,graphics,ok]' p16 +g6 +sS'in1' +p17 g8 sS'graphics.exprs' -p17 -NsS'model.ipar' p18 +NsS'model.ipar' +p19 g6 sS'typ' -p19 -g11 -sS'[model,graphics,ok]' p20 -g6 +g11 sS'model.blocktype' p21 S'string' |