summaryrefslogtreecommitdiff
path: root/js/Electrical
diff options
context:
space:
mode:
Diffstat (limited to 'js/Electrical')
-rw-r--r--js/Electrical/CCS.pickle40
-rw-r--r--js/Electrical/CVS.pickle40
-rw-r--r--js/Electrical/Capacitor.pickle62
-rw-r--r--js/Electrical/ConstantVoltage.pickle71
-rw-r--r--js/Electrical/CurrentSensor.pickle62
-rw-r--r--js/Electrical/Diode.pickle94
-rw-r--r--js/Electrical/Ground.pickle52
-rw-r--r--js/Electrical/Gyrator.pickle77
-rw-r--r--js/Electrical/IdealTransformer.pickle93
-rw-r--r--js/Electrical/Inductor.pickle55
-rw-r--r--js/Electrical/MOTOR.pickle50
-rw-r--r--js/Electrical/NMOS.pickle98
-rw-r--r--js/Electrical/NPN.pickle77
-rw-r--r--js/Electrical/OpAmp.pickle54
-rw-r--r--js/Electrical/PMOS.pickle98
-rw-r--r--js/Electrical/PNP.pickle77
-rw-r--r--js/Electrical/PotentialSensor.pickle52
-rw-r--r--js/Electrical/Resistor.pickle65
-rw-r--r--js/Electrical/SineVoltage.pickle112
-rw-r--r--js/Electrical/Switch.pickle64
-rw-r--r--js/Electrical/VVsourceAC.pickle88
-rw-r--r--js/Electrical/VariableResistor.pickle64
-rw-r--r--js/Electrical/VoltageSensor.pickle62
-rw-r--r--js/Electrical/VsourceAC.pickle104
24 files changed, 851 insertions, 860 deletions
diff --git a/js/Electrical/CCS.pickle b/js/Electrical/CCS.pickle
index 61408d9b..e3c95720 100644
--- a/js/Electrical/CCS.pickle
+++ b/js/Electrical/CCS.pickle
@@ -29,35 +29,35 @@ g8
sS'model.in1'
p10
g8
-sS'this.x.graphics.out_implicit'
+sS'mo.inputs'
p11
S'matrix'
p12
-sS'mo.inputs'
+sS'Typeout'
p13
g12
-sS'Typeout'
+sS'x.graphics.in_implicit'
p14
g12
sS'mo.parameters'
p15
g6
-sS'this.x'
-p16
-g8
sS'model.sim'
-p17
+p16
g4
sS'ModelName'
-p18
+p17
g4
sS'y'
-p19
+p18
g6
sS'mo.outputs'
-p20
+p19
g12
sS'Typein'
+p20
+g12
+sS'x.graphics.out_implicit'
p21
g12
sS'model.rpar'
@@ -72,30 +72,30 @@ g2
sS'typ'
p25
g6
-sS'this.x.graphics.in_implicit'
-p26
-g12
sS'model.blocktype'
-p27
+p26
g4
sS'MO'
-p28
+p27
g12
sS'MI'
-p29
+p28
g12
sS'model.dep_ut'
-p30
+p29
g6
sS'exprs'
-p31
+p30
g6
sS'gr_i'
-p32
+p31
g6
sS'PortName'
-p33
+p32
g12
+sS'x'
+p33
+g8
sS'model'
p34
g2
diff --git a/js/Electrical/CVS.pickle b/js/Electrical/CVS.pickle
index 61408d9b..e3c95720 100644
--- a/js/Electrical/CVS.pickle
+++ b/js/Electrical/CVS.pickle
@@ -29,35 +29,35 @@ g8
sS'model.in1'
p10
g8
-sS'this.x.graphics.out_implicit'
+sS'mo.inputs'
p11
S'matrix'
p12
-sS'mo.inputs'
+sS'Typeout'
p13
g12
-sS'Typeout'
+sS'x.graphics.in_implicit'
p14
g12
sS'mo.parameters'
p15
g6
-sS'this.x'
-p16
-g8
sS'model.sim'
-p17
+p16
g4
sS'ModelName'
-p18
+p17
g4
sS'y'
-p19
+p18
g6
sS'mo.outputs'
-p20
+p19
g12
sS'Typein'
+p20
+g12
+sS'x.graphics.out_implicit'
p21
g12
sS'model.rpar'
@@ -72,30 +72,30 @@ g2
sS'typ'
p25
g6
-sS'this.x.graphics.in_implicit'
-p26
-g12
sS'model.blocktype'
-p27
+p26
g4
sS'MO'
-p28
+p27
g12
sS'MI'
-p29
+p28
g12
sS'model.dep_ut'
-p30
+p29
g6
sS'exprs'
-p31
+p30
g6
sS'gr_i'
-p32
+p31
g6
sS'PortName'
-p33
+p32
g12
+sS'x'
+p33
+g8
sS'model'
p34
g2
diff --git a/js/Electrical/Capacitor.pickle b/js/Electrical/Capacitor.pickle
index b387bab4..f4f7f5eb 100644
--- a/js/Electrical/Capacitor.pickle
+++ b/js/Electrical/Capacitor.pickle
@@ -22,7 +22,7 @@ sS'mo.model'
p4
S'string'
p5
-sS'this.x.model'
+sS'x.model'
p6
NsS'model.out'
p7
@@ -31,43 +31,43 @@ p8
sS'model.in1'
p9
g8
-sS'typ'
+sS'x.graphics'
p10
-S'vector'
-p11
+g2
sS'mo.inputs'
-p12
+p11
g5
-sS'mo.parameters'
+sS'x.graphics.in_implicit'
+p12
+S'vector'
p13
-g11
-sS'this.x'
+sS'mo.parameters'
p14
-g8
+g13
sS'model.sim'
p15
g5
-sS'model.equations'
+sS'C'
p16
g8
-sS'mo.outputs'
+sS'model.equations'
p17
-g5
-sS'model.rpar'
+g8
+sS'mo.outputs'
p18
-S'matrix'
+g5
+sS'x.graphics.out_implicit'
p19
-sS'this.v'
+g13
+sS'model.rpar'
p20
-g8
-sS'graphics.exprs'
+S'matrix'
p21
-NsS'this.x.graphics'
+sS'graphics.exprs'
p22
-g2
-sS'this.x.graphics.in_implicit'
+NsS'typ'
p23
-g11
+g13
sS'model.blocktype'
p24
g5
@@ -76,26 +76,26 @@ p25
g2
sS'model.dep_ut'
p26
-g11
+g13
sS'model.equations.parameters[2-1]'
p27
-g11
+g13
sS'exprs'
p28
g5
sS'gr_i'
p29
-g11
-sS'this.x.graphics.out_implicit'
+g13
+sS'v'
p30
-g11
+g8
sS'y'
p31
-g11
-sS'model'
+g13
+sS'x'
p32
-g2
-sS'this.C'
-p33
g8
+sS'model'
+p33
+g2
s. \ No newline at end of file
diff --git a/js/Electrical/ConstantVoltage.pickle b/js/Electrical/ConstantVoltage.pickle
index 0731e88c..3f44287b 100644
--- a/js/Electrical/ConstantVoltage.pickle
+++ b/js/Electrical/ConstantVoltage.pickle
@@ -13,81 +13,82 @@ S'arg1'
p1
S'object'
p2
-sS'graphics'
+sS'graphics.exprs'
p3
-g2
-sS'mo.model'
+NsS'mo.model'
p4
S'string'
p5
-sS'this.V'
+sS'x.model'
p6
-S'double'
+NsS'model.out'
p7
-sS'this.x.model'
+S'double'
p8
-NsS'model.out'
-p9
-g7
sS'model.in1'
+p9
+g8
+sS'x.graphics'
p10
-g7
-sS'typ'
+g2
+sS'mo.inputs'
p11
-S'vector'
+g5
+sS'x.graphics.in_implicit'
p12
-sS'mo.inputs'
+S'vector'
p13
-g5
sS'mo.parameters'
p14
-g12
-sS'this.x'
-p15
-g7
+g13
sS'model.sim'
-p16
+p15
g5
sS'model.equations'
-p17
-g7
+p16
+g8
sS'mo.outputs'
-p18
+p17
g5
+sS'x.graphics.out_implicit'
+p18
+g13
sS'model.rpar'
p19
-NsS'graphics.exprs'
+g8
+sS'V'
p20
-NsS'this.x.graphics'
+g8
+sS'typ'
p21
-g2
-sS'this.x.graphics.in_implicit'
+g13
+sS'graphics'
p22
-g12
+g2
sS'model.blocktype'
p23
g5
sS'mo'
p24
-g7
+g8
sS'model.dep_ut'
p25
-g12
+g13
sS'model.equations.parameters[2-1]'
p26
-g12
+g13
sS'exprs'
p27
g5
sS'gr_i'
p28
-g12
-sS'this.x.graphics.out_implicit'
-p29
-g12
+g13
sS'y'
+p29
+g13
+sS'x'
p30
-g12
+g8
sS'model'
p31
g2
diff --git a/js/Electrical/CurrentSensor.pickle b/js/Electrical/CurrentSensor.pickle
index fa14c6bc..a76e4523 100644
--- a/js/Electrical/CurrentSensor.pickle
+++ b/js/Electrical/CurrentSensor.pickle
@@ -7,63 +7,63 @@ p2
atp3
Rp4
.(dp0
-S'this.x'
+S'model.sim'
p1
-S'double'
+S'string'
p2
-sS'model.sim'
+sS'model.in1'
p3
-S'string'
+S'double'
p4
-sS'model.in1'
-p5
-g2
sS'model.equations'
+p5
+g4
+sS'model.blocktype'
p6
g2
-sS'model.blocktype'
-p7
-g4
sS'exprs'
-p8
+p7
S'vector'
+p8
+sS'x.graphics.out_implicit'
p9
-sS'this.x.graphics.out_implicit'
-p10
S'matrix'
-p11
+p10
sS'mo'
+p11
+g4
+sS'mo.inputs'
p12
g2
-sS'mo.inputs'
-p13
-g4
sS'mo.model'
-p14
-g4
+p13
+g2
sS'model.dep_ut'
-p15
-g9
+p14
+g8
sS'model.out'
-p16
-g11
+p15
+g10
sS'gr_i'
+p16
+g8
+sS'x.graphics.in_implicit'
p17
-g9
+g8
sS'y'
p18
-g9
-sS'model'
+g8
+sS'x'
p19
-S'object'
+g4
+sS'model'
p20
-sS'this.x.graphics.in_implicit'
+S'object'
p21
-g9
sS'typ'
p22
-g9
+g8
sS'mo.outputs'
p23
-g11
+g10
s. \ No newline at end of file
diff --git a/js/Electrical/Diode.pickle b/js/Electrical/Diode.pickle
index ba2c2d72..87390e96 100644
--- a/js/Electrical/Diode.pickle
+++ b/js/Electrical/Diode.pickle
@@ -22,90 +22,90 @@ p2
sS'graphics'
p3
g2
-sS'mo.model'
+sS'Maxexp'
p4
-S'string'
+S'double'
p5
-sS'model.dep_ut'
+sS'x.model'
p6
-S'vector'
+NsS'model.out'
p7
-sS'this.x.model'
+g5
+sS'model.in1'
p8
-NsS'model.out'
+g5
+sS'x.graphics'
p9
-S'double'
+g2
+sS'mo.inputs'
p10
-sS'model.in1'
+S'string'
p11
-g10
-sS'typ'
+sS'x.graphics.in_implicit'
p12
-g7
-sS'mo.inputs'
+S'vector'
p13
-g5
sS'mo.parameters'
p14
-g7
-sS'this.x'
-p15
-g10
+g13
sS'model.sim'
+p15
+g11
+sS'model.equations'
p16
g5
-sS'model.equations'
-p17
-g10
sS'mo.outputs'
+p17
+g11
+sS'x.graphics.out_implicit'
p18
-g5
-sS'this.Vt'
+g13
+sS'Ids'
p19
-g10
+g5
sS'model.rpar'
p20
S'matrix'
p21
-sS'y'
+sS'mo.model'
p22
-g7
-sS'graphics.exprs'
+g11
+sS'R'
p23
-NsS'this.x.graphics'
+g5
+sS'graphics.exprs'
p24
-g2
-sS'model.equations.parameters'
+NsS'typ'
p25
-g7
-sS'this.x.graphics.in_implicit'
+g13
+sS'model.equations.parameters'
p26
-g7
+g13
sS'model.blocktype'
p27
-g5
-sS'this.R'
+g11
+sS'mo'
p28
-g10
-sS'this.Maxexp'
+g5
+sS'model.dep_ut'
p29
-g10
+g13
sS'exprs'
p30
-g5
+g11
sS'gr_i'
p31
-g7
-sS'this.x.graphics.out_implicit'
+g13
+sS'Vt'
p32
-g7
-sS'this.Ids'
+g5
+sS'y'
p33
-g10
-sS'model'
+g13
+sS'x'
p34
-g2
-sS'mo'
+g5
+sS'model'
p35
-g10
+g2
s. \ No newline at end of file
diff --git a/js/Electrical/Ground.pickle b/js/Electrical/Ground.pickle
index 2c80066d..c84cf52a 100644
--- a/js/Electrical/Ground.pickle
+++ b/js/Electrical/Ground.pickle
@@ -7,59 +7,59 @@ p2
atp3
Rp4
.(dp0
-S'this.x'
+S'model.sim'
p1
-S'double'
+S'string'
p2
-sS'model.sim'
+sS'model.in1'
p3
-S'string'
+S'vector'
p4
-sS'model.in1'
+sS'model.equations'
p5
-S'vector'
+S'double'
p6
-sS'model.equations'
+sS'model.blocktype'
p7
g2
-sS'model.blocktype'
-p8
-g4
sS'exprs'
+p8
+g2
+sS'x.graphics.out_implicit'
p9
g4
-sS'this.x.graphics.out_implicit'
+sS'mo'
p10
g6
-sS'mo'
+sS'mo.inputs'
p11
g2
-sS'mo.inputs'
-p12
-g4
sS'mo.model'
+p12
+g2
+sS'model.dep_ut'
p13
g4
-sS'model.dep_ut'
-p14
-g6
sS'model.out'
-p15
-g6
+p14
+g4
sS'gr_i'
+p15
+g4
+sS'x.graphics.in_implicit'
p16
-g6
+g4
sS'y'
p17
+g4
+sS'x'
+p18
g6
sS'model'
-p18
-S'object'
p19
-sS'this.x.graphics.in_implicit'
+S'object'
p20
-g6
sS'typ'
p21
-g6
+g4
s. \ No newline at end of file
diff --git a/js/Electrical/Gyrator.pickle b/js/Electrical/Gyrator.pickle
index 372f8f0a..8a6c5e65 100644
--- a/js/Electrical/Gyrator.pickle
+++ b/js/Electrical/Gyrator.pickle
@@ -11,7 +11,7 @@ p4
atp5
Rp6
.(dp0
-S'this.x.model.equations.parameters[2-1]'
+S'x.model.equations.parameters[2-1]'
p1
S'vector'
p2
@@ -40,84 +40,81 @@ g10
sS'x.graphics'
p13
g4
-sS'this.x.graphics.exprs'
+sS'mo.inputs'
p14
-NsS'this.x.graphics.out_implicit'
+g8
+sS'Typeout'
p15
g8
-sS'mo.inputs'
+sS'x.graphics.in_implicit'
p16
g8
-sS'Typeout'
-p17
-g8
sS'mo.parameters'
-p18
+p17
g2
-sS'this.x'
-p19
-g10
sS'model.sim'
-p20
+p18
g6
sS'ModelName'
-p21
+p19
g6
sS'y'
-p22
+p20
g2
sS'mo.outputs'
-p23
+p21
g8
sS'Typein'
-p24
+p22
+g8
+sS'x.graphics.out_implicit'
+p23
g8
sS'model.rpar'
-p25
+p24
g8
sS'P'
-p26
+p25
g8
sS'graphics'
-p27
+p26
g4
sS'typ'
-p28
+p27
g2
-sS'this.x.graphics.in_implicit'
-p29
-g8
sS'model.blocktype'
-p30
+p28
g6
-sS'MO'
-p31
-g8
+sS'mo'
+p29
+g10
+sS'gr_i'
+p30
+g2
sS'MI'
-p32
+p31
g8
sS'model.dep_ut'
-p33
+p32
g2
sS'exprs'
-p34
+p33
g8
-sS'gr_i'
+sS'x.graphics.exprs'
+p34
+NsS'PortName'
p35
-g2
-sS'PortName'
-p36
g8
sS'x'
-p37
-g4
+p36
+g10
sS'model'
-p38
+p37
g4
sS'ParametersName'
+p38
+g8
+sS'MO'
p39
g8
-sS'mo'
-p40
-g10
s. \ No newline at end of file
diff --git a/js/Electrical/IdealTransformer.pickle b/js/Electrical/IdealTransformer.pickle
index a8b00713..80b6afcb 100644
--- a/js/Electrical/IdealTransformer.pickle
+++ b/js/Electrical/IdealTransformer.pickle
@@ -9,7 +9,7 @@ p3
atp4
Rp5
.(dp0
-S'this.x.model.equations.parameters[2-1]'
+S'x.model.equations.parameters[2-1]'
p1
S'vector'
p2
@@ -37,85 +37,82 @@ g9
sS'x.graphics'
p12
g4
-sS'this.x.graphics.exprs'
+sS'mo.inputs'
p13
-NsS'this.x.graphics.out_implicit'
-p14
S'matrix'
+p14
+sS'Typeout'
p15
-sS'mo.inputs'
+g14
+sS'x.graphics.in_implicit'
p16
-g15
-sS'Typeout'
-p17
-g15
+g14
sS'mo.parameters'
-p18
+p17
g2
-sS'this.x'
-p19
-g9
sS'model.sim'
-p20
+p18
g6
sS'ModelName'
-p21
+p19
g6
sS'y'
-p22
+p20
g2
sS'mo.outputs'
-p23
-g15
+p21
+g14
sS'Typein'
-p24
-g15
+p22
+g14
+sS'x.graphics.out_implicit'
+p23
+g14
sS'model.rpar'
-p25
+p24
g2
sS'P'
-p26
-g15
+p25
+g14
sS'graphics'
-p27
+p26
g4
sS'typ'
-p28
+p27
g2
-sS'this.x.graphics.in_implicit'
-p29
-g15
sS'model.blocktype'
-p30
+p28
g6
-sS'MO'
-p31
-g15
+sS'mo'
+p29
+g9
+sS'gr_i'
+p30
+g2
sS'MI'
-p32
-g15
+p31
+g14
sS'model.dep_ut'
-p33
+p32
g2
sS'exprs'
-p34
+p33
g2
-sS'gr_i'
+sS'x.graphics.exprs'
+p34
+NsS'PortName'
p35
-g2
-sS'PortName'
-p36
-g15
+g14
sS'x'
-p37
-g4
+p36
+g9
sS'model'
-p38
+p37
g4
sS'ParametersName'
-p39
+p38
g2
-sS'mo'
-p40
-g9
+sS'MO'
+p39
+g14
s. \ No newline at end of file
diff --git a/js/Electrical/Inductor.pickle b/js/Electrical/Inductor.pickle
index 53b07415..7877e5f2 100644
--- a/js/Electrical/Inductor.pickle
+++ b/js/Electrical/Inductor.pickle
@@ -20,7 +20,7 @@ sS'mo.model'
p4
S'string'
p5
-sS'this.x.model'
+sS'x.model'
p6
NsS'model.out'
p7
@@ -29,65 +29,66 @@ p8
sS'model.in1'
p9
g8
-sS'typ'
+sS'x.graphics'
p10
-g8
+g2
sS'mo.inputs'
p11
g5
-sS'mo.parameters'
+sS'x.graphics.in_implicit'
p12
g8
-sS'this.x'
+sS'mo.parameters'
p13
-S'double'
-p14
+g8
sS'model.sim'
-p15
+p14
g5
sS'model.equations'
+p15
+S'double'
p16
-g14
sS'mo.outputs'
p17
g5
-sS'model.rpar'
+sS'x.graphics.out_implicit'
p18
-NsS'graphics.exprs'
+g8
+sS'L'
p19
-NsS'this.x.graphics'
+g16
+sS'model.rpar'
p20
-g2
-sS'this.x.graphics.in_implicit'
+g16
+sS'graphics.exprs'
p21
+NsS'typ'
+p22
g8
sS'model.blocktype'
-p22
+p23
g5
sS'mo'
-p23
-g14
-sS'model.dep_ut'
p24
+g16
+sS'model.dep_ut'
+p25
g8
sS'model.equations.parameters[2-1]'
-p25
+p26
g8
sS'exprs'
-p26
+p27
g5
sS'gr_i'
-p27
-g8
-sS'this.L'
p28
-g14
-sS'this.x.graphics.out_implicit'
-p29
g8
sS'y'
-p30
+p29
g8
+sS'x'
+p30
+g16
sS'model'
p31
g2
diff --git a/js/Electrical/MOTOR.pickle b/js/Electrical/MOTOR.pickle
index 3b5deb46..9a3a7caa 100644
--- a/js/Electrical/MOTOR.pickle
+++ b/js/Electrical/MOTOR.pickle
@@ -7,48 +7,48 @@ p2
atp3
Rp4
.(dp0
-S'this.x'
+S'model.sim'
p1
-S'double'
+S'string'
p2
-sS'model.sim'
+sS'model.in1'
p3
-S'string'
+S'vector'
p4
-sS'model.in1'
+sS'model.blocktype'
p5
-S'vector'
+g2
+sS'exprs'
p6
-sS'model.blocktype'
+g2
+sS'x.graphics.out_implicit'
p7
-g4
-sS'exprs'
+S'matrix'
p8
-g4
-sS'this.x.graphics.out_implicit'
+sS'model.dep_ut'
p9
-S'matrix'
+g4
+sS'model.out'
p10
-sS'model.dep_ut'
+g8
+sS'gr_i'
p11
-g6
-sS'model.out'
+g4
+sS'x.graphics.in_implicit'
p12
-g10
-sS'gr_i'
-p13
-g6
+g4
sS'y'
+p13
+g4
+sS'x'
p14
-g6
-sS'model'
+S'double'
p15
-S'object'
+sS'model'
p16
-sS'this.x.graphics.in_implicit'
+S'object'
p17
-g6
sS'typ'
p18
-g6
+g4
s. \ No newline at end of file
diff --git a/js/Electrical/NMOS.pickle b/js/Electrical/NMOS.pickle
index 57a4855a..3c7082ed 100644
--- a/js/Electrical/NMOS.pickle
+++ b/js/Electrical/NMOS.pickle
@@ -36,70 +36,70 @@ sS'mo.model'
p4
S'string'
p5
-sS'this.x.model'
+sS'K2'
p6
-NsS'model.out'
-p7
S'double'
+p7
+sS'x.model'
p8
-sS'this.W'
+NsS'K5'
p9
-g8
-sS'model.in1'
+g7
+sS'model.out'
p10
-g8
-sS'typ'
+g7
+sS'model.in1'
p11
-S'vector'
+g7
+sS'x.graphics'
p12
-sS'this.K2'
-p13
-g8
+g2
sS'mo.inputs'
-p14
+p13
g5
-sS'this.K5'
+sS'Beta'
+p14
+g7
+sS'x.graphics.in_implicit'
p15
-g8
-sS'mo.parameters'
+S'vector'
p16
-g12
-sS'this.Beta'
+sS'mo.parameters'
p17
-g8
-sS'this.x'
-p18
-g8
+g16
sS'model.sim'
-p19
+p18
g5
sS'model.equations'
+p19
+g7
+sS'RDS'
p20
-g8
-sS'this.dL'
-p21
-g8
+g7
sS'mo.outputs'
-p22
+p21
S'matrix'
+p22
+sS'x.graphics.out_implicit'
p23
-sS'this.Vt'
+g22
+sS'L'
p24
-g8
-sS'graphics.exprs'
+g7
+sS'W'
p25
-NsS'this.RDS'
+g7
+sS'graphics.exprs'
p26
-g8
-sS'this.x.graphics'
+NsS'typ'
p27
-g2
-sS'this.dW'
+g16
+sS'dW'
p28
-g8
-sS'this.x.graphics.in_implicit'
+g7
+sS'dL'
p29
-g12
+g7
sS'model.blocktype'
p30
g5
@@ -108,25 +108,25 @@ p31
g2
sS'model.dep_ut'
p32
-g12
+g16
sS'model.equations.parameters[2-1]'
p33
-g12
+g16
sS'exprs'
p34
-g23
+g22
sS'gr_i'
p35
-g12
-sS'this.L'
+g16
+sS'Vt'
p36
-g8
-sS'this.x.graphics.out_implicit'
-p37
-g23
+g7
sS'y'
+p37
+g16
+sS'x'
p38
-g12
+g7
sS'model'
p39
g2
diff --git a/js/Electrical/NPN.pickle b/js/Electrical/NPN.pickle
index 87fccc09..16e61485 100644
--- a/js/Electrical/NPN.pickle
+++ b/js/Electrical/NPN.pickle
@@ -41,7 +41,7 @@ p19
atp20
Rp21
.(dp0
-S'this.x.model.equations.parameters[2-1]'
+S'x.model.equations.parameters[2-1]'
p1
S'vector'
p2
@@ -70,84 +70,81 @@ g10
sS'x.graphics'
p13
g4
-sS'this.x.graphics.exprs'
+sS'mo.inputs'
p14
-NsS'this.x.graphics.out_implicit'
+g8
+sS'Typeout'
p15
g8
-sS'mo.inputs'
+sS'x.graphics.in_implicit'
p16
g8
-sS'Typeout'
-p17
-g8
sS'mo.parameters'
-p18
+p17
g2
-sS'this.x'
-p19
-g10
sS'model.sim'
-p20
+p18
g6
sS'ModelName'
-p21
+p19
g6
sS'y'
-p22
+p20
g2
sS'mo.outputs'
-p23
+p21
g8
sS'Typein'
-p24
+p22
+g8
+sS'x.graphics.out_implicit'
+p23
g8
sS'model.rpar'
-p25
+p24
g8
sS'P'
-p26
+p25
g8
sS'graphics'
-p27
+p26
g4
sS'typ'
-p28
+p27
g2
-sS'this.x.graphics.in_implicit'
-p29
-g8
sS'model.blocktype'
-p30
+p28
g6
-sS'MO'
-p31
-g8
+sS'mo'
+p29
+g10
+sS'gr_i'
+p30
+g2
sS'MI'
-p32
+p31
g8
sS'model.dep_ut'
-p33
+p32
g2
sS'exprs'
-p34
+p33
g8
-sS'gr_i'
+sS'x.graphics.exprs'
+p34
+NsS'PortName'
p35
-g2
-sS'PortName'
-p36
g8
sS'x'
-p37
-g4
+p36
+g10
sS'model'
-p38
+p37
g4
sS'ParametersName'
+p38
+g8
+sS'MO'
p39
g8
-sS'mo'
-p40
-g10
s. \ No newline at end of file
diff --git a/js/Electrical/OpAmp.pickle b/js/Electrical/OpAmp.pickle
index 8f37888d..c1058a70 100644
--- a/js/Electrical/OpAmp.pickle
+++ b/js/Electrical/OpAmp.pickle
@@ -24,7 +24,7 @@ sS'mo.model'
p4
S'string'
p5
-sS'this.x.model'
+sS'x.model'
p6
NsS'model.out'
p7
@@ -33,20 +33,20 @@ p8
sS'model.in1'
p9
g8
-sS'typ'
+sS'x.graphics'
p10
-S'vector'
-p11
+g2
sS'mo.inputs'
-p12
+p11
S'matrix'
+p12
+sS'x.graphics.in_implicit'
p13
+g12
sS'mo.parameters'
p14
-g11
-sS'this.x'
+S'vector'
p15
-g8
sS'model.sim'
p16
g5
@@ -55,24 +55,24 @@ p17
g8
sS'mo.outputs'
p18
-g11
-sS'model.rpar'
+g15
+sS'x.graphics.out_implicit'
p19
-g11
-sS'S'
+g15
+sS'model.rpar'
p20
-g11
-sS'graphics.exprs'
+g15
+sS'S'
p21
-NsS'Z'
+g15
+sS'graphics.exprs'
p22
-g11
-sS'this.x.graphics'
+NsS'Z'
p23
-g2
-sS'this.x.graphics.in_implicit'
+g15
+sS'typ'
p24
-g13
+g15
sS'model.blocktype'
p25
g5
@@ -81,22 +81,22 @@ p26
g2
sS'model.dep_ut'
p27
-g11
+g15
sS'model.equations.parameters[2-1]'
p28
-g11
+g15
sS'exprs'
p29
g5
sS'gr_i'
p30
-g11
-sS'this.x.graphics.out_implicit'
-p31
-g11
+g15
sS'y'
+p31
+g15
+sS'x'
p32
-g11
+g8
sS'model'
p33
g2
diff --git a/js/Electrical/PMOS.pickle b/js/Electrical/PMOS.pickle
index 57a4855a..3c7082ed 100644
--- a/js/Electrical/PMOS.pickle
+++ b/js/Electrical/PMOS.pickle
@@ -36,70 +36,70 @@ sS'mo.model'
p4
S'string'
p5
-sS'this.x.model'
+sS'K2'
p6
-NsS'model.out'
-p7
S'double'
+p7
+sS'x.model'
p8
-sS'this.W'
+NsS'K5'
p9
-g8
-sS'model.in1'
+g7
+sS'model.out'
p10
-g8
-sS'typ'
+g7
+sS'model.in1'
p11
-S'vector'
+g7
+sS'x.graphics'
p12
-sS'this.K2'
-p13
-g8
+g2
sS'mo.inputs'
-p14
+p13
g5
-sS'this.K5'
+sS'Beta'
+p14
+g7
+sS'x.graphics.in_implicit'
p15
-g8
-sS'mo.parameters'
+S'vector'
p16
-g12
-sS'this.Beta'
+sS'mo.parameters'
p17
-g8
-sS'this.x'
-p18
-g8
+g16
sS'model.sim'
-p19
+p18
g5
sS'model.equations'
+p19
+g7
+sS'RDS'
p20
-g8
-sS'this.dL'
-p21
-g8
+g7
sS'mo.outputs'
-p22
+p21
S'matrix'
+p22
+sS'x.graphics.out_implicit'
p23
-sS'this.Vt'
+g22
+sS'L'
p24
-g8
-sS'graphics.exprs'
+g7
+sS'W'
p25
-NsS'this.RDS'
+g7
+sS'graphics.exprs'
p26
-g8
-sS'this.x.graphics'
+NsS'typ'
p27
-g2
-sS'this.dW'
+g16
+sS'dW'
p28
-g8
-sS'this.x.graphics.in_implicit'
+g7
+sS'dL'
p29
-g12
+g7
sS'model.blocktype'
p30
g5
@@ -108,25 +108,25 @@ p31
g2
sS'model.dep_ut'
p32
-g12
+g16
sS'model.equations.parameters[2-1]'
p33
-g12
+g16
sS'exprs'
p34
-g23
+g22
sS'gr_i'
p35
-g12
-sS'this.L'
+g16
+sS'Vt'
p36
-g8
-sS'this.x.graphics.out_implicit'
-p37
-g23
+g7
sS'y'
+p37
+g16
+sS'x'
p38
-g12
+g7
sS'model'
p39
g2
diff --git a/js/Electrical/PNP.pickle b/js/Electrical/PNP.pickle
index 87fccc09..16e61485 100644
--- a/js/Electrical/PNP.pickle
+++ b/js/Electrical/PNP.pickle
@@ -41,7 +41,7 @@ p19
atp20
Rp21
.(dp0
-S'this.x.model.equations.parameters[2-1]'
+S'x.model.equations.parameters[2-1]'
p1
S'vector'
p2
@@ -70,84 +70,81 @@ g10
sS'x.graphics'
p13
g4
-sS'this.x.graphics.exprs'
+sS'mo.inputs'
p14
-NsS'this.x.graphics.out_implicit'
+g8
+sS'Typeout'
p15
g8
-sS'mo.inputs'
+sS'x.graphics.in_implicit'
p16
g8
-sS'Typeout'
-p17
-g8
sS'mo.parameters'
-p18
+p17
g2
-sS'this.x'
-p19
-g10
sS'model.sim'
-p20
+p18
g6
sS'ModelName'
-p21
+p19
g6
sS'y'
-p22
+p20
g2
sS'mo.outputs'
-p23
+p21
g8
sS'Typein'
-p24
+p22
+g8
+sS'x.graphics.out_implicit'
+p23
g8
sS'model.rpar'
-p25
+p24
g8
sS'P'
-p26
+p25
g8
sS'graphics'
-p27
+p26
g4
sS'typ'
-p28
+p27
g2
-sS'this.x.graphics.in_implicit'
-p29
-g8
sS'model.blocktype'
-p30
+p28
g6
-sS'MO'
-p31
-g8
+sS'mo'
+p29
+g10
+sS'gr_i'
+p30
+g2
sS'MI'
-p32
+p31
g8
sS'model.dep_ut'
-p33
+p32
g2
sS'exprs'
-p34
+p33
g8
-sS'gr_i'
+sS'x.graphics.exprs'
+p34
+NsS'PortName'
p35
-g2
-sS'PortName'
-p36
g8
sS'x'
-p37
-g4
+p36
+g10
sS'model'
-p38
+p37
g4
sS'ParametersName'
+p38
+g8
+sS'MO'
p39
g8
-sS'mo'
-p40
-g10
s. \ No newline at end of file
diff --git a/js/Electrical/PotentialSensor.pickle b/js/Electrical/PotentialSensor.pickle
index 413176bb..f97bffc2 100644
--- a/js/Electrical/PotentialSensor.pickle
+++ b/js/Electrical/PotentialSensor.pickle
@@ -7,62 +7,62 @@ p2
atp3
Rp4
.(dp0
-S'this.x'
+S'model.sim'
p1
-S'double'
+S'string'
p2
-sS'model.sim'
+sS'model.in1'
p3
-S'string'
+S'vector'
p4
-sS'model.in1'
+sS'model.equations'
p5
-S'vector'
+S'double'
p6
-sS'model.equations'
+sS'model.blocktype'
p7
g2
-sS'model.blocktype'
+sS'x.graphics.out_implicit'
p8
g4
-sS'this.x.graphics.out_implicit'
+sS'mo'
p9
g6
-sS'mo'
+sS'mo.inputs'
p10
g2
-sS'mo.inputs'
-p11
-g4
sS'mo.model'
+p11
+g2
+sS'model.rpar'
p12
g4
-sS'model.rpar'
-p13
-g6
sS'model.out'
-p14
-g6
+p13
+g4
sS'gr_i'
+p14
+g4
+sS'x.graphics.in_implicit'
p15
-g6
+g4
sS'model.dep_ut'
p16
-g6
+g4
sS'y'
p17
+g4
+sS'x'
+p18
g6
sS'model'
-p18
-S'object'
p19
-sS'this.x.graphics.in_implicit'
+S'object'
p20
-g6
sS'typ'
p21
-g6
+g4
sS'mo.outputs'
p22
-g6
+g4
s. \ No newline at end of file
diff --git a/js/Electrical/Resistor.pickle b/js/Electrical/Resistor.pickle
index 8f50f4e6..fa394c32 100644
--- a/js/Electrical/Resistor.pickle
+++ b/js/Electrical/Resistor.pickle
@@ -20,7 +20,7 @@ sS'mo.model'
p4
S'string'
p5
-sS'this.x.model'
+sS'x.model'
p6
NsS'model.out'
p7
@@ -29,19 +29,19 @@ p8
sS'model.in1'
p9
g8
-sS'typ'
+sS'x.graphics'
p10
-S'vector'
-p11
+g2
sS'mo.inputs'
-p12
+p11
g5
-sS'mo.parameters'
+sS'x.graphics.in_implicit'
+p12
+S'vector'
p13
-g11
-sS'this.x'
+sS'mo.parameters'
p14
-g8
+g13
sS'model.sim'
p15
g5
@@ -51,44 +51,45 @@ g8
sS'mo.outputs'
p17
g5
-sS'model.rpar'
+sS'x.graphics.out_implicit'
p18
-NsS'graphics.exprs'
+g13
+sS'model.rpar'
p19
-NsS'this.x.graphics'
+g8
+sS'R'
p20
-g2
-sS'this.x.graphics.in_implicit'
+g8
+sS'graphics.exprs'
p21
-g11
-sS'model.blocktype'
+NsS'typ'
p22
-g5
-sS'this.R'
+g13
+sS'model.blocktype'
p23
-g8
-sS'model.dep_ut'
+g5
+sS'mo'
p24
-g11
-sS'model.equations.parameters[2-1]'
+g2
+sS'model.dep_ut'
p25
-g11
-sS'exprs'
+g13
+sS'model.equations.parameters[2-1]'
p26
+g13
+sS'exprs'
+p27
g5
sS'gr_i'
-p27
-g11
-sS'this.x.graphics.out_implicit'
p28
-g11
+g13
sS'y'
p29
-g11
-sS'model'
+g13
+sS'x'
p30
-g2
-sS'mo'
+g8
+sS'model'
p31
g2
s. \ No newline at end of file
diff --git a/js/Electrical/SineVoltage.pickle b/js/Electrical/SineVoltage.pickle
index 98ce6c37..8e37a926 100644
--- a/js/Electrical/SineVoltage.pickle
+++ b/js/Electrical/SineVoltage.pickle
@@ -17,100 +17,100 @@ p7
atp8
Rp9
.(dp0
-S'this.frq'
+S'arg1'
p1
-S'double'
+S'object'
p2
-sS'this.ph'
+sS'offset'
p3
-g2
-sS'arg1'
+S'double'
p4
-S'object'
+sS'mo.model'
p5
-sS'graphics'
+S'string'
p6
-g5
-sS'mo.model'
+sS'x.model'
p7
-S'string'
+NsS'model.out'
p8
-sS'this.start'
+S'vector'
p9
-g2
-sS'this.V'
+sS'model.in1'
p10
-g2
-sS'this.x.model'
+g9
+sS'x.graphics'
p11
-NsS'model.out'
+g2
+sS'mo.inputs'
p12
-S'vector'
+g6
+sS'start'
p13
-sS'model.in1'
+g4
+sS'frq'
p14
-g13
-sS'typ'
+g4
+sS'x.graphics.in_implicit'
p15
-g13
-sS'mo.inputs'
+g9
+sS'ph'
p16
-g8
+g4
sS'mo.parameters'
p17
-g13
-sS'this.x'
-p18
-g2
+g9
sS'model.sim'
+p18
+g6
+sS'V'
p19
-g8
+g4
sS'model.equations'
p20
-g2
+g4
sS'mo.outputs'
p21
-g8
-sS'model.rpar'
+g6
+sS'x.graphics.out_implicit'
p22
-S'matrix'
+g9
+sS'model.rpar'
p23
-sS'graphics.exprs'
+S'matrix'
p24
-NsS'this.offset'
+sS'graphics.exprs'
p25
-g2
-sS'this.x.graphics'
+NsS'typ'
p26
-g5
-sS'this.x.graphics.in_implicit'
-p27
-g13
+g9
sS'model.blocktype'
+p27
+g6
+sS'graphics'
p28
-g8
-sS'mo'
-p29
g2
sS'model.dep_ut'
-p30
-g13
+p29
+g9
sS'model.equations.parameters[2-1]'
-p31
-g13
+p30
+g9
sS'exprs'
-p32
-g23
+p31
+g24
sS'gr_i'
+p32
+g9
+sS'y'
p33
-g13
-sS'this.x.graphics.out_implicit'
+g9
+sS'x'
p34
-g13
-sS'y'
-p35
-g13
+g4
sS'model'
+p35
+g2
+sS'mo'
p36
-g5
+g4
s. \ No newline at end of file
diff --git a/js/Electrical/Switch.pickle b/js/Electrical/Switch.pickle
index a1f31b3a..aa8da9b7 100644
--- a/js/Electrical/Switch.pickle
+++ b/js/Electrical/Switch.pickle
@@ -22,7 +22,7 @@ sS'mo.model'
p4
S'string'
p5
-sS'this.x.model'
+sS'x.model'
p6
NsS'model.out'
p7
@@ -31,76 +31,76 @@ p8
sS'model.in1'
p9
g8
-sS'this.Ron'
+sS'x.graphics'
p10
-g8
-sS'typ'
+g2
+sS'mo.inputs'
p11
-S'vector'
+S'matrix'
p12
-sS'mo.inputs'
+sS'x.graphics.in_implicit'
p13
-S'matrix'
-p14
+g12
sS'mo.parameters'
+p14
+S'vector'
p15
-g12
-sS'this.x'
-p16
-g8
sS'model.sim'
-p17
+p16
g5
sS'model.equations'
-p18
+p17
g8
sS'mo.outputs'
-p19
+p18
g5
+sS'x.graphics.out_implicit'
+p19
+g15
sS'model.rpar'
p20
g8
sS'S'
p21
-g14
+g12
sS'graphics.exprs'
p22
-NsS'this.Roff'
+NsS'Z'
p23
g8
-sS'Z'
+sS'typ'
p24
-g8
-sS'this.x.graphics'
+g15
+sS'model.blocktype'
p25
-g2
-sS'this.x.graphics.in_implicit'
+g5
+sS'Roff'
p26
-g14
-sS'model.blocktype'
+g8
+sS'Ron'
p27
-g5
+g8
sS'mo'
p28
g2
sS'model.dep_ut'
p29
-g12
+g15
sS'model.equations.parameters[2-1]'
p30
-g12
+g15
sS'exprs'
p31
g5
sS'gr_i'
p32
-g12
-sS'this.x.graphics.out_implicit'
-p33
-g12
+g15
sS'y'
+p33
+g15
+sS'x'
p34
-g12
+g8
sS'model'
p35
g2
diff --git a/js/Electrical/VVsourceAC.pickle b/js/Electrical/VVsourceAC.pickle
index af8b720b..09f887d5 100644
--- a/js/Electrical/VVsourceAC.pickle
+++ b/js/Electrical/VVsourceAC.pickle
@@ -9,91 +9,91 @@ p3
atp4
Rp5
.(dp0
-S'model.sim'
+S'FR'
p1
-S'string'
+S'double'
p2
-sS'arg1'
+sS'model.sim'
p3
-S'object'
+S'string'
p4
-sS'graphics'
+sS'arg1'
p5
-g4
-sS'mo.model'
+S'object'
p6
-g2
-sS'this.x.model'
+sS'graphics'
p7
-NsS'model.out'
+g6
+sS'mo.model'
p8
-S'vector'
+g4
+sS'x.model'
p9
-sS'model.in1'
+NsS'model.out'
p10
-S'matrix'
+S'vector'
p11
-sS'typ'
+sS'model.in1'
p12
-g9
-sS'mo.inputs'
+S'matrix'
p13
-g9
-sS'mo.parameters'
+sS'x.graphics'
p14
-g9
-sS'this.FR'
+g6
+sS'mo.inputs'
p15
-S'double'
+g11
+sS'x.graphics.in_implicit'
p16
-sS'this.x'
+g11
+sS'mo.parameters'
p17
-g16
+g11
sS'VA'
p18
-g16
+g2
sS'model.equations'
p19
-g16
+g2
sS'mo.outputs'
p20
-g2
-sS'model.rpar'
+g4
+sS'x.graphics.out_implicit'
p21
-g9
-sS'graphics.exprs'
+g11
+sS'model.rpar'
p22
-NsS'this.x.graphics'
+g11
+sS'graphics.exprs'
p23
-g4
-sS'this.x.graphics.in_implicit'
+NsS'typ'
p24
-g9
+g11
sS'model.blocktype'
p25
-g2
+g4
sS'mo'
p26
-g16
+g2
sS'model.dep_ut'
p27
-g9
+g11
sS'model.equations.parameters[2-1]'
p28
-g9
+g11
sS'exprs'
p29
-g9
+g11
sS'gr_i'
p30
-g9
-sS'this.x.graphics.out_implicit'
-p31
-g9
+g11
sS'y'
+p31
+g11
+sS'x'
p32
-g9
+g2
sS'model'
p33
-g4
+g6
s. \ No newline at end of file
diff --git a/js/Electrical/VariableResistor.pickle b/js/Electrical/VariableResistor.pickle
index a99a3770..a8d46cd4 100644
--- a/js/Electrical/VariableResistor.pickle
+++ b/js/Electrical/VariableResistor.pickle
@@ -7,62 +7,62 @@ p2
atp3
Rp4
.(dp0
-S'this.x'
+S'model.sim'
p1
-S'double'
+S'string'
p2
-sS'model.sim'
+sS'model.in1'
p3
-S'string'
+S'double'
p4
-sS'model.in1'
-p5
-g2
sS'model.equations'
+p5
+g4
+sS'model.blocktype'
p6
g2
-sS'model.blocktype'
-p7
-g4
sS'exprs'
-p8
+p7
S'vector'
+p8
+sS'x.graphics.out_implicit'
p9
-sS'this.x.graphics.out_implicit'
-p10
-g9
+g8
sS'mo'
-p11
+p10
S'object'
-p12
+p11
sS'mo.inputs'
-p13
-g9
+p12
+g8
sS'mo.model'
-p14
-g4
+p13
+g2
sS'model.dep_ut'
-p15
-g9
+p14
+g8
sS'model.out'
-p16
-g2
+p15
+g4
sS'gr_i'
+p16
+g8
+sS'x.graphics.in_implicit'
p17
-g9
+g8
sS'y'
p18
-g9
-sS'model'
+g8
+sS'x'
p19
-g12
-sS'this.x.graphics.in_implicit'
+g4
+sS'model'
p20
-g9
+g11
sS'typ'
p21
-g9
+g8
sS'mo.outputs'
p22
-g4
+g2
s. \ No newline at end of file
diff --git a/js/Electrical/VoltageSensor.pickle b/js/Electrical/VoltageSensor.pickle
index fa14c6bc..a76e4523 100644
--- a/js/Electrical/VoltageSensor.pickle
+++ b/js/Electrical/VoltageSensor.pickle
@@ -7,63 +7,63 @@ p2
atp3
Rp4
.(dp0
-S'this.x'
+S'model.sim'
p1
-S'double'
+S'string'
p2
-sS'model.sim'
+sS'model.in1'
p3
-S'string'
+S'double'
p4
-sS'model.in1'
-p5
-g2
sS'model.equations'
+p5
+g4
+sS'model.blocktype'
p6
g2
-sS'model.blocktype'
-p7
-g4
sS'exprs'
-p8
+p7
S'vector'
+p8
+sS'x.graphics.out_implicit'
p9
-sS'this.x.graphics.out_implicit'
-p10
S'matrix'
-p11
+p10
sS'mo'
+p11
+g4
+sS'mo.inputs'
p12
g2
-sS'mo.inputs'
-p13
-g4
sS'mo.model'
-p14
-g4
+p13
+g2
sS'model.dep_ut'
-p15
-g9
+p14
+g8
sS'model.out'
-p16
-g11
+p15
+g10
sS'gr_i'
+p16
+g8
+sS'x.graphics.in_implicit'
p17
-g9
+g8
sS'y'
p18
-g9
-sS'model'
+g8
+sS'x'
p19
-S'object'
+g4
+sS'model'
p20
-sS'this.x.graphics.in_implicit'
+S'object'
p21
-g9
sS'typ'
p22
-g9
+g8
sS'mo.outputs'
p23
-g11
+g10
s. \ No newline at end of file
diff --git a/js/Electrical/VsourceAC.pickle b/js/Electrical/VsourceAC.pickle
index 8e137727..b545ba61 100644
--- a/js/Electrical/VsourceAC.pickle
+++ b/js/Electrical/VsourceAC.pickle
@@ -11,91 +11,91 @@ p4
atp5
Rp6
.(dp0
-S'arg1'
+S'FR'
p1
-S'object'
+S'double'
p2
-sS'graphics'
+sS'model.sim'
p3
-g2
-sS'mo.model'
-p4
S'string'
+p4
+sS'arg1'
p5
-sS'this.x.model'
+S'object'
p6
-NsS'model.out'
+sS'graphics'
p7
-S'vector'
+g6
+sS'mo.model'
p8
-sS'model.in1'
+g4
+sS'x.model'
p9
-g8
-sS'typ'
+NsS'model.out'
p10
-g8
-sS'mo.inputs'
+S'vector'
p11
-g5
-sS'mo.parameters'
+sS'model.in1'
p12
-g8
-sS'this.FR'
+g11
+sS'x.graphics'
p13
-S'double'
+g6
+sS'mo.inputs'
p14
-sS'this.x'
+g4
+sS'x.graphics.in_implicit'
p15
-g14
-sS'model.sim'
+g11
+sS'mo.parameters'
p16
-g5
-sS'model.equations'
+g11
+sS'VA'
p17
-g14
-sS'mo.outputs'
+g2
+sS'model.equations'
p18
-g5
-sS'model.rpar'
+g2
+sS'mo.outputs'
p19
-S'matrix'
+g4
+sS'x.graphics.out_implicit'
p20
-sS'graphics.exprs'
+g11
+sS'model.rpar'
p21
-NsS'this.x.graphics'
+S'matrix'
p22
-g2
-sS'this.x.graphics.in_implicit'
+sS'graphics.exprs'
p23
-g8
-sS'model.blocktype'
+NsS'typ'
p24
-g5
-sS'mo'
+g11
+sS'model.blocktype'
p25
-g14
-sS'model.dep_ut'
+g4
+sS'mo'
p26
-g8
-sS'model.equations.parameters[2-1]'
+g2
+sS'model.dep_ut'
p27
-g8
-sS'exprs'
+g11
+sS'model.equations.parameters[2-1]'
p28
-g20
-sS'gr_i'
+g11
+sS'exprs'
p29
-g8
-sS'this.x.graphics.out_implicit'
+g22
+sS'gr_i'
p30
-g8
+g11
sS'y'
p31
-g8
-sS'model'
+g11
+sS'x'
p32
g2
-sS'this.VA'
+sS'model'
p33
-g14
+g6
s. \ No newline at end of file