diff options
author | Sunil Shetye | 2018-07-15 00:26:52 +0530 |
---|---|---|
committer | Sunil Shetye | 2018-07-15 07:11:58 +0530 |
commit | 92f8a251bbaeddf6ec034722a3079d865517d650 (patch) | |
tree | fb1b9f51c3456c04c02ac3ab144b65bdd392e98b /js/NonLinear | |
parent | c394c9628cd411c95def024d47f10d953e160ec5 (diff) | |
download | sci2js-92f8a251bbaeddf6ec034722a3079d865517d650.tar.gz sci2js-92f8a251bbaeddf6ec034722a3079d865517d650.tar.bz2 sci2js-92f8a251bbaeddf6ec034722a3079d865517d650.zip |
handle boolean differently
Diffstat (limited to 'js/NonLinear')
56 files changed, 483 insertions, 455 deletions
diff --git a/js/NonLinear/ABSBLK_f.js b/js/NonLinear/ABSBLK_f.js index 5425305b..39e5984c 100644 --- a/js/NonLinear/ABSBLK_f.js +++ b/js/NonLinear/ABSBLK_f.js @@ -6,7 +6,7 @@ function ABSBLK_f() { this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ABSBLK_f\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i); return new BasicBlock(this.x); diff --git a/js/NonLinear/ABSBLK_f.pickle b/js/NonLinear/ABSBLK_f.pickle index 71de1bca..096b22c4 100644 --- a/js/NonLinear/ABSBLK_f.pickle +++ b/js/NonLinear/ABSBLK_f.pickle @@ -25,7 +25,7 @@ S'string' p4 sS'model.dep_ut' p5 -S'vector' +S'vector_boolean' p6 sS'model.out' p7 @@ -33,20 +33,21 @@ S'double' p8 sS'gr_i' p9 -g6 -sS'model.in' +S'vector' p10 +sS'model.in' +p11 g8 sS'y' -p11 -g6 -sS'x' p12 -NsS'model' +g10 +sS'x' p13 -S'object' +NsS'model' p14 -sS'typ' +S'object' p15 -g6 +sS'typ' +p16 +g10 s.
\ No newline at end of file diff --git a/js/NonLinear/ABS_VALUE.js b/js/NonLinear/ABS_VALUE.js index 72816ca7..01c6d20c 100644 --- a/js/NonLinear/ABS_VALUE.js +++ b/js/NonLinear/ABS_VALUE.js @@ -9,7 +9,7 @@ function ABS_VALUE() { this.model.nzcross = new ScilabDouble([nu]); this.model.nmode = new ScilabDouble([nu]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [string([1])]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ABS_VALUE\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); diff --git a/js/NonLinear/ABS_VALUE.pickle b/js/NonLinear/ABS_VALUE.pickle index e31d1d91..ee9bd886 100644 --- a/js/NonLinear/ABS_VALUE.pickle +++ b/js/NonLinear/ABS_VALUE.pickle @@ -43,37 +43,38 @@ p11 g4 sS'model.dep_ut' p12 -S'vector' +S'vector_boolean' p13 sS'model.nzcross' p14 g4 sS'exprs' p15 -g13 -sS'x.model' +S'vector' p16 -NsS'gr_i' +sS'x.model' p17 -g13 -sS'model.in' +NsS'gr_i' p18 +g16 +sS'model.in' +p19 g4 sS'graphics' -p19 +p20 g8 sS'y' -p20 -g13 -sS'x' p21 -NsS'model' +g16 +sS'x' p22 +NsS'model' +p23 g8 sS'typ' -p23 -g13 -sS'nu' p24 +g16 +sS'nu' +p25 g4 s.
\ No newline at end of file diff --git a/js/NonLinear/COSBLK_f.js b/js/NonLinear/COSBLK_f.js index 82d79ff8..ad166e28 100644 --- a/js/NonLinear/COSBLK_f.js +++ b/js/NonLinear/COSBLK_f.js @@ -7,7 +7,7 @@ function COSBLK_f() { this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"COSBLK_f\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i); return new BasicBlock(this.x); diff --git a/js/NonLinear/COSBLK_f.pickle b/js/NonLinear/COSBLK_f.pickle index f0c888ff..2e1f9573 100644 --- a/js/NonLinear/COSBLK_f.pickle +++ b/js/NonLinear/COSBLK_f.pickle @@ -28,27 +28,28 @@ S'double' p5 sS'model.dep_ut' p6 -S'vector' +S'vector_boolean' p7 sS'model.out' p8 g5 sS'gr_i' p9 -g7 -sS'model.in' +S'vector' p10 +sS'model.in' +p11 g5 sS'y' -p11 -g7 -sS'x' p12 -NsS'model' +g10 +sS'x' p13 -S'object' +NsS'model' p14 -sS'typ' +S'object' p15 -g7 +sS'typ' +p16 +g10 s.
\ No newline at end of file diff --git a/js/NonLinear/DLRADAPT_f.js b/js/NonLinear/DLRADAPT_f.js index b474db34..7283dc3b 100644 --- a/js/NonLinear/DLRADAPT_f.js +++ b/js/NonLinear/DLRADAPT_f.js @@ -17,7 +17,7 @@ function DLRADAPT_f() { this.model.ipar = new ScilabDouble([0],[2],[2]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[sci2exp(this.p)],[sci2exp(this.rn)],[sci2exp(this.rd,0)],[sci2exp(this.g)],[sci2exp(this.last_u)],[sci2exp(this.last_y)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLRADAPT_f\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); diff --git a/js/NonLinear/DLRADAPT_f.pickle b/js/NonLinear/DLRADAPT_f.pickle index c072ce90..62e07275 100644 --- a/js/NonLinear/DLRADAPT_f.pickle +++ b/js/NonLinear/DLRADAPT_f.pickle @@ -101,22 +101,23 @@ p28 g9 sS'model.dep_ut' p29 -g14 -sS'p' +S'vector_boolean' p30 +sS'p' +p31 g2 sS'gr_i' -p31 +p32 g14 sS'ipar' -p32 +p33 g2 sS'y' -p33 +p34 g14 sS'x' -p34 -NsS'model' p35 +NsS'model' +p36 g4 s.
\ No newline at end of file diff --git a/js/NonLinear/EXPBLK_f.js b/js/NonLinear/EXPBLK_f.js index 5e0bc5b4..3cd716fa 100644 --- a/js/NonLinear/EXPBLK_f.js +++ b/js/NonLinear/EXPBLK_f.js @@ -9,7 +9,7 @@ function EXPBLK_f() { this.model.out = new ScilabDouble([-1]); this.model.rpar = new ScilabDouble([this.a]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = ["%e"]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXPBLK_f\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); diff --git a/js/NonLinear/EXPBLK_f.pickle b/js/NonLinear/EXPBLK_f.pickle index 7c9a0548..1c9e152a 100644 --- a/js/NonLinear/EXPBLK_f.pickle +++ b/js/NonLinear/EXPBLK_f.pickle @@ -58,22 +58,23 @@ p16 g14 sS'model.dep_ut' p17 -g14 -sS'model.in' +S'vector_boolean' p18 +sS'model.in' +p19 g2 sS'graphics' -p19 +p20 g8 sS'y' -p20 +p21 g14 sS'x' -p21 -NsS'model' p22 +NsS'model' +p23 g8 sS'typ' -p23 +p24 g14 s.
\ No newline at end of file diff --git a/js/NonLinear/EXPBLK_m.js b/js/NonLinear/EXPBLK_m.js index 0cb66b96..55185a54 100644 --- a/js/NonLinear/EXPBLK_m.js +++ b/js/NonLinear/EXPBLK_m.js @@ -13,7 +13,7 @@ function EXPBLK_m() { this.model.outtyp = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.a]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = ["%e"]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXPBLK_m\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); diff --git a/js/NonLinear/EXPBLK_m.pickle b/js/NonLinear/EXPBLK_m.pickle index 37d444a7..2294f50d 100644 --- a/js/NonLinear/EXPBLK_m.pickle +++ b/js/NonLinear/EXPBLK_m.pickle @@ -74,19 +74,20 @@ S'string' p22 sS'model.dep_ut' p23 -g16 -sS'exprs' +S'vector_boolean' p24 +sS'exprs' +p25 g16 sS'gr_i' -p25 +p26 g16 sS'model.outtyp' -p26 +p27 g6 sS'x' -p27 -NsS'model' p28 +NsS'model' +p29 g2 s.
\ No newline at end of file diff --git a/js/NonLinear/FSV_f.js b/js/NonLinear/FSV_f.js index 5a6f7046..364dd488 100644 --- a/js/NonLinear/FSV_f.js +++ b/js/NonLinear/FSV_f.js @@ -7,7 +7,7 @@ function FSV_f() { this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([in1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = " "; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FSV_f\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); diff --git a/js/NonLinear/FSV_f.pickle b/js/NonLinear/FSV_f.pickle index 60656cd6..112c3884 100644 --- a/js/NonLinear/FSV_f.pickle +++ b/js/NonLinear/FSV_f.pickle @@ -32,27 +32,28 @@ S'double' p7 sS'model.dep_ut' p8 -S'vector' +S'vector_boolean' p9 sS'model.out' p10 g7 sS'gr_i' p11 -g9 -sS'model.in' +S'vector' p12 +sS'model.in' +p13 g7 sS'y' -p13 -g9 -sS'x' p14 -NsS'model' +g12 +sS'x' p15 -S'object' +NsS'model' p16 -sS'typ' +S'object' p17 -g9 +sS'typ' +p18 +g12 s.
\ No newline at end of file diff --git a/js/NonLinear/INTRP2BLK_f.js b/js/NonLinear/INTRP2BLK_f.js index 5cb4604d..5cf1f22f 100644 --- a/js/NonLinear/INTRP2BLK_f.js +++ b/js/NonLinear/INTRP2BLK_f.js @@ -11,7 +11,7 @@ function INTRP2BLK_f() { this.model.rpar = new ScilabDouble([this.a],[this.b],[this.c.slice()]); this.model.ipar = new ScilabDouble([2],[2]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[strcat(sci2exp(this.a))],[strcat(sci2exp(this.b))],[strcat(sci2exp(this.c,0))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTRP2BLK_f\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); diff --git a/js/NonLinear/INTRP2BLK_f.pickle b/js/NonLinear/INTRP2BLK_f.pickle index a21e3536..de096504 100644 --- a/js/NonLinear/INTRP2BLK_f.pickle +++ b/js/NonLinear/INTRP2BLK_f.pickle @@ -62,29 +62,30 @@ S'vector' p17 sS'model.dep_ut' p18 -g17 -sS'model.in' +S'vector_boolean' p19 +sS'model.in' +p20 g2 sS'graphics' -p20 +p21 g10 sS'y' -p21 +p22 g17 sS'x' -p22 -NsS'model' p23 +NsS'model' +p24 g10 sS'model.ipar' -p24 +p25 g2 sS'typ' -p25 +p26 g17 sS'model.out' -p26 -S'double' p27 +S'double' +p28 s.
\ No newline at end of file diff --git a/js/NonLinear/INTRPLBLK_f.js b/js/NonLinear/INTRPLBLK_f.js index a990bbb1..e9347b2c 100644 --- a/js/NonLinear/INTRPLBLK_f.js +++ b/js/NonLinear/INTRPLBLK_f.js @@ -9,7 +9,7 @@ function INTRPLBLK_f() { this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.a],[this.b]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[strcat(sci2exp(this.a))],[strcat(sci2exp(this.b))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTRPLBLK_f\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); diff --git a/js/NonLinear/INTRPLBLK_f.pickle b/js/NonLinear/INTRPLBLK_f.pickle index e482b97d..5699e56b 100644 --- a/js/NonLinear/INTRPLBLK_f.pickle +++ b/js/NonLinear/INTRPLBLK_f.pickle @@ -60,22 +60,23 @@ S'vector' p17 sS'model.dep_ut' p18 -g17 -sS'model.in' +S'vector_boolean' p19 +sS'model.in' +p20 g6 sS'graphics' -p20 +p21 g10 sS'y' -p21 +p22 g17 sS'x' -p22 -NsS'model' p23 +NsS'model' +p24 g10 sS'typ' -p24 +p25 g17 s.
\ No newline at end of file diff --git a/js/NonLinear/INVBLK.js b/js/NonLinear/INVBLK.js index 1906beb7..a86b86d4 100644 --- a/js/NonLinear/INVBLK.js +++ b/js/NonLinear/INVBLK.js @@ -7,7 +7,7 @@ function INVBLK() { this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([in1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = " "; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INVBLK\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); diff --git a/js/NonLinear/INVBLK.pickle b/js/NonLinear/INVBLK.pickle index 60656cd6..112c3884 100644 --- a/js/NonLinear/INVBLK.pickle +++ b/js/NonLinear/INVBLK.pickle @@ -32,27 +32,28 @@ S'double' p7 sS'model.dep_ut' p8 -S'vector' +S'vector_boolean' p9 sS'model.out' p10 g7 sS'gr_i' p11 -g9 -sS'model.in' +S'vector' p12 +sS'model.in' +p13 g7 sS'y' -p13 -g9 -sS'x' p14 -NsS'model' +g12 +sS'x' p15 -S'object' +NsS'model' p16 -sS'typ' +S'object' p17 -g9 +sS'typ' +p18 +g12 s.
\ No newline at end of file diff --git a/js/NonLinear/INVBLK_f.js b/js/NonLinear/INVBLK_f.js index 6383212c..1e344ded 100644 --- a/js/NonLinear/INVBLK_f.js +++ b/js/NonLinear/INVBLK_f.js @@ -7,7 +7,7 @@ function INVBLK_f() { this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([in1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = " "; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INVBLK_f\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); diff --git a/js/NonLinear/INVBLK_f.pickle b/js/NonLinear/INVBLK_f.pickle index ddc91776..1e6ab305 100644 --- a/js/NonLinear/INVBLK_f.pickle +++ b/js/NonLinear/INVBLK_f.pickle @@ -31,27 +31,28 @@ S'double' p6 sS'model.dep_ut' p7 -S'vector' +S'vector_boolean' p8 sS'model.out' p9 g6 sS'gr_i' p10 -g8 -sS'model.in' +S'vector' p11 +sS'model.in' +p12 g6 sS'y' -p12 -g8 -sS'x' p13 -NsS'model' +g11 +sS'x' p14 -S'object' +NsS'model' p15 -sS'typ' +S'object' p16 -g8 +sS'typ' +p17 +g11 s.
\ No newline at end of file diff --git a/js/NonLinear/LOGBLK_f.js b/js/NonLinear/LOGBLK_f.js index 6dffed6f..e2b14f15 100644 --- a/js/NonLinear/LOGBLK_f.js +++ b/js/NonLinear/LOGBLK_f.js @@ -9,7 +9,7 @@ function LOGBLK_f() { this.model.out = new ScilabDouble([-1]); this.model.rpar = new ScilabDouble([this.a]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = "%e"; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOGBLK_f\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); diff --git a/js/NonLinear/LOGBLK_f.pickle b/js/NonLinear/LOGBLK_f.pickle index 952da34c..ebd0f47d 100644 --- a/js/NonLinear/LOGBLK_f.pickle +++ b/js/NonLinear/LOGBLK_f.pickle @@ -58,22 +58,23 @@ S'vector' p16 sS'model.dep_ut' p17 -g16 -sS'model.in' +S'vector_boolean' p18 +sS'model.in' +p19 g2 sS'graphics' -p19 +p20 g8 sS'y' -p20 +p21 g16 sS'x' -p21 -NsS'model' p22 +NsS'model' +p23 g8 sS'typ' -p23 +p24 g16 s.
\ No newline at end of file diff --git a/js/NonLinear/LOOKUP2D.js b/js/NonLinear/LOOKUP2D.js index db6d365e..a733a55b 100644 --- a/js/NonLinear/LOOKUP2D.js +++ b/js/NonLinear/LOOKUP2D.js @@ -15,7 +15,7 @@ function LOOKUP2D() { this.model.rpar = new ScilabDouble([this.xx.slice()],[this.yy.slice()],[this.zz.slice()]); this.model.ipar = new ScilabDouble([Nx],[Ny],[this.Method]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = list(strcat(sci2exp(this.xx)),strcat(sci2exp(this.yy)),strcat(sci2exp(this.zz)),sci2exp(this.Method),Graf); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOOKUP2D\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,this.exprs,this.gr_i); diff --git a/js/NonLinear/LOOKUP2D.pickle b/js/NonLinear/LOOKUP2D.pickle index e4356e53..d2caff95 100644 --- a/js/NonLinear/LOOKUP2D.pickle +++ b/js/NonLinear/LOOKUP2D.pickle @@ -119,27 +119,28 @@ sS'x.model' p36 NsS'model.dep_ut' p37 -g11 -sS'exprs' +S'vector_boolean' p38 +sS'exprs' +p39 g23 sS'gr_i' -p39 +p40 g11 sS'mtd' -p40 +p41 g8 sS'graphics.exprs' -p41 -NsS'y' p42 +NsS'y' +p43 g11 sS'x' -p43 -NsS'model' p44 +NsS'model' +p45 g4 sS'graf' -p45 +p46 g2 s.
\ No newline at end of file diff --git a/js/NonLinear/LOOKUP_c.js b/js/NonLinear/LOOKUP_c.js index 08f1ddb5..46efa138 100644 --- a/js/NonLinear/LOOKUP_c.js +++ b/js/NonLinear/LOOKUP_c.js @@ -17,7 +17,7 @@ function LOOKUP_c() { this.model.rpar = new ScilabDouble([this.xx.slice()],[this.yy.slice()]); this.model.ipar = new ScilabDouble([N],[this.Method],[0],[0]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.model.evtin = new ScilabDouble([]); this.model.evtout = new ScilabDouble([]); this.model.firing = new ScilabDouble([0]); diff --git a/js/NonLinear/LOOKUP_c.pickle b/js/NonLinear/LOOKUP_c.pickle index e6e522ce..3f78747d 100644 --- a/js/NonLinear/LOOKUP_c.pickle +++ b/js/NonLinear/LOOKUP_c.pickle @@ -322,555 +322,556 @@ sS'x.model' p63 NsS'model.dep_ut' p64 -g2 -sS'menu_s' +S'vector_boolean' p65 +sS'menu_s' +p66 g2 sS'Sawt1_exprs' -p66 -NsS'sample4' p67 +NsS'sample4' +p68 g2 sS'sTp2' -p68 +p69 g2 sS'x' -p69 +p70 g7 sS'x12' -p70 +p71 g4 sS'exprs[1-1]' -p71 +p72 g4 sS'points.data' -p72 +p73 g2 sS'j' -p73 +p74 g4 sS'x11' -p74 +p75 g4 sS'arg1' -p75 +p76 g19 sS'Pd3' -p76 +p77 g2 sS't3' -p77 +p78 g4 sS'ey' -p78 +p79 g7 sS'ex' -p79 +p80 g7 sS'xmn1' -p80 +p81 g7 sS'sAmp' -p81 +p82 g2 sS'a.children[2-1]' -p82 +p83 g19 sS'sample5' -p83 +p84 g2 sS'a.title.font_style' -p84 +p85 g7 sS'y2' -p85 +p86 g4 sS'orpar' -p86 +p87 g2 sS'x.graphics' -p87 +p88 g19 sS'menu_d' -p88 +p89 g2 sS'menu_e' -p89 +p90 g2 sS'A[j+1-1][i+N-1]' -p90 +p91 g7 sS'a.children[1-1]' -p91 +p92 g19 sS'y1p' -p92 +p93 g7 sS'r' -p93 +p94 g4 sS'seed4' -p94 +p95 g2 sS'seed5' -p95 +p96 g2 sS'B[j+1-1]' -p96 +p97 g7 sS'model.evtin' -p97 +p98 g2 sS'y21' -p98 +p99 g4 sS'menu_t' -p99 +p100 g2 sS'menu_r' -p100 +p101 g2 sS'PO' -p101 +p102 g7 sS'x22' -p102 +p103 g4 sS'C' -p103 +p104 g2 sS'DChange' -p104 +p105 g11 sS'Cformat' -p105 +p106 g4 sS'Q[i+N-1][i-1]' -p106 +p107 g7 sS'rep' -p107 +p108 g7 sS'model.out2' -p108 +p109 g7 sS'xy[N-1][2-1]' -p109 +p110 g7 sS'sTp' -p110 +p111 g2 sS'wp' -p111 +p112 g2 sS'New_methhod' -p112 +p113 g7 sS'PeridicOption' -p113 +p114 g7 sS'Graf' -p114 +p115 g4 sS'Q' -p115 +p116 g7 sS'ok' -p116 +p117 g11 sS'ly11' -p117 +p118 g7 sS'xy[k-1].slice()' -p118 +p119 g2 sS'Z' -p119 +p120 g2 sS'Cmenu' -p120 +p121 g4 sS'periodicoption' -p121 +p122 g7 sS'w' -p122 +p123 g4 sS'random_u_exprs2' -p123 +p124 g33 sS'model.outtyp' -p124 +p125 g7 sS'A[j+1-1][i+2*N-1]' -p125 +p126 g7 sS'YMN' -p126 +p127 g7 sS'Q[i-1][i+N-1]' -p127 +p128 g7 sS'y11' -p128 +p129 g4 sS'x2p' -p129 +p130 g7 sS'y12' -p130 +p131 g4 sS'NC' -p131 +p132 g7 sS'xyt' -p132 +p133 g2 sS'xo' -p133 +p134 g27 sS'ipar[2-1]' -p134 +p135 g7 sS'xc' -p135 +p136 g7 sS'extrapo' -p136 +p137 g7 sS'offset' -p137 +p138 g2 sS'splines.data' -p138 +p139 g2 sS'perop' -p139 +p140 g4 sS'xe' -p140 +p141 g7 sS'Y' -p141 +p142 g27 sS'xx' -p142 +p143 g27 sS'xy' -p143 +p144 g2 sS'btn' -p144 +p145 g7 sS'xye' -p145 +p146 g2 sS'SaveExit' -p146 +p147 g11 sS'xp' -p147 +p148 g7 sS'Method' -p148 +p149 g7 sS'xt' -p149 +p150 g27 sS'xyo' -p150 +p151 g2 sS'Q[i-1][i-1]' -p151 +p152 g7 sS'ystR' -p152 +p153 g7 sS'A[j-1][i+2*N-1]' -p153 +p154 g7 sS'ipar[4-1]' -p154 +p155 g7 sS'px' -p155 +p156 g7 sS'py' -p156 +p157 g7 sS'splines' -p157 -NsS'tok' p158 +NsS'tok' +p159 g11 sS'ixy' -p159 +p160 g2 sS'rect' -p160 +p161 g27 sS'NP' -p161 +p162 g7 sS'Amp' -p162 +p163 g2 sS'exprs[2-1]' -p163 +p164 g7 sS'model.firing' -p164 +p165 g7 sS'xy2' -p165 +p166 g2 sS'B' -p166 +p167 g7 sS'A' -p167 +p168 g7 sS'yenC' -p168 +p169 g4 sS'N' -p169 +p170 g7 sS'random_u_exprs' -p170 +p171 g33 sS'Sawt2_exprs' -p171 -NsS'XMX' p172 +NsS'XMX' +p173 g7 sS'a.x_ticks' -p173 +p174 g19 sS'model.in' -p174 +p175 g7 sS'graphics' -p175 +p176 g19 sS'Exitm' -p176 +p177 g4 sS'N2' -p177 +p178 g7 sS'model.ipar' -p178 +p179 g27 sS'Pw3' -p179 +p180 g2 sS'f' -p180 +p181 g7 sS'a.grid' -p181 +p182 g2 sS'y[N-1]' -p182 +p183 g7 sS'gr_i' -p183 +p184 g2 sS'ipar' -p184 +p185 g2 sS'ystC' -p185 +p186 g4 sS'mtd' -p186 +p187 g7 sS'PERIODIC' -p187 +p188 g4 sS'xmx1' -p188 +p189 g7 sS'scam' -p189 +p190 g4 sS'exprs[4-1]' -p190 +p191 g4 sS'ans0' -p191 +p192 g4 sS'ymn1' -p192 +p193 g7 sS't1' -p193 +p194 g4 sS'model.evtout' -p194 +p195 g2 sS'rpar' -p195 +p196 g2 sS'lx11' -p196 +p197 g7 sS'np5' -p197 +p198 g2 sS'Bias3' -p198 +p199 g2 sS'Tp3' -p199 +p200 g2 sS'model.out' -p200 +p201 g7 sS'np4' -p201 +p202 g2 sS'rectx' -p202 +p203 g7 sS'np1' -p203 +p204 g7 sS'Lx' -p204 +p205 g7 sS'x21' -p205 +p206 g4 sS'model.in2' -p206 +p207 g7 sS'x[k-1]' -p207 +p208 g2 sS'HIT' -p208 +p209 g11 sS'xstR' -p209 +p210 g7 sS'ymx1' -p210 +p211 g7 sS'A[j+1-1][i-1]' -p211 +p212 g7 sS'sAmp2' -p212 +p213 g2 sS'TN' -p213 +p214 g2 sS'menus' -p214 +p215 g33 sS'sdelay' -p215 +p216 g2 sS'points' -p216 -NsS'Q[i+N-1][i+N-1]' p217 +NsS'Q[i+N-1][i+N-1]' +p218 g7 sS'TA' -p218 +p219 g27 sS'Datam' -p219 +p220 g4 sS'model.sim' -p220 +p221 g33 sS'XMN' -p221 +p222 g7 sS'A[j+2-1][i+N+1-1]' -p222 +p223 g7 sS'a.data_bounds' -p223 +p224 g7 sS'menu_o' -p224 +p225 g2 sS'd' -p225 +p226 g7 sS'ye' -p226 +p227 g7 sS'X' -p227 +p228 g27 sS'y2p' -p228 +p229 g7 sS'fd' -p229 +p230 g7 sS'exprs[5-1]' -p230 +p231 g4 sS'graphics.exprs' -p231 -NsS'phase' p232 +NsS'phase' +p233 g7 sS'typ' -p233 +p234 g2 sS'min5' -p234 +p235 g2 sS'a' -p235 +p236 g19 sS'mok' -p236 +p237 g11 sS'Orderm' -p237 +p238 g4 sS'A[j+2-1][i+N-1]' -p238 +p239 g7 sS'B[j-1]' -p239 +p240 g7 sS'ly21' -p240 +p241 g7 sS'A[j+2-1][i-1]' -p241 +p242 g7 sS'max5' -p242 +p243 g2 sS'exprs' -p243 +p244 g27 sS'exprs[3-1]' -p244 +p245 g7 sS'y[k-1]' -p245 +p246 g2 sS'At' -p246 +p247 g27 sS'y' -p247 +p248 g7 sS'model' -p248 +p249 g19 sS'order' -p249 +p250 g7 s.
\ No newline at end of file diff --git a/js/NonLinear/LOOKUP_f.js b/js/NonLinear/LOOKUP_f.js index b8a60f1d..471833f3 100644 --- a/js/NonLinear/LOOKUP_f.js +++ b/js/NonLinear/LOOKUP_f.js @@ -7,7 +7,7 @@ function LOOKUP_f() { this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([-2],[-1],[1],[2],[-1],[1],[-1],[1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOOKUP_f\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i); return new BasicBlock(this.x); diff --git a/js/NonLinear/LOOKUP_f.pickle b/js/NonLinear/LOOKUP_f.pickle index 7e9f98a5..b166f999 100644 --- a/js/NonLinear/LOOKUP_f.pickle +++ b/js/NonLinear/LOOKUP_f.pickle @@ -60,25 +60,26 @@ p19 g16 sS'model.dep_ut' p20 -g16 -sS'model.in' +S'vector_boolean' p21 +sS'model.in' +p22 g4 sS'graphics' -p22 +p23 g9 sS'y' -p23 +p24 g16 sS'x' -p24 -NsS'model' p25 +NsS'model' +p26 g9 sS'n' -p26 +p27 g4 sS'typ' -p27 +p28 g16 s.
\ No newline at end of file diff --git a/js/NonLinear/MAXMIN.js b/js/NonLinear/MAXMIN.js index 56f8a8d3..e2e7f3ef 100644 --- a/js/NonLinear/MAXMIN.js +++ b/js/NonLinear/MAXMIN.js @@ -6,7 +6,7 @@ function MAXMIN() { this.model.out = new ScilabDouble([1]); this.model.in = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.model.ipar = new ScilabDouble([0]); this.exprs = [string(transpose([2,1,1]))]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MAXMIN\",sz(1),sz(2));"]); diff --git a/js/NonLinear/MAXMIN.pickle b/js/NonLinear/MAXMIN.pickle index a8f6f334..faeff50d 100644 --- a/js/NonLinear/MAXMIN.pickle +++ b/js/NonLinear/MAXMIN.pickle @@ -84,19 +84,20 @@ p25 g6 sS'model.dep_ut' p26 -g12 -sS'exprs' +S'vector_boolean' p27 +sS'exprs' +p28 g12 sS'gr_i' -p28 +p29 g12 sS'y' -p29 +p30 g12 sS'x' -p30 -NsS'model' p31 +NsS'model' +p32 g2 s.
\ No newline at end of file diff --git a/js/NonLinear/MAX_f.js b/js/NonLinear/MAX_f.js index f258c935..c7a348bb 100644 --- a/js/NonLinear/MAX_f.js +++ b/js/NonLinear/MAX_f.js @@ -8,7 +8,7 @@ function MAX_f() { this.model.out = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([0],[0]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = " "; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MAX_f\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); diff --git a/js/NonLinear/MAX_f.pickle b/js/NonLinear/MAX_f.pickle index 9471b916..adc1b315 100644 --- a/js/NonLinear/MAX_f.pickle +++ b/js/NonLinear/MAX_f.pickle @@ -35,27 +35,28 @@ S'double' p8 sS'model.dep_ut' p9 -S'vector' +S'vector_boolean' p10 sS'model.out' p11 g8 sS'gr_i' p12 -g10 -sS'model.in' +S'vector' p13 +sS'model.in' +p14 g8 sS'y' -p14 -g10 -sS'x' p15 -NsS'model' +g13 +sS'x' p16 -S'object' +NsS'model' p17 -sS'typ' +S'object' p18 -g10 +sS'typ' +p19 +g13 s.
\ No newline at end of file diff --git a/js/NonLinear/MIN_f.js b/js/NonLinear/MIN_f.js index 244a414d..316e43e4 100644 --- a/js/NonLinear/MIN_f.js +++ b/js/NonLinear/MIN_f.js @@ -8,7 +8,7 @@ function MIN_f() { this.model.out = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([0],[0]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = sci2exp(in1); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MIN_f\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); diff --git a/js/NonLinear/MIN_f.pickle b/js/NonLinear/MIN_f.pickle index 9471b916..adc1b315 100644 --- a/js/NonLinear/MIN_f.pickle +++ b/js/NonLinear/MIN_f.pickle @@ -35,27 +35,28 @@ S'double' p8 sS'model.dep_ut' p9 -S'vector' +S'vector_boolean' p10 sS'model.out' p11 g8 sS'gr_i' p12 -g10 -sS'model.in' +S'vector' p13 +sS'model.in' +p14 g8 sS'y' -p14 -g10 -sS'x' p15 -NsS'model' +g13 +sS'x' p16 -S'object' +NsS'model' p17 -sS'typ' +S'object' p18 -g10 +sS'typ' +p19 +g13 s.
\ No newline at end of file diff --git a/js/NonLinear/POWBLK_f.js b/js/NonLinear/POWBLK_f.js index c7d70e81..a86c49a2 100644 --- a/js/NonLinear/POWBLK_f.js +++ b/js/NonLinear/POWBLK_f.js @@ -9,7 +9,7 @@ function POWBLK_f() { this.model.out = new ScilabDouble([-1]); this.model.rpar = new ScilabDouble([this.a]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = string(this.a); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"POWBLK_f\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); diff --git a/js/NonLinear/POWBLK_f.pickle b/js/NonLinear/POWBLK_f.pickle index 3b71ccc3..a46390ba 100644 --- a/js/NonLinear/POWBLK_f.pickle +++ b/js/NonLinear/POWBLK_f.pickle @@ -58,28 +58,29 @@ S'vector' p16 sS'model.dep_ut' p17 -g16 -sS'model.in' +S'vector_boolean' p18 +sS'model.in' +p19 g2 sS'graphics' -p19 +p20 g8 sS'y' -p20 +p21 g16 sS'x' -p21 -NsS'model' p22 +NsS'model' +p23 g8 sS'model.ipar' -p23 +p24 g16 sS'typ' -p24 +p25 g16 sS'model.firing' -p25 +p26 g16 s.
\ No newline at end of file diff --git a/js/NonLinear/PRODUCT.js b/js/NonLinear/PRODUCT.js index c01104d4..1f550e4a 100644 --- a/js/NonLinear/PRODUCT.js +++ b/js/NonLinear/PRODUCT.js @@ -8,7 +8,7 @@ function PRODUCT() { this.model.out = new ScilabDouble([-1]); this.model.ipar = new ScilabDouble(this.sgn); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = sci2exp(this.sgn); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PRODUCT\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,3]),this.model,this.exprs,this.gr_i); diff --git a/js/NonLinear/PRODUCT.pickle b/js/NonLinear/PRODUCT.pickle index 97be2d1c..8f36506e 100644 --- a/js/NonLinear/PRODUCT.pickle +++ b/js/NonLinear/PRODUCT.pickle @@ -48,7 +48,7 @@ p13 g4 sS'model.dep_ut' p14 -S'vector' +S'vector_boolean' p15 sS'exprs' p16 @@ -58,30 +58,31 @@ sS'x.model' p18 NsS'gr_i' p19 -g15 -sS'graphics.exprs' +S'vector' p20 -NsS'graphics' +sS'graphics.exprs' p21 +NsS'graphics' +p22 g10 sS'y' -p22 -g15 -sS'x' p23 -NsS'model' +g20 +sS'x' p24 +NsS'model' +p25 g10 sS'model.ipar' -p25 +p26 g8 sS'typ' -p26 -g15 -sS'nout' p27 +g20 +sS'nout' +p28 g4 sS'model.blocktype' -p28 +p29 g17 s.
\ No newline at end of file diff --git a/js/NonLinear/PROD_f.js b/js/NonLinear/PROD_f.js index ee3954bc..5d6903f4 100644 --- a/js/NonLinear/PROD_f.js +++ b/js/NonLinear/PROD_f.js @@ -6,7 +6,7 @@ function PROD_f() { this.model.in = new ScilabDouble([-1],[-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.x = new standard_define(new ScilabDouble([1,1]),this.model,[],[]); return new BasicBlock(this.x); } diff --git a/js/NonLinear/PROD_f.pickle b/js/NonLinear/PROD_f.pickle index cd57a97f..691cc0f1 100644 --- a/js/NonLinear/PROD_f.pickle +++ b/js/NonLinear/PROD_f.pickle @@ -29,7 +29,7 @@ S'string' p6 sS'model.dep_ut' p7 -S'vector' +S'vector_boolean' p8 sS'p' p9 @@ -40,14 +40,15 @@ S'matrix' p11 sS'y' p12 -g8 -sS'x' +S'vector' p13 -NsS'model' +sS'x' p14 -S'object' +NsS'model' p15 -sS'typ' +S'object' p16 -g8 +sS'typ' +p17 +g13 s.
\ No newline at end of file diff --git a/js/NonLinear/QUANT_f.js b/js/NonLinear/QUANT_f.js index ff846e2b..ca5cb9e4 100644 --- a/js/NonLinear/QUANT_f.js +++ b/js/NonLinear/QUANT_f.js @@ -10,7 +10,7 @@ function QUANT_f() { this.model.rpar = new ScilabDouble([this.pas]); this.model.ipar = new ScilabDouble([this.meth]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[string(this.pas)],[string(this.meth)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"QUANT_f\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); diff --git a/js/NonLinear/QUANT_f.pickle b/js/NonLinear/QUANT_f.pickle index be4d0864..07ffc32e 100644 --- a/js/NonLinear/QUANT_f.pickle +++ b/js/NonLinear/QUANT_f.pickle @@ -59,28 +59,29 @@ S'vector' p17 sS'model.dep_ut' p18 -g17 -sS'model.in' +S'vector_boolean' p19 +sS'model.in' +p20 g4 sS'graphics' -p20 +p21 g8 sS'y' -p21 +p22 g17 sS'x' -p22 -NsS'model' p23 +NsS'model' +p24 g8 sS'model.ipar' -p24 +p25 g4 sS'typ' -p25 +p26 g17 sS'meth' -p26 +p27 g4 s.
\ No newline at end of file diff --git a/js/NonLinear/SATURATION.js b/js/NonLinear/SATURATION.js index 4a34ff87..c87c0edf 100644 --- a/js/NonLinear/SATURATION.js +++ b/js/NonLinear/SATURATION.js @@ -12,7 +12,7 @@ function SATURATION() { this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[string(this.maxp)],[string(this.minp)],[string(this.model.nmode)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SATURATION\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); diff --git a/js/NonLinear/SATURATION.pickle b/js/NonLinear/SATURATION.pickle index 0326c662..ab8faf42 100644 --- a/js/NonLinear/SATURATION.pickle +++ b/js/NonLinear/SATURATION.pickle @@ -75,19 +75,20 @@ S'string' p22 sS'model.dep_ut' p23 -g12 -sS'exprs' +S'vector_boolean' p24 +sS'exprs' +p25 g5 sS'gr_i' -p25 +p26 g12 sS'y' -p26 +p27 g12 sS'x' -p27 -NsS'model' p28 +NsS'model' +p29 g2 s.
\ No newline at end of file diff --git a/js/NonLinear/SAT_f.js b/js/NonLinear/SAT_f.js index 44776f9b..8a5cf3ef 100644 --- a/js/NonLinear/SAT_f.js +++ b/js/NonLinear/SAT_f.js @@ -12,7 +12,7 @@ function SAT_f() { this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.minp],[this.maxp],[slope]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[string(this.minp)],[string(this.maxp)],[string(slope)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAT_f\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); diff --git a/js/NonLinear/SAT_f.pickle b/js/NonLinear/SAT_f.pickle index ed5199b1..f64e4f77 100644 --- a/js/NonLinear/SAT_f.pickle +++ b/js/NonLinear/SAT_f.pickle @@ -78,19 +78,20 @@ S'string' p23 sS'model.dep_ut' p24 -g13 -sS'exprs' +S'vector_boolean' p25 +sS'exprs' +p26 g7 sS'gr_i' -p26 +p27 g13 sS'y' -p27 +p28 g13 sS'x' -p28 -NsS'model' p29 +NsS'model' +p30 g4 s.
\ No newline at end of file diff --git a/js/NonLinear/SIGNUM.js b/js/NonLinear/SIGNUM.js index 1649d7f7..dc5b69cf 100644 --- a/js/NonLinear/SIGNUM.js +++ b/js/NonLinear/SIGNUM.js @@ -9,7 +9,7 @@ function SIGNUM() { this.model.nzcross = new ScilabDouble([nu]); this.model.nmode = new ScilabDouble([nu]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [string([1])]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SIGNUM\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); diff --git a/js/NonLinear/SIGNUM.pickle b/js/NonLinear/SIGNUM.pickle index e31d1d91..ee9bd886 100644 --- a/js/NonLinear/SIGNUM.pickle +++ b/js/NonLinear/SIGNUM.pickle @@ -43,37 +43,38 @@ p11 g4 sS'model.dep_ut' p12 -S'vector' +S'vector_boolean' p13 sS'model.nzcross' p14 g4 sS'exprs' p15 -g13 -sS'x.model' +S'vector' p16 -NsS'gr_i' +sS'x.model' p17 -g13 -sS'model.in' +NsS'gr_i' p18 +g16 +sS'model.in' +p19 g4 sS'graphics' -p19 +p20 g8 sS'y' -p20 -g13 -sS'x' p21 -NsS'model' +g16 +sS'x' p22 +NsS'model' +p23 g8 sS'typ' -p23 -g13 -sS'nu' p24 +g16 +sS'nu' +p25 g4 s.
\ No newline at end of file diff --git a/js/NonLinear/SINBLK_f.js b/js/NonLinear/SINBLK_f.js index 37304b71..7d850bd4 100644 --- a/js/NonLinear/SINBLK_f.js +++ b/js/NonLinear/SINBLK_f.js @@ -6,7 +6,7 @@ function SINBLK_f() { this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = " "; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SINBLK_f\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); diff --git a/js/NonLinear/SINBLK_f.pickle b/js/NonLinear/SINBLK_f.pickle index aac36c43..634bd203 100644 --- a/js/NonLinear/SINBLK_f.pickle +++ b/js/NonLinear/SINBLK_f.pickle @@ -27,7 +27,7 @@ p4 g2 sS'model.dep_ut' p5 -S'vector' +S'vector_boolean' p6 sS'model.out' p7 @@ -35,20 +35,21 @@ S'double' p8 sS'gr_i' p9 -g6 -sS'model.in' +S'vector' p10 +sS'model.in' +p11 g8 sS'y' -p11 -g6 -sS'x' p12 -NsS'model' +g10 +sS'x' p13 -S'object' +NsS'model' p14 -sS'typ' +S'object' p15 -g6 +sS'typ' +p16 +g10 s.
\ No newline at end of file diff --git a/js/NonLinear/TANBLK_f.js b/js/NonLinear/TANBLK_f.js index 4693fb68..288dd11f 100644 --- a/js/NonLinear/TANBLK_f.js +++ b/js/NonLinear/TANBLK_f.js @@ -7,7 +7,7 @@ function TANBLK_f() { this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([in1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = sci2exp(in1); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TANBLK_f\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); diff --git a/js/NonLinear/TANBLK_f.pickle b/js/NonLinear/TANBLK_f.pickle index 378aaddd..5fa25f1b 100644 --- a/js/NonLinear/TANBLK_f.pickle +++ b/js/NonLinear/TANBLK_f.pickle @@ -35,26 +35,27 @@ S'double' p8 sS'model.dep_ut' p9 -g5 -sS'model.out' +S'vector_boolean' p10 +sS'model.out' +p11 g8 sS'gr_i' -p11 +p12 g5 sS'model.in' -p12 +p13 g8 sS'y' -p13 +p14 g5 sS'x' -p14 -NsS'model' p15 -S'object' +NsS'model' p16 -sS'typ' +S'object' p17 +sS'typ' +p18 g5 s.
\ No newline at end of file diff --git a/js/NonLinear/TrigFun.js b/js/NonLinear/TrigFun.js index 86ae4d56..2a18fff8 100644 --- a/js/NonLinear/TrigFun.js +++ b/js/NonLinear/TrigFun.js @@ -6,7 +6,7 @@ function TrigFun() { this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = "sin"; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TrigFun\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); diff --git a/js/NonLinear/TrigFun.pickle b/js/NonLinear/TrigFun.pickle index 4911d539..9b3e3964 100644 --- a/js/NonLinear/TrigFun.pickle +++ b/js/NonLinear/TrigFun.pickle @@ -56,22 +56,23 @@ S'vector' p17 sS'model.dep_ut' p18 -g17 -sS'model.in' +S'vector_boolean' p19 +sS'model.in' +p20 g4 sS'graphics' -p20 +p21 g8 sS'y' -p21 +p22 g17 sS'x' -p22 -NsS'model' p23 +NsS'model' +p24 g8 sS'typ' -p24 +p25 g17 s.
\ No newline at end of file |