fix var when assigning

12 files changed, 539 insertions, 537 deletions

diff --git a/js/IntegerOp/BITCLEAR.pickle b/js/IntegerOp/BITCLEAR.pickle
index 1cbad887..f19d284e 100644
--- a/js/IntegerOp/BITCLEAR.pickle
+++ b/js/IntegerOp/BITCLEAR.pickle
@@ -20,82 +20,82 @@ p3
 g2
 sS'it'
 p4
-NsS'model.intyp'
+NsS'x.model'
 p5
-S'double'
+g2
+sS'model.intyp'
 p6
-sS'this.x.model'
+S'double'
 p7
-g2
 sS'model.out'
 p8
-g6
+g7
 sS'out'
 p9
 S'vector'
 p10
 sS'model.in2'
 p11
-g6
+g7
 sS'model.in1'
 p12
-g6
-sS'typ'
+g7
+sS'x.graphics'
 p13
-g10
-sS'this.x'
-p14
-g6
+g2
 sS'model.sim'
-p15
+p14
 g10
 sS'model.out2'
-p16
-g6
-sS'this.bit'
-p17
-g6
+p15
+g7
 sS'in1'
-p18
+p16
 g10
 sS'model.outtyp'
-p19
-g6
+p17
+g7
 sS'graphics.exprs'
+p18
+NsS'bit'
+p19
+g7
+sS'typ'
 p20
-NsS'this.x.graphics'
-p21
-g2
+g10
 sS'model.opar'
-p22
+p21
 g10
 sS'[model,graphics,ok]'
-p23
-g6
+p22
+g7
 sS'ok'
-p24
+p23
 S'boolean'
-p25
+p24
 sS'model.blocktype'
-p26
+p25
 S'string'
-p27
+p26
 sS'model.dep_ut'
-p28
+p27
 g10
 sS'n'
-p29
-g6
+p28
+g7
 sS'exprs'
-p30
+p29
 S'matrix'
-p31
+p30
 sS'gr_i'
-p32
+p31
 g10
 sS'y'
-p33
+p32
 g10
+sS'x'
+p33
+g7
 sS'model'
 p34
 g2
diff --git a/js/IntegerOp/BITSET.pickle b/js/IntegerOp/BITSET.pickle
index 1cbad887..f19d284e 100644
--- a/js/IntegerOp/BITSET.pickle
+++ b/js/IntegerOp/BITSET.pickle
@@ -20,82 +20,82 @@ p3
 g2
 sS'it'
 p4
-NsS'model.intyp'
+NsS'x.model'
 p5
-S'double'
+g2
+sS'model.intyp'
 p6
-sS'this.x.model'
+S'double'
 p7
-g2
 sS'model.out'
 p8
-g6
+g7
 sS'out'
 p9
 S'vector'
 p10
 sS'model.in2'
 p11
-g6
+g7
 sS'model.in1'
 p12
-g6
-sS'typ'
+g7
+sS'x.graphics'
 p13
-g10
-sS'this.x'
-p14
-g6
+g2
 sS'model.sim'
-p15
+p14
 g10
 sS'model.out2'
-p16
-g6
-sS'this.bit'
-p17
-g6
+p15
+g7
 sS'in1'
-p18
+p16
 g10
 sS'model.outtyp'
-p19
-g6
+p17
+g7
 sS'graphics.exprs'
+p18
+NsS'bit'
+p19
+g7
+sS'typ'
 p20
-NsS'this.x.graphics'
-p21
-g2
+g10
 sS'model.opar'
-p22
+p21
 g10
 sS'[model,graphics,ok]'
-p23
-g6
+p22
+g7
 sS'ok'
-p24
+p23
 S'boolean'
-p25
+p24
 sS'model.blocktype'
-p26
+p25
 S'string'
-p27
+p26
 sS'model.dep_ut'
-p28
+p27
 g10
 sS'n'
-p29
-g6
+p28
+g7
 sS'exprs'
