add type to expressions

29 files changed, 2015 insertions, 29 deletions

diff --git a/js/Branching/CLKFROM.pickle b/js/Branching/CLKFROM.pickle
index d6f0a280..02bf57d8 100644
--- a/js/Branching/CLKFROM.pickle
+++ b/js/Branching/CLKFROM.pickle
@@ -9,4 +9,61 @@ p3
 atp4
 Rp5
 .(dp0
-.
\ No newline at end of file
+S'this.x'
+p1
+S'double'
+p2
+sS'needcompile'
+p3
+g2
+sS'model.evtout'
+p4
+g2
+sS'model.blocktype'
+p5
+S'string'
+p6
+sS'model.sim'
+p7
+g6
+sS'this.x.graphics'
+p8
+S'object'
+p9
+sS'arg1'
+p10
+g9
+sS'graphics.exprs'
+p11
+NsS'model.dep_ut'
+p12
+S'vector'
+p13
+sS'this.x.model'
+p14
+g9
+sS'exprs'
+p15
+g6
+sS'this.x.graphics.id'
+p16
+g6
+sS'graphics'
+p17
+g9
+sS'y'
+p18
+g2
+sS'model'
+p19
+g2
+sS'typ'
+p20
+g13
+sS'model.opar'
+p21
+g13
+sS'model.firing'
+p22
+g2
+s.
\ No newline at end of file
diff --git a/js/Branching/CLKGOTO.pickle b/js/Branching/CLKGOTO.pickle
index a0c2e14c..71b01fe0 100644
--- a/js/Branching/CLKGOTO.pickle
+++ b/js/Branching/CLKGOTO.pickle
@@ -11,4 +11,72 @@ p4
 atp5
 Rp6
 .(dp0
-.
\ No newline at end of file
+S'this.x'
+p1
+S'double'
+p2
+sS'needcompile'
+p3
+g2
+sS'model.ipar'
+p4
+g2
+sS'ok'
+p5
+S'boolean'
+p6
+sS'model.blocktype'
+p7
+S'string'
+p8
+sS'model.sim'
+p9
+g8
+sS'this.x.graphics'
+p10
+S'object'
+p11
+sS'arg1'
+p12
+g11
+sS'model.evtin'
+p13
+g2
+sS'model.dep_ut'
+p14
+S'vector'
+p15
+sS'this.x.model'
+p16
+g11
+sS'exprs'
+p17
+S'matrix'
+p18
+sS'this.x.graphics.id'
+p19
+g8
+sS'graphics.exprs'
+p20
+NsS'graphics'
+p21
+g11
+sS'y'
+p22
+g2
+sS'model'
+p23
+g2
+sS'this.tagvis'
+p24
+g2
+sS'typ'
+p25
+g15
+sS'model.opar'
+p26
+g15
+sS'model.firing'
+p27
+g2
+s.
\ No newline at end of file
diff --git a/js/Branching/CLKGotoTagVisibility.pickle b/js/Branching/CLKGotoTagVisibility.pickle
index d6f0a280..48fdd6c4 100644
--- a/js/Branching/CLKGotoTagVisibility.pickle
+++ b/js/Branching/CLKGotoTagVisibility.pickle
@@ -9,4 +9,80 @@ p3
 atp4
 Rp5
 .(dp0
-.
\ No newline at end of file
+S'arg1'
+p1
+S'object'
+p2
+sS'graphics'
+p3
+g2
+sS'this.x.model'
+p4
+g2
+sS'model.out'
+p5
+S'vector'
+p6
+sS'model.in2'
+p7
+g6
+sS'model.in1'
+p8
+g6
+sS'typ'
+p9
+g6
+sS'model.evtin'
+p10
+g6
+sS'model.firing'
+p11
+S'boolean'
+p12
+sS'this.x'
+p13
+S'double'
+p14
+sS'model.sim'
+p15
+S'string'
+p16
+sS'model.out2'
+p17
+g6
+sS'model.intyp'
+p18
+g14
+sS'y'
+p19
+g14
+sS'graphics.exprs'
+p20
+NsS'this.x.graphics'
+p21
+g2
+sS'model.opar'
+p22
+g6
+sS'needcompile'
+p23
+g14
+sS'model.blocktype'
+p24
+g16
+sS'model.dep_ut'
+p25
+g6
+sS'exprs'
+p26
+g16
+sS'gr_i'
+p27
+g6
+sS'model.outtyp'
+p28
+g14
+sS'model'
+p29
+g14
+s.
\ No newline at end of file
diff --git a/js/Branching/DEMUX.pickle b/js/Branching/DEMUX.pickle
index 6ea9b1b1..1430ff8b 100644
--- a/js/Branching/DEMUX.pickle
+++ b/js/Branching/DEMUX.pickle
@@ -9,4 +9,72 @@ p3
 atp4
 Rp5
 .(dp0
-.
\ No newline at end of file
+S'arg1'
+p1
+S'object'
+p2
+sS'graphics'
+p3
+g2
+sS'this.x.model'
+p4
+NsS'model.out'
+p5
+S'vector'
+p6
+sS'model.in1'
+p7
+S'double'
+p8
+sS'typ'
+p9
+g6
+sS'this.out'
+p10
+g8
+sS'model.firing'
+p11
+g6
+sS'this.x'
+p12
+g8
+sS'model.sim'
+p13
+g6
+sS'nin'
+p14
+g8
+sS'graphics.exprs'
+p15
+NsS'model.ipar'
+p16
+NsS'this.x.graphics'
+p17
+g2
+sS'[model,graphics,ok]'
+p18
+g8
+sS'ok'
+p19
+S'boolean'
+p20
+sS'model.blocktype'
+p21
+S'string'
+p22
+sS'model.dep_ut'
+p23
+g6
+sS'exprs'
+p24
+g22
+sS'gr_i'
+p25
+g6
+sS'y'
+p26
+g6
+sS'model'
+p27
+g8
+s.
\ No newline at end of file
diff --git a/js/Branching/DEMUX_f.pickle b/js/Branching/DEMUX_f.pickle
index 6ea9b1b1..1430ff8b 100644
--- a/js/Branching/DEMUX_f.pickle
+++ b/js/Branching/DEMUX_f.pickle
@@ -9,4 +9,72 @@ p3
 atp4
 Rp5
 .(dp0
-.
\ No newline at end of file
+S'arg1'
+p1
+S'object'
+p2
+sS'graphics'
+p3
+g2
+sS'this.x.model'
+p4
+NsS'model.out'
+p5
+S'vector'
+p6
+sS'model.in1'
+p7
+S'double'
+p8
+sS'typ'
+p9
+g6
+sS'this.out'
+p10
+g8
+sS'model.firing'
+p11
+g6
+sS'this.x'
+p12
+g8
+sS'model.sim'
+p13
+g6
+sS'nin'
+p14
+g8
+sS'graphics.exprs'
+p15
+NsS'model.ipar'
+p16
+NsS'this.x.graphics'
+p17
+g2
+sS'[model,graphics,ok]'
+p18
+g8
+sS'ok'
+p19
+S'boolean'
+p20
+sS'model.blocktype'
+p21
+S'string'
+p22
+sS'model.dep_ut'
+p23
+g6
+sS'exprs'
+p24
+g22
+sS'gr_i'
+p25
+g6
+sS'y'
+p26
+g6
+sS'model'
+p27
+g8
+s.
\ No newline at end of file
diff --git a/js/Branching/ESELECT_f.pickle b/js/Branching/ESELECT_f.pickle
index c3c13292..b1a8f029 100644
--- a/js/Branching/ESELECT_f.pickle
+++ b/js/Branching/ESELECT_f.pickle
@@ -13,4 +13,91 @@ p5
 atp6
 Rp7
 .(dp0
-.
\ No newline at end of file
+S'this.nmod'
+p1
+S'double'
+p2
+sS'arg1'
+p3
+S'object'
+p4
+sS'graphics'
+p5
+g4
+sS'model.intyp'
+p6
+g2
+sS'this.x.model'
+p7
+NsS'this.inh'
+p8
+g2
+sS'model.in1'
+p9
+g2
+sS'model.nzcross'
+p10
+g2
+sS'this.out'
+p11
+g2
+sS'model.evtin'
+p12
+g2
+sS'exprs[2-1]'
+p13
+S'string'
+p14
+sS'model.firing'
+p15
+g2
+sS'this.x'
+p16
+g2
+sS'model.sim'
+p17
+S'vector'
+p18
+sS'model.evtout'
+p19
+g2
+sS'model.in2'
+p20
+g2
+sS'model.nmode'
+p21
+g2
+sS'exprs[3-1]'
+p22
+g14
+sS'graphics.exprs'
+p23
+NsS'this.x.graphics'
+p24
+g4
+sS'[model,graphics,ok]'
+p25
+g2
+sS'model.blocktype'
+p26
+g14
+sS'typ'
+p27
+g18
+sS'model.dep_ut'
+p28
+g18
+sS'exprs'
+p29
+S'matrix'
+p30
+sS'gr_i'
+p31
+g18
+sS'y'
+p32
+g18
+sS'model'
+p33
+g4
+s.
\ No newline at end of file
diff --git a/js/Branching/EXTRACTOR.pickle b/js/Branching/EXTRACTOR.pickle
index 39568f5f..0a76095f 100644
--- a/js/Branching/EXTRACTOR.pickle
+++ b/js/Branching/EXTRACTOR.pickle
@@ -9,4 +9,62 @@ p3
 atp4
 Rp5
 .(dp0
-.
\ No newline at end of file
+S'this.x'
+p1
+S'double'
+p2
+sS'[model,graphics,ok]'
+p3
+g2
+sS'model.in1'
+p4
+g2
+sS'model.blocktype'
+p5
+S'string'
+p6
+sS'model.sim'
+p7
+S'vector'
+p8
+sS'this.x.graphics'
+p9
+S'object'
+p10
+sS'arg1'
+p11
+g10
+sS'graphics.exprs'
+p12
+NsS'this.ind'
+p13
+g2
+sS'model.out'
+p14
+g2
+sS'this.x.model'
+p15
+NsS'exprs'
+p16
+g8
+sS'gr_i'
+p17
+g8
+sS'model.dep_ut'
+p18
+g8
+sS'graphics'
+p19
+g10
+sS'y'
+p20
+g8
+sS'model'
+p21
+g2
+sS'model.ipar'
+p22
+NsS'typ'
+p23
+g8
+s.
\ No newline at end of file
diff --git a/js/Branching/FROM.pickle b/js/Branching/FROM.pickle
index d6f0a280..1d812580 100644
--- a/js/Branching/FROM.pickle
+++ b/js/Branching/FROM.pickle
@@ -9,4 +9,79 @@ p3
 atp4
 Rp5
 .(dp0
-.
\ No newline at end of file
+S'arg1'
+p1
+S'object'
+p2
+sS'graphics'
+p3
+g2
+sS'this.x.model'
+p4
+g2
+sS'model.out'
+p5
+S'double'
+p6
+sS'model.in2'
+p7
+S'vector'
+p8
+sS'model.in1'
+p9
+g8
+sS'typ'
+p10
+g8
+sS'this.x.graphics.id'
+p11
+S'string'
+p12
+sS'this.x'
+p13
+g6
+sS'model.sim'
+p14
+g12
+sS'model.out2'
+p15
+g6
+sS'model.intyp'
+p16
+g6
+sS'y'
+p17
+g6
+sS'graphics.exprs'
+p18
+NsS'model.ipar'
+p19
+g8
+sS'this.x.graphics'
+p20
+g2
+sS'model.opar'
+p21
+g8
+sS'needcompile'
+p22
+g6
+sS'model.blocktype'
+p23
+g12
+sS'model.dep_ut'
+p24
+g8
+sS'exprs'
+p25
+g8
+sS'gr_i'
+p26
+g8
+sS'model.outtyp'
+p27
+g6
+sS'model'
+p28
+g6
+s.
\ No newline at end of file
diff --git a/js/Branching/FROMMO.pickle b/js/Branching/FROMMO.pickle
index d6f0a280..23276901 100644
--- a/js/Branching/FROMMO.pickle
+++ b/js/Branching/FROMMO.pickle
@@ -9,4 +9,88 @@ p3
 atp4
 Rp5
 .(dp0
-.
\ No newline at end of file
+S'arg1'
+p1
+S'object'
+p2
+sS'graphics'
+p3
+g2
+sS'mo.model'
+p4
+S'string'
+p5
+sS'this.x.model'
+p6
+g2
+sS'model.out'
+p7
+S'double'
+p8
+sS'model.in2'
+p9
+S'vector'
+p10
+sS'model.in1'
+p11
+g10
+sS'typ'
+p12
+g10
+sS'this.x'
+p13
+g8
+sS'model.sim'
+p14
+g5
+sS'mo.outputs'
+p15
+g5
+sS'model.out2'
+p16
+g8
+sS'model.intyp'
+p17
+g8
+sS'y'
+p18
+g8
+sS'graphics.exprs'
+p19
+NsS'model.ipar'
+p20
+g10
+sS'this.x.graphics'
+p21
+g2
+sS'model.opar'
+p22
+g10
+sS'needcompile'
+p23
+g8
+sS'model.blocktype'
+p24
+g5
+sS'mo'
+p25
+g8
+sS'model.dep_ut'
+p26
+g10
+sS'exprs'
+p27
+g10
+sS'gr_i'
+p28
+g10
+sS'this.x.graphics.out_implicit'
+p29
+g10
+sS'model.outtyp'
+p30
+g8
+sS'model'
+p31
+g8
+s.
\ No newline at end of file
diff --git a/js/Branching/GOTO.pickle b/js/Branching/GOTO.pickle
index a0c2e14c..49dc3332 100644
--- a/js/Branching/GOTO.pickle
+++ b/js/Branching/GOTO.pickle
@@ -11,4 +11,86 @@ p4
 atp5
 Rp6
 .(dp0
-.
\ No newline at end of file
+S'arg1'
+p1
+NsS'graphics'
+p2
+S'object'
+p3
+sS'this.x.model'
+p4
+g3
+sS'model.out'
+p5
+S'vector'
+p6
+sS'model.in2'
+p7
+S'double'
+p8
+sS'model.in1'
+p9
+g8
+sS'typ'
+p10
+g6
+sS'this.x.graphics.id'
+p11
+S'string'
+p12
+sS'this.x'
+p13
+g8
+sS'model.sim'
+p14
+g12
+sS'model.out2'
+p15
+g6
+sS'model.intyp'
+p16
+g8
+sS'y'
+p17
+g8
+sS'graphics.exprs'
+p18
+NsS'model.ipar'
+p19
+g8
+sS'this.x.graphics'
+p20
+g3
+sS'model.opar'
+p21
+g6
+sS'needcompile'
+p22
+g8
+sS'ok'
+p23
+S'boolean'
+p24
+sS'model.blocktype'
+p25
+g12
+sS'model.dep_ut'
+p26
+g6
+sS'exprs'
+p27
+S'matrix'
+p28
+sS'gr_i'
+p29
+g6
+sS'model.outtyp'
+p30
+g8
+sS'model'
+p31
+g8
+sS'this.tagvis'
+p32
+g8
+s.
\ No newline at end of file
diff --git a/js/Branching/GOTOMO.pickle b/js/Branching/GOTOMO.pickle
index a0c2e14c..29a636f8 100644
--- a/js/Branching/GOTOMO.pickle
+++ b/js/Branching/GOTOMO.pickle
@@ -11,4 +11,95 @@ p4
 atp5
 Rp6
 .(dp0
-.
\ No newline at end of file
+S'arg1'
+p1
+NsS'graphics'
+p2
+S'object'
+p3
+sS'mo.model'
+p4
+S'string'
+p5
+sS'this.x.model'
+p6
+g3
+sS'model.out'
+p7
+S'vector'
+p8
+sS'model.in2'
+p9
+S'double'
+p10
+sS'model.in1'
+p11
+g10
+sS'typ'
+p12
+g8
+sS'mo.inputs'
+p13
+g5
+sS'this.x.graphics.in_implicit'
+p14
+g8
+sS'this.x'
+p15
+g10
+sS'model.sim'
+p16
+g5
+sS'model.out2'
+p17
+g8
+sS'model.intyp'
+p18
+g8
+sS'y'
+p19
+g10
+sS'graphics.exprs'
+p20
+NsS'model.ipar'
+p21
+g10
+sS'this.x.graphics'
+p22
+g3
+sS'model.opar'
+p23
+g8
+sS'needcompile'
+p24
+g10
+sS'ok'
+p25
+S'boolean'
+p26
+sS'model.blocktype'
+p27
+g5
+sS'mo'
+p28
+g10
+sS'model.dep_ut'
+p29
+g8
+sS'exprs'
+p30
+S'matrix'
+p31
+sS'gr_i'
+p32
+g8
+sS'model.outtyp'
+p33
+g10
+sS'model'
+p34
+g10
+sS'this.tagvis'
+p35
+g10
+s.
\ No newline at end of file
diff --git a/js/Branching/GotoTagVisibility.pickle b/js/Branching/GotoTagVisibility.pickle
index d6f0a280..48fdd6c4 100644
--- a/js/Branching/GotoTagVisibility.pickle
+++ b/js/Branching/GotoTagVisibility.pickle
@@ -9,4 +9,80 @@ p3
 atp4
 Rp5
 .(dp0
-.
\ No newline at end of file
+S'arg1'
+p1
+S'object'
+p2
+sS'graphics'
+p3
+g2
+sS'this.x.model'
+p4
+g2
+sS'model.out'
+p5
+S'vector'
+p6
+sS'model.in2'
+p7
+g6
+sS'model.in1'
+p8
+g6
+sS'typ'
+p9
+g6
+sS'model.evtin'
+p10
+g6
+sS'model.firing'
+p11
+S'boolean'
+p12
+sS'this.x'
+p13
+S'double'
+p14
+sS'model.sim'
+p15
+S'string'
+p16
+sS'model.out2'
+p17
+g6
+sS'model.intyp'
+p18
+g14
+sS'y'
+p19
+g14
+sS'graphics.exprs'
+p20
+NsS'this.x.graphics'
+p21
+g2
+sS'model.opar'
+p22
+g6
+sS'needcompile'
+p23
+g14
+sS'model.blocktype'
+p24
+g16
+sS'model.dep_ut'
+p25
+g6
+sS'exprs'
+p26
+g16
+sS'gr_i'
+p27
+g6
+sS'model.outtyp'
+p28
+g14
+sS'model'
+p29
+g14
+s.
\ No newline at end of file
diff --git a/js/Branching/GotoTagVisibilityMO.pickle b/js/Branching/GotoTagVisibilityMO.pickle
index d6f0a280..48fdd6c4 100644
--- a/js/Branching/GotoTagVisibilityMO.pickle
+++ b/js/Branching/GotoTagVisibilityMO.pickle
@@ -9,4 +9,80 @@ p3
 atp4
 Rp5
 .(dp0
-.
\ No newline at end of file
+S'arg1'
+p1
+S'object'
+p2
+sS'graphics'
+p3
+g2
+sS'this.x.model'
+p4
+g2
+sS'model.out'
+p5
+S'vector'
+p6
+sS'model.in2'
+p7
+g6
+sS'model.in1'
+p8
+g6
+sS'typ'
+p9
+g6
+sS'model.evtin'
+p10
+g6
+sS'model.firing'
+p11
+S'boolean'
+p12
+sS'this.x'
+p13
+S'double'
+p14
+sS'model.sim'
+p15
+S'string'
+p16
+sS'model.out2'
+p17
+g6
+sS'model.intyp'
+p18
+g14
+sS'y'
+p19
+g14
+sS'graphics.exprs'
+p20
+NsS'this.x.graphics'
+p21
+g2
+sS'model.opar'
+p22
+g6
+sS'needcompile'
+p23
+g14
+sS'model.blocktype'
+p24
+g16
+sS'model.dep_ut'
+p25
+g6
+sS'exprs'
+p26
+g16
+sS'gr_i'
+p27
+g6
+sS'model.outtyp'
+p28
+g14
+sS'model'
+p29
+g14
+s.
\ No newline at end of file
diff --git a/js/Branching/ISELECT_f.pickle b/js/Branching/ISELECT_f.pickle
index 61ad85b1..6778b6a5 100644
--- a/js/Branching/ISELECT_f.pickle
+++ b/js/Branching/ISELECT_f.pickle
@@ -11,4 +11,72 @@ p4
 atp5
 Rp6
 .(dp0
-.
\ No newline at end of file
+S'model.dstate'
+p1
+NsS'arg1'
+p2
+S'object'
+p3
+sS'graphics'
+p4
+g3
+sS'this.x.model'
+p5
+NsS'model.out'
+p6
+S'matrix'
+p7
+sS'out'
+p8
+g7
+sS'model.in1'
+p9
+S'double'
+p10
+sS'typ'
+p11
+S'vector'
+p12
+sS'model.evtin'
+p13
+g10
+sS'this.x'
+p14
+g10
+sS'model.sim'
+p15
+g12
+sS'this.nout'
+p16
+g10
+sS'graphics.exprs'
+p17
+NsS'this.x.graphics'
+p18
+g3
+sS'[model,graphics,ok]'
+p19
+g10
+sS'model.blocktype'
+p20
+S'string'
+p21
+sS'model.dep_ut'
+p22
+g12
+sS'exprs'
+p23
+g7
+sS'gr_i'
+p24
+g12
+sS'y'
+p25
+g12
+sS'model'
+p26
+g10
+sS'this.z0'
+p27
+g10
+s.
\ No newline at end of file
diff --git a/js/Branching/ISELECT_m.js b/js/Branching/ISELECT_m.js
index be6715a6..20558271 100644
--- a/js/Branching/ISELECT_m.js
+++ b/js/Branching/ISELECT_m.js
@@ -37,7 +37,7 @@ function ISELECT_m() {
         return options;
     }
     ISELECT_m.prototype.set = function ISELECT_m() {
-        this.typ = parseFloat((arguments[0]["typ"]))
+        this.typ = inverse((arguments[0]["typ"]))
         this.nout = parseFloat((arguments[0]["nout"]))
         this.z0 = parseFloat((arguments[0]["z0"]))
         this.x = arg1;
diff --git a/js/Branching/ISELECT_m.pickle b/js/Branching/ISELECT_m.pickle
index 547ae382..d5b8710f 100644
--- a/js/Branching/ISELECT_m.pickle
+++ b/js/Branching/ISELECT_m.pickle
@@ -13,4 +13,112 @@ p5
 atp6
 Rp7
 .(dp0
-.
\ No newline at end of file
+S'model.dstate'
+p1
+NsS'arg1'
+p2
+S'object'
+p3
+sS'graphics'
+p4
+g3
+sS'it'
+p5
+S'vector'
+p6
+sS'model.intyp'
+p7
+S'double'
+p8
+sS'this.x.model'
+p9
+NsS'model.out'
+p10
+S'matrix'
+p11
+sS'out'
+p12
+g6
+sS'model.in2'
+p13
+g8
+sS'model.in1'
+p14
+g8
+sS'typ'
+p15
+g6
+sS'model.evtin'
+p16
+g8
+sS'model.firing'
+p17
+g6
+sS'this.x'
+p18
+g8
+sS'model.sim'
+p19
+g6
+sS'model.evtout'
+p20
+g6
+sS'this.nout'
+p21
+g8
+sS'model.out2'
+p22
+g11
+sS'in1'
+p23
+g6
+sS'model.rpar'
+p24
+g6
+sS'model.outtyp'
+p25
+g8
+sS'model.state'
+p26
+g6
+sS'graphics.exprs'
+p27
+NsS'model.ipar'
+p28
+g6
+sS'this.x.graphics'
+p29
+g3
+sS'[model,graphics,ok]'
+p30
+g8
+sS'ot'
+p31
+S'string'
+p32
+sS'ok'
+p33
+S'boolean'
+p34
+sS'model.blocktype'
+p35
+g32
+sS'model.dep_ut'
+p36
+g6
+sS'exprs'
+p37
+g11
+sS'gr_i'
+p38
+g6
+sS'y'
+p39
+g6
+sS'model'
+p40
+g8
+sS'this.z0'
+p41
+g8
+s.
\ No newline at end of file
diff --git a/js/Branching/MUX.pickle b/js/Branching/MUX.pickle
index 4a5f393a..39ddcbf5 100644
--- a/js/Branching/MUX.pickle
+++ b/js/Branching/MUX.pickle
@@ -9,4 +9,69 @@ p3
 atp4
 Rp5
 .(dp0
-.
\ No newline at end of file
+S'this.x'
+p1
+S'double'
+p2
+sS'[model,graphics,ok]'
+p3
+g2
+sS'model.in1'
+p4
+S'vector'
+p5
+sS'ok'
+p6
+S'boolean'
+p7
+sS'model.blocktype'
+p8
+S'string'
+p9
+sS'model.sim'
+p10
+g5
+sS'this.x.graphics'
+p11
+S'object'
+p12
+sS'arg1'
+p13
+g12
+sS'graphics.exprs'
+p14
+NsS'model.out'
+p15
+g2
+sS'this.x.model'
+p16
+NsS'exprs'
+p17
+g9
+sS'gr_i'
+p18
+g5
+sS'model.dep_ut'
+p19
+g5
+sS'graphics'
+p20
+g12
+sS'y'
+p21
+g5
+sS'model'
+p22
+g2
+sS'model.ipar'
+p23
+NsS'typ'
+p24
+g5
+sS'this.in1'
+p25
+g2
+sS'nout'
+p26
+g2
+s.
\ No newline at end of file
diff --git a/js/Branching/MUX_f.pickle b/js/Branching/MUX_f.pickle
index 4a5f393a..39ddcbf5 100644
--- a/js/Branching/MUX_f.pickle
+++ b/js/Branching/MUX_f.pickle
@@ -9,4 +9,69 @@ p3
 atp4
 Rp5
 .(dp0
-.
\ No newline at end of file
+S'this.x'
+p1
+S'double'
+p2
+sS'[model,graphics,ok]'
+p3
+g2
+sS'model.in1'
+p4
+S'vector'
+p5
+sS'ok'
+p6
+S'boolean'
+p7
+sS'model.blocktype'
+p8
+S'string'
+p9
+sS'model.sim'
+p10
+g5
+sS'this.x.graphics'
+p11
+S'object'
+p12
+sS'arg1'
+p13
+g12
+sS'graphics.exprs'
+p14
+NsS'model.out'
+p15
+g2
+sS'this.x.model'
+p16
+NsS'exprs'
+p17
+g9
+sS'gr_i'
+p18
+g5
+sS'model.dep_ut'
+p19
+g5
+sS'graphics'
+p20
+g12
+sS'y'
+p21
+g5
+sS'model'
+p22
+g2
+sS'model.ipar'
+p23
+NsS'typ'
+p24
+g5
+sS'this.in1'
+p25
+g2
+sS'nout'
+p26
+g2
+s.
\ No newline at end of file
diff --git a/js/Branching/M_SWITCH.pickle b/js/Branching/M_SWITCH.pickle
index efee243e..ec20319d 100644
--- a/js/Branching/M_SWITCH.pickle
+++ b/js/Branching/M_SWITCH.pickle
@@ -13,4 +13,85 @@ p5
 atp6
 Rp7
 .(dp0
-.
\ No newline at end of file
+S'arg1'
+p1
+S'object'
+p2
+sS'graphics'
+p3
+g2
+sS'it'
+p4
+S'matrix'
+p5
+sS'this.x.model'
+p6
+NsS'model.out'
+p7
+S'double'
+p8
+sS'out'
+p9
+S'vector'
+p10
+sS'model.in1'
+p11
+g5
+sS'this.base'
+p12
+g8
+sS'this.x.graphics'
+p13
+g2
+sS'this.x'
+p14
+g8
+sS'model.sim'
+p15
+g10
+sS'in1'
+p16
+g5
+sS'in2'
+p17
+g5
+sS'graphics.exprs'
+p18
+NsS'model.ipar'
+p19
+g5
+sS'typ'
+p20
+g10
+sS'[model,graphics,ok]'
+p21
+g8
+sS'model.blocktype'
+p22
+S'string'
+p23
+sS'this.nin'
+p24
+g8
+sS'model.dep_ut'
+p25
+g10
+sS'exprs'
+p26
+g5
+sS'gr_i'
+p27
+g10
+sS'ipar'
+p28
+g5
+sS'y'
+p29
+g10
+sS'model'
+p30
+g8
+sS'ot'
+p31
+g8
+s.
\ No newline at end of file
diff --git a/js/Branching/NRMSOM_f.pickle b/js/Branching/NRMSOM_f.pickle
index 2641395d..be2e2f41 100644
--- a/js/Branching/NRMSOM_f.pickle
+++ b/js/Branching/NRMSOM_f.pickle
@@ -9,4 +9,64 @@ p3
 atp4
 Rp5
 .(dp0
-.
\ No newline at end of file
+S'this.x'
+p1
+S'double'
+p2
+sS'[model,graphics,ok]'
+p3
+g2
+sS'model.in1'
+p4
+S'matrix'
+p5
+sS'model.blocktype'
+p6
+S'string'
+p7
+sS'model.sim'
+p8
+g7
+sS'this.x.graphics'
+p9
+S'object'
+p10
+sS'arg1'
+p11
+g10
+sS'graphics.exprs'
+p12
+NsS'in1'
+p13
+g5
+sS'model.out'
+p14
+g2
+sS'this.nin'
+p15
+g2
+sS'this.x.model'
+p16
+NsS'exprs'
+p17
+S'vector'
+p18
+sS'gr_i'
+p19
+g18
+sS'model.dep_ut'
+p20
+g18
+sS'graphics'
+p21
+g10
+sS'y'
+p22
+g18
+sS'model'
+p23
+g2
+sS'typ'
+p24
+g18
+s.
\ No newline at end of file
diff --git a/js/Branching/RELAY_f.pickle b/js/Branching/RELAY_f.pickle
index c7cae8a5..7adf4ca6 100644
--- a/js/Branching/RELAY_f.pickle
+++ b/js/Branching/RELAY_f.pickle
@@ -11,4 +11,79 @@ p4
 atp5
 Rp6
 .(dp0
-.
\ No newline at end of file
+S'model.dstate'
+p1
+S'double'
+p2
+sS'arg1'
+p3
+S'object'
+p4
+sS'graphics'
+p5
+g4
+sS'this.x.model'
+p6
+g4
+sS'model.out'
+p7
+g2
+sS'model.in1'
+p8
+S'matrix'
+p9
+sS'typ'
+p10
+S'vector'
+p11
+sS'model.evtin'
+p12
+g2
+sS'model.firing'
+p13
+g11
+sS'this.x'
+p14
+g2
+sS'model.sim'
+p15
+g11
+sS'i0'
+p16
+g2
+sS'in1'
+p17
+g9
+sS'graphics.exprs'
+p18
+NsS'this.x.graphics'
+p19
+g4
+sS'[model,graphics,ok]'
+p20
+g2
+sS'model.blocktype'
+p21
+S'string'
+p22
+sS'this.nin'
+p23
+g2
+sS'model.dep_ut'
+p24
+g11
+sS'exprs'
+p25
+g9
+sS'gr_i'
+p26
+g11
+sS'ipar'
+p27
+NsS'y'
+p28
+g11
+sS'model'
+p29
+g2
+s.
\ No newline at end of file
diff --git a/js/Branching/SCALAR2VECTOR.pickle b/js/Branching/SCALAR2VECTOR.pickle
index 31939e0f..7f3c0396 100644
--- a/js/Branching/SCALAR2VECTOR.pickle
+++ b/js/Branching/SCALAR2VECTOR.pickle
@@ -9,4 +9,63 @@ p3
 atp4
 Rp5
 .(dp0
-.
\ No newline at end of file
+S'this.x'
+p1
+S'double'
+p2
+sS'[model,graphics,ok]'
+p3
+g2
+sS'model.out'
+p4
+NsS'ok'
+p5
+S'boolean'
+p6
+sS'this.nout'
+p7
+g2
+sS'model.sim'
+p8
+S'vector'
+p9
+sS'this.x.graphics'
+p10
+S'object'
+p11
+sS'arg1'
+p12
+g11
+sS'graphics.exprs'
+p13
+NsS'model.in1'
+p14
+g2
+sS'model.dep_ut'
+p15
+g9
+sS'this.x.model'
+p16
+NsS'exprs'
+p17
+g9
+sS'gr_i'
+p18
+g9
+sS'graphics'
+p19
+g11
+sS'y'
+p20
+g9
+sS'model'
+p21
+g2
+sS'typ'
+p22
+g9
+sS'model.blocktype'
+p23
+S'string'
+p24
+s.
\ No newline at end of file
diff --git a/js/Branching/SELECT_f.pickle b/js/Branching/SELECT_f.pickle
index c7cae8a5..b40300cb 100644
--- a/js/Branching/SELECT_f.pickle
+++ b/js/Branching/SELECT_f.pickle
@@ -11,4 +11,72 @@ p4
 atp5
 Rp6
 .(dp0
-.
\ No newline at end of file
+S'model.dstate'
+p1
+NsS'arg1'
+p2
+S'object'
+p3
+sS'graphics'
+p4
+g3
+sS'this.x.model'
+p5
+NsS'model.out'
+p6
+S'double'
+p7
+sS'model.in1'
+p8
+S'matrix'
+p9
+sS'typ'
+p10
+S'vector'
+p11
+sS'model.evtin'
+p12
+g7
+sS'this.x'
+p13
+g7
+sS'model.sim'
+p14
+g11
+sS'in1'
+p15
+g9
+sS'graphics.exprs'
+p16
+NsS'this.x.graphics'
+p17
+g3
+sS'[model,graphics,ok]'
+p18
+g7
+sS'model.blocktype'
+p19
+S'string'
+p20
+sS'this.nin'
+p21
+g7
+sS'model.dep_ut'
+p22
+g11
+sS'exprs'
+p23
+g9
+sS'gr_i'
+p24
+g11
+sS'y'
+p25
+g11
+sS'model'
+p26
+g7
+sS'this.z0'
+p27
+g7
+s.
\ No newline at end of file
diff --git a/js/Branching/SELECT_m.js b/js/Branching/SELECT_m.js
index 142aa8b0..aef3a43f 100644
--- a/js/Branching/SELECT_m.js
+++ b/js/Branching/SELECT_m.js
@@ -37,7 +37,7 @@ function SELECT_m() {
         return options;
     }
     SELECT_m.prototype.set = function SELECT_m() {
-        this.typ = parseFloat((arguments[0]["typ"]))
+        this.typ = inverse((arguments[0]["typ"]))
         this.nin = parseFloat((arguments[0]["nin"]))
         this.z0 = parseFloat((arguments[0]["z0"]))
         this.x = arg1;
diff --git a/js/Branching/SELECT_m.pickle b/js/Branching/SELECT_m.pickle
index 07559f38..f0c06e4a 100644
--- a/js/Branching/SELECT_m.pickle
+++ b/js/Branching/SELECT_m.pickle
@@ -13,4 +13,112 @@ p5
 atp6
 Rp7
 .(dp0
-.
\ No newline at end of file
+S'model.dstate'
+p1
+NsS'arg1'
+p2
+S'object'
+p3
+sS'graphics'
+p4
+g3
+sS'it'
+p5
+S'string'
+p6
+sS'model.intyp'
+p7
+S'double'
+p8
+sS'this.x.model'
+p9
+NsS'model.out'
+p10
+g8
+sS'out'
+p11
+S'vector'
+p12
+sS'model.in2'
+p13
+S'matrix'
+p14
+sS'model.in1'
+p15
+g14
+sS'typ'
+p16
+g12
+sS'model.evtin'
+p17
+g8
+sS'model.firing'
+p18
+g12
+sS'this.x'
+p19
+g8
+sS'model.sim'
+p20
+g12
+sS'model.evtout'
+p21
+g12
+sS'model.out2'
+p22
+g8
+sS'in1'
+p23
+g12
+sS'model.rpar'
+p24
+g12
+sS'model.outtyp'
+p25
+g8
+sS'model.state'
+p26
+g12
+sS'graphics.exprs'
+p27
+NsS'model.ipar'
+p28
+g12
+sS'this.x.graphics'
+p29
+g3
+sS'[model,graphics,ok]'
+p30
+g8
+sS'ot'
+p31
+g12
+sS'ok'
+p32
+S'boolean'
+p33
+sS'model.blocktype'
+p34
+g6
+sS'this.nin'
+p35
+g8
+sS'model.dep_ut'
+p36
+g12
+sS'exprs'
+p37
+g14
+sS'gr_i'
+p38
+g12
+sS'y'
+p39
+g12
+sS'model'
+p40
+g8
+sS'this.z0'
+p41
+g8
+s.
\ No newline at end of file
diff --git a/js/Branching/SELF_SWITCH.pickle b/js/Branching/SELF_SWITCH.pickle
index 22be73de..d2c6d4a6 100644
--- a/js/Branching/SELF_SWITCH.pickle
+++ b/js/Branching/SELF_SWITCH.pickle
@@ -9,4 +9,11 @@ p3
 atp4
 Rp5
 .(dp0
-.
\ No newline at end of file
+S'diagram'
+p1
+S'double'
+p2
+sS'diagram.objs[1-1]'
+p3
+g2
+s.
\ No newline at end of file
diff --git a/js/Branching/SWITCH2.pickle b/js/Branching/SWITCH2.pickle
index 610527c0..613facd5 100644
--- a/js/Branching/SWITCH2.pickle
+++ b/js/Branching/SWITCH2.pickle
@@ -13,4 +13,81 @@ p5
 atp6
 Rp7
 .(dp0
-.
\ No newline at end of file
+S'arg1'
+p1
+S'object'
+p2
+sS'graphics'
+p3
+g2
+sS'typ'
+p4
+S'vector'
+p5
+sS'rpar'
+p6
+S'double'
+p7
+sS'this.x.model'
+p8
+NsS'model.out'
+p9
+g7
+sS'model.in1'
+p10
+S'matrix'
+p11
+sS'exprs'
+p12
+g11
+sS'model.nzcross'
+p13
+NsS'this.x'
+p14
+g7
+sS'model.sim'
+p15
+g5
+sS'model.nmode'
+p16
+g7
+sS'model.rpar'
+p17
+g7
+sS'in1'
+p18
+g11
+sS'graphics.exprs'
+p19
+NsS'model.ipar'
+p20
+g5
+sS'this.x.graphics'
+p21
+g2
+sS'model.blocktype'
+p22
+S'string'
+p23
+sS'this.nzz'
+p24
+g7
+sS'model.dep_ut'
+p25
+g5
+sS'this.rule'
+p26
+g7
+sS'gr_i'
+p27
+g5
+sS'ipar'
+p28
+g5
+sS'y'
+p29
+g5
+sS'model'
+p30
+g7
+s.
\ No newline at end of file
diff --git a/js/Branching/SWITCH2_m.pickle b/js/Branching/SWITCH2_m.pickle
index 406d6afc..c60c2ac8 100644
--- a/js/Branching/SWITCH2_m.pickle
+++ b/js/Branching/SWITCH2_m.pickle
@@ -15,4 +15,111 @@ p6
 atp7
 Rp8
 .(dp0
-.
\ No newline at end of file
+S'this.x.graphics'
+p1
+S'object'
+p2
+sS'arg1'
+p3
+g2
+sS'graphics'
+p4
+g2
+sS'rpar'
+p5
+S'double'
+p6
+sS'model.intyp'
+p7
+g6
+sS'this.x.model'
+p8
+g2
+sS'model.out'
+p9
+g6
+sS'it[3-1]'
+p10
+NsS'out'
+p11
+S'vector'
+p12
+sS'model.in2'
+p13
+S'matrix'
+p14
+sS'model.in1'
+p15
+g14
+sS'exprs'
+p16
+g14
+sS'it[2-1]'
+p17
+g6
+sS'typ'
+p18
+g12
+sS'this.x'
+p19
+g6
+sS'model.sim'
+p20
+g12
+sS'model.out2'
+p21
+g6
+sS'model.nmode'
+p22
+g6
+sS'model.rpar'
+p23
+g6
+sS'in1'
+p24
+g12
+sS'model.outtyp'
+p25
+g6
+sS'graphics.exprs'
+p26
+NsS'model.ipar'
+p27
+g12
+sS'model.nzcross'
+p28
+NsS'[model,graphics,ok]'
+p29
+g6
+sS'ok'
+p30
+S'boolean'
+p31
+sS'model.blocktype'
+p32
+S'string'
+p33
+sS'this.nzz'
+p34
+g6
+sS'model.dep_ut'
+p35
+g12
+sS'this.rule'
+p36
+g6
+sS'gr_i'
+p37
+g12
+sS'ipar'
+p38
+g12
+sS'y'
+p39
+g12
+sS'model'
+p40
+g6
+sS'it[1-1]'
+p41
+Ns.
\ No newline at end of file
diff --git a/js/Branching/SWITCH_f.pickle b/js/Branching/SWITCH_f.pickle
index c7cae8a5..0416cf18 100644
--- a/js/Branching/SWITCH_f.pickle
+++ b/js/Branching/SWITCH_f.pickle
@@ -11,4 +11,76 @@ p4
 atp5
 Rp6
 .(dp0
-.
\ No newline at end of file
+S'arg1'
+p1
+S'object'
+p2
+sS'graphics'
+p3
+g2
+sS'this.x.model'
+p4
+g2
+sS'model.out'
+p5
+S'double'
+p6
+sS'model.in1'
+p7
+S'matrix'
+p8
+sS'typ'
+p9
+S'vector'
+p10
+sS'model.firing'
+p11
+g10
+sS'this.x'
+p12
+g6
+sS'model.sim'
+p13
+g10
+sS'i0'
+p14
+g6
+sS'in1'
+p15
+g8
+sS'graphics.exprs'
+p16
+NsS'model.ipar'
+p17
+g6
+sS'this.x.graphics'
+p18
+g2
+sS'[model,graphics,ok]'
+p19
+g6
+sS'model.blocktype'
+p20
+S'string'
+p21
+sS'this.nin'
+p22
+g6
+sS'model.dep_ut'
+p23
+g10
+sS'exprs'
+p24
+g8
+sS'gr_i'
+p25
+g10
+sS'ipar'
+p26
+NsS'y'
+p27
+g10
+sS'model'
+p28
+g6
+s.
\ No newline at end of file