diff options
Diffstat (limited to 'js/Branching')
53 files changed, 397 insertions, 370 deletions
diff --git a/js/Branching/CLKFROM.js b/js/Branching/CLKFROM.js index 3775c0b9..34481156 100644 --- a/js/Branching/CLKFROM.js +++ b/js/Branching/CLKFROM.js @@ -7,7 +7,7 @@ function CLKFROM() { this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = "A"; this.x = new standard_define(new ScilabDouble([2,1]),this.model,this.exprs," "); this.x.graphics.id = "From"; diff --git a/js/Branching/CLKFROM.pickle b/js/Branching/CLKFROM.pickle index 75776b33..03b08283 100644 --- a/js/Branching/CLKFROM.pickle +++ b/js/Branching/CLKFROM.pickle @@ -42,7 +42,7 @@ sS'graphics.exprs' p10 NsS'model.dep_ut' p11 -S'vector' +S'vector_boolean' p12 sS'exprs' p13 @@ -63,15 +63,16 @@ p18 g8 sS'typ' p19 -g12 -sS'model.opar' +S'vector' p20 -S'list' +sS'model.opar' p21 -sS'model.firing' +S'list' p22 +sS'model.firing' +p23 g2 sS'x.graphics.id' -p23 +p24 g4 s.
\ No newline at end of file diff --git a/js/Branching/CLKGOTO.js b/js/Branching/CLKGOTO.js index c5fad0c4..0bef1950 100644 --- a/js/Branching/CLKGOTO.js +++ b/js/Branching/CLKGOTO.js @@ -8,7 +8,7 @@ function CLKGOTO() { this.model.ipar = new ScilabDouble([int(1)]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [["A"],[sci2exp(1)]]; this.x = new standard_define(new ScilabDouble([2,1]),this.model,this.exprs," "); this.x.graphics.id = "Goto"; diff --git a/js/Branching/CLKGOTO.pickle b/js/Branching/CLKGOTO.pickle index f6501445..1d8387b8 100644 --- a/js/Branching/CLKGOTO.pickle +++ b/js/Branching/CLKGOTO.pickle @@ -49,7 +49,7 @@ p12 g4 sS'model.dep_ut' p13 -S'vector' +S'vector_boolean' p14 sS'exprs' p15 @@ -76,15 +76,16 @@ p23 g2 sS'typ' p24 -g14 -sS'model.opar' +S'vector' p25 -S'list' +sS'model.opar' p26 -sS'model.firing' +S'list' p27 +sS'model.firing' +p28 g2 sS'model.blocktype' -p28 +p29 g4 s.
\ No newline at end of file diff --git a/js/Branching/CLKGotoTagVisibility.js b/js/Branching/CLKGotoTagVisibility.js index c28ac482..2cd648f3 100644 --- a/js/Branching/CLKGotoTagVisibility.js +++ b/js/Branching/CLKGotoTagVisibility.js @@ -13,7 +13,7 @@ function CLKGotoTagVisibility() { this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabBoolean([false]); - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = "A"; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKGotoTagVisibility\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); diff --git a/js/Branching/CLKGotoTagVisibility.pickle b/js/Branching/CLKGotoTagVisibility.pickle index 5e227bec..8a8a7330 100644 --- a/js/Branching/CLKGotoTagVisibility.pickle +++ b/js/Branching/CLKGotoTagVisibility.pickle @@ -78,19 +78,20 @@ p24 g15 sS'model.dep_ut' p25 -g6 -sS'exprs' +S'vector_boolean' p26 +sS'exprs' +p27 g15 sS'gr_i' -p27 +p28 g6 sS'model.outtyp' -p28 +p29 g9 sS'x' -p29 -NsS'model' p30 +NsS'model' +p31 g2 s.
\ No newline at end of file diff --git a/js/Branching/DEMUX.js b/js/Branching/DEMUX.js index 9d311dd6..b5646b57 100644 --- a/js/Branching/DEMUX.js +++ b/js/Branching/DEMUX.js @@ -9,7 +9,7 @@ function DEMUX() { this.model.ipar = new ScilabDouble([this.out]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = string(this.out); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEMUX\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([.5,2]),this.model,this.exprs,this.gr_i); diff --git a/js/Branching/DEMUX.pickle b/js/Branching/DEMUX.pickle index 1ea8e3a7..544bab46 100644 --- a/js/Branching/DEMUX.pickle +++ b/js/Branching/DEMUX.pickle @@ -48,39 +48,40 @@ S'double' p14 sS'model.dep_ut' p15 -g4 -sS'exprs' +S'vector_boolean' p16 +sS'exprs' +p17 g8 sS'x.model' -p17 -NsS'gr_i' p18 +NsS'gr_i' +p19 g4 sS'model.in' -p19 +p20 g14 sS'graphics' -p20 +p21 g10 sS'y' -p21 +p22 g4 sS'x' -p22 -NsS'model' p23 +NsS'model' +p24 g10 sS'model.ipar' -p24 +p25 g14 sS'typ' -p25 +p26 g4 sS'model.firing' -p26 +p27 g4 sS'out' -p27 +p28 g14 s.
\ No newline at end of file diff --git a/js/Branching/DEMUX_f.js b/js/Branching/DEMUX_f.js index 9202d190..b63dc715 100644 --- a/js/Branching/DEMUX_f.js +++ b/js/Branching/DEMUX_f.js @@ -9,7 +9,7 @@ function DEMUX_f() { this.model.ipar = new ScilabDouble([this.out]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = string(this.out); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEMUX_f\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([.5,2]),this.model,this.exprs,this.gr_i); diff --git a/js/Branching/DEMUX_f.pickle b/js/Branching/DEMUX_f.pickle index 1ea8e3a7..544bab46 100644 --- a/js/Branching/DEMUX_f.pickle +++ b/js/Branching/DEMUX_f.pickle @@ -48,39 +48,40 @@ S'double' p14 sS'model.dep_ut' p15 -g4 -sS'exprs' +S'vector_boolean' p16 +sS'exprs' +p17 g8 sS'x.model' -p17 -NsS'gr_i' p18 +NsS'gr_i' +p19 g4 sS'model.in' -p19 +p20 g14 sS'graphics' -p20 +p21 g10 sS'y' -p21 +p22 g4 sS'x' -p22 -NsS'model' p23 +NsS'model' +p24 g10 sS'model.ipar' -p24 +p25 g14 sS'typ' -p25 +p26 g4 sS'model.firing' -p26 +p27 g4 sS'out' -p27 +p28 g14 s.
\ No newline at end of file diff --git a/js/Branching/ESELECT_f.js b/js/Branching/ESELECT_f.js index 54588d0e..1483d17a 100644 --- a/js/Branching/ESELECT_f.js +++ b/js/Branching/ESELECT_f.js @@ -11,7 +11,7 @@ function ESELECT_f() { this.model.evtout = new ScilabDouble([ones(this.out,1)]); this.model.blocktype = new ScilabString(["l"]); this.model.firing = new ScilabDouble([-ones(this.out,1)]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.model.nmode = new ScilabDouble([0]); this.model.nzcross = new ScilabDouble([0]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ESELECT_f\",sz(1),sz(2));"]); diff --git a/js/Branching/ESELECT_f.pickle b/js/Branching/ESELECT_f.pickle index 347553e3..56a802e6 100644 --- a/js/Branching/ESELECT_f.pickle +++ b/js/Branching/ESELECT_f.pickle @@ -36,7 +36,7 @@ S'double' p6 sS'model.dep_ut' p7 -S'vector' +S'vector_boolean' p8 sS'out' p9 @@ -52,57 +52,58 @@ p12 g2 sS'typ' p13 -g8 -sS'model.evtin' +S'vector' p14 +sS'model.evtin' +p15 g6 sS'exprs[2-1]' -p15 -S'string' p16 -sS'model.firing' +S'string' p17 +sS'model.firing' +p18 g6 sS'model.sim' -p18 -S'list' p19 -sS'model.evtout' +S'list' p20 +sS'model.evtout' +p21 g6 sS'model.nmode' -p21 +p22 g6 sS'exprs[3-1]' -p22 -g16 -sS'model.in' p23 +g17 +sS'model.in' +p24 g6 sS'graphics.exprs' -p24 -NsS'model.nzcross' p25 +NsS'model.nzcross' +p26 g6 sS'model.blocktype' -p26 -g16 -sS'nmod' p27 +g17 +sS'nmod' +p28 g6 sS'exprs' -p28 -S'matrix' p29 -sS'gr_i' +S'matrix' p30 -g8 -sS'y' +sS'gr_i' p31 -g8 -sS'x' +g14 +sS'y' p32 -NsS'model' +g14 +sS'x' p33 +NsS'model' +p34 g2 s.
\ No newline at end of file diff --git a/js/Branching/EXTRACTOR.js b/js/Branching/EXTRACTOR.js index b8d25027..0db161c1 100644 --- a/js/Branching/EXTRACTOR.js +++ b/js/Branching/EXTRACTOR.js @@ -7,7 +7,7 @@ function EXTRACTOR() { this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.model.ipar = new ScilabDouble([this.ind]); this.exprs = [sci2exp(this.ind)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACTOR\",sz(1),sz(2));"]); diff --git a/js/Branching/EXTRACTOR.pickle b/js/Branching/EXTRACTOR.pickle index d54d0fb3..2c70431e 100644 --- a/js/Branching/EXTRACTOR.pickle +++ b/js/Branching/EXTRACTOR.pickle @@ -42,35 +42,36 @@ NsS'x.model' p11 NsS'model.dep_ut' p12 -S'vector' +S'vector_boolean' p13 sS'exprs' p14 -g13 -sS'ind' +S'vector' p15 +sS'ind' +p16 g4 sS'gr_i' -p16 -g13 -sS'model.in' p17 +g15 +sS'model.in' +p18 g4 sS'graphics' -p18 +p19 g8 sS'y' -p19 -g13 -sS'x' p20 -NsS'model' +g15 +sS'x' p21 +NsS'model' +p22 g8 sS'model.ipar' -p22 +p23 g4 sS'typ' -p23 -g13 +p24 +g15 s.
\ No newline at end of file diff --git a/js/Branching/FROM.js b/js/Branching/FROM.js index 658831b1..7168937d 100644 --- a/js/Branching/FROM.js +++ b/js/Branching/FROM.js @@ -12,7 +12,7 @@ function FROM() { this.model.ipar = new ScilabDouble([]); this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = ["A"]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROM\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,1]),this.model,this.exprs,this.gr_i); diff --git a/js/Branching/FROM.pickle b/js/Branching/FROM.pickle index 679be93c..7b2dab46 100644 --- a/js/Branching/FROM.pickle +++ b/js/Branching/FROM.pickle @@ -77,19 +77,20 @@ p23 g12 sS'model.dep_ut' p24 -g8 -sS'exprs' +S'vector_boolean' p25 +sS'exprs' +p26 g8 sS'gr_i' -p26 +p27 g8 sS'model.outtyp' -p27 +p28 g6 sS'x' -p28 -NsS'model' p29 +NsS'model' +p30 g2 s.
\ No newline at end of file diff --git a/js/Branching/FROMMO.js b/js/Branching/FROMMO.js index 15f0066f..a0ce70b5 100644 --- a/js/Branching/FROMMO.js +++ b/js/Branching/FROMMO.js @@ -12,7 +12,7 @@ function FROMMO() { this.model.ipar = new ScilabDouble([]); this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); var mo = modelica(); mo.model = "frommo"; mo.outputs = "n"; diff --git a/js/Branching/FROMMO.pickle b/js/Branching/FROMMO.pickle index 28322662..6377e098 100644 --- a/js/Branching/FROMMO.pickle +++ b/js/Branching/FROMMO.pickle @@ -86,19 +86,20 @@ p26 g8 sS'model.dep_ut' p27 -g10 -sS'exprs' +S'vector_boolean' p28 +sS'exprs' +p29 g10 sS'gr_i' -p29 +p30 g10 sS'model.outtyp' -p30 +p31 g8 sS'x' -p31 -NsS'model' p32 +NsS'model' +p33 g2 s.
\ No newline at end of file diff --git a/js/Branching/GOTO.js b/js/Branching/GOTO.js index d83ec85d..d68cdc42 100644 --- a/js/Branching/GOTO.js +++ b/js/Branching/GOTO.js @@ -12,7 +12,7 @@ function GOTO() { this.model.ipar = new ScilabDouble([int(1)]); this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [["A"],[sci2exp(1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GOTO\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,1]),this.model,this.exprs,this.gr_i); diff --git a/js/Branching/GOTO.pickle b/js/Branching/GOTO.pickle index 7ba2a3c3..6e20e181 100644 --- a/js/Branching/GOTO.pickle +++ b/js/Branching/GOTO.pickle @@ -85,20 +85,21 @@ p26 g13 sS'model.dep_ut' p27 -g8 -sS'exprs' +S'vector_boolean' p28 -S'matrix' +sS'exprs' p29 -sS'gr_i' +S'matrix' p30 +sS'gr_i' +p31 g8 sS'model.outtyp' -p31 +p32 g2 sS'x' -p32 -NsS'model' p33 +NsS'model' +p34 g5 s.
\ No newline at end of file diff --git a/js/Branching/GOTOMO.js b/js/Branching/GOTOMO.js index a2b2d18c..70c4dfd0 100644 --- a/js/Branching/GOTOMO.js +++ b/js/Branching/GOTOMO.js @@ -12,7 +12,7 @@ function GOTOMO() { this.model.ipar = new ScilabDouble([int(1)]); this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); var mo = modelica(); mo.model = "gotomo"; mo.inputs = "p"; diff --git a/js/Branching/GOTOMO.pickle b/js/Branching/GOTOMO.pickle index cc8af0d9..9c5805ba 100644 --- a/js/Branching/GOTOMO.pickle +++ b/js/Branching/GOTOMO.pickle @@ -94,20 +94,21 @@ p29 g2 sS'model.dep_ut' p30 -g10 -sS'exprs' +S'vector_boolean' p31 -S'matrix' +sS'exprs' p32 -sS'gr_i' +S'matrix' p33 +sS'gr_i' +p34 g10 sS'model.outtyp' -p34 +p35 g2 sS'x' -p35 -NsS'model' p36 +NsS'model' +p37 g5 s.
\ No newline at end of file diff --git a/js/Branching/GotoTagVisibility.js b/js/Branching/GotoTagVisibility.js index dc5fbfa0..c68ee62c 100644 --- a/js/Branching/GotoTagVisibility.js +++ b/js/Branching/GotoTagVisibility.js @@ -13,7 +13,7 @@ function GotoTagVisibility() { this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabBoolean([false]); - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = "A"; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GotoTagVisibility\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); diff --git a/js/Branching/GotoTagVisibility.pickle b/js/Branching/GotoTagVisibility.pickle index 5e227bec..8a8a7330 100644 --- a/js/Branching/GotoTagVisibility.pickle +++ b/js/Branching/GotoTagVisibility.pickle @@ -78,19 +78,20 @@ p24 g15 sS'model.dep_ut' p25 -g6 -sS'exprs' +S'vector_boolean' p26 +sS'exprs' +p27 g15 sS'gr_i' -p27 +p28 g6 sS'model.outtyp' -p28 +p29 g9 sS'x' -p29 -NsS'model' p30 +NsS'model' +p31 g2 s.
\ No newline at end of file diff --git a/js/Branching/GotoTagVisibilityMO.js b/js/Branching/GotoTagVisibilityMO.js index e2fc5b73..5fe5f7e6 100644 --- a/js/Branching/GotoTagVisibilityMO.js +++ b/js/Branching/GotoTagVisibilityMO.js @@ -13,7 +13,7 @@ function GotoTagVisibilityMO() { this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabBoolean([false]); - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = "A"; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GotoTagVisibilityMO\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); diff --git a/js/Branching/GotoTagVisibilityMO.pickle b/js/Branching/GotoTagVisibilityMO.pickle index 5e227bec..8a8a7330 100644 --- a/js/Branching/GotoTagVisibilityMO.pickle +++ b/js/Branching/GotoTagVisibilityMO.pickle @@ -78,19 +78,20 @@ p24 g15 sS'model.dep_ut' p25 -g6 -sS'exprs' +S'vector_boolean' p26 +sS'exprs' +p27 g15 sS'gr_i' -p27 +p28 g6 sS'model.outtyp' -p28 +p29 g9 sS'x' -p29 -NsS'model' p30 +NsS'model' +p31 g2 s.
\ No newline at end of file diff --git a/js/Branching/ISELECT_f.js b/js/Branching/ISELECT_f.js index 9ad6e505..0146d570 100644 --- a/js/Branching/ISELECT_f.js +++ b/js/Branching/ISELECT_f.js @@ -11,7 +11,7 @@ function ISELECT_f() { this.model.evtin = new ScilabDouble([ones(out)]); this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[string(this.nout)],[string(this.z0+1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ISELECT_f\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); diff --git a/js/Branching/ISELECT_f.pickle b/js/Branching/ISELECT_f.pickle index ed8bf469..3a73aad5 100644 --- a/js/Branching/ISELECT_f.pickle +++ b/js/Branching/ISELECT_f.pickle @@ -45,7 +45,7 @@ sS'graphics.exprs' p11 NsS'model.dep_ut' p12 -S'vector' +S'vector_boolean' p13 sS'model.blocktype' p14 @@ -58,31 +58,32 @@ sS'x.model' p17 NsS'gr_i' p18 -g13 -sS'z0' +S'vector' p19 +sS'z0' +p20 g6 sS'model.in' -p20 +p21 g6 sS'graphics' -p21 +p22 g9 sS'y' -p22 -g13 -sS'x' p23 -NsS'model' +g19 +sS'x' p24 +NsS'model' +p25 g9 sS'typ' -p25 -g13 -sS'nout' p26 +g19 +sS'nout' +p27 g6 sS'out' -p27 +p28 g4 s.
\ No newline at end of file diff --git a/js/Branching/ISELECT_m.js b/js/Branching/ISELECT_m.js index d31861e2..6148db4b 100644 --- a/js/Branching/ISELECT_m.js +++ b/js/Branching/ISELECT_m.js @@ -19,7 +19,7 @@ function ISELECT_m() { this.model.evtin = new ScilabDouble([ones(this.nout,1)]); this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[sci2exp(1)],[sci2exp(this.nout)],[sci2exp(this.z0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ISELECT_m\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); diff --git a/js/Branching/ISELECT_m.pickle b/js/Branching/ISELECT_m.pickle index 2fd47018..696cb0db 100644 --- a/js/Branching/ISELECT_m.pickle +++ b/js/Branching/ISELECT_m.pickle @@ -106,25 +106,26 @@ S'string' p33 sS'model.dep_ut' p34 -g7 -sS'exprs' +S'vector_boolean' p35 +sS'exprs' +p36 g10 sS'gr_i' -p36 +p37 g7 sS'y' -p37 +p38 g7 sS'x' -p38 -NsS'model' p39 +NsS'model' +p40 g4 sS'ot' -p40 +p41 g33 sS'nout' -p41 +p42 g2 s.
\ No newline at end of file diff --git a/js/Branching/MUX.js b/js/Branching/MUX.js index ece52555..64b4c3c6 100644 --- a/js/Branching/MUX.js +++ b/js/Branching/MUX.js @@ -8,7 +8,7 @@ function MUX() { this.model.out = new ScilabDouble([0]); this.model.ipar = new ScilabDouble([this.in1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = string(this.in1); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MUX\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([.5,2]),this.model,this.exprs,this.gr_i); diff --git a/js/Branching/MUX.pickle b/js/Branching/MUX.pickle index b8a51212..e89840ef 100644 --- a/js/Branching/MUX.pickle +++ b/js/Branching/MUX.pickle @@ -47,7 +47,7 @@ p13 g4 sS'model.dep_ut' p14 -S'vector' +S'vector_boolean' p15 sS'exprs' p16 @@ -56,28 +56,29 @@ sS'x.model' p17 NsS'gr_i' p18 -g15 -sS'model.in' +S'vector' p19 -g15 -sS'graphics' +sS'model.in' p20 +g19 +sS'graphics' +p21 g10 sS'y' -p21 -g15 -sS'x' p22 -NsS'model' +g19 +sS'x' p23 +NsS'model' +p24 g10 sS'model.ipar' -p24 +p25 g4 sS'typ' -p25 -g15 -sS'nout' p26 +g19 +sS'nout' +p27 g4 s.
\ No newline at end of file diff --git a/js/Branching/MUX_f.js b/js/Branching/MUX_f.js index 52bb4318..5d0bdf43 100644 --- a/js/Branching/MUX_f.js +++ b/js/Branching/MUX_f.js @@ -8,7 +8,7 @@ function MUX_f() { this.model.out = new ScilabDouble([0]); this.model.ipar = new ScilabDouble([this.in1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = string(this.in1); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MUX_f\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([0.5,2]),this.model,this.exprs,this.gr_i); diff --git a/js/Branching/MUX_f.pickle b/js/Branching/MUX_f.pickle index b8a51212..e89840ef 100644 --- a/js/Branching/MUX_f.pickle +++ b/js/Branching/MUX_f.pickle @@ -47,7 +47,7 @@ p13 g4 sS'model.dep_ut' p14 -S'vector' +S'vector_boolean' p15 sS'exprs' p16 @@ -56,28 +56,29 @@ sS'x.model' p17 NsS'gr_i' p18 -g15 -sS'model.in' +S'vector' p19 -g15 -sS'graphics' +sS'model.in' p20 +g19 +sS'graphics' +p21 g10 sS'y' -p21 -g15 -sS'x' p22 -NsS'model' +g19 +sS'x' p23 +NsS'model' +p24 g10 sS'model.ipar' -p24 +p25 g4 sS'typ' -p25 -g15 -sS'nout' p26 +g19 +sS'nout' +p27 g4 s.
\ No newline at end of file diff --git a/js/Branching/M_SWITCH.js b/js/Branching/M_SWITCH.js index 1e9ceb39..843e56a3 100644 --- a/js/Branching/M_SWITCH.js +++ b/js/Branching/M_SWITCH.js @@ -10,7 +10,7 @@ function M_SWITCH() { this.model.out = new ScilabDouble([-1]); this.model.ipar = new ScilabDouble(ipar); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[string(this.nin)],[string(ipar)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"M_SWITCH\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,this.exprs,this.gr_i); diff --git a/js/Branching/M_SWITCH.pickle b/js/Branching/M_SWITCH.pickle index 46a2872c..9cfd3442 100644 --- a/js/Branching/M_SWITCH.pickle +++ b/js/Branching/M_SWITCH.pickle @@ -78,25 +78,26 @@ S'string' p23 sS'model.dep_ut' p24 -g10 -sS'exprs' +S'vector_boolean' p25 +sS'exprs' +p26 g5 sS'gr_i' -p26 +p27 g10 sS'ipar' -p27 +p28 g5 sS'y' -p28 +p29 g10 sS'x' -p29 -NsS'model' p30 +NsS'model' +p31 g2 sS'ot' -p31 +p32 g8 s.
\ No newline at end of file diff --git a/js/Branching/NRMSOM_f.js b/js/Branching/NRMSOM_f.js index 8c56f5d1..6310a88c 100644 --- a/js/Branching/NRMSOM_f.js +++ b/js/Branching/NRMSOM_f.js @@ -8,7 +8,7 @@ function NRMSOM_f() { this.model.in = new ScilabDouble(in1); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [string(this.nin)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NRMSOM_f\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([.2,2]),this.model,this.exprs,this.gr_i); diff --git a/js/Branching/NRMSOM_f.pickle b/js/Branching/NRMSOM_f.pickle index e0d55699..011b8839 100644 --- a/js/Branching/NRMSOM_f.pickle +++ b/js/Branching/NRMSOM_f.pickle @@ -46,31 +46,32 @@ S'matrix' p12 sS'model.dep_ut' p13 -S'vector' +S'vector_boolean' p14 sS'exprs' p15 -g14 -sS'x.model' +S'vector' p16 -NsS'gr_i' +sS'x.model' p17 -g14 -sS'model.in' +NsS'gr_i' p18 +g16 +sS'model.in' +p19 g12 sS'graphics' -p19 +p20 g8 sS'y' -p20 -g14 -sS'x' p21 -NsS'model' +g16 +sS'x' p22 +NsS'model' +p23 g8 sS'typ' -p23 -g14 +p24 +g16 s.
\ No newline at end of file diff --git a/js/Branching/RELAY_f.js b/js/Branching/RELAY_f.js index 0e348a7c..c55047f1 100644 --- a/js/Branching/RELAY_f.js +++ b/js/Branching/RELAY_f.js @@ -12,7 +12,7 @@ function RELAY_f() { this.model.dstate = new ScilabDouble([i0]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,true]); + this.model.dep_ut = new ScilabBoolean([true,true]); this.exprs = [[string(this.nin)],[string(i0+1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RELAY_f\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); diff --git a/js/Branching/RELAY_f.pickle b/js/Branching/RELAY_f.pickle index 9103134c..ef5f9ec9 100644 --- a/js/Branching/RELAY_f.pickle +++ b/js/Branching/RELAY_f.pickle @@ -74,21 +74,22 @@ S'string' p22 sS'model.dep_ut' p23 -g11 -sS'exprs' +S'vector_boolean' p24 +sS'exprs' +p25 g17 sS'gr_i' -p25 +p26 g11 sS'ipar' -p26 -NsS'y' p27 +NsS'y' +p28 g11 sS'x' -p28 -NsS'model' p29 +NsS'model' +p30 g4 s.
\ No newline at end of file diff --git a/js/Branching/SCALAR2VECTOR.js b/js/Branching/SCALAR2VECTOR.js index a78d2fdc..9727f4d0 100644 --- a/js/Branching/SCALAR2VECTOR.js +++ b/js/Branching/SCALAR2VECTOR.js @@ -7,7 +7,7 @@ function SCALAR2VECTOR() { this.model.out = new ScilabDouble([this.nout]); this.model.in = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [string([this.nout])]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SCALAR2VECTOR\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); diff --git a/js/Branching/SCALAR2VECTOR.pickle b/js/Branching/SCALAR2VECTOR.pickle index 95f52eb3..2b404522 100644 --- a/js/Branching/SCALAR2VECTOR.pickle +++ b/js/Branching/SCALAR2VECTOR.pickle @@ -44,34 +44,35 @@ sS'graphics.exprs' p12 NsS'model.dep_ut' p13 -S'vector' +S'vector_boolean' p14 sS'exprs' p15 -g14 -sS'x.model' +S'vector' p16 -NsS'gr_i' +sS'x.model' p17 -g14 -sS'model.in' +NsS'gr_i' p18 +g16 +sS'model.in' +p19 g4 sS'graphics' -p19 +p20 g10 sS'y' -p20 -g14 -sS'x' p21 -NsS'model' +g16 +sS'x' p22 +NsS'model' +p23 g10 sS'typ' -p23 -g14 -sS'nout' p24 +g16 +sS'nout' +p25 g4 s.
\ No newline at end of file diff --git a/js/Branching/SELECT_f.js b/js/Branching/SELECT_f.js index ec241d1a..ef371a9f 100644 --- a/js/Branching/SELECT_f.js +++ b/js/Branching/SELECT_f.js @@ -11,7 +11,7 @@ function SELECT_f() { this.model.evtin = new ScilabDouble([ones(in1)]); this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[string(this.nin)],[string(this.z0+1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SELECT_f\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); diff --git a/js/Branching/SELECT_f.pickle b/js/Branching/SELECT_f.pickle index 00b654cc..b09ecfbf 100644 --- a/js/Branching/SELECT_f.pickle +++ b/js/Branching/SELECT_f.pickle @@ -51,7 +51,7 @@ S'matrix' p13 sS'model.dep_ut' p14 -S'vector' +S'vector_boolean' p15 sS'exprs' p16 @@ -60,29 +60,30 @@ sS'x.model' p17 NsS'gr_i' p18 -g15 -sS'z0' +S'vector' p19 +sS'z0' +p20 g4 sS'model.in' -p20 +p21 g13 sS'graphics' -p21 +p22 g8 sS'y' -p22 -g15 -sS'x' p23 -NsS'model' +g19 +sS'x' p24 +NsS'model' +p25 g8 sS'typ' -p25 -g15 -sS'model.blocktype' p26 -S'string' +g19 +sS'model.blocktype' p27 +S'string' +p28 s.
\ No newline at end of file diff --git a/js/Branching/SELECT_m.js b/js/Branching/SELECT_m.js index ad79cc27..7690d04d 100644 --- a/js/Branching/SELECT_m.js +++ b/js/Branching/SELECT_m.js @@ -19,7 +19,7 @@ function SELECT_m() { this.model.evtin = new ScilabDouble([ones(this.nin,1)]); this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[sci2exp(1)],[sci2exp(this.nin)],[sci2exp(this.z0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SELECT_m\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); diff --git a/js/Branching/SELECT_m.pickle b/js/Branching/SELECT_m.pickle index f4d96d76..e4d06d0c 100644 --- a/js/Branching/SELECT_m.pickle +++ b/js/Branching/SELECT_m.pickle @@ -109,22 +109,23 @@ p34 g7 sS'model.dep_ut' p35 -g11 -sS'exprs' +S'vector_boolean' p36 +sS'exprs' +p37 g13 sS'gr_i' -p37 +p38 g11 sS'y' -p38 +p39 g11 sS'x' -p39 -NsS'model' p40 +NsS'model' +p41 g4 sS'ot' -p41 +p42 g11 s.
\ No newline at end of file diff --git a/js/Branching/SELF_SWITCH.pickle b/js/Branching/SELF_SWITCH.pickle index 55184003..4353efb2 100644 --- a/js/Branching/SELF_SWITCH.pickle +++ b/js/Branching/SELF_SWITCH.pickle @@ -27,7 +27,7 @@ S'double' p4 sS'x.model.dep_ut' p5 -S'vector' +S'vector_boolean' p6 sS'diagram.objs[1-1].graphics.pout' p7 @@ -53,92 +53,93 @@ p14 g2 sS'x.graphics.gr_i' p15 -g6 -sS'x.graphics.pout' +S'vector' p16 +sS'x.graphics.pout' +p17 g4 sS'diagram.objs[3-1].graphics.pout' -p17 +p18 g4 sS'x.model.blocktype' -p18 +p19 g9 sS'diagram.objs[2-1].graphics.pin' -p19 +p20 g4 sS'diagram.objs[7-1]' -p20 +p21 g4 sS'diagram.objs[6-1]' -p21 +p22 g4 sS'diagram.objs[5-1]' -p22 +p23 g4 sS'x.graphics.in_implicit' -p23 -g6 -sS'diagram.objs[3-1].model.rpar' p24 +g16 +sS'diagram.objs[3-1].model.rpar' +p25 g4 sS'diagram.objs[4-1]' -p25 +p26 g2 sS'x.graphics.in_style' -p26 +p27 g9 sS'stateOpen' -p27 -S'boolean' p28 -sS'x.graphics.out_implicit' +S'boolean' p29 -g6 -sS'diagram.objs[4-1].graphics.pout' +sS'x.graphics.out_implicit' p30 +g16 +sS'diagram.objs[4-1].graphics.pout' +p31 g4 sS'diagram' -p31 +p32 g4 sS'x.graphics.pin' -p32 +p33 g4 sS'x.model.opar' -p33 -S'list' p34 -sS'typ' +S'list' p35 -g34 -sS'x.model.sim' +sS'typ' p36 +g35 +sS'x.model.sim' +p37 g9 sS'diagram.objs[4-1].graphics.pin' -p37 -g6 -sS'x.graphics.style' p38 +g16 +sS'x.graphics.style' +p39 g9 sS'diagram.objs[3-1].graphics.exprs' -p39 +p40 g9 sS'x.model.in' -p40 +p41 g4 sS'x.gui' -p41 +p42 g9 sS'x.graphics.sz' -p42 -g6 -sS'diagram.objs[4-1].graphics.exprs' p43 -S'matrix' +g16 +sS'diagram.objs[4-1].graphics.exprs' p44 -sS'y' +S'matrix' p45 +sS'y' +p46 g4 sS'x' -p46 +p47 g4 s.
\ No newline at end of file diff --git a/js/Branching/SWITCH2.js b/js/Branching/SWITCH2.js index dc97fdbc..f4363888 100644 --- a/js/Branching/SWITCH2.js +++ b/js/Branching/SWITCH2.js @@ -14,7 +14,7 @@ function SWITCH2() { this.model.nzcross = new ScilabDouble([this.nzz]); this.model.nmode = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[string(ipar)],[string(rpar)],[string(this.nzz)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SWITCH2\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); diff --git a/js/Branching/SWITCH2.pickle b/js/Branching/SWITCH2.pickle index 34ad8f7d..4f8888b6 100644 --- a/js/Branching/SWITCH2.pickle +++ b/js/Branching/SWITCH2.pickle @@ -36,7 +36,7 @@ sS'x.model' p6 NsS'model.dep_ut' p7 -S'vector' +S'vector_boolean' p8 sS'model.out' p9 @@ -46,57 +46,58 @@ p10 g2 sS'typ' p11 -g8 -sS'model.sim' +S'vector' p12 -S'list' +sS'model.sim' p13 -sS'model.nmode' +S'list' p14 +sS'model.nmode' +p15 g5 sS'model.rpar' -p15 +p16 g5 sS'in1' -p16 -S'matrix' p17 -sS'model.in' +S'matrix' p18 -g17 -sS'graphics.exprs' +sS'model.in' p19 -NsS'model.ipar' +g18 +sS'graphics.exprs' p20 -g8 -sS'model.nzcross' +NsS'model.ipar' p21 +g12 +sS'model.nzcross' +p22 g5 sS'model.blocktype' -p22 -S'string' p23 -sS'nzz' +S'string' p24 +sS'nzz' +p25 g5 sS'rule' -p25 +p26 g5 sS'exprs' -p26 -g17 -sS'gr_i' p27 -g8 -sS'ipar' +g18 +sS'gr_i' p28 -g8 -sS'y' +g12 +sS'ipar' p29 -g8 -sS'x' +g12 +sS'y' p30 -NsS'model' +g12 +sS'x' p31 +NsS'model' +p32 g2 s.
\ No newline at end of file diff --git a/js/Branching/SWITCH2_m.js b/js/Branching/SWITCH2_m.js index 211b8a1a..e3f2313a 100644 --- a/js/Branching/SWITCH2_m.js +++ b/js/Branching/SWITCH2_m.js @@ -17,7 +17,7 @@ function SWITCH2_m() { this.model.nzcross = new ScilabDouble([this.nzz]); this.model.nmode = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[sci2exp(1)],[string(ipar)],[string(rpar)],[string(this.nzz)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SWITCH2_m\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); diff --git a/js/Branching/SWITCH2_m.pickle b/js/Branching/SWITCH2_m.pickle index 9bdd61dc..686b6898 100644 --- a/js/Branching/SWITCH2_m.pickle +++ b/js/Branching/SWITCH2_m.pickle @@ -39,7 +39,7 @@ p6 g2 sS'model.dep_ut' p7 -S'vector' +S'vector_boolean' p8 sS'model.out' p9 @@ -48,84 +48,85 @@ sS'it[3-1]' p10 NsS'out' p11 -g8 -sS'model.in2' +S'vector' p12 -S'matrix' +sS'model.in2' p13 -sS'model.intyp' +S'matrix' p14 +sS'model.intyp' +p15 g5 sS'x.graphics' -p15 +p16 g2 sS'it[2-1]' -p16 +p17 g5 sS'typ' -p17 -g8 -sS'model.sim' p18 -S'list' +g12 +sS'model.sim' p19 -sS'model.out2' +S'list' p20 +sS'model.out2' +p21 g5 sS'model.nmode' -p21 +p22 g5 sS'model.rpar' -p22 +p23 g5 sS'in1' -p23 -g8 -sS'model.outtyp' p24 +g12 +sS'model.outtyp' +p25 g5 sS'model.in' -p25 -g13 -sS'graphics.exprs' p26 -NsS'model.ipar' +g14 +sS'graphics.exprs' p27 -g8 -sS'model.nzcross' +NsS'model.ipar' p28 +g12 +sS'model.nzcross' +p29 g5 sS'ok' -p29 -S'boolean' p30 -sS'model.blocktype' +S'boolean' p31 -S'string' +sS'model.blocktype' p32 -sS'nzz' +S'string' p33 +sS'nzz' +p34 g5 sS'rule' -p34 +p35 g5 sS'exprs' -p35 -g13 -sS'gr_i' p36 -g8 -sS'ipar' +g14 +sS'gr_i' p37 -g8 -sS'y' +g12 +sS'ipar' p38 -g8 -sS'x' +g12 +sS'y' p39 -NsS'model' +g12 +sS'x' p40 +NsS'model' +p41 g2 sS'it[1-1]' -p41 +p42 Ns.
\ No newline at end of file diff --git a/js/Branching/SWITCH_f.js b/js/Branching/SWITCH_f.js index 151ec1a6..39ab5654 100644 --- a/js/Branching/SWITCH_f.js +++ b/js/Branching/SWITCH_f.js @@ -11,7 +11,7 @@ function SWITCH_f() { this.model.ipar = new ScilabDouble([i0]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,true]); + this.model.dep_ut = new ScilabBoolean([true,true]); this.exprs = [[string(this.nin)],[string(i0+1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SWITCH_f\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); diff --git a/js/Branching/SWITCH_f.pickle b/js/Branching/SWITCH_f.pickle index c9faffa8..e9f05526 100644 --- a/js/Branching/SWITCH_f.pickle +++ b/js/Branching/SWITCH_f.pickle @@ -71,21 +71,22 @@ S'string' p21 sS'model.dep_ut' p22 -g9 -sS'exprs' +S'vector_boolean' p23 +sS'exprs' +p24 g15 sS'gr_i' -p24 +p25 g9 sS'ipar' -p25 -NsS'y' p26 +NsS'y' +p27 g9 sS'x' -p27 -NsS'model' p28 +NsS'model' +p29 g2 s.
\ No newline at end of file |