-p30
+p29
 S'matrix'
-p31
+p30
 sS'gr_i'
-p32
+p31
 g10
 sS'y'
-p33
+p32
 g10
+sS'x'
+p33
+g7
 sS'model'
 p34
 g2
diff --git a/js/IntegerOp/CONVERT.pickle b/js/IntegerOp/CONVERT.pickle
index fa6ceaa4..d341b99c 100644
--- a/js/IntegerOp/CONVERT.pickle
+++ b/js/IntegerOp/CONVERT.pickle
@@ -13,96 +13,96 @@ p5
 atp6
 Rp7
 .(dp0
-S'this.ot'
+S'arg1'
 p1
-S'double'
+S'object'
 p2
-sS'arg1'
+sS'graphics'
 p3
-S'object'
+g2
+sS'it'
 p4
-sS'this.x.model'
+S'double'
 p5
-g4
-sS'graphics'
+sS'x.model'
 p6
-g4
+g2
 sS'model.intyp'
 p7
-g2
+g5
 sS'sgn'
 p8
-g2
+g5
 sS'model.out'
 p9
-g2
+g5
 sS'out'
 p10
 S'vector'
 p11
 sS'model.in2'
 p12
-g2
+g5
 sS'model.in1'
 p13
-g2
-sS'typ'
+g5
+sS'x.graphics'
 p14
-g11
-sS'this.it'
-p15
-g2
-sS'this.x'
-p16
 g2
 sS'model.sim'
-p17
+p15
 g11
 sS'model.out2'
-p18
-g2
+p16
+g5
 sS'in1'
-p19
+p17
 g11
 sS'model.rpar'
-p20
+p18
 g11
 sS'model.outtyp'
-p21
-g2
+p19
+g5
 sS'graphics.exprs'
-p22
+p20
 NsS'model.ipar'
-p23
-g2
-sS'this.x.graphics'
-p24
-g4
+p21
+g5
+sS'typ'
+p22
+g11
 sS'[model,graphics,ok]'
-p25
-g2
+p23
+g5
 sS'ok'
-p26
+p24
 S'boolean'
-p27
+p25
 sS'model.blocktype'
-p28
+p26
 S'string'
-p29
+p27
 sS'model.dep_ut'
-p30
+p28
 g11
 sS'exprs'
-p31
+p29
 S'matrix'
-p32
+p30
 sS'gr_i'
-p33
+p31
 g11
 sS'y'
-p34
+p32
 g11
+sS'x'
+p33
+g5
 sS'model'
+p34
+g2
+sS'ot'
 p35
-g4
+g5
 s.
\ No newline at end of file
diff --git a/js/IntegerOp/DFLIPFLOP.pickle b/js/IntegerOp/DFLIPFLOP.pickle
index d4412b2f..11601ed1 100644
--- a/js/IntegerOp/DFLIPFLOP.pickle
+++ b/js/IntegerOp/DFLIPFLOP.pickle
@@ -107,128 +107,128 @@ g2
 sS'scs_m.objs[33-1]'
 p36
 g2
-sS'this.x'
-p37
-g2
 sS'scs_m.objs[13-1]'
-p38
+p37
 g2
 sS'scs_m_1.objs[8-1]'
-p39
+p38
 g2
 sS'scs_m_1.objs[10-1]'
-p40
+p39
 g2
 sS'model.in2'
-p41
+p40
 g14
 sS'scs_m.objs[6-1]'
-p42
+p41
 g2
 sS'scs_m.objs[9-1]'
-p43
+p42
 g2
 sS'model.out2'
-p44
+p43
 g14
 sS'model.intyp'
-p45
+p44
 g30
 sS'model.rpar'
-p46
+p45
 g2
 sS'scs_m.objs[3-1]'
-p47
+p46
 g2
 sS'scs_m_1.objs[4-1]'
-p48
+p47
 g2
 sS'scs_m.objs[16-1]'
-p49
+p48
 g2
 sS'scs_m.objs[11-1]'
-p50
+p49
 g2
 sS'scs_m.objs[14-1]'
-p51
+p50
 g2
 sS'scs_m.objs[17-1]'
-p52
+p51
 g2
 sS'scs_m_1.objs[5-1]'
-p53
+p52
 g2
 sS'model.outtyp'
-p54
+p53
 g30
 sS'scs_m_1.objs[7-1]'
-p55
+p54
 g2
 sS'scs_m.objs[4-1]'
-p56
+p55
 g2
 sS'scs_m.objs[7-1]'
-p57
+p56
 g2
 sS'typ'
-p58
+p57
 g30
 sS'model'
-p59
+p58
 S'object'
-p60
+p59
 sS'scs_m.objs[44-1]'
-p61
+p60
 g2
 sS'scs_m.objs[29-1]'
-p62
+p61
 g2
 sS'scs_m.objs[42-1]'
-p63
+p62
 g2
 sS'scs_m.objs[30-1]'
-p64
+p63
 g2
 sS'scs_m.objs[8-1]'
-p65
+p64
 g2
 sS'scs_m.objs[15-1]'
-p66
+p65
 g2
 sS'scs_m.objs[21-1]'
-p67
+p66
 g2
 sS'scs_m_1.objs[1-1]'
-p68
+p67
 g2
 sS'model.dep_ut'
-p69
+p68
 g30
 sS'scs_m.objs[43-1]'
-p70
+p69
 g2
 sS'scs_m.objs[1-1]'
-p71
+p70
 g2
 sS'model.sim'
-p72
+p71
 S'string'
-p73
+p72
 sS'scs_m.objs[32-1]'
-p74
+p73
 g2
 sS'scs_m.objs[12-1]'
-p75
+p74
 g2
 sS'scs_m.objs[24-1]'
-p76
+p75
 g2
 sS'model.blocktype'
-p77
-g73
+p76
+g72
 sS'y'
-p78
+p77
 g30
+sS'x'
+p78
+g2
 sS'scs_m.objs[27-1]'
 p79
 g2
diff --git a/js/IntegerOp/DLATCH.pickle b/js/IntegerOp/DLATCH.pickle
index eff126fb..17f74656 100644
--- a/js/IntegerOp/DLATCH.pickle
+++ b/js/IntegerOp/DLATCH.pickle
@@ -43,80 +43,80 @@ g6
 sS'scs_m.objs[12-1]'
 p14
 g6
-sS'this.x'
-p15
-g6
 sS'scs_m.objs[13-1]'
-p16
+p15
 g6
 sS'scs_m.objs[6-1]'
-p17
+p16
 g6
 sS'scs_m.objs[9-1]'
-p18
+p17
 g6
 sS'model.out2'
-p19
+p18
 g4
 sS'model.intyp'
-p20
+p19
 S'vector'
-p21
+p20
 sS'model.rpar'
-p22
+p21
 g6
 sS'scs_m.objs[3-1]'
-p23
+p22
 g6
 sS'model.outtyp'
-p24
-g21
+p23
+g20
 sS'scs_m.objs[16-1]'
-p25
+p24
 g6
 sS'scs_m.objs[11-1]'
-p26
+p25
 g6
 sS'scs_m.objs[14-1]'
-p27
+p26
 g6
 sS'scs_m.objs[17-1]'
-p28
+p27
 g6
 sS'scs_m.objs[4-1]'
-p29
+p28
 g6
 sS'scs_m.objs[7-1]'
-p30
+p29
 g6
 sS'typ'
-p31
-g21
+p30
+g20
 sS'model.blocktype'
-p32
+p31
 g2
 sS'scs_m.objs[8-1]'
-p33
+p32
 g6
 sS'scs_m.objs[15-1]'
-p34
+p33
 g6
 sS'model.dep_ut'
-p35
-g21
+p34
+g20
 sS'scs_m.objs[1-1]'
-p36
+p35
 g6
 sS'gr_i'
-p37
-g21
+p36
+g20
 sS'model.firing'
-p38
+p37
 S'boolean'
-p39
+p38
 sS'y'
+p39
+g20
+sS'x'
 p40
-g21
+g6
 sS'model'
 p41
 S'object'
diff --git a/js/IntegerOp/EXTRACTBITS.pickle b/js/IntegerOp/EXTRACTBITS.pickle
index a396bbcb..a1d56c93 100644
--- a/js/IntegerOp/EXTRACTBITS.pickle
+++ b/js/IntegerOp/EXTRACTBITS.pickle
@@ -24,88 +24,88 @@ p3
 g2
 sS'it'
 p4
-NsS'model.intyp'
+NsS'x.model'
 p5
-S'double'
+g2
+sS'model.intyp'
 p6
-sS'this.x.model'
+S'double'
 p7
-g2
-sS'model.out'
+sS'model.dep_ut'
 p8
-g6
-sS'out'
-p9
 S'vector'
+p9
+sS'model.out'
 p10
-sS'model.in2'
+g7
+sS'out'
 p11
-g6
-sS'model.in1'
+g9
+sS'model.in2'
 p12
-g6
-sS'exprs'
+g7
+sS'model.in1'
 p13
-S'matrix'
+g7
+sS'x.graphics'
 p14
-sS'this.x.graphics'
-p15
 g2
-sS'this.x'
-p16
-g6
 sS'model.sim'
-p17
-g10
+p15
+g9
 sS'model.out2'
+p16
+g7
+sS'in1'
+p17
+g9
+sS'model.outtyp'
 p18
-g6
-sS'this.bit'
+g7
+sS'numb'
 p19
-g6
-sS'in1'
+g9
+sS'graphics.exprs'
 p20
-g10
-sS'model.outtyp'
+NsS'bit'
 p21
-g6
-sS'numb'
+g7
+sS'model.ipar'
 p22
-g10
-sS'graphics.exprs'
+g9
+sS'typ'
 p23
-NsS'model.ipar'
+g9
+sS'bitstr'
 p24
-g10
-sS'typ'
+g7
+sS'[model,graphics,ok]'
 p25
-g10
-sS'bitstr'
+g7
+sS'ok'
 p26
-g6
-sS'[model,graphics,ok]'
+S'boolean'
 p27
-g6
-sS'ok'
+sS'model.blocktype'
 p28
-S'boolean'
+S'string'
 p29
-sS'model.blocktype'
+sS'rule'
 p30
-S'string'
+g7
+sS'exprs'
 p31
-sS'model.dep_ut'
+S'matrix'
 p32
-g10
-sS'this.rule'
-p33
-g6
 sS'gr_i'
-p34
-g10
+p33
+g9
 sS'y'
+p34
+g9
+sS'x'
 p35
-g10
+g7
 sS'model'
 p36
 g2
diff --git a/js/IntegerOp/INTMUL.pickle b/js/IntegerOp/INTMUL.pickle
index 29870147..3b7d4302 100644
--- a/js/IntegerOp/INTMUL.pickle
+++ b/js/IntegerOp/INTMUL.pickle
@@ -15,14 +15,14 @@ S'arg1'
 p1
 S'object'
 p2
-sS'this.x.model'
+sS'graphics'
 p3
 g2
 sS'it'
 p4
 S'string'
 p5
-sS'graphics'
+sS'x.model'
 p6
 g2
 sS'model.intyp'
@@ -46,57 +46,57 @@ p14
 sS'model.in1'
 p15
 g14
-sS'typ'
+sS'x.graphics'
 p16
-g8
-sS'this.x'
-p17
-g10
+g2
 sS'model.sim'
-p18
+p17
 g8
 sS'model.out2'
-p19
+p18
 g10
 sS'in1'
-p20
+p19
 g8
 sS'model.rpar'
-p21
+p20
 g8
 sS'model.outtyp'
-p22
+p21
 g10
 sS'graphics.exprs'
-p23
+p22
 NsS'model.ipar'
-p24
+p23
 g10
-sS'this.x.graphics'
-p25
-g2
+sS'typ'
+p24
+g8
 sS'[model,graphics,ok]'
-p26
+p25
 g10
 sS'ok'
-p27
+p26
 S'boolean'
-p28
+p27
 sS'model.blocktype'
-p29
+p28
 g5
 sS'model.dep_ut'
-p30
+p29
 g8
 sS'exprs'
-p31
+p30
 g14
 sS'gr_i'
-p32
+p31
 g8
 sS'y'
-p33
+p32
 g8
+sS'x'
+p33
+g10
 sS'model'
 p34
 g2
diff --git a/js/IntegerOp/JKFLIPFLOP.pickle b/js/IntegerOp/JKFLIPFLOP.pickle
index 80ca43ca..eb4fda69 100644
--- a/js/IntegerOp/JKFLIPFLOP.pickle
+++ b/js/IntegerOp/JKFLIPFLOP.pickle
@@ -11,199 +11,200 @@ p4
 atp5
 Rp6
 .(dp0
-S'init_old'
+S'xx.model'
 p1
-S'double'
+S'object'
 p2
-sS'xx.model'
+sS'model.sim'
 p3
-S'object'
+S'string'
 p4
-sS'model.sim'
+sS'arg1'
 p5
-S'string'
+g2
+sS'scs_m_1.objs[6-1]'
 p6
-sS'arg1'
+S'double'
 p7
-g4
-sS'scs_m_1.objs[6-1]'
-p8
-g2
 sS'scs_m_1.objs[3-1]'
+p8
+g7
+sS'xx.graphics'
 p9
 g2
-sS'xx.graphics'
-p10
-g4
 sS'model.out'
-p11
+p10
 S'matrix'
-p12
+p11
 sS'xx'
-p13
-g4
+p12
+g2
 sS'o'
-p14
-g4
-sS'scs_m_1.objs[7-1]'
-p15
+p13
 g2
+sS'scs_m_1.objs[7-1]'
+p14
+g7
 sS'xx.graphics.exprs[1-1]'
-p16
+p15
 NsS'scs_m.objs[20-1]'
-p17
-g2
+p16
+g7
 sS'scs_m.objs[2-1]'
-p18
-g2
+p17
+g7
 sS'scs_m.objs[5-1]'
+p18
+g7
+sS'scs_m.objs[10-1]'
 p19
-g2
-sS'this.init'
+g7
+sS'scs_m'
 p20
-g2
-sS'scs_m.objs[10-1]'
+g7
+sS'model.in1'
 p21
-g2
-sS'scs_m'
+g11
+sS'scs_m.objs[19-1]'
 p22
-g2
-sS'model.in1'
+g7
+sS'scs_m.objs[1-1]'
 p23
-g12
-sS'scs_m.objs[19-1]'
+g7
+sS'scs_m.objs[18-1]'
 p24
-g2
-sS'scs_m.objs[1-1]'
+g7
+sS'model.dep_ut'
 p25
-g2
-sS'scs_m.objs[18-1]'
+S'vector'
 p26
-g2
-sS'model.dep_ut'
+sS'newpar[size(newpar)+1-1]'
 p27
-S'vector'
+g7
+sS'init'
 p28
-sS'newpar[size(newpar)+1-1]'
-p29
-g2
+g7
 sS'scs_m_1'
-p30
-g2
+p29
+g7
 sS'scs_m.objs[22-1]'
-p31
-g2
+p30
+g7
 sS'scs_m_1.objs[2-1]'
+p31
+g7
+sS'init_old'
 p32
-g2
-sS'this.x'
-p33
-g2
+g7
 sS'scs_m.objs[13-1]'
-p34
-g2
+p33
+g7
 sS'model.firing'
-p35
+p34
 S'boolean'
-p36
+p35
 sS'newpar'
-p37
-g28
+p36
+g26
 sS'model.in2'
-p38
-g12
+p37
+g11
 sS'scs_m.objs[6-1]'
-p39
-g2
+p38
+g7
 sS'scs_m.objs[9-1]'
-p40
-g2
+p39
+g7
 sS'model.odstate[1-1]'
+p40
+g7
+sS'model.out2'
 p41
-NsS'model.out2'
-p42
-g12
+g11
 sS'model.intyp'
-p43
-g28
+p42
+g26
 sS'model.rpar'
-p44
-g2
+p43
+g7
 sS'scs_m.objs[3-1]'
-p45
-g2
+p44
+g7
 sS'scs_m_1.objs[4-1]'
-p46
-g2
+p45
+g7
 sS'scs_m.objs[16-1]'
-p47
-g2
+p46
+g7
 sS'scs_m.objs[11-1]'
-p48
-g2
+p47
+g7
 sS'scs_m.objs[14-1]'
-p49
-g2
+p48
+g7
 sS'scs_m.objs[17-1]'
-p50
-g2
+p49
+g7
 sS'scs_m_1.objs[5-1]'
-p51
-g2
+p50
+g7
 sS'path'
-p52
+p51
 NsS'scs_m.objs[4-1]'
-p53
-g2
+p52
+g7
 sS'scs_m.objs[7-1]'
-p54
-g2
+p53
+g7
 sS'typ'
-p55
-g28
+p54
+g26
 sS'model.outtyp'
-p56
-g28
+p55
+g26
 sS'needcompile'
+p56
+g7
+sS'arg1.model'
 p57
 g2
-sS'arg1.model'
+sS'model.blocktype'
 p58
 g4
-sS'model.blocktype'
-p59
-g6
 sS'scs_m.objs[8-1]'
-p60
-g2
+p59
+g7
 sS'scs_m.objs[15-1]'
-p61
-g2
+p60
+g7
 sS'scs_m.objs[21-1]'
-p62
-g2
+p61
+g7
 sS'scs_m_1.objs[1-1]'
+p62
+g7
+sS'arg1.model.rpar.objs[path-1]'
 p63
 g2
-sS'arg1.model.rpar.objs[path-1]'
-p64
-g4
 sS'exprs'
-p65
-g2
+p64
+g7
 sS'gr_i'
-p66
-g28
+p65
+g26
 sS'scs_m.objs[12-1]'
-p67
-g2
+p66
+g7
 sS'y'
+p67
+g7
+sS'x'
 p68
-g2
+g7
 sS'model'
 p69
-g4
+g2
 sS'arg1.model.rpar'
 p70
-g4
+g2
 s.
\ No newline at end of file
diff --git a/js/IntegerOp/LOGIC.js b/js/IntegerOp/LOGIC.js
index e06ea999..823bad8b 100644
--- a/js/IntegerOp/LOGIC.js
+++ b/js/IntegerOp/LOGIC.js
@@ -31,7 +31,7 @@ function LOGIC() {
         return options;
     }
     LOGIC.prototype.set = function LOGIC() {
-        this.mat = parseFloat((arguments[0]["mat"]))
+        this.mat = inverse((arguments[0]["mat"]))
         this.herit = parseFloat((arguments[0]["herit"]))
         this.x = arg1;
         graphics = arg1.graphics;
diff --git a/js/IntegerOp/LOGIC.pickle b/js/IntegerOp/LOGIC.pickle
index a23980d6..90e666b6 100644
--- a/js/IntegerOp/LOGIC.pickle
+++ b/js/IntegerOp/LOGIC.pickle
@@ -22,18 +22,18 @@ sS'it'
 p4
 S'double'
 p5
-sS'model.intyp'
+sS'x.model'
 p6
-S'vector'
+NsS'model.intyp'
 p7
-sS'this.x.model'
+S'vector'
 p8
-NsS'model.out'
+sS'model.out'
 p9
 g5
 sS'out'
 p10
-g7
+g8
 sS'model.in2'
 p11
 S'matrix'
@@ -41,9 +41,9 @@ p12
 sS'model.in1'
 p13
 g12
-sS'typ'
+sS'x.graphics'
 p14
-g7
+g2
 sS'u1'
 p15
 g5
@@ -54,32 +54,32 @@ sS'model.firing'
 p17
 S'boolean'
 p18
-sS'this.x'
-p19
-g5
 sS'model.sim'
-p20
-g7
+p19
+g8
 sS'nin'
-p21
+p20
 g5
+sS'mat'
+p21
+g12
 sS'model.out2'
 p22
 g5
 sS'in1'
 p23
-g7
+g8
 sS'model.outtyp'
 p24
 g5
 sS'graphics.exprs'
 p25
-NsS'this.x.graphics'
+NsS'typ'
 p26
-g2
+g8
 sS'model.opar'
 p27
-g7
+g8
 sS'[model,graphics,ok]'
 p28
 g5
@@ -92,19 +92,19 @@ S'string'
 p31
 sS'model.dep_ut'
 p32
-g7
+g8
 sS'exprs'
 p33
 g12
 sS'gr_i'
 p34
-g7
-sS'this.mat'
-p35
-g12
+g8
 sS'y'
+p35
+g8
+sS'x'
 p36
-g7
+g5
 sS'model'
 p37
 g2
diff --git a/js/IntegerOp/SHIFT.pickle b/js/IntegerOp/SHIFT.pickle
index 439d3b6c..fca9045b 100644
--- a/js/IntegerOp/SHIFT.pickle
+++ b/js/IntegerOp/SHIFT.pickle
@@ -21,14 +21,14 @@ sS'arg1'
 p3
 S'object'
 p4
-sS'this.x.model'
+sS'graphics'
 p5
-NsS'it'
+g4
+sS'it'
 p6
-NsS'graphics'
+NsS'x.model'
 p7
-g4
-sS'sgn'
+NsS'sgn'
 p8
 S'matrix'
 p9
@@ -41,59 +41,59 @@ g2
 sS'model.in1'
 p12
 g2
-sS'typ'
+sS'x.graphics'
 p13
-S'vector'
+g4
+sS'model.sim'
 p14
-sS'this.x'
+S'vector'
 p15
-g2
-sS'model.sim'
-p16
-g14
 sS'model.out2'
-p17
+p16
 g2
 sS'model.intyp'
-p18
+p17
 g2
 sS'model.rpar'
-p19
-g14
+p18
+g15
 sS'model.outtyp'
-p20
+p19
 g2
 sS'graphics.exprs'
-p21
+p20
 NsS'model.ipar'
-p22
+p21
 g9
-sS'this.x.graphics'
-p23
-g4
+sS'typ'
+p22
+g15
 sS'[model,graphics,ok]'
-p24
+p23
 g2
 sS'ok'
-p25
+p24
 S'boolean'
-p26
+p25
 sS'model.blocktype'
-p27
+p26
 S'string'
-p28
+p27
 sS'model.dep_ut'
-p29
-g14
+p28
+g15
 sS'exprs'
-p30
+p29
 g9
 sS'gr_i'
-p31
-g14
+p30
+g15
 sS'y'
+p31
+g15
+sS'x'
 p32
-g14
+g2
 sS'model'
 p33
 g4
diff --git a/js/IntegerOp/SRFLIPFLOP.pickle b/js/IntegerOp/SRFLIPFLOP.pickle
index f79a03a1..32690c22 100644
--- a/js/IntegerOp/SRFLIPFLOP.pickle
+++ b/js/IntegerOp/SRFLIPFLOP.pickle
@@ -11,150 +11,151 @@ p4
 atp5
 Rp6
 .(dp0
-S'init_old'
+S'xx.model'
 p1
-S'double'
+S'object'
 p2
-sS'xx.model'
+sS'model.sim'
 p3
-S'object'
+S'string'
 p4
-sS'model.sim'
+sS'arg1'
 p5
-S'string'
+g2
+sS'xx.graphics'
 p6
-sS'arg1'
+g2
+sS'model.out'
 p7
-g4
-sS'xx.graphics'
+S'matrix'
 p8
-g4
-sS'model.out'
+sS'xx'
 p9
-S'matrix'
+g2
+sS'o'
 p10
-sS'xx'
+g2
+sS'xx.graphics.exprs[1-1]'
 p11
-g4
-sS'o'
+NsS'scs_m.objs[2-1]'
 p12
-g4
-sS'xx.graphics.exprs[1-1]'
+S'double'
 p13
-NsS'scs_m.objs[2-1]'
-p14
-g2
 sS'scs_m.objs[5-1]'
+p14
+g13
+sS'scs_m.objs[10-1]'
 p15
-g2
-sS'this.init'
+g13
+sS'scs_m'
 p16
-g2
-sS'scs_m.objs[10-1]'
+g13
+sS'model.in1'
 p17
-g2
-sS'scs_m'
+g8
+sS'scs_m.objs[1-1]'
 p18
-g2
-sS'model.in1'
+g13
+sS'model.dep_ut'
 p19
-g10
-sS'scs_m.objs[1-1]'
+S'vector'
 p20
-g2
-sS'model.dep_ut'
+sS'newpar[size(newpar)+1-1]'
 p21
-S'vector'
+NsS'init'
 p22
-sS'newpar[size(newpar)+1-1]'
+g13
+sS'scs_m.objs[12-1]'
 p23
-NsS'scs_m.objs[12-1]'
+g13
+sS'init_old'
 p24
-g2
-sS'this.x'
-p25
-g2
+g13
 sS'scs_m.objs[13-1]'
-p26
-g2
+p25
+g13
 sS'newpar'
-p27
-g22
+p26
+g20
 sS'model.in2'
-p28
-g10
+p27
+g8
 sS'scs_m.objs[6-1]'
-p29
-g2
+p28
+g13
 sS'scs_m.objs[9-1]'
-p30
-g2
+p29
+g13
 sS'model.odstate[1-1]'
+p30
+g13
+sS'model.out2'
 p31
-NsS'model.out2'
-p32
-g10
+g8
 sS'model.intyp'
-p33
-g22
+p32
+g20
 sS'model.rpar'
-p34
-g2
+p33
+g13
 sS'scs_m.objs[3-1]'
-p35
-g2
+p34
+g13
 sS'model.outtyp'
-p36
-g22
+p35
+g20
 sS'scs_m.objs[11-1]'
-p37
-g2
+p36
+g13
 sS'scs_m.objs[14-1]'
-p38
-g2
+p37
+g13
 sS'path'
-p39
+p38
 NsS'scs_m.objs[4-1]'
-p40
-g2
+p39
+g13
 sS'scs_m.objs[7-1]'
-p41
-g2
+p40
+g13
 sS'typ'
-p42
-g22
+p41
+g20
 sS'needcompile'
+p42
+g13
+sS'arg1.model'
 p43
 g2
-sS'arg1.model'
+sS'model.blocktype'
 p44
 g4
-sS'model.blocktype'
-p45
-g6
 sS'scs_m.objs[8-1]'
+p45
+g13
+sS'arg1.model.rpar.objs[path-1]'
 p46
 g2
-sS'arg1.model.rpar.objs[path-1]'
-p47
-g4
 sS'exprs'
-p48
-g2
+p47
+g13
 sS'gr_i'
-p49
-g22
+p48
+g20
 sS'model.firing'
-p50
+p49
 S'boolean'
-p51
+p50
 sS'y'
+p51
+g13
+sS'x'
 p52
-g2
+g13
 sS'model'
 p53
-g4
+g2
 sS'arg1.model.rpar'
 p54
-g4
+g2
 s.
\ No newline at end of file