diff options
author | Sunil Shetye | 2018-07-15 07:29:25 +0530 |
---|---|---|
committer | Sunil Shetye | 2018-07-16 15:31:24 +0530 |
commit | 1896e61799fda88188ffc3a8df12a4029361048c (patch) | |
tree | 08454cae6871e080e52d8087369ee43acc0a48d0 /js | |
parent | 92f8a251bbaeddf6ec034722a3079d865517d650 (diff) | |
download | sci2js-1896e61799fda88188ffc3a8df12a4029361048c.tar.gz sci2js-1896e61799fda88188ffc3a8df12a4029361048c.tar.bz2 sci2js-1896e61799fda88188ffc3a8df12a4029361048c.zip |
support string vector also
Diffstat (limited to 'js')
84 files changed, 2071 insertions, 1996 deletions
diff --git a/js/Branching/EXTRACTOR.pickle b/js/Branching/EXTRACTOR.pickle index 2c70431e..c334c07e 100644 --- a/js/Branching/EXTRACTOR.pickle +++ b/js/Branching/EXTRACTOR.pickle @@ -46,32 +46,33 @@ S'vector_boolean' p13 sS'exprs' p14 -S'vector' +S'vector_string' p15 sS'ind' p16 g4 sS'gr_i' p17 -g15 -sS'model.in' +S'vector' p18 +sS'model.in' +p19 g4 sS'graphics' -p19 +p20 g8 sS'y' -p20 -g15 -sS'x' p21 -NsS'model' +g18 +sS'x' p22 +NsS'model' +p23 g8 sS'model.ipar' -p23 +p24 g4 sS'typ' -p24 -g15 +p25 +g18 s.
\ No newline at end of file diff --git a/js/Branching/FROM.pickle b/js/Branching/FROM.pickle index 7b2dab46..b73c9110 100644 --- a/js/Branching/FROM.pickle +++ b/js/Branching/FROM.pickle @@ -81,16 +81,17 @@ S'vector_boolean' p25 sS'exprs' p26 -g8 -sS'gr_i' +S'vector_string' p27 +sS'gr_i' +p28 g8 sS'model.outtyp' -p28 +p29 g6 sS'x' -p29 -NsS'model' p30 +NsS'model' +p31 g2 s.
\ No newline at end of file diff --git a/js/Branching/FROMMO.pickle b/js/Branching/FROMMO.pickle index 6377e098..1b5e3af9 100644 --- a/js/Branching/FROMMO.pickle +++ b/js/Branching/FROMMO.pickle @@ -56,50 +56,51 @@ p15 g8 sS'x.graphics.out_implicit' p16 -g10 -sS'y' +S'vector_string' p17 +sS'y' +p18 g8 sS'model.in' -p18 +p19 g10 sS'graphics.exprs' -p19 -NsS'model.ipar' p20 +NsS'model.ipar' +p21 g10 sS'typ' -p21 +p22 g10 sS'model.opar' -p22 -S'list' p23 -sS'needcompile' +S'list' p24 +sS'needcompile' +p25 g8 sS'model.blocktype' -p25 +p26 g5 sS'mo' -p26 +p27 g8 sS'model.dep_ut' -p27 -S'vector_boolean' p28 -sS'exprs' +S'vector_boolean' p29 -g10 -sS'gr_i' +sS'exprs' p30 +g17 +sS'gr_i' +p31 g10 sS'model.outtyp' -p31 +p32 g8 sS'x' -p32 -NsS'model' p33 +NsS'model' +p34 g2 s.
\ No newline at end of file diff --git a/js/Branching/GOTOMO.pickle b/js/Branching/GOTOMO.pickle index 9c5805ba..2d9330a6 100644 --- a/js/Branching/GOTOMO.pickle +++ b/js/Branching/GOTOMO.pickle @@ -54,61 +54,62 @@ p14 g7 sS'x.graphics.in_implicit' p15 -g10 -sS'model.sim' +S'vector_string' p16 +sS'model.sim' +p17 g7 sS'model.out2' -p17 +p18 g10 sS'y' -p18 +p19 g2 sS'model.in' -p19 +p20 g2 sS'graphics.exprs' -p20 -NsS'model.ipar' p21 +NsS'model.ipar' +p22 g2 sS'typ' -p22 +p23 g10 sS'model.opar' -p23 -S'list' p24 -sS'needcompile' +S'list' p25 +sS'needcompile' +p26 g2 sS'ok' -p26 -S'boolean' p27 -sS'model.blocktype' +S'boolean' p28 +sS'model.blocktype' +p29 g7 sS'mo' -p29 +p30 g2 sS'model.dep_ut' -p30 -S'vector_boolean' p31 -sS'exprs' +S'vector_boolean' p32 -S'matrix' +sS'exprs' p33 -sS'gr_i' +S'matrix' p34 +sS'gr_i' +p35 g10 sS'model.outtyp' -p35 +p36 g2 sS'x' -p36 -NsS'model' p37 +NsS'model' +p38 g5 s.
\ No newline at end of file diff --git a/js/Branching/NRMSOM_f.pickle b/js/Branching/NRMSOM_f.pickle index 011b8839..8e2598f6 100644 --- a/js/Branching/NRMSOM_f.pickle +++ b/js/Branching/NRMSOM_f.pickle @@ -50,28 +50,29 @@ S'vector_boolean' p14 sS'exprs' p15 -S'vector' +S'vector_string' p16 sS'x.model' p17 NsS'gr_i' p18 -g16 -sS'model.in' +S'vector' p19 +sS'model.in' +p20 g12 sS'graphics' -p20 +p21 g8 sS'y' -p21 -g16 -sS'x' p22 -NsS'model' +g19 +sS'x' p23 +NsS'model' +p24 g8 sS'typ' -p24 -g16 +p25 +g19 s.
\ No newline at end of file diff --git a/js/Branching/SCALAR2VECTOR.pickle b/js/Branching/SCALAR2VECTOR.pickle index 2b404522..5d98b24d 100644 --- a/js/Branching/SCALAR2VECTOR.pickle +++ b/js/Branching/SCALAR2VECTOR.pickle @@ -48,31 +48,32 @@ S'vector_boolean' p14 sS'exprs' p15 -S'vector' +S'vector_string' p16 sS'x.model' p17 NsS'gr_i' p18 -g16 -sS'model.in' +S'vector' p19 +sS'model.in' +p20 g4 sS'graphics' -p20 +p21 g10 sS'y' -p21 -g16 -sS'x' p22 -NsS'model' +g19 +sS'x' p23 +NsS'model' +p24 g10 sS'typ' -p24 -g16 -sS'nout' p25 +g19 +sS'nout' +p26 g4 s.
\ No newline at end of file diff --git a/js/Branching/SELF_SWITCH.pickle b/js/Branching/SELF_SWITCH.pickle index 4353efb2..5ec17e33 100644 --- a/js/Branching/SELF_SWITCH.pickle +++ b/js/Branching/SELF_SWITCH.pickle @@ -78,68 +78,69 @@ p23 g4 sS'x.graphics.in_implicit' p24 -g16 -sS'diagram.objs[3-1].model.rpar' +S'vector_string' p25 +sS'diagram.objs[3-1].model.rpar' +p26 g4 sS'diagram.objs[4-1]' -p26 +p27 g2 sS'x.graphics.in_style' -p27 +p28 g9 sS'stateOpen' -p28 -S'boolean' p29 -sS'x.graphics.out_implicit' +S'boolean' p30 -g16 -sS'diagram.objs[4-1].graphics.pout' +sS'x.graphics.out_implicit' p31 +g25 +sS'diagram.objs[4-1].graphics.pout' +p32 g4 sS'diagram' -p32 +p33 g4 sS'x.graphics.pin' -p33 +p34 g4 sS'x.model.opar' -p34 -S'list' p35 -sS'typ' +S'list' p36 -g35 -sS'x.model.sim' +sS'typ' p37 +g36 +sS'x.model.sim' +p38 g9 sS'diagram.objs[4-1].graphics.pin' -p38 +p39 g16 sS'x.graphics.style' -p39 +p40 g9 sS'diagram.objs[3-1].graphics.exprs' -p40 +p41 g9 sS'x.model.in' -p41 +p42 g4 sS'x.gui' -p42 +p43 g9 sS'x.graphics.sz' -p43 +p44 g16 sS'diagram.objs[4-1].graphics.exprs' -p44 -S'matrix' p45 -sS'y' +S'matrix' p46 +sS'y' +p47 g4 sS'x' -p47 +p48 g4 s.
\ No newline at end of file diff --git a/js/Electrical/Capacitor.pickle b/js/Electrical/Capacitor.pickle index 8e48a96f..8fa9dc59 100644 --- a/js/Electrical/Capacitor.pickle +++ b/js/Electrical/Capacitor.pickle @@ -44,7 +44,7 @@ p10 g5 sS'x.graphics.in_implicit' p11 -S'vector' +S'vector_string' p12 sS'mo.parameters' p13 @@ -76,35 +76,36 @@ sS'graphics.exprs' p23 NsS'typ' p24 -g12 -sS'model.blocktype' +S'vector' p25 +sS'model.blocktype' +p26 g5 sS'mo' -p26 +p27 g2 sS'model.dep_ut' -p27 -S'vector_boolean' p28 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p29 +sS'model.equations.parameters[2-1]' +p30 g14 sS'exprs' -p30 +p31 g5 sS'gr_i' -p31 -g12 -sS'v' p32 +g25 +sS'v' +p33 g8 sS'y' -p33 -g12 -sS'x' p34 -NsS'model' +g25 +sS'x' p35 +NsS'model' +p36 g2 s.
\ No newline at end of file diff --git a/js/Electrical/ConstantVoltage.pickle b/js/Electrical/ConstantVoltage.pickle index f05caaee..7e2fbca9 100644 --- a/js/Electrical/ConstantVoltage.pickle +++ b/js/Electrical/ConstantVoltage.pickle @@ -44,7 +44,7 @@ p11 g5 sS'x.graphics.in_implicit' p12 -S'vector' +S'vector_string' p13 sS'mo.parameters' p14 @@ -73,32 +73,33 @@ p22 g8 sS'typ' p23 -g13 -sS'model.blocktype' +S'vector' p24 +sS'model.blocktype' +p25 g5 sS'mo' -p25 +p26 g8 sS'model.dep_ut' -p26 -S'vector_boolean' p27 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p28 +sS'model.equations.parameters[2-1]' +p29 g15 sS'exprs' -p29 +p30 g5 sS'gr_i' -p30 -g13 -sS'y' p31 -g13 -sS'x' +g24 +sS'y' p32 -NsS'model' +g24 +sS'x' p33 +NsS'model' +p34 g2 s.
\ No newline at end of file diff --git a/js/Electrical/CurrentSensor.pickle b/js/Electrical/CurrentSensor.pickle index 152bc012..c2c5913a 100644 --- a/js/Electrical/CurrentSensor.pickle +++ b/js/Electrical/CurrentSensor.pickle @@ -55,23 +55,24 @@ p16 g7 sS'x.graphics.in_implicit' p17 -g7 -sS'model.in' +S'vector_string' p18 +sS'model.in' +p19 g4 sS'y' -p19 +p20 g7 sS'x' -p20 -NsS'model' p21 -S'object' +NsS'model' p22 -sS'typ' +S'object' p23 +sS'typ' +p24 g7 sS'mo.outputs' -p24 +p25 g9 s.
\ No newline at end of file diff --git a/js/Electrical/Diode.js b/js/Electrical/Diode.js index 5cd03621..a25b513d 100644 --- a/js/Electrical/Diode.js +++ b/js/Electrical/Diode.js @@ -50,7 +50,7 @@ function Diode() { break; } this.model.rpar = new ScilabDouble([this.Ids],[this.Vt],[this.Maxexp],[this.R]); - this.model.equations.parameters = list(["Ids","Vt","Maxexp","R"],list(this.Ids,this.Vt,this.Maxexp,this.R)); + this.model.equations.parameters = list(new ScilabDouble([["Ids","Vt","Maxexp","R"]]),list(this.Ids,this.Vt,this.Maxexp,this.R)); this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Electrical/Diode.pickle b/js/Electrical/Diode.pickle index 786733de..41fdba9c 100644 --- a/js/Electrical/Diode.pickle +++ b/js/Electrical/Diode.pickle @@ -48,7 +48,7 @@ S'string' p10 sS'x.graphics.in_implicit' p11 -S'vector' +S'vector_string' p12 sS'mo.parameters' p13 @@ -86,35 +86,36 @@ sS'graphics.exprs' p25 NsS'typ' p26 -g12 -sS'model.equations.parameters' +S'vector' p27 +sS'model.equations.parameters' +p28 g14 sS'model.blocktype' -p28 +p29 g10 sS'mo' -p29 +p30 g5 sS'model.dep_ut' -p30 -S'vector_boolean' p31 -sS'exprs' +S'vector_boolean' p32 +sS'exprs' +p33 g10 sS'gr_i' -p33 -g12 -sS'Vt' p34 +g27 +sS'Vt' +p35 g5 sS'y' -p35 -g12 -sS'x' p36 -NsS'model' +g27 +sS'x' p37 +NsS'model' +p38 g2 s.
\ No newline at end of file diff --git a/js/Electrical/Ground.pickle b/js/Electrical/Ground.pickle index c429dc77..39091ac3 100644 --- a/js/Electrical/Ground.pickle +++ b/js/Electrical/Ground.pickle @@ -31,7 +31,7 @@ p6 g2 sS'x.graphics.out_implicit' p7 -S'vector' +S'vector_string' p8 sS'mo' p9 @@ -48,26 +48,27 @@ S'vector_boolean' p13 sS'model.out' p14 -g8 -sS'gr_i' +S'vector' p15 -g8 -sS'x.graphics.in_implicit' +sS'gr_i' p16 -g8 -sS'model.in' +g15 +sS'x.graphics.in_implicit' p17 g8 -sS'y' +sS'model.in' p18 -g8 -sS'x' +g15 +sS'y' p19 -NsS'model' +g15 +sS'x' p20 -S'object' +NsS'model' p21 -sS'typ' +S'object' p22 -g8 +sS'typ' +p23 +g15 s.
\ No newline at end of file diff --git a/js/Electrical/IdealTransformer.pickle b/js/Electrical/IdealTransformer.pickle index 2228b43d..84cbb61a 100644 --- a/js/Electrical/IdealTransformer.pickle +++ b/js/Electrical/IdealTransformer.pickle @@ -107,22 +107,23 @@ S'vector_boolean' p34 sS'exprs' p35 -g8 -sS'x.graphics.exprs' +S'vector_string' p36 -NsS'PortName' +sS'x.graphics.exprs' p37 +NsS'PortName' +p38 g14 sS'x' -p38 +p39 g4 sS'model' -p39 +p40 g4 sS'ParametersName' -p40 -g8 -sS'MO' p41 +g36 +sS'MO' +p42 g14 s.
\ No newline at end of file diff --git a/js/Electrical/Inductor.pickle b/js/Electrical/Inductor.pickle index fa521d31..b2faeed5 100644 --- a/js/Electrical/Inductor.pickle +++ b/js/Electrical/Inductor.pickle @@ -42,63 +42,64 @@ p10 g5 sS'x.graphics.in_implicit' p11 -g8 -sS'mo.parameters' +S'vector_string' p12 -S'list' +sS'mo.parameters' p13 -sS'model.sim' +S'list' p14 +sS'model.sim' +p15 g5 sS'model.equations' -p15 -S'double' p16 -sS'mo.outputs' +S'double' p17 +sS'mo.outputs' +p18 g5 sS'x.graphics.out_implicit' -p18 -g8 -sS'L' p19 -g16 -sS'model.rpar' +g12 +sS'L' p20 -g16 -sS'model.in' +g17 +sS'model.rpar' p21 +g17 +sS'model.in' +p22 g8 sS'graphics.exprs' -p22 -NsS'typ' p23 +NsS'typ' +p24 g8 sS'model.blocktype' -p24 +p25 g5 sS'mo' -p25 -g16 -sS'model.dep_ut' p26 -S'vector_boolean' +g17 +sS'model.dep_ut' p27 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p28 -g13 -sS'exprs' +sS'model.equations.parameters[2-1]' p29 +g14 +sS'exprs' +p30 g5 sS'gr_i' -p30 +p31 g8 sS'y' -p31 +p32 g8 sS'x' -p32 -NsS'model' p33 +NsS'model' +p34 g2 s.
\ No newline at end of file diff --git a/js/Electrical/MOTOR.pickle b/js/Electrical/MOTOR.pickle index fc3dbc05..80f82401 100644 --- a/js/Electrical/MOTOR.pickle +++ b/js/Electrical/MOTOR.pickle @@ -42,20 +42,21 @@ S'vector' p11 sS'x.graphics.in_implicit' p12 -g11 -sS'model.in' +S'vector_string' p13 +sS'model.in' +p14 g11 sS'y' -p14 +p15 g11 sS'x' -p15 -NsS'model' p16 -S'object' +NsS'model' p17 -sS'typ' +S'object' p18 +sS'typ' +p19 g11 s.
\ No newline at end of file diff --git a/js/Electrical/NMOS.pickle b/js/Electrical/NMOS.pickle index 7201b86f..78efedcb 100644 --- a/js/Electrical/NMOS.pickle +++ b/js/Electrical/NMOS.pickle @@ -70,7 +70,7 @@ p14 g2 sS'x.graphics.in_implicit' p15 -S'vector' +S'vector_string' p16 sS'mo.parameters' p17 @@ -102,41 +102,42 @@ sS'graphics.exprs' p27 NsS'typ' p28 -g16 -sS'dW' +S'vector' p29 +sS'dW' +p30 g2 sS'dL' -p30 +p31 g2 sS'model.blocktype' -p31 +p32 g7 sS'mo' -p32 +p33 g4 sS'model.dep_ut' -p33 -S'vector_boolean' p34 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p35 +sS'model.equations.parameters[2-1]' +p36 g18 sS'exprs' -p36 +p37 g23 sS'gr_i' -p37 -g16 -sS'Vt' p38 +g29 +sS'Vt' +p39 g2 sS'y' -p39 -g16 -sS'x' p40 -NsS'model' +g29 +sS'x' p41 +NsS'model' +p42 g4 s.
\ No newline at end of file diff --git a/js/Electrical/OpAmp.pickle b/js/Electrical/OpAmp.pickle index bb3307a5..c297d124 100644 --- a/js/Electrical/OpAmp.pickle +++ b/js/Electrical/OpAmp.pickle @@ -60,53 +60,54 @@ p16 g8 sS'mo.outputs' p17 -S'vector' +S'vector_string' p18 sS'x.graphics.out_implicit' p19 g18 sS'model.rpar' p20 -g18 -sS'S' +S'vector' p21 -g18 -sS'model.in' +sS'S' p22 +g21 +sS'model.in' +p23 g8 sS'graphics.exprs' -p23 -NsS'Z' p24 -g18 -sS'typ' +NsS'Z' p25 -g18 -sS'model.blocktype' +g21 +sS'typ' p26 +g21 +sS'model.blocktype' +p27 g5 sS'mo' -p27 +p28 g2 sS'model.dep_ut' -p28 -S'vector_boolean' p29 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p30 +sS'model.equations.parameters[2-1]' +p31 g14 sS'exprs' -p31 +p32 g5 sS'gr_i' -p32 -g18 -sS'y' p33 -g18 -sS'x' +g21 +sS'y' p34 -NsS'model' +g21 +sS'x' p35 +NsS'model' +p36 g2 s.
\ No newline at end of file diff --git a/js/Electrical/PMOS.pickle b/js/Electrical/PMOS.pickle index 7201b86f..78efedcb 100644 --- a/js/Electrical/PMOS.pickle +++ b/js/Electrical/PMOS.pickle @@ -70,7 +70,7 @@ p14 g2 sS'x.graphics.in_implicit' p15 -S'vector' +S'vector_string' p16 sS'mo.parameters' p17 @@ -102,41 +102,42 @@ sS'graphics.exprs' p27 NsS'typ' p28 -g16 -sS'dW' +S'vector' p29 +sS'dW' +p30 g2 sS'dL' -p30 +p31 g2 sS'model.blocktype' -p31 +p32 g7 sS'mo' -p32 +p33 g4 sS'model.dep_ut' -p33 -S'vector_boolean' p34 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p35 +sS'model.equations.parameters[2-1]' +p36 g18 sS'exprs' -p36 +p37 g23 sS'gr_i' -p37 -g16 -sS'Vt' p38 +g29 +sS'Vt' +p39 g2 sS'y' -p39 -g16 -sS'x' p40 -NsS'model' +g29 +sS'x' p41 +NsS'model' +p42 g4 s.
\ No newline at end of file diff --git a/js/Electrical/PotentialSensor.pickle b/js/Electrical/PotentialSensor.pickle index 4ffd6a0b..7f05e0bf 100644 --- a/js/Electrical/PotentialSensor.pickle +++ b/js/Electrical/PotentialSensor.pickle @@ -28,7 +28,7 @@ p5 g2 sS'x.graphics.out_implicit' p6 -S'vector' +S'vector_string' p7 sS'mo' p8 @@ -41,36 +41,37 @@ p10 g2 sS'model.rpar' p11 -g7 -sS'model.out' +S'vector' p12 -g7 -sS'gr_i' +sS'model.out' p13 -g7 -sS'x.graphics.in_implicit' +g12 +sS'gr_i' p14 +g12 +sS'x.graphics.in_implicit' +p15 g7 sS'model.dep_ut' -p15 -S'vector_boolean' p16 -sS'model.in' +S'vector_boolean' p17 -g7 -sS'y' +sS'model.in' p18 -g7 -sS'x' +g12 +sS'y' p19 -NsS'model' +g12 +sS'x' p20 -S'object' +NsS'model' p21 -sS'typ' +S'object' p22 -g7 -sS'mo.outputs' +sS'typ' p23 +g12 +sS'mo.outputs' +p24 g7 s.
\ No newline at end of file diff --git a/js/Electrical/Resistor.pickle b/js/Electrical/Resistor.pickle index 9e75b190..b76bb187 100644 --- a/js/Electrical/Resistor.pickle +++ b/js/Electrical/Resistor.pickle @@ -42,7 +42,7 @@ p10 g5 sS'x.graphics.in_implicit' p11 -S'vector' +S'vector_string' p12 sS'mo.parameters' p13 @@ -73,32 +73,33 @@ sS'graphics.exprs' p22 NsS'typ' p23 -g12 -sS'model.blocktype' +S'vector' p24 +sS'model.blocktype' +p25 g5 sS'mo' -p25 +p26 g2 sS'model.dep_ut' -p26 -S'vector_boolean' p27 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p28 +sS'model.equations.parameters[2-1]' +p29 g14 sS'exprs' -p29 +p30 g5 sS'gr_i' -p30 -g12 -sS'y' p31 -g12 -sS'x' +g24 +sS'y' p32 -NsS'model' +g24 +sS'x' p33 +NsS'model' +p34 g2 s.
\ No newline at end of file diff --git a/js/Electrical/SineVoltage.pickle b/js/Electrical/SineVoltage.pickle index 46bb2f90..5f558e59 100644 --- a/js/Electrical/SineVoltage.pickle +++ b/js/Electrical/SineVoltage.pickle @@ -60,66 +60,67 @@ p14 g12 sS'x.graphics.in_implicit' p15 -g8 -sS'ph' +S'vector_string' p16 +sS'ph' +p17 g12 sS'mo.parameters' -p17 -S'list' p18 -sS'model.sim' +S'list' p19 +sS'model.sim' +p20 g5 sS'V' -p20 +p21 g12 sS'model.equations' -p21 +p22 g12 sS'mo.outputs' -p22 +p23 g5 sS'x.graphics.out_implicit' -p23 -g8 -sS'model.rpar' p24 -S'matrix' +g16 +sS'model.rpar' p25 -sS'model.in' +S'matrix' p26 +sS'model.in' +p27 g8 sS'graphics.exprs' -p27 -NsS'typ' p28 +NsS'typ' +p29 g8 sS'model.blocktype' -p29 +p30 g5 sS'mo' -p30 +p31 g12 sS'model.dep_ut' -p31 -S'vector_boolean' p32 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p33 -g18 -sS'exprs' +sS'model.equations.parameters[2-1]' p34 -g25 -sS'gr_i' +g19 +sS'exprs' p35 +g26 +sS'gr_i' +p36 g8 sS'y' -p36 +p37 g8 sS'x' -p37 -NsS'model' p38 +NsS'model' +p39 g2 s.
\ No newline at end of file diff --git a/js/Electrical/Switch.pickle b/js/Electrical/Switch.pickle index 4ec1aed2..ca3caa79 100644 --- a/js/Electrical/Switch.pickle +++ b/js/Electrical/Switch.pickle @@ -61,7 +61,7 @@ p17 g5 sS'x.graphics.out_implicit' p18 -S'vector' +S'vector_string' p19 sS'model.rpar' p20 @@ -79,38 +79,39 @@ p24 g8 sS'typ' p25 -g19 -sS'model.blocktype' +S'vector' p26 +sS'model.blocktype' +p27 g5 sS'Roff' -p27 +p28 g8 sS'Ron' -p28 +p29 g8 sS'mo' -p29 +p30 g2 sS'model.dep_ut' -p30 -S'vector_boolean' p31 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p32 +sS'model.equations.parameters[2-1]' +p33 g14 sS'exprs' -p33 +p34 g5 sS'gr_i' -p34 -g19 -sS'y' p35 -g19 -sS'x' +g26 +sS'y' p36 -NsS'model' +g26 +sS'x' p37 +NsS'model' +p38 g2 s.
\ No newline at end of file diff --git a/js/Electrical/VVsourceAC.pickle b/js/Electrical/VVsourceAC.pickle index 3b6c49a6..04d0ae15 100644 --- a/js/Electrical/VVsourceAC.pickle +++ b/js/Electrical/VVsourceAC.pickle @@ -46,63 +46,64 @@ p12 g6 sS'mo.inputs' p13 -g11 -sS'x.graphics.in_implicit' +S'vector_string' p14 -g11 -sS'mo.parameters' +sS'x.graphics.in_implicit' p15 -S'list' +g14 +sS'mo.parameters' p16 -sS'VA' +S'list' p17 +sS'VA' +p18 g2 sS'model.equations' -p18 +p19 g2 sS'mo.outputs' -p19 +p20 g4 sS'x.graphics.out_implicit' -p20 -g11 -sS'model.rpar' p21 +g14 +sS'model.rpar' +p22 g11 sS'model.in' -p22 -S'matrix' p23 -sS'graphics.exprs' +S'matrix' p24 -NsS'typ' +sS'graphics.exprs' p25 +NsS'typ' +p26 g11 sS'model.blocktype' -p26 +p27 g4 sS'mo' -p27 +p28 g2 sS'model.dep_ut' -p28 -S'vector_boolean' p29 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p30 -g16 -sS'exprs' +sS'model.equations.parameters[2-1]' p31 -g11 -sS'gr_i' +g17 +sS'exprs' p32 +g14 +sS'gr_i' +p33 g11 sS'y' -p33 +p34 g11 sS'x' -p34 -NsS'model' p35 +NsS'model' +p36 g6 s.
\ No newline at end of file diff --git a/js/Electrical/VariableResistor.pickle b/js/Electrical/VariableResistor.pickle index 645f7075..73a8a892 100644 --- a/js/Electrical/VariableResistor.pickle +++ b/js/Electrical/VariableResistor.pickle @@ -32,45 +32,46 @@ S'vector' p7 sS'x.graphics.out_implicit' p8 -g7 -sS'mo' +S'vector_string' p9 -S'object' +sS'mo' p10 -sS'mo.inputs' +S'object' p11 -g7 -sS'mo.model' +sS'mo.inputs' p12 +g9 +sS'mo.model' +p13 g2 sS'model.dep_ut' -p13 -S'vector_boolean' p14 -sS'model.out' +S'vector_boolean' p15 +sS'model.out' +p16 g4 sS'gr_i' -p16 -g7 -sS'x.graphics.in_implicit' p17 g7 -sS'model.in' +sS'x.graphics.in_implicit' p18 +g9 +sS'model.in' +p19 g4 sS'y' -p19 +p20 g7 sS'x' -p20 -NsS'model' p21 -g10 -sS'typ' +NsS'model' p22 +g11 +sS'typ' +p23 g7 sS'mo.outputs' -p23 +p24 g2 s.
\ No newline at end of file diff --git a/js/Electrical/VoltageSensor.pickle b/js/Electrical/VoltageSensor.pickle index 152bc012..c2c5913a 100644 --- a/js/Electrical/VoltageSensor.pickle +++ b/js/Electrical/VoltageSensor.pickle @@ -55,23 +55,24 @@ p16 g7 sS'x.graphics.in_implicit' p17 -g7 -sS'model.in' +S'vector_string' p18 +sS'model.in' +p19 g4 sS'y' -p19 +p20 g7 sS'x' -p20 -NsS'model' p21 -S'object' +NsS'model' p22 -sS'typ' +S'object' p23 +sS'typ' +p24 g7 sS'mo.outputs' -p24 +p25 g9 s.
\ No newline at end of file diff --git a/js/Electrical/VsourceAC.pickle b/js/Electrical/VsourceAC.pickle index 7d0bc6da..f0fb4a57 100644 --- a/js/Electrical/VsourceAC.pickle +++ b/js/Electrical/VsourceAC.pickle @@ -51,60 +51,61 @@ p13 g4 sS'x.graphics.in_implicit' p14 -g11 -sS'mo.parameters' +S'vector_string' p15 -S'list' +sS'mo.parameters' p16 -sS'VA' +S'list' p17 +sS'VA' +p18 g2 sS'model.equations' -p18 +p19 g2 sS'mo.outputs' -p19 +p20 g4 sS'x.graphics.out_implicit' -p20 -g11 -sS'model.rpar' p21 -S'matrix' +g15 +sS'model.rpar' p22 -sS'model.in' +S'matrix' p23 +sS'model.in' +p24 g11 sS'graphics.exprs' -p24 -NsS'typ' p25 +NsS'typ' +p26 g11 sS'model.blocktype' -p26 +p27 g4 sS'mo' -p27 +p28 g2 sS'model.dep_ut' -p28 -S'vector_boolean' p29 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p30 -g16 -sS'exprs' +sS'model.equations.parameters[2-1]' p31 -g22 -sS'gr_i' +g17 +sS'exprs' p32 +g23 +sS'gr_i' +p33 g11 sS'y' -p33 +p34 g11 sS'x' -p34 -NsS'model' p35 +NsS'model' +p36 g6 s.
\ No newline at end of file diff --git a/js/Events/freq_div.js b/js/Events/freq_div.js index a4e0e47c..17094d5d 100644 --- a/js/Events/freq_div.js +++ b/js/Events/freq_div.js @@ -30,7 +30,7 @@ function freq_div() { this.model = blk.model; this.graphics.orig = new ScilabDouble([120,0]); this.graphics.sz = new ScilabDouble([20,20]); - this.graphics.exprs = new ScilabDouble(["1"]); + this.graphics.exprs = new ScilabString(["1"]); this.model.ipar = new ScilabDouble([1]); this.graphics.peout = new ScilabDouble([6]); blk.graphics = this.graphics; @@ -41,7 +41,7 @@ function freq_div() { this.model = blk.model; this.graphics.orig = new ScilabDouble([130,-160]); this.graphics.sz = new ScilabDouble([20,20]); - this.graphics.exprs = new ScilabDouble(["1"]); + this.graphics.exprs = new ScilabString(["1"]); this.model.ipar = new ScilabDouble([1]); this.graphics.pein = new ScilabDouble([8]); blk.graphics = this.graphics; diff --git a/js/Hydraulics/Bache.pickle b/js/Hydraulics/Bache.pickle index c4842111..a30426e7 100644 --- a/js/Hydraulics/Bache.pickle +++ b/js/Hydraulics/Bache.pickle @@ -67,7 +67,7 @@ p13 g8 sS'mo.inputs' p14 -S'vector' +S'vector_string' p15 sS'x.graphics.in_implicit' p16 @@ -117,35 +117,36 @@ sS'graphics.exprs' p32 NsS'typ' p33 -g15 -sS'model.blocktype' +S'vector' p34 +sS'model.blocktype' +p35 g5 sS'mo' -p35 +p36 g2 sS'model.dep_ut' -p36 -S'vector_boolean' p37 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p38 +sS'model.equations.parameters[2-1]' +p39 g19 sS'exprs' -p39 +p40 g17 sS'gr_i' -p40 -g15 -sS'p_rho' p41 +g34 +sS'p_rho' +p42 g8 sS'y' -p42 -g15 -sS'x' p43 -NsS'model' +g34 +sS'x' p44 +NsS'model' +p45 g2 s.
\ No newline at end of file diff --git a/js/Hydraulics/PerteDP.pickle b/js/Hydraulics/PerteDP.pickle index b854926d..d72e0b98 100644 --- a/js/Hydraulics/PerteDP.pickle +++ b/js/Hydraulics/PerteDP.pickle @@ -52,7 +52,7 @@ p10 g5 sS'x.graphics.in_implicit' p11 -S'vector' +S'vector_string' p12 sS'mo.parameters' p13 @@ -87,44 +87,45 @@ sS'graphics.exprs' p24 NsS'typ' p25 -g12 -sS'z1' +S'vector' p26 +sS'z1' +p27 g8 sS'z2' -p27 +p28 g8 sS'model.blocktype' -p28 +p29 g5 sS'mo' -p29 +p30 g2 sS'model.dep_ut' -p30 -S'vector_boolean' p31 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p32 +sS'model.equations.parameters[2-1]' +p33 g14 sS'exprs' -p33 +p34 g22 sS'gr_i' -p34 -g12 -sS'p_rho' p35 +g26 +sS'p_rho' +p36 g8 sS'y' -p36 -g12 -sS'x' p37 -NsS'model' +g26 +sS'x' p38 +NsS'model' +p39 g2 sS'lambda' -p39 +p40 g8 s.
\ No newline at end of file diff --git a/js/Hydraulics/PuitsP.pickle b/js/Hydraulics/PuitsP.pickle index c3099d29..341e98aa 100644 --- a/js/Hydraulics/PuitsP.pickle +++ b/js/Hydraulics/PuitsP.pickle @@ -41,7 +41,7 @@ p7 g2 sS'mo.inputs' p8 -S'vector' +S'vector_string' p9 sS'x.graphics.in_implicit' p10 @@ -77,35 +77,36 @@ sS'graphics.exprs' p22 NsS'typ' p23 -g9 -sS'model.blocktype' +S'vector' p24 +sS'model.blocktype' +p25 g5 sS'mo' -p25 +p26 g2 sS'model.dep_ut' -p26 -S'vector_boolean' p27 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p28 +sS'model.equations.parameters[2-1]' +p29 g14 sS'exprs' -p29 +p30 g19 sS'gr_i' -p30 -g9 -sS'y' p31 -g9 -sS'x' +g24 +sS'y' p32 -NsS'model' +g24 +sS'x' p33 +NsS'model' +p34 g2 sS'H0' -p34 +p35 g12 s.
\ No newline at end of file diff --git a/js/Hydraulics/SourceP.pickle b/js/Hydraulics/SourceP.pickle index 4d269b4a..fe605e44 100644 --- a/js/Hydraulics/SourceP.pickle +++ b/js/Hydraulics/SourceP.pickle @@ -65,53 +65,54 @@ p17 g8 sS'mo.outputs' p18 -g11 -sS'x.graphics.out_implicit' +S'vector_string' p19 -g11 -sS'model.rpar' +sS'x.graphics.out_implicit' p20 -S'matrix' +g19 +sS'model.rpar' p21 -sS'T0' +S'matrix' p22 +sS'T0' +p23 g8 sS'model.in' -p23 +p24 g8 sS'graphics.exprs' -p24 -NsS'typ' p25 +NsS'typ' +p26 g11 sS'model.blocktype' -p26 +p27 g5 sS'mo' -p27 +p28 g2 sS'model.dep_ut' -p28 -S'vector_boolean' p29 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p30 +sS'model.equations.parameters[2-1]' +p31 g14 sS'exprs' -p31 -g21 -sS'gr_i' p32 +g22 +sS'gr_i' +p33 g11 sS'y' -p33 +p34 g11 sS'x' -p34 -NsS'model' p35 +NsS'model' +p36 g2 sS'H0' -p36 +p37 g8 s.
\ No newline at end of file diff --git a/js/Hydraulics/VanneReglante.pickle b/js/Hydraulics/VanneReglante.pickle index 662d2cf8..13a61e27 100644 --- a/js/Hydraulics/VanneReglante.pickle +++ b/js/Hydraulics/VanneReglante.pickle @@ -44,7 +44,7 @@ p10 g2 sS'mo.inputs' p11 -S'vector' +S'vector_string' p12 sS'x.graphics.in_implicit' p13 @@ -76,35 +76,36 @@ sS'graphics.exprs' p23 NsS'typ' p24 -g12 -sS'model.blocktype' +S'vector' p25 +sS'model.blocktype' +p26 g5 sS'mo' -p26 +p27 g2 sS'model.dep_ut' -p27 -S'vector_boolean' p28 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p29 +sS'model.equations.parameters[2-1]' +p30 g16 sS'exprs' -p30 +p31 g14 sS'gr_i' -p31 -g12 -sS'p_rho' p32 +g25 +sS'p_rho' +p33 g7 sS'y' -p33 -g12 -sS'x' p34 -NsS'model' +g25 +sS'x' p35 +NsS'model' +p36 g2 s.
\ No newline at end of file diff --git a/js/Linear/DELAY_f.pickle b/js/Linear/DELAY_f.pickle index 86fac0f1..3ea3b379 100644 --- a/js/Linear/DELAY_f.pickle +++ b/js/Linear/DELAY_f.pickle @@ -52,7 +52,7 @@ p13 g4 sS'x.graphics.in_implicit' p14 -S'vector' +S'vector_string' p15 sS'diagram.objs[5-1]' p16 @@ -81,210 +81,211 @@ sS'ppath[1-1]' p25 NsS'output_port.graphics.sz' p26 -g15 -sS'register.graphics.pout' +S'vector' p27 +sS'register.graphics.pout' +p28 g4 sS'output_port' -p28 +p29 g2 sS'arg1.model' -p29 +p30 g2 sS'input_port.graphics.pout' -p30 +p31 g4 sS'evtdly.model.firing' -p31 +p32 g4 sS'x.graphics.sz' -p32 -g15 -sS'output_port.graphics.pin' p33 +g27 +sS'output_port.graphics.pin' +p34 g4 sS'x' -p34 +p35 g4 sS'arg1.model.rpar' -p35 +p36 g2 sS'evtdly.model' -p36 +p37 g2 sS'arg1' -p37 +p38 g2 sS'evtdly.graphics.sz' -p38 -g15 -sS'register.graphics.sz' p39 -g15 -sS'x.graphics.in_style' +g27 +sS'register.graphics.sz' p40 +g27 +sS'x.graphics.in_style' +p41 g6 sS'output_port.model.ipar' -p41 +p42 g4 sS'evtdly_exprs' -p42 -NsS'input_port.graphics.sz' p43 -g15 -sS'register.model' +NsS'input_port.graphics.sz' p44 +g27 +sS'register.model' +p45 g2 sS'diagram.objs[2-1]' -p45 +p46 g2 sS'diagram.objs[4-1]' -p46 +p47 g2 sS'diagram.objs[10-1]' -p47 +p48 g4 sS'evtdly.graphics.exprs' -p48 +p49 g8 sS'ok' -p49 +p50 g19 sS'x.model.in' -p50 +p51 g4 sS'input_port' -p51 +p52 g2 sS'evtdly.graphics.orig' -p52 -g15 -sS'output_port.graphics.exprs' p53 +g27 +sS'output_port.graphics.exprs' +p54 g8 sS'ppath' -p54 +p55 g22 sS'output_port.graphics.flip' -p55 +p56 g19 sS'x.model' -p56 +p57 g2 sS'x.model.rpar' -p57 +p58 g4 sS'x.model.rpar.objs[ppath[2-1]-1]' -p58 +p59 g2 sS'evtdly.graphics.exprs[1-1]' -p59 +p60 g4 sS'x.graphics.gr_i' -p60 -g15 -sS'x.model.blocktype' p61 +g27 +sS'x.model.blocktype' +p62 g6 sS'register.graphics.orig' -p62 -g15 -sS'diagram.objs[9-1]' p63 +g27 +sS'diagram.objs[9-1]' +p64 g4 sS'input_port.graphics.orig' -p64 -g15 -sS'input_port.graphics.exprs' p65 +g27 +sS'input_port.graphics.exprs' +p66 g8 sS'input_port.model.ipar' -p66 +p67 g4 sS'x.model.rpar.objs[ppath[1-1]-1]' -p67 +p68 g2 sS'x.model.sim' -p68 +p69 g6 sS'evtdly.graphics.peout' -p69 +p70 g4 sS'register.model.dstate' -p70 -g15 -sS'split.graphics.peout' p71 +g27 +sS'split.graphics.peout' +p72 g8 sS'x.model.dep_ut' -p72 -S'vector_boolean' p73 -sS'o' +S'vector_boolean' p74 +sS'o' +p75 g2 sS'evtdly.graphics.pein' -p75 +p76 g4 sS'diagram.objs[3-1]' -p76 +p77 g2 sS'evtdly.graphics.flip' -p77 +p78 g19 sS'register.graphics.pin' -p78 +p79 g4 sS'ppath[2-1]' -p79 -NsS'diagram.objs[6-1]' p80 +NsS'diagram.objs[6-1]' +p81 g4 sS'split' -p81 +p82 g2 sS'register_exprs' -p82 -NsS'diagram.objs[8-1]' p83 +NsS'diagram.objs[8-1]' +p84 g2 sS'mess' -p84 +p85 g8 sS'diagram' -p85 +p86 g4 sS'y' -p86 +p87 g4 sS'newpar[$+1-1]' -p87 +p88 g4 sS'register.graphics' -p88 +p89 g2 sS'typ' -p89 +p90 g22 sS'register.graphics.exprs' -p90 +p91 g6 sS'x.graphics.pout' -p91 +p92 g4 sS'register' -p92 +p93 g2 sS'exprs' -p93 +p94 g8 sS'output_port.graphics.orig' -p94 -g15 -sS'x.graphics.pin' p95 +g27 +sS'x.graphics.pin' +p96 g4 sS'register.graphics.flip' -p96 +p97 g19 s.
\ No newline at end of file diff --git a/js/Linear/INTEGRAL_m.pickle b/js/Linear/INTEGRAL_m.pickle index 5a9e7ec4..293ff2e4 100644 --- a/js/Linear/INTEGRAL_m.pickle +++ b/js/Linear/INTEGRAL_m.pickle @@ -79,57 +79,58 @@ p21 g2 sS'in1' p22 -g9 -sS'model.rpar' +S'vector_string' p23 +sS'model.rpar' +p24 g9 sS'model.nmode' -p24 +p25 g2 sS'satur' -p25 +p26 g2 sS'model.state' -p26 +p27 g2 sS'lowp' -p27 +p28 g2 sS'graphics' -p28 +p29 g4 sS'model.nzcross' -p29 +p30 g2 sS'ok' -p30 -S'boolean' p31 -sS'model.blocktype' +S'boolean' p32 -S'string' +sS'model.blocktype' p33 -sS'model.dep_ut' +S'string' p34 -S'vector_boolean' +sS'model.dep_ut' p35 -sS'exprs' +S'vector_boolean' p36 -g33 -sS'gr_i' +sS'exprs' p37 +g34 +sS'gr_i' +p38 g9 sS'graphics.exprs' -p38 -NsS'y' p39 +NsS'y' +p40 g9 sS'x' -p40 -NsS'model' p41 +NsS'model' +p42 g4 sS'ot' -p42 +p43 g2 s.
\ No newline at end of file diff --git a/js/Linear/SAMPHOLD_m.pickle b/js/Linear/SAMPHOLD_m.pickle index 17ea2010..67bad104 100644 --- a/js/Linear/SAMPHOLD_m.pickle +++ b/js/Linear/SAMPHOLD_m.pickle @@ -40,59 +40,60 @@ S'vector' p9 sS'label' p10 -g9 -sS'model.evtin' +S'vector_string' p11 +sS'model.evtin' +p12 g5 sS'model.sim' -p12 -S'list' p13 -sS'arg1.graphics' +S'list' p14 +sS'arg1.graphics' +p15 g2 sS'model.out2' -p15 +p16 g5 sS'in1' -p16 +p17 g9 sS'model.outtyp' -p17 +p18 g5 sS'model.in' -p18 +p19 g5 sS'graphics.exprs' -p19 -NsS'typ' p20 +NsS'typ' +p21 g9 sS'arg1.model' -p21 +p22 g2 sS'ok' -p22 -S'boolean' p23 -sS'model.blocktype' +S'boolean' p24 -S'string' +sS'model.blocktype' p25 -sS'model.dep_ut' +S'string' p26 -S'vector_boolean' +sS'model.dep_ut' p27 -sS'gr_i' +S'vector_boolean' p28 +sS'gr_i' +p29 g9 sS'y' -p29 +p30 g9 sS'x' -p30 +p31 g2 sS'model' -p31 +p32 g2 s.
\ No newline at end of file diff --git a/js/Linear/SOM_f.pickle b/js/Linear/SOM_f.pickle index 6dbd734b..ff4c1d13 100644 --- a/js/Linear/SOM_f.pickle +++ b/js/Linear/SOM_f.pickle @@ -42,37 +42,38 @@ p11 g6 sS'labs' p12 -S'vector' +S'vector_string' p13 sS'p' p14 g4 sS'gr_i' p15 -g13 -sS'model.dep_ut' +S'vector' p16 -S'vector_boolean' +sS'model.dep_ut' p17 -sS'str' +S'vector_boolean' p18 +sS'str' +p19 g6 sS'graphics' -p19 +p20 g9 sS'y' -p20 -g13 -sS'x' p21 -NsS'model' +g16 +sS'x' p22 +NsS'model' +p23 g9 sS'typ' -p23 -g13 -sS'model.blocktype' p24 -S'string' +g16 +sS'model.blocktype' p25 +S'string' +p26 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATBKSL.pickle b/js/MatrixOp/MATBKSL.pickle index 958dcb1f..8f0081ab 100644 --- a/js/MatrixOp/MATBKSL.pickle +++ b/js/MatrixOp/MATBKSL.pickle @@ -50,83 +50,84 @@ p13 g2 sS'label' p14 -g2 -sS'model.evtin' +S'vector_string' p15 +sS'model.evtin' +p16 g2 sS'model.firing' -p16 +p17 g2 sS'function_name' -p17 -S'string' p18 -sS'model.sim' +S'string' p19 -S'list' +sS'model.sim' p20 -sS'model.evtout' +S'list' p21 +sS'model.evtout' +p22 g2 sS'arg1.graphics' -p22 +p23 g4 sS'model.out2' -p23 +p24 g8 sS'in1' -p24 +p25 g2 sS'model.rpar' -p25 +p26 g2 sS'model.outtyp' -p26 +p27 g8 sS'model.state' -p27 +p28 g2 sS'model.in' -p28 +p29 g12 sS'graphics.exprs' -p29 -NsS'model.ipar' p30 +NsS'model.ipar' +p31 g2 sS'typ' -p31 +p32 g2 sS'arg1.model' -p32 +p33 g4 sS'label[9-1]' -p33 +p34 g2 sS'ok' -p34 -S'boolean' p35 -sS'model.blocktype' +S'boolean' p36 -g18 -sS'model.dep_ut' +sS'model.blocktype' p37 -S'vector_boolean' +g19 +sS'model.dep_ut' p38 -sS'gr_i' +S'vector_boolean' p39 +sS'gr_i' +p40 g2 sS'y' -p40 +p41 g2 sS'x' -p41 +p42 g4 sS'model' -p42 +p43 g4 sS'ot' -p43 +p44 g8 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATCATH.pickle b/js/MatrixOp/MATCATH.pickle index fa59704b..4bd900cc 100644 --- a/js/MatrixOp/MATCATH.pickle +++ b/js/MatrixOp/MATCATH.pickle @@ -52,75 +52,76 @@ p13 g2 sS'label' p14 -g2 -sS'model.evtin' +S'vector_string' p15 +sS'model.evtin' +p16 g2 sS'model.firing' -p16 +p17 g2 sS'function_name' -p17 -S'string' p18 -sS'model.sim' +S'string' p19 -S'list' +sS'model.sim' p20 -sS'model.evtout' +S'list' p21 +sS'model.evtout' +p22 g2 sS'arg1.graphics' -p22 +p23 g4 sS'model.out2' -p23 +p24 g7 sS'in1' -p24 +p25 g2 sS'model.rpar' -p25 +p26 g2 sS'model.outtyp' -p26 +p27 g7 sS'model.state' -p27 +p28 g2 sS'model.in' -p28 +p29 g12 sS'graphics.exprs' -p29 -NsS'model.ipar' p30 +NsS'model.ipar' +p31 g2 sS'typ' -p31 +p32 g2 sS'arg1.model' -p32 -NsS'model.blocktype' p33 -g18 -sS'model.dep_ut' +NsS'model.blocktype' p34 -S'vector_boolean' +g19 +sS'model.dep_ut' p35 -sS'gr_i' +S'vector_boolean' p36 +sS'gr_i' +p37 g2 sS'y' -p37 +p38 g2 sS'x' -p38 +p39 g4 sS'model' -p39 +p40 g4 sS'ot' -p40 +p41 g7 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATCATV.pickle b/js/MatrixOp/MATCATV.pickle index a52625cd..fe6d469a 100644 --- a/js/MatrixOp/MATCATV.pickle +++ b/js/MatrixOp/MATCATV.pickle @@ -52,78 +52,79 @@ p13 g2 sS'label' p14 -g2 -sS'model.evtin' +S'vector_string' p15 +sS'model.evtin' +p16 g2 sS'model.firing' -p16 +p17 g2 sS'function_name' -p17 -S'string' p18 -sS'model.sim' +S'string' p19 -S'list' +sS'model.sim' p20 -sS'model.evtout' +S'list' p21 +sS'model.evtout' +p22 g2 sS'arg1.graphics' -p22 +p23 g4 sS'model.out2' -p23 +p24 g7 sS'in1' -p24 +p25 g2 sS'model.rpar' -p25 +p26 g2 sS'model.outtyp' -p26 +p27 g7 sS'model.state' -p27 +p28 g2 sS'model.in' -p28 +p29 g12 sS'graphics.exprs' -p29 -NsS'model.ipar' p30 +NsS'model.ipar' +p31 g2 sS'typ' -p31 +p32 g2 sS'arg1.model' -p32 -NsS'model.blocktype' p33 -g18 -sS'model.dep_ut' +NsS'model.blocktype' p34 -S'vector_boolean' +g19 +sS'model.dep_ut' p35 -sS'gr_i' +S'vector_boolean' p36 +sS'gr_i' +p37 g2 sS'l1' -p37 +p38 g12 sS'y' -p38 +p39 g2 sS'x' -p39 +p40 g4 sS'model' -p40 +p41 g4 sS'ot' -p41 +p42 g7 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATDET.pickle b/js/MatrixOp/MATDET.pickle index b0b2a1e6..7f950c5b 100644 --- a/js/MatrixOp/MATDET.pickle +++ b/js/MatrixOp/MATDET.pickle @@ -49,83 +49,84 @@ p12 g7 sS'label' p13 -g2 -sS'model.evtin' +S'vector_string' p14 +sS'model.evtin' +p15 g2 sS'model.firing' -p15 +p16 g2 sS'function_name' -p16 -S'string' p17 -sS'model.sim' +S'string' p18 -S'list' +sS'model.sim' p19 -sS'model.evtout' +S'list' p20 +sS'model.evtout' +p21 g2 sS'arg1.graphics' -p21 +p22 g4 sS'model.out2' -p22 +p23 g7 sS'in1' -p23 +p24 g2 sS'model.rpar' -p24 +p25 g2 sS'model.outtyp' -p25 +p26 g7 sS'model.state' -p26 +p27 g2 sS'model.in' -p27 +p28 g7 sS'graphics.exprs' -p28 -NsS'model.ipar' p29 +NsS'model.ipar' +p30 g2 sS'typ' -p30 +p31 g2 sS'arg1.model' -p31 +p32 g4 sS'label[9-1]' -p32 +p33 g2 sS'ok' -p33 -S'boolean' p34 -sS'model.blocktype' +S'boolean' p35 -g17 -sS'model.dep_ut' +sS'model.blocktype' p36 -S'vector_boolean' +g18 +sS'model.dep_ut' p37 -sS'gr_i' +S'vector_boolean' p38 +sS'gr_i' +p39 g2 sS'y' -p39 +p40 g2 sS'x' -p40 +p41 g4 sS'model' -p41 +p42 g4 sS'ot' -p42 +p43 g7 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATDIAG.pickle b/js/MatrixOp/MATDIAG.pickle index b0b2a1e6..7f950c5b 100644 --- a/js/MatrixOp/MATDIAG.pickle +++ b/js/MatrixOp/MATDIAG.pickle @@ -49,83 +49,84 @@ p12 g7 sS'label' p13 -g2 -sS'model.evtin' +S'vector_string' p14 +sS'model.evtin' +p15 g2 sS'model.firing' -p15 +p16 g2 sS'function_name' -p16 -S'string' p17 -sS'model.sim' +S'string' p18 -S'list' +sS'model.sim' p19 -sS'model.evtout' +S'list' p20 +sS'model.evtout' +p21 g2 sS'arg1.graphics' -p21 +p22 g4 sS'model.out2' -p22 +p23 g7 sS'in1' -p23 +p24 g2 sS'model.rpar' -p24 +p25 g2 sS'model.outtyp' -p25 +p26 g7 sS'model.state' -p26 +p27 g2 sS'model.in' -p27 +p28 g7 sS'graphics.exprs' -p28 -NsS'model.ipar' p29 +NsS'model.ipar' +p30 g2 sS'typ' -p30 +p31 g2 sS'arg1.model' -p31 +p32 g4 sS'label[9-1]' -p32 +p33 g2 sS'ok' -p33 -S'boolean' p34 -sS'model.blocktype' +S'boolean' p35 -g17 -sS'model.dep_ut' +sS'model.blocktype' p36 -S'vector_boolean' +g18 +sS'model.dep_ut' p37 -sS'gr_i' +S'vector_boolean' p38 +sS'gr_i' +p39 g2 sS'y' -p39 +p40 g2 sS'x' -p40 +p41 g4 sS'model' -p41 +p42 g4 sS'ot' -p42 +p43 g7 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATDIV.pickle b/js/MatrixOp/MATDIV.pickle index 958dcb1f..8f0081ab 100644 --- a/js/MatrixOp/MATDIV.pickle +++ b/js/MatrixOp/MATDIV.pickle @@ -50,83 +50,84 @@ p13 g2 sS'label' p14 -g2 -sS'model.evtin' +S'vector_string' p15 +sS'model.evtin' +p16 g2 sS'model.firing' -p16 +p17 g2 sS'function_name' -p17 -S'string' p18 -sS'model.sim' +S'string' p19 -S'list' +sS'model.sim' p20 -sS'model.evtout' +S'list' p21 +sS'model.evtout' +p22 g2 sS'arg1.graphics' -p22 +p23 g4 sS'model.out2' -p23 +p24 g8 sS'in1' -p24 +p25 g2 sS'model.rpar' -p25 +p26 g2 sS'model.outtyp' -p26 +p27 g8 sS'model.state' -p27 +p28 g2 sS'model.in' -p28 +p29 g12 sS'graphics.exprs' -p29 -NsS'model.ipar' p30 +NsS'model.ipar' +p31 g2 sS'typ' -p31 +p32 g2 sS'arg1.model' -p32 +p33 g4 sS'label[9-1]' -p33 +p34 g2 sS'ok' -p34 -S'boolean' p35 -sS'model.blocktype' +S'boolean' p36 -g18 -sS'model.dep_ut' +sS'model.blocktype' p37 -S'vector_boolean' +g19 +sS'model.dep_ut' p38 -sS'gr_i' +S'vector_boolean' p39 +sS'gr_i' +p40 g2 sS'y' -p40 +p41 g2 sS'x' -p41 +p42 g4 sS'model' -p42 +p43 g4 sS'ot' -p43 +p44 g8 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATEXPM.pickle b/js/MatrixOp/MATEXPM.pickle index b0b2a1e6..7f950c5b 100644 --- a/js/MatrixOp/MATEXPM.pickle +++ b/js/MatrixOp/MATEXPM.pickle @@ -49,83 +49,84 @@ p12 g7 sS'label' p13 -g2 -sS'model.evtin' +S'vector_string' p14 +sS'model.evtin' +p15 g2 sS'model.firing' -p15 +p16 g2 sS'function_name' -p16 -S'string' p17 -sS'model.sim' +S'string' p18 -S'list' +sS'model.sim' p19 -sS'model.evtout' +S'list' p20 +sS'model.evtout' +p21 g2 sS'arg1.graphics' -p21 +p22 g4 sS'model.out2' -p22 +p23 g7 sS'in1' -p23 +p24 g2 sS'model.rpar' -p24 +p25 g2 sS'model.outtyp' -p25 +p26 g7 sS'model.state' -p26 +p27 g2 sS'model.in' -p27 +p28 g7 sS'graphics.exprs' -p28 -NsS'model.ipar' p29 +NsS'model.ipar' +p30 g2 sS'typ' -p30 +p31 g2 sS'arg1.model' -p31 +p32 g4 sS'label[9-1]' -p32 +p33 g2 sS'ok' -p33 -S'boolean' p34 -sS'model.blocktype' +S'boolean' p35 -g17 -sS'model.dep_ut' +sS'model.blocktype' p36 -S'vector_boolean' +g18 +sS'model.dep_ut' p37 -sS'gr_i' +S'vector_boolean' p38 +sS'gr_i' +p39 g2 sS'y' -p39 +p40 g2 sS'x' -p40 +p41 g4 sS'model' -p41 +p42 g4 sS'ot' -p42 +p43 g7 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATINV.pickle b/js/MatrixOp/MATINV.pickle index b0b2a1e6..7f950c5b 100644 --- a/js/MatrixOp/MATINV.pickle +++ b/js/MatrixOp/MATINV.pickle @@ -49,83 +49,84 @@ p12 g7 sS'label' p13 -g2 -sS'model.evtin' +S'vector_string' p14 +sS'model.evtin' +p15 g2 sS'model.firing' -p15 +p16 g2 sS'function_name' -p16 -S'string' p17 -sS'model.sim' +S'string' p18 -S'list' +sS'model.sim' p19 -sS'model.evtout' +S'list' p20 +sS'model.evtout' +p21 g2 sS'arg1.graphics' -p21 +p22 g4 sS'model.out2' -p22 +p23 g7 sS'in1' -p23 +p24 g2 sS'model.rpar' -p24 +p25 g2 sS'model.outtyp' -p25 +p26 g7 sS'model.state' -p26 +p27 g2 sS'model.in' -p27 +p28 g7 sS'graphics.exprs' -p28 -NsS'model.ipar' p29 +NsS'model.ipar' +p30 g2 sS'typ' -p30 +p31 g2 sS'arg1.model' -p31 +p32 g4 sS'label[9-1]' -p32 +p33 g2 sS'ok' -p33 -S'boolean' p34 -sS'model.blocktype' +S'boolean' p35 -g17 -sS'model.dep_ut' +sS'model.blocktype' p36 -S'vector_boolean' +g18 +sS'model.dep_ut' p37 -sS'gr_i' +S'vector_boolean' p38 +sS'gr_i' +p39 g2 sS'y' -p39 +p40 g2 sS'x' -p40 +p41 g4 sS'model' -p41 +p42 g4 sS'ot' -p42 +p43 g7 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATMAGPHI.pickle b/js/MatrixOp/MATMAGPHI.pickle index 1cb33b61..349daa3a 100644 --- a/js/MatrixOp/MATMAGPHI.pickle +++ b/js/MatrixOp/MATMAGPHI.pickle @@ -52,82 +52,83 @@ p13 g8 sS'label' p14 -g2 -sS'model.evtin' +S'vector_string' p15 +sS'model.evtin' +p16 g2 sS'model.firing' -p16 +p17 g2 sS'function_name' -p17 -S'string' p18 -sS'model.sim' +S'string' p19 -S'list' +sS'model.sim' p20 -sS'model.evtout' +S'list' p21 +sS'model.evtout' +p22 g2 sS'arg1.graphics' -p22 +p23 g4 sS'model.out2' -p23 +p24 g10 sS'in1' -p24 +p25 g10 sS'model.rpar' -p25 +p26 g2 sS'model.outtyp' -p26 +p27 g2 sS'model.state' -p27 +p28 g2 sS'model.in' -p28 +p29 g8 sS'graphics.exprs' -p29 -NsS'model.ipar' p30 +NsS'model.ipar' +p31 g2 sS'typ' -p31 +p32 g2 sS'arg1.model' -p32 -NsS'label[9-1]' p33 +NsS'label[9-1]' +p34 g2 sS'ok' -p34 -S'boolean' p35 -sS'model.blocktype' +S'boolean' p36 -g18 -sS'model.dep_ut' +sS'model.blocktype' p37 -S'vector_boolean' +g19 +sS'model.dep_ut' p38 -sS'gr_i' +S'vector_boolean' p39 +sS'gr_i' +p40 g2 sS'y' -p40 +p41 g2 sS'x' -p41 +p42 g4 sS'model' -p42 +p43 g4 sS'ot' -p43 +p44 g8 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATMUL.pickle b/js/MatrixOp/MATMUL.pickle index 7851af36..13121ca7 100644 --- a/js/MatrixOp/MATMUL.pickle +++ b/js/MatrixOp/MATMUL.pickle @@ -61,66 +61,67 @@ p17 g10 sS'label' p18 -g13 -sS'np' +S'vector_string' p19 +sS'np' +p20 g10 sS'model.sim' -p20 -S'list' p21 -sS'label[2-1]' +S'list' p22 +sS'label[2-1]' +p23 g5 sS'model.out2' -p23 +p24 g10 sS'in1' -p24 +p25 g15 sS'model.rpar' -p25 +p26 g15 sS'kmax' -p26 +p27 g10 sS'model.in' -p27 +p28 g15 sS'graphics' -p28 +p29 g2 sS'model.ipar' -p29 +p30 g10 sS'typ' -p30 +p31 g13 sS'ot' -p31 -NsS'ok' p32 -S'boolean' +NsS'ok' p33 -sS'rule' +S'boolean' p34 +sS'rule' +p35 g10 sS'gr_i' -p35 +p36 g13 sS'TABMIN' -p36 +p37 g15 sS'y' -p37 +p38 g13 sS'x' -p38 +p39 g2 sS'model' -p39 +p40 g2 sS'TABMAX' -p40 +p41 g15 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATPINV.pickle b/js/MatrixOp/MATPINV.pickle index b0b2a1e6..7f950c5b 100644 --- a/js/MatrixOp/MATPINV.pickle +++ b/js/MatrixOp/MATPINV.pickle @@ -49,83 +49,84 @@ p12 g7 sS'label' p13 -g2 -sS'model.evtin' +S'vector_string' p14 +sS'model.evtin' +p15 g2 sS'model.firing' -p15 +p16 g2 sS'function_name' -p16 -S'string' p17 -sS'model.sim' +S'string' p18 -S'list' +sS'model.sim' p19 -sS'model.evtout' +S'list' p20 +sS'model.evtout' +p21 g2 sS'arg1.graphics' -p21 +p22 g4 sS'model.out2' -p22 +p23 g7 sS'in1' -p23 +p24 g2 sS'model.rpar' -p24 +p25 g2 sS'model.outtyp' -p25 +p26 g7 sS'model.state' -p26 +p27 g2 sS'model.in' -p27 +p28 g7 sS'graphics.exprs' -p28 -NsS'model.ipar' p29 +NsS'model.ipar' +p30 g2 sS'typ' -p30 +p31 g2 sS'arg1.model' -p31 +p32 g4 sS'label[9-1]' -p32 +p33 g2 sS'ok' -p33 -S'boolean' p34 -sS'model.blocktype' +S'boolean' p35 -g17 -sS'model.dep_ut' +sS'model.blocktype' p36 -S'vector_boolean' +g18 +sS'model.dep_ut' p37 -sS'gr_i' +S'vector_boolean' p38 +sS'gr_i' +p39 g2 sS'y' -p39 +p40 g2 sS'x' -p40 +p41 g4 sS'model' -p41 +p42 g4 sS'ot' -p42 +p43 g7 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATTRAN.pickle b/js/MatrixOp/MATTRAN.pickle index ea3e6ac6..d1a9c67e 100644 --- a/js/MatrixOp/MATTRAN.pickle +++ b/js/MatrixOp/MATTRAN.pickle @@ -45,59 +45,60 @@ p10 g5 sS'label' p11 -g9 -sS'function_name' +S'vector_string' p12 -S'string' +sS'function_name' p13 -sS'model.sim' +S'string' p14 -S'list' +sS'model.sim' p15 -sS'arg1.graphics' +S'list' p16 +sS'arg1.graphics' +p17 g2 sS'label[2-1]' -p17 -g13 -sS'model.out2' p18 +g14 +sS'model.out2' +p19 g5 sS'in1' -p19 +p20 g9 sS'model.in' -p20 +p21 g5 sS'graphics.exprs' -p21 -NsS'typ' p22 +NsS'typ' +p23 g9 sS'arg1.model' -p23 +p24 g2 sS'ok' -p24 -S'boolean' p25 -sS'model.dep_ut' +S'boolean' p26 -S'vector_boolean' +sS'model.dep_ut' p27 -sS'gr_i' +S'vector_boolean' p28 +sS'gr_i' +p29 g9 sS'y' -p29 +p30 g9 sS'x' -p30 +p31 g2 sS'model' -p31 +p32 g2 sS'ot' -p32 +p33 g5 s.
\ No newline at end of file diff --git a/js/MatrixOp/SQRT.pickle b/js/MatrixOp/SQRT.pickle index 129282a7..6db85eec 100644 --- a/js/MatrixOp/SQRT.pickle +++ b/js/MatrixOp/SQRT.pickle @@ -46,59 +46,60 @@ p11 g7 sS'label' p12 -g5 -sS'function_name' +S'vector_string' p13 -S'string' +sS'function_name' p14 -sS'model.sim' +S'string' p15 -S'list' +sS'model.sim' p16 -sS'arg1.graphics' +S'list' p17 +sS'arg1.graphics' +p18 g2 sS'model.out2' -p18 +p19 g7 sS'in1' -p19 +p20 g5 sS'model.outtyp' -p20 +p21 g7 sS'model.in' -p21 +p22 g7 sS'graphics.exprs' -p22 -NsS'typ' p23 +NsS'typ' +p24 g5 sS'arg1.model' -p24 +p25 g2 sS'ok' -p25 -S'boolean' p26 -sS'model.dep_ut' +S'boolean' p27 -S'vector_boolean' +sS'model.dep_ut' p28 -sS'gr_i' +S'vector_boolean' p29 +sS'gr_i' +p30 g5 sS'y' -p30 +p31 g5 sS'x' -p31 +p32 g2 sS'model' -p32 +p33 g2 sS'ot' -p33 +p34 g5 s.
\ No newline at end of file diff --git a/js/MatrixOp/SUBMAT.pickle b/js/MatrixOp/SUBMAT.pickle index 3d97bb83..f4755cc8 100644 --- a/js/MatrixOp/SUBMAT.pickle +++ b/js/MatrixOp/SUBMAT.pickle @@ -50,92 +50,93 @@ p9 g7 sS'out' p10 -g2 -sS'model.in2' +S'vector_string' p11 +sS'model.in2' +p12 g7 sS'model.intyp' -p12 +p13 g7 sS'label' -p13 -S'matrix' p14 -sS'model.evtin' +S'matrix' p15 +sS'model.evtin' +p16 g2 sS'model.firing' -p16 +p17 g2 sS'function_name' -p17 -S'string' p18 -sS'model.sim' +S'string' p19 -S'list' +sS'model.sim' p20 -sS'model.evtout' +S'list' p21 +sS'model.evtout' +p22 g2 sS'arg1.graphics' -p22 +p23 g4 sS'model.out2' -p23 +p24 g7 sS'in1' -p24 +p25 g2 sS'model.rpar' -p25 +p26 g2 sS'model.outtyp' -p26 +p27 g7 sS'model.state' -p27 +p28 g2 sS'model.in' -p28 +p29 g7 sS'graphics.exprs' -p29 -NsS'model.ipar' p30 -g14 -sS'typ' +NsS'model.ipar' p31 +g15 +sS'typ' +p32 g2 sS'label[6-1]' -p32 -g18 -sS'arg1.model' p33 -NsS'ok' +g19 +sS'arg1.model' p34 -S'boolean' +NsS'ok' p35 -sS'model.blocktype' +S'boolean' p36 -g18 -sS'model.dep_ut' +sS'model.blocktype' p37 -S'vector_boolean' +g19 +sS'model.dep_ut' p38 -sS'gr_i' +S'vector_boolean' p39 +sS'gr_i' +p40 g2 sS'y' -p40 +p41 g2 sS'x' -p41 +p42 g4 sS'model' -p42 +p43 g4 sS'ot' -p43 +p44 g7 s.
\ No newline at end of file diff --git a/js/Misc/DEBUG.pickle b/js/Misc/DEBUG.pickle index 03123225..88e6f456 100644 --- a/js/Misc/DEBUG.pickle +++ b/js/Misc/DEBUG.pickle @@ -46,7 +46,7 @@ p12 g9 sS'tt' p13 -S'vector' +S'vector_string' p14 sS'graphics.exprs' p15 @@ -55,22 +55,23 @@ p16 g3 sS'gr_i' p17 -g14 -sS'graphics' +S'vector' p18 +sS'graphics' +p19 g9 sS'y' -p19 -g14 -sS'x' p20 -NsS'model' +g18 +sS'x' p21 +NsS'model' +p22 g9 sS'typ' -p22 -g14 -sS'warnMode' p23 +g18 +sS'warnMode' +p24 g11 s.
\ No newline at end of file diff --git a/js/Misc/EDGETRIGGER.pickle b/js/Misc/EDGETRIGGER.pickle index def535c9..305c6bff 100644 --- a/js/Misc/EDGETRIGGER.pickle +++ b/js/Misc/EDGETRIGGER.pickle @@ -54,30 +54,31 @@ p16 g4 sS'exprs' p17 -g15 -sS'x.model' +S'vector_string' p18 -NsS'edge' +sS'x.model' p19 +NsS'edge' +p20 g4 sS'model.in' -p20 +p21 g4 sS'graphics' -p21 +p22 g9 sS'y' -p22 +p23 g15 sS'x' -p23 -NsS'model' p24 +NsS'model' +p25 g9 sS'model.ipar' -p25 +p26 g4 sS'typ' -p26 +p27 g15 s.
\ No newline at end of file diff --git a/js/Misc/EDGE_TRIGGER.js b/js/Misc/EDGE_TRIGGER.js index 8662ade4..4699c0b0 100644 --- a/js/Misc/EDGE_TRIGGER.js +++ b/js/Misc/EDGE_TRIGGER.js @@ -40,7 +40,7 @@ function EDGE_TRIGGER() { this.model = blk.model; this.graphics.orig = new ScilabDouble([0,10]); this.graphics.sz = new ScilabDouble([20,20]); - this.graphics.exprs = new ScilabDouble(["1"]); + this.graphics.exprs = new ScilabString(["1"]); this.model.ipar = new ScilabDouble([1]); this.graphics.pout = new ScilabDouble([5]); blk.graphics = this.graphics; @@ -51,7 +51,7 @@ function EDGE_TRIGGER() { this.model = blk.model; this.graphics.orig = new ScilabDouble([170,-60]); this.graphics.sz = new ScilabDouble([20,20]); - this.graphics.exprs = new ScilabDouble(["1"]); + this.graphics.exprs = new ScilabString(["1"]); this.model.ipar = new ScilabDouble([1]); this.graphics.pein = new ScilabDouble([7]); blk.graphics = this.graphics; diff --git a/js/Misc/EDGE_TRIGGER.pickle b/js/Misc/EDGE_TRIGGER.pickle index ad0be9c8..82928962 100644 --- a/js/Misc/EDGE_TRIGGER.pickle +++ b/js/Misc/EDGE_TRIGGER.pickle @@ -165,20 +165,21 @@ sS'blk.graphics' p54 NsS'graphics.exprs' p55 -g2 -sS'y' +S'vector_string' p56 +sS'y' +p57 g6 sS'x' -p57 +p58 g10 sS'model' -p58 +p59 g10 sS'lnk.to' -p59 +p60 g2 sS'arg1.model.rpar' -p60 +p61 g10 s.
\ No newline at end of file diff --git a/js/Misc/Extract_Activation.js b/js/Misc/Extract_Activation.js index 7747092a..164b496c 100644 --- a/js/Misc/Extract_Activation.js +++ b/js/Misc/Extract_Activation.js @@ -39,7 +39,7 @@ function Extract_Activation() { this.model = blk.model; this.graphics.orig = new ScilabDouble([0,10]); this.graphics.sz = new ScilabDouble([20,20]); - this.graphics.exprs = new ScilabDouble(["1"]); + this.graphics.exprs = new ScilabString(["1"]); this.model.ipar = new ScilabDouble([1]); this.graphics.pout = new ScilabDouble([7]); blk.graphics = this.graphics; @@ -50,7 +50,7 @@ function Extract_Activation() { this.model = blk.model; this.graphics.orig = new ScilabDouble([110,-140]); this.graphics.sz = new ScilabDouble([20,20]); - this.graphics.exprs = new ScilabDouble(["1"]); + this.graphics.exprs = new ScilabString(["1"]); this.model.ipar = new ScilabDouble([1]); this.graphics.pein = new ScilabDouble([8]); blk.graphics = this.graphics; diff --git a/js/Misc/Extract_Activation.pickle b/js/Misc/Extract_Activation.pickle index 5e5b2dec..32d491ea 100644 --- a/js/Misc/Extract_Activation.pickle +++ b/js/Misc/Extract_Activation.pickle @@ -91,39 +91,40 @@ p28 g4 sS'graphics.exprs' p29 -g2 -sS'scs_m_1.objs[7-1]' +S'vector_string' p30 +sS'scs_m_1.objs[7-1]' +p31 g4 sS'model.ipar' -p31 +p32 g4 sS'model.nzcross' -p32 +p33 g4 sS'graphics.pout' -p33 +p34 g4 sS'scs_m_1.objs[1-1]' -p34 +p35 g8 sS'scs_m_1.objs[5-1]' -p35 +p36 g4 sS'gr_i' -p36 +p37 g2 sS'scs_m_1.objs[4-1]' -p37 +p38 g8 sS'x' -p38 -NsS'model' p39 +NsS'model' +p40 g8 sS'lnk.to' -p40 +p41 g2 sS'blk.graphics' -p41 +p42 Ns.
\ No newline at end of file diff --git a/js/Misc/IMPSPLIT_f.pickle b/js/Misc/IMPSPLIT_f.pickle index 6db902d4..a6502f37 100644 --- a/js/Misc/IMPSPLIT_f.pickle +++ b/js/Misc/IMPSPLIT_f.pickle @@ -25,7 +25,7 @@ S'double' p4 sS'x.graphics.out_implicit' p5 -S'vector' +S'vector_string' p6 sS'mo' p7 @@ -48,17 +48,18 @@ p13 g4 sS'y' p14 -g6 -sS'x' +S'vector' p15 -NsS'model' +sS'x' p16 +NsS'model' +p17 g8 sS'typ' -p17 -g6 -sS'mo.outputs' p18 -S'matrix' +g15 +sS'mo.outputs' p19 +S'matrix' +p20 s.
\ No newline at end of file diff --git a/js/Misc/LOGICAL_OP.js b/js/Misc/LOGICAL_OP.js index ce52871a..cdb9ed51 100644 --- a/js/Misc/LOGICAL_OP.js +++ b/js/Misc/LOGICAL_OP.js @@ -118,7 +118,7 @@ function LOGICAL_OP() { var label = "NOT"; } this.graphics.exprs = new ScilabDouble(this.exprs); - this.graphics.style = new ScilabDouble(["blockWithLabel;displayedLabel="+label]); + this.graphics.style = new ScilabString(["blockWithLabel;displayedLabel="+label]); this.x.graphics = this.graphics; this.x.model = this.model; break; diff --git a/js/Misc/LOGICAL_OP.pickle b/js/Misc/LOGICAL_OP.pickle index 98da2a59..23986b25 100644 --- a/js/Misc/LOGICAL_OP.pickle +++ b/js/Misc/LOGICAL_OP.pickle @@ -50,66 +50,67 @@ S'vector' p12 sS'graphics.style' p13 -g12 -sS'x.graphics' +S'vector_string' p14 +sS'x.graphics' +p15 g2 sS'tp' -p15 +p16 g10 sS'label' -p16 +p17 g5 sS'model.sim' -p17 -S'list' p18 -sS'nin' +S'list' p19 +sS'nin' +p20 g10 sS'in1' -p20 -S'matrix' p21 -sS'model.in' +S'matrix' p22 -g21 -sS'graphics.exprs' +sS'model.in' p23 -g21 -sS'model.ipar' +g22 +sS'graphics.exprs' p24 +g22 +sS'model.ipar' +p25 g12 sS'typ' -p25 +p26 g12 sS'ok' -p26 -S'boolean' p27 -sS'model.blocktype' +S'boolean' p28 +sS'model.blocktype' +p29 g5 sS'rule' -p29 +p30 g10 sS'exprs' -p30 -g21 -sS'gr_i' p31 +g22 +sS'gr_i' +p32 g12 sS'ipar' -p32 +p33 g12 sS'y' -p33 +p34 g12 sS'x' -p34 -NsS'model' p35 +NsS'model' +p36 g2 sS'ot' -p36 +p37 Ns.
\ No newline at end of file diff --git a/js/Misc/MBLOCK.js b/js/Misc/MBLOCK.js index f245bcce..0ca1910a 100644 --- a/js/Misc/MBLOCK.js +++ b/js/Misc/MBLOCK.js @@ -287,7 +287,7 @@ function MBLOCK() { this.exprs.funtxt = tt; this.x.model = this.model; this.graphics.gr_i[1-1][1-1] = new ScilabString(["txt=[\'Modelica\';\' "+nameF+" \'];"]); - this.graphics.in_implicit = new ScilabDouble(this.intype); + this.graphics.in_implicit = new ScilabString(this.intype); this.graphics.out_implicit = new ScilabDouble(this.outtype); this.graphics.exprs = this.exprs; this.x.graphics = this.graphics; diff --git a/js/Misc/MBLOCK.pickle b/js/Misc/MBLOCK.pickle index 513e1e22..398535f8 100644 --- a/js/Misc/MBLOCK.pickle +++ b/js/Misc/MBLOCK.pickle @@ -121,127 +121,128 @@ p30 g2 sS'mo.inputs' p31 -g29 -sS'param' +S'vector_string' p32 +sS'param' +p33 g21 sS'gr_i' -p33 +p34 g29 sS'paramv' -p34 +p35 g13 sS'exprs.funtxt' -p35 -g29 -sS'x.graphics.in_implicit' p36 g29 -sS'mo.parameters' +sS'x.graphics.in_implicit' p37 +g32 +sS'mo.parameters' +p38 g13 sS'Tparam_sz' -p38 +p39 g8 sS'pprop' -p39 +p40 g21 sS'model.out' -p40 +p41 g8 sS'model.sim' -p41 +p42 g13 sS'model.equations' -p42 +p43 g4 sS'mo.outputs' -p43 +p44 g21 sS'intype' -p44 -g29 -sS'x.graphics.out_implicit' p45 +g32 +sS'x.graphics.out_implicit' +p46 g21 sS'in1' -p46 -g29 -sS'model.rpar' p47 +g32 +sS'model.rpar' +p48 g21 sS'lhs_txt' -p48 +p49 g2 sS'outtype' -p49 +p50 g21 sS'model.in' -p50 +p51 g8 sS'graphics' -p51 +p52 g4 sS'intypex' -p52 +p53 g8 sS'lab_1' -p53 +p54 g13 sS'lab_2' -p54 -NsS'paramv[$+1-1]' p55 +NsS'paramv[$+1-1]' +p56 g2 sS'ok' -p56 -S'boolean' p57 -sS'model.blocktype' +S'boolean' p58 +sS'model.blocktype' +p59 g2 sS'exprs.param' -p59 +p60 g8 sS'model.sim[1-1]' -p60 -NsS'mo' p61 +NsS'mo' +p62 g4 sS'x.graphics' -p62 +p63 g4 sS'pprop[$+1-1]' -p63 +p64 g8 sS'model.dep_ut' -p64 -S'vector_boolean' p65 -sS'exprs.paramv' +S'vector_boolean' p66 +sS'exprs.paramv' +p67 g13 sS'exprs' -p67 +p68 g8 sS'lab_2[$+1-1]' -p68 +p69 g2 sS'r' -p69 -g57 -sS'lab_txt' p70 +g58 +sS'lab_txt' +p71 g2 sS'y' -p71 +p72 g29 sS'x' -p72 -NsS'model' p73 +NsS'model' +p74 g4 sS'tt' -p74 +p75 g29 s.
\ No newline at end of file diff --git a/js/Misc/MPBLOCK.js b/js/Misc/MPBLOCK.js index ddaca010..8b246576 100644 --- a/js/Misc/MPBLOCK.js +++ b/js/Misc/MPBLOCK.js @@ -271,7 +271,7 @@ function MPBLOCK() { this.exprs.funtxt = ""; this.x.model = this.model; this.graphics.gr_i[1-1][1-1] = new ScilabString(["txt=[\' "+nameF+" \'];"]); - this.graphics.in_implicit = new ScilabDouble(this.intype); + this.graphics.in_implicit = new ScilabString(this.intype); this.graphics.out_implicit = new ScilabDouble(this.outtype); this.graphics.exprs = this.exprs; this.x.graphics = this.graphics; diff --git a/js/Misc/MPBLOCK.pickle b/js/Misc/MPBLOCK.pickle index 76b38fb4..6eb24584 100644 --- a/js/Misc/MPBLOCK.pickle +++ b/js/Misc/MPBLOCK.pickle @@ -108,124 +108,125 @@ p31 g2 sS'mo.inputs' p32 -g30 -sS'param' +S'vector_string' p33 +sS'param' +p34 g30 sS'paramv' -p34 +p35 g14 sS'gr_i' -p35 -g30 -sS'x.graphics.in_implicit' p36 g30 -sS'mo.parameters' +sS'x.graphics.in_implicit' p37 +g33 +sS'mo.parameters' +p38 g14 sS'Tparam_sz' -p38 +p39 g4 sS'pprop' -p39 +p40 g30 sS'model.out' -p40 +p41 g4 sS'model.sim' -p41 +p42 g14 sS'model.equations' -p42 +p43 g6 sS'mo.outputs' -p43 +p44 g22 sS'intype' -p44 -g30 -sS'x.graphics.out_implicit' p45 +g33 +sS'x.graphics.out_implicit' +p46 g22 sS'in1' -p46 -g30 -sS'model.rpar' p47 +g33 +sS'model.rpar' +p48 g22 sS'lhs_txt' -p48 +p49 g2 sS'outtype' -p49 +p50 g22 sS'model.in' -p50 +p51 g4 sS'graphics' -p51 +p52 g6 sS'intypex' -p52 +p53 g4 sS'lab_1' -p53 +p54 g14 sS'lab_2' -p54 -NsS'paramv[$+1-1]' p55 +NsS'paramv[$+1-1]' +p56 g2 sS'ok' -p56 -S'boolean' p57 -sS'model.blocktype' +S'boolean' p58 +sS'model.blocktype' +p59 g2 sS'exprs.param' -p59 +p60 g4 sS'model.sim[1-1]' -p60 -NsS'mo' p61 +NsS'mo' +p62 g6 sS'x.graphics' -p62 +p63 g6 sS'pprop[$+1-1]' -p63 +p64 g4 sS'model.dep_ut' -p64 -S'vector_boolean' p65 -sS'exprs.funtxt' +S'vector_boolean' p66 +sS'exprs.funtxt' +p67 g2 sS'exprs' -p67 +p68 g4 sS'lab_2[$+1-1]' -p68 +p69 g2 sS'r' -p69 -g57 -sS'lab_txt' p70 +g58 +sS'lab_txt' +p71 g2 sS'y' -p71 +p72 g30 sS'x' -p72 -NsS'model' p73 +NsS'model' +p74 g6 sS'exprs.paramv' -p74 +p75 g14 s.
\ No newline at end of file diff --git a/js/Misc/RELATIONALOP.js b/js/Misc/RELATIONALOP.js index ae05feb5..b4874f59 100644 --- a/js/Misc/RELATIONALOP.js +++ b/js/Misc/RELATIONALOP.js @@ -92,7 +92,7 @@ function RELATIONALOP() { var label = "≥"; } this.graphics.exprs = new ScilabDouble(this.exprs); - this.graphics.style = new ScilabDouble(["fontSize=13;fontStyle=1;displayedLabel="+label]); + this.graphics.style = new ScilabString(["fontSize=13;fontStyle=1;displayedLabel="+label]); this.model.ipar = new ScilabDouble([this.rule]); this.model.nzcross = new ScilabDouble([this.zcr]); this.model.nmode = new ScilabDouble([this.zcr]); diff --git a/js/Misc/RELATIONALOP.pickle b/js/Misc/RELATIONALOP.pickle index 502f8553..17357af5 100644 --- a/js/Misc/RELATIONALOP.pickle +++ b/js/Misc/RELATIONALOP.pickle @@ -51,69 +51,70 @@ S'vector' p13 sS'graphics.style' p14 -g13 -sS'x.graphics' +S'vector_string' p15 +sS'x.graphics' +p16 g2 sS'typ' -p16 +p17 g13 sS'label' -p17 +p18 g5 sS'model.sim' -p18 -S'list' p19 -sS'model.nmode' +S'list' p20 +sS'model.nmode' +p21 g10 sS'in1' -p21 -S'matrix' p22 -sS'model.in' +S'matrix' p23 -g22 -sS'graphics.exprs' +sS'model.in' p24 -g22 -sS'x.graphics.style' +g23 +sS'graphics.exprs' p25 -g13 -sS'model.ipar' +g23 +sS'x.graphics.style' p26 +g15 +sS'model.ipar' +p27 g13 sS'model.nzcross' -p27 +p28 g10 sS'ok' -p28 -S'boolean' p29 -sS'model.blocktype' +S'boolean' p30 +sS'model.blocktype' +p31 g5 sS'rule' -p31 +p32 g10 sS'exprs' -p32 -g22 -sS'gr_i' p33 +g23 +sS'gr_i' +p34 g13 sS'ipar' -p34 +p35 g13 sS'y' -p35 +p36 g13 sS'x' -p36 -NsS'model' p37 +NsS'model' +p38 g2 sS'ot' -p38 +p39 Ns.
\ No newline at end of file diff --git a/js/NonLinear/ABS_VALUE.pickle b/js/NonLinear/ABS_VALUE.pickle index ee9bd886..9f75b5bc 100644 --- a/js/NonLinear/ABS_VALUE.pickle +++ b/js/NonLinear/ABS_VALUE.pickle @@ -50,31 +50,32 @@ p14 g4 sS'exprs' p15 -S'vector' +S'vector_string' p16 sS'x.model' p17 NsS'gr_i' p18 -g16 -sS'model.in' +S'vector' p19 +sS'model.in' +p20 g4 sS'graphics' -p20 +p21 g8 sS'y' -p21 -g16 -sS'x' p22 -NsS'model' +g19 +sS'x' p23 +NsS'model' +p24 g8 sS'typ' -p24 -g16 -sS'nu' p25 +g19 +sS'nu' +p26 g4 s.
\ No newline at end of file diff --git a/js/NonLinear/EXPBLK_f.pickle b/js/NonLinear/EXPBLK_f.pickle index 1c9e152a..91a61c0e 100644 --- a/js/NonLinear/EXPBLK_f.pickle +++ b/js/NonLinear/EXPBLK_f.pickle @@ -49,32 +49,33 @@ p12 g2 sS'exprs' p13 -S'vector' +S'vector_string' p14 sS'x.model' p15 NsS'gr_i' p16 -g14 -sS'model.dep_ut' +S'vector' p17 -S'vector_boolean' +sS'model.dep_ut' p18 -sS'model.in' +S'vector_boolean' p19 +sS'model.in' +p20 g2 sS'graphics' -p20 +p21 g8 sS'y' -p21 -g14 -sS'x' p22 -NsS'model' +g17 +sS'x' p23 +NsS'model' +p24 g8 sS'typ' -p24 -g14 +p25 +g17 s.
\ No newline at end of file diff --git a/js/NonLinear/EXPBLK_m.pickle b/js/NonLinear/EXPBLK_m.pickle index 2294f50d..bfef4ca4 100644 --- a/js/NonLinear/EXPBLK_m.pickle +++ b/js/NonLinear/EXPBLK_m.pickle @@ -78,16 +78,17 @@ S'vector_boolean' p24 sS'exprs' p25 -g16 -sS'gr_i' +S'vector_string' p26 +sS'gr_i' +p27 g16 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/NonLinear/LOOKUP_c.pickle b/js/NonLinear/LOOKUP_c.pickle index 3f78747d..0adf7fa7 100644 --- a/js/NonLinear/LOOKUP_c.pickle +++ b/js/NonLinear/LOOKUP_c.pickle @@ -198,680 +198,681 @@ S'object' p19 sS'a.title.text' p20 -g2 -sS'xmn' +S'vector_string' p21 +sS'xmn' +p22 g7 sS'x1' -p22 +p23 g4 sS'lx21' -p23 +p24 g7 sS'xstC' -p24 +p25 g4 sS'ymx' -p25 +p26 g7 sS'Zt' -p26 -S'matrix' p27 -sS'Bt' +S'matrix' p28 -g27 -sS'a.title.font_size' +sS'Bt' p29 +g28 +sS'a.title.font_size' +p30 g7 sS'xmx' -p30 +p31 g7 sS'x1p' -p31 +p32 g7 sS'random_n_exprs' -p32 -S'list' p33 -sS'a.axes_visible' +S'list' p34 +sS'a.axes_visible' +p35 g4 sS'METHOD' -p35 +p36 g7 sS'PeriodicOption' -p36 +p37 g4 sS'ymn' -p37 +p38 g7 sS'NOrder' -p38 +p39 g7 sS'var4' -p39 +p40 g2 sS'xa' -p40 +p41 g7 sS'yo' -p41 +p42 g7 sS'y22' -p42 +p43 g4 sS'ya' -p43 +p44 g7 sS'YMX' -p44 +p45 g7 sS'yc' -p45 +p46 g7 sS'a.title.foreground' -p46 +p47 g7 sS'model.rpar' -p47 -g27 -sS'yy' p48 -g27 -sS'sok' +g28 +sS'yy' p49 +g28 +sS'sok' +p50 g11 sS'Pulse_exprs' -p50 -NsS'dx' p51 +NsS'dx' +p52 g7 sS'dy' -p52 +p53 g7 sS'random_n_exprs2' -p53 -g33 -sS'a.clip_state' p54 +g34 +sS'a.clip_state' +p55 g4 sS'yt' -p55 +p56 g7 sS'model.blocktype' -p56 +p57 g4 sS'save_curwin' -p57 -NsS'oipar' p58 -NsS'MENU' +NsS'oipar' p59 -g2 -sS't4' +NsS'MENU' p60 +g21 +sS't4' +p61 g4 sS't5' -p61 +p62 g4 sS't2' -p62 +p63 g4 sS'x.model' -p63 -NsS'model.dep_ut' p64 -S'vector_boolean' +NsS'model.dep_ut' p65 -sS'menu_s' +S'vector_boolean' p66 +sS'menu_s' +p67 g2 sS'Sawt1_exprs' -p67 -NsS'sample4' p68 +NsS'sample4' +p69 g2 sS'sTp2' -p69 +p70 g2 sS'x' -p70 +p71 g7 sS'x12' -p71 +p72 g4 sS'exprs[1-1]' -p72 +p73 g4 sS'points.data' -p73 +p74 g2 sS'j' -p74 +p75 g4 sS'x11' -p75 +p76 g4 sS'arg1' -p76 +p77 g19 sS'Pd3' -p77 +p78 g2 sS't3' -p78 +p79 g4 sS'ey' -p79 +p80 g7 sS'ex' -p80 +p81 g7 sS'xmn1' -p81 +p82 g7 sS'sAmp' -p82 +p83 g2 sS'a.children[2-1]' -p83 +p84 g19 sS'sample5' -p84 +p85 g2 sS'a.title.font_style' -p85 +p86 g7 sS'y2' -p86 +p87 g4 sS'orpar' -p87 +p88 g2 sS'x.graphics' -p88 +p89 g19 sS'menu_d' -p89 -g2 -sS'menu_e' p90 -g2 -sS'A[j+1-1][i+N-1]' +g21 +sS'menu_e' p91 +g21 +sS'A[j+1-1][i+N-1]' +p92 g7 sS'a.children[1-1]' -p92 +p93 g19 sS'y1p' -p93 +p94 g7 sS'r' -p94 +p95 g4 sS'seed4' -p95 +p96 g2 sS'seed5' -p96 +p97 g2 sS'B[j+1-1]' -p97 +p98 g7 sS'model.evtin' -p98 +p99 g2 sS'y21' -p99 +p100 g4 sS'menu_t' -p100 -g2 -sS'menu_r' p101 +g21 +sS'menu_r' +p102 g2 sS'PO' -p102 +p103 g7 sS'x22' -p103 +p104 g4 sS'C' -p104 +p105 g2 sS'DChange' -p105 +p106 g11 sS'Cformat' -p106 +p107 g4 sS'Q[i+N-1][i-1]' -p107 +p108 g7 sS'rep' -p108 +p109 g7 sS'model.out2' -p109 +p110 g7 sS'xy[N-1][2-1]' -p110 +p111 g7 sS'sTp' -p111 +p112 g2 sS'wp' -p112 +p113 g2 sS'New_methhod' -p113 +p114 g7 sS'PeridicOption' -p114 +p115 g7 sS'Graf' -p115 +p116 g4 sS'Q' -p116 +p117 g7 sS'ok' -p117 +p118 g11 sS'ly11' -p118 +p119 g7 sS'xy[k-1].slice()' -p119 +p120 g2 sS'Z' -p120 +p121 g2 sS'Cmenu' -p121 +p122 g4 sS'periodicoption' -p122 +p123 g7 sS'w' -p123 +p124 g4 sS'random_u_exprs2' -p124 -g33 -sS'model.outtyp' p125 +g34 +sS'model.outtyp' +p126 g7 sS'A[j+1-1][i+2*N-1]' -p126 +p127 g7 sS'YMN' -p127 +p128 g7 sS'Q[i-1][i+N-1]' -p128 +p129 g7 sS'y11' -p129 +p130 g4 sS'x2p' -p130 +p131 g7 sS'y12' -p131 +p132 g4 sS'NC' -p132 +p133 g7 sS'xyt' -p133 +p134 g2 sS'xo' -p134 -g27 -sS'ipar[2-1]' p135 +g28 +sS'ipar[2-1]' +p136 g7 sS'xc' -p136 +p137 g7 sS'extrapo' -p137 +p138 g7 sS'offset' -p138 +p139 g2 sS'splines.data' -p139 +p140 g2 sS'perop' -p140 +p141 g4 sS'xe' -p141 +p142 g7 sS'Y' -p142 -g27 -sS'xx' p143 -g27 -sS'xy' +g28 +sS'xx' p144 +g28 +sS'xy' +p145 g2 sS'btn' -p145 +p146 g7 sS'xye' -p146 +p147 g2 sS'SaveExit' -p147 +p148 g11 sS'xp' -p148 +p149 g7 sS'Method' -p149 +p150 g7 sS'xt' -p150 -g27 -sS'xyo' p151 +g28 +sS'xyo' +p152 g2 sS'Q[i-1][i-1]' -p152 +p153 g7 sS'ystR' -p153 +p154 g7 sS'A[j-1][i+2*N-1]' -p154 +p155 g7 sS'ipar[4-1]' -p155 +p156 g7 sS'px' -p156 +p157 g7 sS'py' -p157 +p158 g7 sS'splines' -p158 -NsS'tok' p159 +NsS'tok' +p160 g11 sS'ixy' -p160 +p161 g2 sS'rect' -p161 -g27 -sS'NP' p162 +g28 +sS'NP' +p163 g7 sS'Amp' -p163 +p164 g2 sS'exprs[2-1]' -p164 +p165 g7 sS'model.firing' -p165 +p166 g7 sS'xy2' -p166 +p167 g2 sS'B' -p167 +p168 g7 sS'A' -p168 +p169 g7 sS'yenC' -p169 +p170 g4 sS'N' -p170 +p171 g7 sS'random_u_exprs' -p171 -g33 -sS'Sawt2_exprs' p172 -NsS'XMX' +g34 +sS'Sawt2_exprs' p173 +NsS'XMX' +p174 g7 sS'a.x_ticks' -p174 +p175 g19 sS'model.in' -p175 +p176 g7 sS'graphics' -p176 +p177 g19 sS'Exitm' -p177 +p178 g4 sS'N2' -p178 +p179 g7 sS'model.ipar' -p179 -g27 -sS'Pw3' p180 +g28 +sS'Pw3' +p181 g2 sS'f' -p181 +p182 g7 sS'a.grid' -p182 +p183 g2 sS'y[N-1]' -p183 +p184 g7 sS'gr_i' -p184 +p185 g2 sS'ipar' -p185 +p186 g2 sS'ystC' -p186 +p187 g4 sS'mtd' -p187 +p188 g7 sS'PERIODIC' -p188 +p189 g4 sS'xmx1' -p189 +p190 g7 sS'scam' -p190 +p191 g4 sS'exprs[4-1]' -p191 +p192 g4 sS'ans0' -p192 +p193 g4 sS'ymn1' -p193 +p194 g7 sS't1' -p194 +p195 g4 sS'model.evtout' -p195 +p196 g2 sS'rpar' -p196 +p197 g2 sS'lx11' -p197 +p198 g7 sS'np5' -p198 +p199 g2 sS'Bias3' -p199 +p200 g2 sS'Tp3' -p200 +p201 g2 sS'model.out' -p201 +p202 g7 sS'np4' -p202 +p203 g2 sS'rectx' -p203 +p204 g7 sS'np1' -p204 +p205 g7 sS'Lx' -p205 +p206 g7 sS'x21' -p206 +p207 g4 sS'model.in2' -p207 +p208 g7 sS'x[k-1]' -p208 +p209 g2 sS'HIT' -p209 +p210 g11 sS'xstR' -p210 +p211 g7 sS'ymx1' -p211 +p212 g7 sS'A[j+1-1][i-1]' -p212 +p213 g7 sS'sAmp2' -p213 -g2 -sS'TN' p214 g2 -sS'menus' +sS'TN' p215 -g33 -sS'sdelay' +g21 +sS'menus' p216 +g34 +sS'sdelay' +p217 g2 sS'points' -p217 -NsS'Q[i+N-1][i+N-1]' p218 +NsS'Q[i+N-1][i+N-1]' +p219 g7 sS'TA' -p219 -g27 -sS'Datam' p220 +g28 +sS'Datam' +p221 g4 sS'model.sim' -p221 -g33 -sS'XMN' p222 +g34 +sS'XMN' +p223 g7 sS'A[j+2-1][i+N+1-1]' -p223 +p224 g7 sS'a.data_bounds' -p224 +p225 g7 sS'menu_o' -p225 -g2 -sS'd' p226 +g21 +sS'd' +p227 g7 sS'ye' -p227 +p228 g7 sS'X' -p228 -g27 -sS'y2p' p229 +g28 +sS'y2p' +p230 g7 sS'fd' -p230 +p231 g7 sS'exprs[5-1]' -p231 +p232 g4 sS'graphics.exprs' -p232 -NsS'phase' p233 +NsS'phase' +p234 g7 sS'typ' -p234 +p235 g2 sS'min5' -p235 +p236 g2 sS'a' -p236 +p237 g19 sS'mok' -p237 +p238 g11 sS'Orderm' -p238 +p239 g4 sS'A[j+2-1][i+N-1]' -p239 +p240 g7 sS'B[j-1]' -p240 +p241 g7 sS'ly21' -p241 +p242 g7 sS'A[j+2-1][i-1]' -p242 +p243 g7 sS'max5' -p243 +p244 g2 sS'exprs' -p244 -g27 -sS'exprs[3-1]' p245 +g28 +sS'exprs[3-1]' +p246 g7 sS'y[k-1]' -p246 +p247 g2 sS'At' -p247 -g27 -sS'y' p248 +g28 +sS'y' +p249 g7 sS'model' -p249 +p250 g19 sS'order' -p250 +p251 g7 s.
\ No newline at end of file diff --git a/js/NonLinear/MAXMIN.pickle b/js/NonLinear/MAXMIN.pickle index faeff50d..f4dca3c1 100644 --- a/js/NonLinear/MAXMIN.pickle +++ b/js/NonLinear/MAXMIN.pickle @@ -88,16 +88,17 @@ S'vector_boolean' p27 sS'exprs' p28 -g12 -sS'gr_i' +S'vector_string' p29 +sS'gr_i' +p30 g12 sS'y' -p30 +p31 g12 sS'x' -p31 -NsS'model' p32 +NsS'model' +p33 g2 s.
\ No newline at end of file diff --git a/js/NonLinear/SIGNUM.pickle b/js/NonLinear/SIGNUM.pickle index ee9bd886..9f75b5bc 100644 --- a/js/NonLinear/SIGNUM.pickle +++ b/js/NonLinear/SIGNUM.pickle @@ -50,31 +50,32 @@ p14 g4 sS'exprs' p15 -S'vector' +S'vector_string' p16 sS'x.model' p17 NsS'gr_i' p18 -g16 -sS'model.in' +S'vector' p19 +sS'model.in' +p20 g4 sS'graphics' -p20 +p21 g8 sS'y' -p21 -g16 -sS'x' p22 -NsS'model' +g19 +sS'x' p23 +NsS'model' +p24 g8 sS'typ' -p24 -g16 -sS'nu' p25 +g19 +sS'nu' +p26 g4 s.
\ No newline at end of file diff --git a/js/Sinks/BARXY.pickle b/js/Sinks/BARXY.pickle index 501e43da..2af2eb77 100644 --- a/js/Sinks/BARXY.pickle +++ b/js/Sinks/BARXY.pickle @@ -56,61 +56,62 @@ p12 g2 sS'x.graphics.in_implicit' p13 -g5 -sS'model.evtin' +S'vector_string' p14 +sS'model.evtin' +p15 g5 sS'model.sim' -p15 -S'list' p16 -sS'mess' +S'list' p17 -S'matrix' +sS'mess' p18 -sS'x.graphics.out_implicit' +S'matrix' p19 +sS'x.graphics.out_implicit' +p20 g5 sS'model.rpar' -p20 -g18 -sS'model.in' p21 -g18 -sS'graphics.exprs' +g19 +sS'model.in' p22 -NsS'model.ipar' +g19 +sS'graphics.exprs' p23 +NsS'model.ipar' +p24 g8 sS'typ' -p24 +p25 g5 sS'ok' -p25 -S'boolean' p26 -sS'model.blocktype' +S'boolean' p27 -S'string' +sS'model.blocktype' p28 -sS'model.dep_ut' +S'string' p29 -S'vector_boolean' +sS'model.dep_ut' p30 -sS'exprs' +S'vector_boolean' p31 -NsS'x.graphics.exprs' +sS'exprs' p32 -g18 -sS'xmax' +NsS'x.graphics.exprs' p33 +g19 +sS'xmax' +p34 g8 sS'y' -p34 +p35 g5 sS'x' -p35 -NsS'model' p36 +NsS'model' +p37 g2 s.
\ No newline at end of file diff --git a/js/Sinks/OUTIMPL_f.pickle b/js/Sinks/OUTIMPL_f.pickle index 0d1d4a26..387f4e48 100644 --- a/js/Sinks/OUTIMPL_f.pickle +++ b/js/Sinks/OUTIMPL_f.pickle @@ -47,50 +47,51 @@ p12 g5 sS'x.graphics.in_implicit' p13 -g10 -sS'model.sim' +S'vector_string' p14 +sS'model.sim' +p15 g5 sS'model.equations' -p15 +p16 g7 sS'model.in' -p16 +p17 g10 sS'graphics.exprs' -p17 +p18 g7 sS'model.ipar' -p18 +p19 g10 sS'typ' -p19 +p20 g10 sS'needcompile' -p20 +p21 g7 sS'model.blocktype' -p21 +p22 g5 sS'mo' -p22 +p23 g7 sS'model.dep_ut' -p23 -S'vector_boolean' p24 -sS'exprs' +S'vector_boolean' p25 +sS'exprs' +p26 g5 sS'gr_i' -p26 +p27 g10 sS'y' -p27 +p28 g7 sS'x' -p28 -NsS'model' p29 +NsS'model' +p30 g2 s.
\ No newline at end of file diff --git a/js/Sinks/WRITEAU_f.pickle b/js/Sinks/WRITEAU_f.pickle index 1cbfc95a..f42ff3ef 100644 --- a/js/Sinks/WRITEAU_f.pickle +++ b/js/Sinks/WRITEAU_f.pickle @@ -104,19 +104,20 @@ p32 g15 sS'exprs' p33 -g27 -sS'gr_i' +S'vector_string' p34 +sS'gr_i' +p35 g27 sS'ipar' -p35 +p36 g2 sS'y' -p36 +p37 g27 sS'x' -p37 -NsS'model' p38 +NsS'model' +p39 g4 s.
\ No newline at end of file diff --git a/js/Sinks/WRITEC_f.pickle b/js/Sinks/WRITEC_f.pickle index e98aa87f..c4a21594 100644 --- a/js/Sinks/WRITEC_f.pickle +++ b/js/Sinks/WRITEC_f.pickle @@ -81,7 +81,7 @@ p20 g12 sS'fmts' p21 -S'vector' +S'vector_string' p22 sS'in1' p23 @@ -99,35 +99,36 @@ p27 g2 sS'typ' p28 -g22 -sS'ok' +S'vector' p29 -S'boolean' +sS'ok' p30 -sS'model.blocktype' +S'boolean' p31 +sS'model.blocktype' +p32 g15 sS'frmt1' -p32 +p33 g15 sS'fname1' -p33 +p34 g12 sS'exprs' -p34 +p35 g2 sS'gr_i' -p35 -g22 -sS'ipar' p36 +g29 +sS'ipar' +p37 g2 sS'y' -p37 -g22 -sS'x' p38 -NsS'model' +g29 +sS'x' p39 +NsS'model' +p40 g4 s.
\ No newline at end of file diff --git a/js/Sources/CURVE_c.pickle b/js/Sources/CURVE_c.pickle index 73b01a8e..81ff6fbd 100644 --- a/js/Sources/CURVE_c.pickle +++ b/js/Sources/CURVE_c.pickle @@ -195,691 +195,692 @@ p17 g7 sS'a.title.text' p18 -g2 -sS'xmn' +S'vector_string' p19 +sS'xmn' +p20 g7 sS'x1' -p20 +p21 g4 sS'ye[zz-1]' -p21 +p22 g2 sS'lx21' -p22 +p23 g7 sS'xstC' -p23 +p24 g4 sS'ymx' -p24 +p25 g7 sS'Bt' -p25 -S'matrix' p26 -sS'a.title.font_size' +S'matrix' p27 +sS'a.title.font_size' +p28 g7 sS'xmx' -p28 +p29 g7 sS'x1p' -p29 +p30 g7 sS'random_n_exprs' -p30 -S'list' p31 -sS'a.axes_visible' +S'list' p32 +sS'a.axes_visible' +p33 g4 sS'METHOD' -p33 +p34 g7 sS'PeriodicOption' -p34 +p35 g4 sS'ymn' -p35 +p36 g7 sS'NOrder' -p36 +p37 g7 sS'var4' -p37 +p38 g2 sS'xa' -p38 +p39 g7 sS'yo' -p39 +p40 g7 sS'y22' -p40 +p41 g4 sS'ya' -p41 +p42 g7 sS'YMX' -p42 +p43 g7 sS'yc' -p43 +p44 g7 sS'a.title.foreground' -p44 +p45 g7 sS'model.rpar' -p45 -g26 -sS'yy' p46 +g27 +sS'yy' +p47 g2 sS'x[zz-1]' -p47 +p48 g2 sS'Pulse_exprs' -p48 -NsS'dx' p49 +NsS'dx' +p50 g7 sS'dy' -p50 +p51 g7 sS'random_n_exprs2' -p51 -g31 -sS'a.clip_state' p52 +g32 +sS'a.clip_state' +p53 g4 sS'yt' -p53 +p54 g7 sS'model.blocktype' -p54 +p55 g4 sS'splines' -p55 -NsS'oipar' p56 -NsS'MENU' +NsS'oipar' p57 -g2 -sS't4' +NsS'MENU' p58 +g19 +sS't4' +p59 g4 sS't5' -p59 +p60 g4 sS't2' -p60 +p61 g4 sS'x.model' -p61 -NsS'model.dep_ut' p62 -S'vector_boolean' +NsS'model.dep_ut' p63 -sS'menu_s' +S'vector_boolean' p64 +sS'menu_s' +p65 g2 sS'sample5' -p65 +p66 g2 sS'sample4' -p66 +p67 g2 sS'sTp2' -p67 +p68 g2 sS'x' -p68 +p69 g7 sS'x12' -p69 +p70 g4 sS'exprs[1-1]' -p70 +p71 g4 sS'points.data' -p71 +p72 g2 sS'j' -p72 +p73 g4 sS'x11' -p73 +p74 g4 sS'arg1' -p74 -S'object' p75 -sS'Pd3' +S'object' p76 +sS'Pd3' +p77 g2 sS't3' -p77 +p78 g4 sS'ey' -p78 +p79 g7 sS'ex' -p79 +p80 g7 sS'zz' -p80 +p81 g7 sS'sAmp' -p81 +p82 g2 sS'a.children[2-1]' -p82 -g75 -sS'Sawt1_exprs' p83 -NsS'a.title.font_style' +g76 +sS'Sawt1_exprs' p84 +NsS'a.title.font_style' +p85 g7 sS'y2' -p85 +p86 g4 sS'orpar' -p86 +p87 g2 sS'x.graphics' -p87 -g75 -sS'menu_d' p88 -g2 -sS'menu_e' +g76 +sS'menu_d' p89 -g2 -sS'ye[$+1-1]' +g19 +sS'menu_e' p90 +g19 +sS'ye[$+1-1]' +p91 g7 sS'A[j+1-1][i+N-1]' -p91 +p92 g7 sS'a.children[1-1]' -p92 -g75 -sS'y1p' p93 +g76 +sS'y1p' +p94 g7 sS'r' -p94 +p95 g4 sS'seed4' -p95 +p96 g2 sS'seed5' -p96 +p97 g2 sS'B[j+1-1]' -p97 +p98 g7 sS'model.evtin' -p98 +p99 g7 sS'y21' -p99 +p100 g4 sS'menu_t' -p100 -g2 -sS'menu_r' p101 +g19 +sS'menu_r' +p102 g2 sS'PO' -p102 +p103 g7 sS'x22' -p103 +p104 g4 sS'C' -p104 +p105 g2 sS'DChange' -p105 +p106 g11 sS'Cformat' -p106 +p107 g4 sS'Q[i+N-1][i-1]' -p107 +p108 g7 sS'rep' -p108 +p109 g7 sS'ymx1' -p109 +p110 g7 sS'xy[N-1][2-1]' -p110 +p111 g7 sS'ipar[3-1]' -p111 +p112 g7 sS'sTp' -p112 +p113 g2 sS'wp' -p113 +p114 g2 sS'New_methhod' -p114 +p115 g7 sS'PeridicOption' -p115 +p116 g7 sS'Graf' -p116 +p117 g4 sS'Q' -p117 +p118 g7 sS'ok' -p118 +p119 g11 sS'ly11' -p119 +p120 g7 sS'xy[k-1].slice()' -p120 +p121 g2 sS'Z' -p121 +p122 g2 sS'Cmenu' -p122 +p123 g4 sS'periodicoption' -p123 +p124 g7 sS'w' -p124 +p125 g4 sS'a.x_ticks' -p125 -g75 -sS'y2p' p126 +g76 +sS'y2p' +p127 g7 sS'A[j+1-1][i+2*N-1]' -p127 +p128 g7 sS'YMN' -p128 +p129 g7 sS'Q[i-1][i+N-1]' -p129 +p130 g7 sS'y11' -p130 +p131 g4 sS'x2p' -p131 +p132 g7 sS'y12' -p132 +p133 g4 sS'NC' -p133 +p134 g7 sS'xyt' -p134 +p135 g2 sS'xo' -p135 -g26 -sS'ipar[2-1]' p136 +g27 +sS'ipar[2-1]' +p137 g7 sS'xc' -p137 +p138 g7 sS'sok' -p138 +p139 g11 sS'offset' -p139 +p140 g2 sS'splines.data' -p140 +p141 g2 sS'perop' -p141 +p142 g4 sS'xe' -p142 +p143 g7 sS'Y' -p143 +p144 g7 sS'xx' -p144 +p145 g2 sS'xy' -p145 +p146 g2 sS'btn' -p146 +p147 g7 sS'xye' -p147 +p148 g2 sS'xe[$+1-1]' -p148 +p149 g7 sS'SaveExit' -p149 +p150 g11 sS'xp' -p150 +p151 g7 sS'Method' -p151 +p152 g7 sS'xt' -p152 -g26 -sS'xyo' p153 +g27 +sS'xyo' +p154 g2 sS'Q[i-1][i-1]' -p154 +p155 g7 sS'ystR' -p155 +p156 g7 sS'A[j-1][i+2*N-1]' -p156 +p157 g7 sS'random_u_exprs2' -p157 -g31 -sS'px' p158 +g32 +sS'px' +p159 g7 sS'py' -p159 +p160 g7 sS'tok' -p160 +p161 g11 sS'ixy' -p161 +p162 g2 sS'rect' -p162 -g26 -sS'NP' p163 +g27 +sS'NP' +p164 g7 sS'Amp' -p164 +p165 g2 sS'exprs[2-1]' -p165 +p166 g7 sS'model.firing' -p166 +p167 g7 sS'xy2' -p167 +p168 g2 sS'B' -p168 +p169 g7 sS'A' -p169 +p170 g7 sS'yenC' -p170 +p171 g4 sS'N' -p171 +p172 g7 sS'random_u_exprs' -p172 -g31 -sS'Sawt2_exprs' p173 -NsS'XMX' +g32 +sS'Sawt2_exprs' p174 +NsS'XMX' +p175 g7 sS'model.in' -p175 +p176 g2 sS'graphics' -p176 -g75 -sS'Exitm' p177 +g76 +sS'Exitm' +p178 g4 sS'N2' -p178 +p179 g7 sS'model.ipar' -p179 -g26 -sS'Pw3' p180 +g27 +sS'Pw3' +p181 g2 sS'f' -p181 +p182 g7 sS'a.grid' -p182 +p183 g2 sS'y[N-1]' -p183 +p184 g7 sS'xy[zz-1].slice()' -p184 +p185 g2 sS'gr_i' -p185 +p186 g2 sS'ipar' -p186 +p187 g2 sS'ystC' -p187 +p188 g4 sS'mtd' -p188 +p189 g7 sS'PERIODIC' -p189 +p190 g4 sS'xmx1' -p190 +p191 g7 sS'scam' -p191 +p192 g4 sS'exprs[4-1]' -p192 +p193 g4 sS'ans0' -p193 +p194 g4 sS'ymn1' -p194 +p195 g7 sS't1' -p195 +p196 g4 sS'model.evtout' -p196 +p197 g7 sS'rpar' -p197 +p198 g2 sS'lx11' -p198 +p199 g7 sS'model.out' -p199 +p200 g7 sS'Bias3' -p200 +p201 g2 sS'Tp3' -p201 +p202 g2 sS'np5' -p202 +p203 g2 sS'np4' -p203 +p204 g2 sS'rectx' -p204 +p205 g7 sS'np1' -p205 +p206 g7 sS'Lx' -p206 +p207 g7 sS'x21' -p207 +p208 g4 sS'x[k-1]' -p208 +p209 g2 sS'HIT' -p209 +p210 g11 sS'xstR' -p210 +p211 g7 sS'xe[zz-1]' -p211 +p212 g2 sS'A[j+1-1][i-1]' -p212 +p213 g7 sS'sAmp2' -p213 -g2 -sS'TN' p214 g2 -sS'menus' +sS'TN' p215 -g31 -sS'sdelay' +g19 +sS'menus' p216 +g32 +sS'sdelay' +p217 g2 sS'points' -p217 -NsS'Q[i+N-1][i+N-1]' p218 +NsS'Q[i+N-1][i+N-1]' +p219 g7 sS'TA' -p219 -g26 -sS'Datam' p220 +g27 +sS'Datam' +p221 g4 sS'model.sim' -p221 -g31 -sS'XMN' p222 +g32 +sS'XMN' +p223 g7 sS'A[j+2-1][i+N+1-1]' -p223 +p224 g7 sS'a.data_bounds' -p224 +p225 g7 sS'menu_o' -p225 -g2 -sS'd' p226 +g19 +sS'd' +p227 g7 sS'ye' -p227 +p228 g7 sS'X' -p228 -g26 -sS'Zt' p229 -g26 -sS'fd' +g27 +sS'Zt' p230 +g27 +sS'fd' +p231 g7 sS'exprs[5-1]' -p231 +p232 g4 sS'graphics.exprs' -p232 -NsS'phase' p233 +NsS'phase' +p234 g7 sS'ZERO_POINT' -p234 +p235 g11 sS'typ' -p235 +p236 g2 sS'min5' -p236 +p237 g2 sS'a' -p237 -g75 -sS'mok' p238 +g76 +sS'mok' +p239 g11 sS'Orderm' -p239 +p240 g4 sS'A[j+2-1][i+N-1]' -p240 +p241 g7 sS'B[j-1]' -p241 +p242 g7 sS'ly21' -p242 +p243 g7 sS'y[zz-1]' -p243 +p244 g2 sS'A[j+2-1][i-1]' -p244 +p245 g7 sS'max5' -p245 +p246 g2 sS'exprs' -p246 -g26 -sS'exprs[3-1]' p247 +g27 +sS'exprs[3-1]' +p248 g7 sS'y[k-1]' -p248 +p249 g2 sS'At' -p249 -g26 -sS'y' p250 +g27 +sS'y' +p251 g7 sS'model' -p251 -g75 -sS'order' p252 +g76 +sS'order' +p253 g7 s.
\ No newline at end of file diff --git a/js/Sources/GEN_SQR.pickle b/js/Sources/GEN_SQR.pickle index 235a1dc3..db3ad103 100644 --- a/js/Sources/GEN_SQR.pickle +++ b/js/Sources/GEN_SQR.pickle @@ -203,25 +203,26 @@ S'vector_boolean' p64 sS'exprs' p65 -g7 -sS'x.graphics.exprs' +S'vector_string' p66 -NsS'PREVAR_scicos_context' +sS'x.graphics.exprs' p67 +NsS'PREVAR_scicos_context' +p68 g4 sS'model.firing' -p68 +p69 g7 sS'y' -p69 +p70 g4 sS'x' -p70 +p71 g9 sS'model' -p71 +p72 g9 sS'model.state' -p72 +p73 g7 s.
\ No newline at end of file diff --git a/js/Sources/INIMPL_f.pickle b/js/Sources/INIMPL_f.pickle index 64edf93d..fbc0cbbd 100644 --- a/js/Sources/INIMPL_f.pickle +++ b/js/Sources/INIMPL_f.pickle @@ -56,41 +56,42 @@ p15 g10 sS'x.graphics.out_implicit' p16 -g10 -sS'graphics.exprs' +S'vector_string' p17 +sS'graphics.exprs' +p18 g7 sS'model.ipar' -p18 +p19 g10 sS'typ' -p19 +p20 g10 sS'needcompile' -p20 +p21 g7 sS'model.blocktype' -p21 +p22 g5 sS'mo' -p22 +p23 g7 sS'model.dep_ut' -p23 -S'vector_boolean' p24 -sS'exprs' +S'vector_boolean' p25 +sS'exprs' +p26 g5 sS'gr_i' -p26 +p27 g10 sS'y' -p27 +p28 g7 sS'x' -p28 -NsS'model' p29 +NsS'model' +p30 g2 s.
\ No newline at end of file diff --git a/js/Sources/PULSE_SC.pickle b/js/Sources/PULSE_SC.pickle index db951a70..49a18971 100644 --- a/js/Sources/PULSE_SC.pickle +++ b/js/Sources/PULSE_SC.pickle @@ -188,25 +188,26 @@ S'vector_boolean' p59 sS'exprs' p60 -g7 -sS'x.graphics.exprs' +S'vector_string' p61 -NsS'PREVAR_scicos_context' +sS'x.graphics.exprs' p62 +NsS'PREVAR_scicos_context' +p63 g4 sS'model.firing' -p63 +p64 g7 sS'y' -p64 +p65 g4 sS'x' -p65 +p66 g10 sS'model' -p66 +p67 g10 sS'model.state' -p67 +p68 g7 s.
\ No newline at end of file diff --git a/js/Sources/RAMP.pickle b/js/Sources/RAMP.pickle index 2b7c7b79..3034ab2d 100644 --- a/js/Sources/RAMP.pickle +++ b/js/Sources/RAMP.pickle @@ -82,16 +82,17 @@ p25 g2 sS'exprs' p26 -g17 -sS'gr_i' +S'vector_string' p27 +sS'gr_i' +p28 g17 sS'y' -p28 +p29 g17 sS'x' -p29 -NsS'model' p30 +NsS'model' +p31 g4 s.
\ No newline at end of file diff --git a/js/Sources/READC_f.pickle b/js/Sources/READC_f.pickle index dfdb10b1..a089a11f 100644 --- a/js/Sources/READC_f.pickle +++ b/js/Sources/READC_f.pickle @@ -112,56 +112,57 @@ p30 g2 sS'fmts' p31 -g10 -sS'N' +S'vector_string' p32 +sS'N' +p33 g2 sS'graphics' -p33 +p34 g6 sS'model.ipar' -p34 +p35 g4 sS'typ' -p35 +p36 g10 sS'imask' -p36 +p37 g2 sS'model.blocktype' -p37 +p38 g22 sS'outmask' -p38 +p39 g2 sS'frmt1' -p39 +p40 g22 sS'fname1' -p40 +p41 g2 sS'exprs' -p41 +p42 g4 sS'gr_i' -p42 +p43 g10 sS'ievt' -p43 +p44 g2 sS'ipar' -p44 +p45 g4 sS'y' -p45 +p46 g10 sS'x' -p46 +p47 g6 sS'model' -p47 +p48 g6 sS'nout' -p48 +p49 g2 s.
\ No newline at end of file diff --git a/js/Sources/STEP_FUNCTION.js b/js/Sources/STEP_FUNCTION.js index 7bbe4b80..10024cd5 100644 --- a/js/Sources/STEP_FUNCTION.js +++ b/js/Sources/STEP_FUNCTION.js @@ -22,7 +22,7 @@ function STEP_FUNCTION() { this.model = blk.model; this.graphics.orig = new ScilabDouble([80,10]); this.graphics.sz = new ScilabDouble([20,20]); - this.graphics.exprs = new ScilabDouble(["1"]); + this.graphics.exprs = new ScilabString(["1"]); this.model.ipar = new ScilabDouble([1]); this.graphics.pin = new ScilabDouble([3]); blk.graphics = this.graphics; diff --git a/js/Sources/STEP_FUNCTION.pickle b/js/Sources/STEP_FUNCTION.pickle index e32b8734..af8149d5 100644 --- a/js/Sources/STEP_FUNCTION.pickle +++ b/js/Sources/STEP_FUNCTION.pickle @@ -38,137 +38,138 @@ S'object' p9 sS'graphics.exprs' p10 -g2 -sS'scs_m_1.objs[3-1]' +S'vector_string' p11 +sS'scs_m_1.objs[3-1]' +p12 g4 sS'xx' -p12 +p13 g9 sS'spath[$+1-1]' -p13 +p14 g4 sS'model.out' -p14 +p15 g4 sS'eq' -p15 +p16 g9 sS'graphics.orig' -p16 +p17 g2 sS'model.ipar' -p17 +p18 g4 sS'blk' -p18 +p19 g9 sS'newpar[size(newpar)+1-1]' -p19 -NsS'scs_m_1' p20 +NsS'scs_m_1' +p21 g9 sS'eqn' -p21 +p22 g9 sS'np' -p22 +p23 g4 sS'blk.model' -p23 -NsS'graphics.pein' p24 +NsS'graphics.pein' +p25 g4 sS'lnk.from' -p25 +p26 g2 sS'scs_m_1.objs[2-1]' -p26 +p27 g9 sS'model.sim' -p27 -S'string' p28 -sS'spath' +S'string' p29 +sS'spath' +p30 g7 sS'newpar' -p30 +p31 g7 sS'lnk.yy' -p31 +p32 g2 sS'model.out2' -p32 +p33 g4 sS'graphics.pout' -p33 +p34 g4 sS'model.rpar' -p34 +p35 g9 sS'model_n' -p35 +p36 g9 sS'arg1[spath-1]' -p36 +p37 g9 sS'scs_m_1.objs[4-1]' -p37 +p38 g4 sS'graphics.pin' -p38 +p39 g4 sS'graphics' -p39 -NsS'model.outtyp' p40 +NsS'model.outtyp' +p41 g4 sS'graphics.sz' -p41 +p42 g2 sS'typ' -p42 +p43 g7 sS'xxn' -p43 +p44 g9 sS'lnk.xx' -p44 +p45 g2 sS'needcompile' -p45 +p46 g4 sS'arg1.model' -p46 +p47 g9 sS'scs_m_1.objs[1-1]' -p47 +p48 g9 sS'modified' -p48 +p49 g4 sS'o' -p49 +p50 g9 sS'gr_i' -p50 +p51 g2 sS'blk.graphics' -p51 -NsS'y' p52 +NsS'y' +p53 g4 sS'x' -p53 +p54 g9 sS'model' -p54 +p55 g9 sS'lnk.to' -p55 +p56 g2 sS'arg1.model.rpar' -p56 +p57 g9 s.
\ No newline at end of file |