diff options
Diffstat (limited to 'js/Linear')
71 files changed, 513 insertions, 477 deletions
diff --git a/js/Linear/BIGSOM_f.js b/js/Linear/BIGSOM_f.js index 1aac8643..19a2132e 100644 --- a/js/Linear/BIGSOM_f.js +++ b/js/Linear/BIGSOM_f.js @@ -8,7 +8,7 @@ function BIGSOM_f() { this.model.out = new ScilabDouble([-1]); this.model.rpar = 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),\"BIGSOM_f\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,3]),this.model,this.exprs,this.gr_i); diff --git a/js/Linear/BIGSOM_f.pickle b/js/Linear/BIGSOM_f.pickle index 5b4d88ba..90662ba0 100644 --- a/js/Linear/BIGSOM_f.pickle +++ b/js/Linear/BIGSOM_f.pickle @@ -59,22 +59,23 @@ S'vector' p18 sS'model.dep_ut' p19 -g18 -sS'model.in' +S'vector_boolean' p20 +sS'model.in' +p21 g2 sS'graphics' -p21 +p22 g10 sS'y' -p22 +p23 g18 sS'x' -p23 -NsS'model' p24 +NsS'model' +p25 g10 sS'typ' -p25 +p26 g18 s.
\ No newline at end of file diff --git a/js/Linear/CLINDUMMY_f.js b/js/Linear/CLINDUMMY_f.js index 81066883..14724c74 100644 --- a/js/Linear/CLINDUMMY_f.js +++ b/js/Linear/CLINDUMMY_f.js @@ -7,7 +7,7 @@ function CLINDUMMY_f() { this.model.state = new ScilabDouble([x0]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLINDUMMY_f\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([3,2]),this.model,[],this.gr_i); return new BasicBlock(this.x); diff --git a/js/Linear/CLINDUMMY_f.pickle b/js/Linear/CLINDUMMY_f.pickle index c620f0d2..2718e79a 100644 --- a/js/Linear/CLINDUMMY_f.pickle +++ b/js/Linear/CLINDUMMY_f.pickle @@ -25,31 +25,32 @@ S'string' p4 sS'model.dep_ut' p5 -S'vector' +S'vector_boolean' p6 sS'gr_i' p7 -g6 -sS'model.state' +S'vector' p8 -S'double' +sS'model.state' p9 -sS'y' +S'double' p10 -g6 -sS'x' +sS'y' p11 -NsS'x0' +g8 +sS'x' p12 -g9 -sS'typ' +NsS'x0' p13 -g6 -sS'model' +g10 +sS'typ' p14 -S'object' +g8 +sS'model' p15 -sS'model.firing' +S'object' p16 -g6 +sS'model.firing' +p17 +g8 s.
\ No newline at end of file diff --git a/js/Linear/CLR.js b/js/Linear/CLR.js index ff53605b..d134aa43 100644 --- a/js/Linear/CLR.js +++ b/js/Linear/CLR.js @@ -14,7 +14,7 @@ function CLR() { this.model.state = new ScilabDouble([x0]); this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLR\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); @@ -68,7 +68,7 @@ function CLR() { var mmm = [false,true]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = new ScilabDouble(mmm); + this.model.dep_ut = new ScilabBoolean(mmm); } if (ns1<=ns) { var x0 = x0.slice(1-1,ns1); diff --git a/js/Linear/CLR.pickle b/js/Linear/CLR.pickle index b238e029..7d9eff5b 100644 --- a/js/Linear/CLR.pickle +++ b/js/Linear/CLR.pickle @@ -76,7 +76,7 @@ p21 g5 sS'mmm' p22 -S'vector' +S'vector_boolean' p23 sS'model.state' p24 @@ -91,35 +91,36 @@ p27 g8 sS'typ' p28 -g23 -sS'ok' +S'vector' p29 -S'boolean' +sS'ok' p30 -sS'model.blocktype' +S'boolean' p31 -S'string' +sS'model.blocktype' p32 -sS'model.dep_ut' +S'string' p33 +sS'model.dep_ut' +p34 g23 sS'exprs' -p34 +p35 g5 sS'gr_i' -p35 -g23 -sS'PREVAR_scicos_context' p36 -NsS'y' +g29 +sS'PREVAR_scicos_context' p37 -g23 -sS'x' +NsS'y' p38 -NsS'model' +g29 +sS'x' p39 +NsS'model' +p40 g2 sS'nout' -p40 +p41 g8 s.
\ No newline at end of file diff --git a/js/Linear/CLR_f.js b/js/Linear/CLR_f.js index 7caf5a3d..6d85a901 100644 --- a/js/Linear/CLR_f.js +++ b/js/Linear/CLR_f.js @@ -14,7 +14,7 @@ function CLR_f() { this.model.state = new ScilabDouble([x0]); this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLR_f\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2.5,2.5]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); @@ -68,7 +68,7 @@ function CLR_f() { var mmm = [false,true]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = new ScilabDouble(mmm); + this.model.dep_ut = new ScilabBoolean(mmm); } if (ns1<=ns) { var x0 = x0.slice(1-1,ns1); diff --git a/js/Linear/CLR_f.pickle b/js/Linear/CLR_f.pickle index b238e029..7d9eff5b 100644 --- a/js/Linear/CLR_f.pickle +++ b/js/Linear/CLR_f.pickle @@ -76,7 +76,7 @@ p21 g5 sS'mmm' p22 -S'vector' +S'vector_boolean' p23 sS'model.state' p24 @@ -91,35 +91,36 @@ p27 g8 sS'typ' p28 -g23 -sS'ok' +S'vector' p29 -S'boolean' +sS'ok' p30 -sS'model.blocktype' +S'boolean' p31 -S'string' +sS'model.blocktype' p32 -sS'model.dep_ut' +S'string' p33 +sS'model.dep_ut' +p34 g23 sS'exprs' -p34 +p35 g5 sS'gr_i' -p35 -g23 -sS'PREVAR_scicos_context' p36 -NsS'y' +g29 +sS'PREVAR_scicos_context' p37 -g23 -sS'x' +NsS'y' p38 -NsS'model' +g29 +sS'x' p39 +NsS'model' +p40 g2 sS'nout' -p40 +p41 g8 s.
\ No newline at end of file diff --git a/js/Linear/CLSS.js b/js/Linear/CLSS.js index ecc80b33..2b13f73d 100644 --- a/js/Linear/CLSS.js +++ b/js/Linear/CLSS.js @@ -15,7 +15,7 @@ function CLSS() { this.model.state = new ScilabDouble([this.x0]); this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLSS\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); @@ -88,10 +88,10 @@ function CLSS() { var mmm = [false,true]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = new ScilabDouble(mmm); + this.model.dep_ut = new ScilabBoolean(mmm); } } else { - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); } this.model.state = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble(rpar); diff --git a/js/Linear/CLSS.pickle b/js/Linear/CLSS.pickle index b52f30c8..0d6f50f2 100644 --- a/js/Linear/CLSS.pickle +++ b/js/Linear/CLSS.pickle @@ -73,7 +73,7 @@ p18 g5 sS'mmm' p19 -S'vector' +S'vector_boolean' p20 sS'model.state' p21 @@ -89,30 +89,31 @@ p24 g8 sS'typ' p25 -g20 -sS'model.blocktype' +S'vector' p26 -S'string' +sS'model.blocktype' p27 -sS'model.dep_ut' +S'string' p28 +sS'model.dep_ut' +p29 g20 sS'exprs' -p29 +p30 g5 sS'gr_i' -p30 -g20 -sS'okD' p31 -S'boolean' +g26 +sS'okD' p32 -sS'y' +S'boolean' p33 -g20 -sS'x' +sS'y' p34 -NsS'model' +g26 +sS'x' p35 +NsS'model' +p36 g2 s.
\ No newline at end of file diff --git a/js/Linear/CLSS_f.js b/js/Linear/CLSS_f.js index c9dc7a15..3983e7cc 100644 --- a/js/Linear/CLSS_f.js +++ b/js/Linear/CLSS_f.js @@ -15,7 +15,7 @@ function CLSS_f() { this.model.state = new ScilabDouble([this.x0]); this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLSS_f\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); @@ -78,10 +78,10 @@ function CLSS_f() { var mmm = [false,true]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = new ScilabDouble(mmm); + this.model.dep_ut = new ScilabBoolean(mmm); } } else { - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); } this.model.state = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble(rpar); diff --git a/js/Linear/CLSS_f.pickle b/js/Linear/CLSS_f.pickle index 95d63454..3dc6c326 100644 --- a/js/Linear/CLSS_f.pickle +++ b/js/Linear/CLSS_f.pickle @@ -73,7 +73,7 @@ p18 g5 sS'mmm' p19 -S'vector' +S'vector_boolean' p20 sS'model.state' p21 @@ -89,26 +89,27 @@ p24 g8 sS'typ' p25 -g20 -sS'model.blocktype' +S'vector' p26 -S'string' +sS'model.blocktype' p27 -sS'model.dep_ut' +S'string' p28 +sS'model.dep_ut' +p29 g20 sS'exprs' -p29 +p30 g5 sS'gr_i' -p30 -g20 -sS'y' p31 -g20 -sS'x' +g26 +sS'y' p32 -NsS'model' +g26 +sS'x' p33 +NsS'model' +p34 g2 s.
\ No newline at end of file diff --git a/js/Linear/DELAYV_f.js b/js/Linear/DELAYV_f.js index e199ccdd..16d1eefe 100644 --- a/js/Linear/DELAYV_f.js +++ b/js/Linear/DELAYV_f.js @@ -15,7 +15,7 @@ function DELAYV_f() { this.model.rpar = new ScilabDouble([this.T/(size(this.zz0,"*"))]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([0,-1]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[string(this.nin)],[strcat(string(z0.slice(1-1,$-1)),";")],[string(this.T)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DELAYV_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/Linear/DELAYV_f.pickle b/js/Linear/DELAYV_f.pickle index 30ddbeca..81a7bc97 100644 --- a/js/Linear/DELAYV_f.pickle +++ b/js/Linear/DELAYV_f.pickle @@ -92,19 +92,20 @@ S'string' p28 sS'model.dep_ut' p29 -g7 -sS'exprs' +S'vector_boolean' p30 +sS'exprs' +p31 g18 sS'gr_i' -p31 +p32 g7 sS'y' -p32 +p33 g7 sS'x' -p33 -NsS'model' p34 +NsS'model' +p35 g4 s.
\ No newline at end of file diff --git a/js/Linear/DELAY_f.pickle b/js/Linear/DELAY_f.pickle index 4eebe89b..86fac0f1 100644 --- a/js/Linear/DELAY_f.pickle +++ b/js/Linear/DELAY_f.pickle @@ -218,72 +218,73 @@ p71 g8 sS'x.model.dep_ut' p72 -g15 -sS'o' +S'vector_boolean' p73 +sS'o' +p74 g2 sS'evtdly.graphics.pein' -p74 +p75 g4 sS'diagram.objs[3-1]' -p75 +p76 g2 sS'evtdly.graphics.flip' -p76 +p77 g19 sS'register.graphics.pin' -p77 +p78 g4 sS'ppath[2-1]' -p78 -NsS'diagram.objs[6-1]' p79 +NsS'diagram.objs[6-1]' +p80 g4 sS'split' -p80 +p81 g2 sS'register_exprs' -p81 -NsS'diagram.objs[8-1]' p82 +NsS'diagram.objs[8-1]' +p83 g2 sS'mess' -p83 +p84 g8 sS'diagram' -p84 +p85 g4 sS'y' -p85 +p86 g4 sS'newpar[$+1-1]' -p86 +p87 g4 sS'register.graphics' -p87 +p88 g2 sS'typ' -p88 +p89 g22 sS'register.graphics.exprs' -p89 +p90 g6 sS'x.graphics.pout' -p90 +p91 g4 sS'register' -p91 +p92 g2 sS'exprs' -p92 +p93 g8 sS'output_port.graphics.orig' -p93 +p94 g15 sS'x.graphics.pin' -p94 +p95 g4 sS'register.graphics.flip' -p95 +p96 g19 s.
\ No newline at end of file diff --git a/js/Linear/DERIV.js b/js/Linear/DERIV.js index fbcfac9b..12e3c7ef 100644 --- a/js/Linear/DERIV.js +++ b/js/Linear/DERIV.js @@ -6,7 +6,7 @@ function DERIV() { this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["x"]); - 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),\"DERIV\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); diff --git a/js/Linear/DERIV.pickle b/js/Linear/DERIV.pickle index f2e5a169..f97402c1 100644 --- a/js/Linear/DERIV.pickle +++ b/js/Linear/DERIV.pickle @@ -29,27 +29,28 @@ S'vector' p6 sS'model.dep_ut' p7 -g6 -sS'model.out' +S'vector_boolean' p8 -S'double' +sS'model.out' p9 -sS'gr_i' +S'double' p10 +sS'gr_i' +p11 g6 sS'model.in' -p11 -g9 -sS'y' p12 +g10 +sS'y' +p13 g6 sS'x' -p13 -NsS'model' p14 -S'object' +NsS'model' p15 -sS'typ' +S'object' p16 +sS'typ' +p17 g6 s.
\ No newline at end of file diff --git a/js/Linear/DIFF_c.js b/js/Linear/DIFF_c.js index b597fbba..93835c18 100644 --- a/js/Linear/DIFF_c.js +++ b/js/Linear/DIFF_c.js @@ -8,7 +8,7 @@ function DIFF_c() { this.model.out = new ScilabDouble([1]); this.model.state = new ScilabDouble(this.x0); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = [[strcat(sci2exp(this.x0[1-1]))],[strcat(sci2exp(this.x0[2-1]))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DIFF_c\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); diff --git a/js/Linear/DIFF_c.pickle b/js/Linear/DIFF_c.pickle index 57c006e4..cf3a2b5f 100644 --- a/js/Linear/DIFF_c.pickle +++ b/js/Linear/DIFF_c.pickle @@ -73,23 +73,24 @@ S'string' p22 sS'model.dep_ut' p23 -g6 -sS'exprs' +S'vector_boolean' p24 +sS'exprs' +p25 g16 sS'gr_i' -p25 +p26 g6 sS'ask_again' -p26 -S'boolean' p27 -sS'y' +S'boolean' p28 +sS'y' +p29 g6 sS'x' -p29 -NsS'model' p30 +NsS'model' +p31 g2 s.
\ No newline at end of file diff --git a/js/Linear/DLR.js b/js/Linear/DLR.js index 32bce17a..366af3a3 100644 --- a/js/Linear/DLR.js +++ b/js/Linear/DLR.js @@ -15,7 +15,7 @@ function DLR() { this.model.dstate = new ScilabDouble(x0.slice()); this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLR\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); @@ -73,7 +73,7 @@ function DLR() { var mmm = [false,false]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = new ScilabDouble(mmm); + this.model.dep_ut = new ScilabBoolean(mmm); } this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Linear/DLR.pickle b/js/Linear/DLR.pickle index 00444412..ae140424 100644 --- a/js/Linear/DLR.pickle +++ b/js/Linear/DLR.pickle @@ -83,43 +83,44 @@ p24 g7 sS'mmm' p25 -g2 -sS'model.in' +S'vector_boolean' p26 +sS'model.in' +p27 g10 sS'graphics.exprs' -p27 -NsS'x0' p28 +NsS'x0' +p29 g10 sS'typ' -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 -g2 -sS'exprs' +sS'model.dep_ut' p35 +g26 +sS'exprs' +p36 g7 sS'gr_i' -p36 +p37 g2 sS'PREVAR_scicos_context' -p37 -NsS'y' p38 +NsS'y' +p39 g2 sS'x' -p39 -NsS'model' p40 +NsS'model' +p41 g4 s.
\ No newline at end of file diff --git a/js/Linear/DLR_f.js b/js/Linear/DLR_f.js index 1182d540..b265a2b0 100644 --- a/js/Linear/DLR_f.js +++ b/js/Linear/DLR_f.js @@ -15,7 +15,7 @@ function DLR_f() { this.model.dstate = new ScilabDouble(x0.slice()); this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLR_f\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2.5,2.5]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); @@ -73,7 +73,7 @@ function DLR_f() { var mmm = [false,false]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = new ScilabDouble(mmm); + this.model.dep_ut = new ScilabBoolean(mmm); } this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Linear/DLR_f.pickle b/js/Linear/DLR_f.pickle index 9c02362b..308f93d4 100644 --- a/js/Linear/DLR_f.pickle +++ b/js/Linear/DLR_f.pickle @@ -83,42 +83,43 @@ p24 g7 sS'mmm' p25 -g2 -sS'model.in' +S'vector_boolean' p26 +sS'model.in' +p27 g10 sS'graphics.exprs' -p27 -NsS'x0' p28 +NsS'x0' +p29 g10 sS'typ' -p29 +p30 g2 sS'ok' -p30 -S'boolean' p31 -sS'model.blocktype' +S'boolean' p32 +sS'model.blocktype' +p33 g18 sS'model.dep_ut' -p33 -g2 -sS'exprs' p34 +g26 +sS'exprs' +p35 g7 sS'gr_i' -p35 +p36 g2 sS'PREVAR_scicos_context' -p36 -NsS'y' p37 +NsS'y' +p38 g2 sS'x' -p38 -NsS'model' p39 +NsS'model' +p40 g4 s.
\ No newline at end of file diff --git a/js/Linear/DLSS.js b/js/Linear/DLSS.js index 31fa0860..a99c81d3 100644 --- a/js/Linear/DLSS.js +++ b/js/Linear/DLSS.js @@ -14,7 +14,7 @@ function DLSS() { this.model.dstate = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLSS\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); @@ -87,10 +87,10 @@ function DLSS() { var mmm = [false,false]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = new ScilabDouble(mmm); + this.model.dep_ut = new ScilabBoolean(mmm); } } else { - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); } this.model.dstate = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble(rpar); diff --git a/js/Linear/DLSS.pickle b/js/Linear/DLSS.pickle index 098b35e0..b2842dad 100644 --- a/js/Linear/DLSS.pickle +++ b/js/Linear/DLSS.pickle @@ -80,42 +80,43 @@ p21 g7 sS'mmm' p22 -g2 -sS'model.in' +S'vector_boolean' p23 +sS'model.in' +p24 g10 sS'graphics.exprs' -p24 +p25 g10 sS'x0' -p25 +p26 g10 sS'typ' -p26 +p27 g2 sS'model.blocktype' -p27 -S'string' p28 -sS'model.dep_ut' +S'string' p29 -g2 -sS'exprs' +sS'model.dep_ut' p30 +g23 +sS'exprs' +p31 g7 sS'gr_i' -p31 +p32 g2 sS'okD' -p32 -S'boolean' p33 -sS'y' +S'boolean' p34 +sS'y' +p35 g2 sS'x' -p35 -NsS'model' p36 +NsS'model' +p37 g4 s.
\ No newline at end of file diff --git a/js/Linear/DLSS_f.js b/js/Linear/DLSS_f.js index 8197a635..4afcf99d 100644 --- a/js/Linear/DLSS_f.js +++ b/js/Linear/DLSS_f.js @@ -14,7 +14,7 @@ function DLSS_f() { this.model.dstate = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLSS_f\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); @@ -77,10 +77,10 @@ function DLSS_f() { var mmm = [false,false]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = new ScilabDouble(mmm); + this.model.dep_ut = new ScilabBoolean(mmm); } } else { - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); } this.model.dstate = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble(rpar); diff --git a/js/Linear/DLSS_f.pickle b/js/Linear/DLSS_f.pickle index a0a9e9ef..a754a23a 100644 --- a/js/Linear/DLSS_f.pickle +++ b/js/Linear/DLSS_f.pickle @@ -80,38 +80,39 @@ p21 g7 sS'mmm' p22 -g2 -sS'model.in' +S'vector_boolean' p23 +sS'model.in' +p24 g10 sS'graphics.exprs' -p24 +p25 g10 sS'x0' -p25 +p26 g10 sS'typ' -p26 +p27 g2 sS'model.blocktype' -p27 -S'string' p28 -sS'model.dep_ut' +S'string' p29 -g2 -sS'exprs' +sS'model.dep_ut' p30 +g23 +sS'exprs' +p31 g7 sS'gr_i' -p31 +p32 g2 sS'y' -p32 +p33 g2 sS'x' -p33 -NsS'model' p34 +NsS'model' +p35 g4 s.
\ No newline at end of file diff --git a/js/Linear/DOLLAR.js b/js/Linear/DOLLAR.js index ed4b52e3..3b5d3ae4 100644 --- a/js/Linear/DOLLAR.js +++ b/js/Linear/DOLLAR.js @@ -12,7 +12,7 @@ function DOLLAR() { this.model.evtin = new ScilabDouble([1-this.inh]); this.model.dstate = new ScilabDouble([z]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); diff --git a/js/Linear/DOLLAR.pickle b/js/Linear/DOLLAR.pickle index f7c5f3ef..9722d530 100644 --- a/js/Linear/DOLLAR.pickle +++ b/js/Linear/DOLLAR.pickle @@ -87,22 +87,23 @@ p26 g17 sS'model.dep_ut' p27 -g13 -sS'exprs' +S'vector_boolean' p28 +sS'exprs' +p29 g17 sS'gr_i' -p29 +p30 g13 sS'y' -p30 +p31 g13 sS'x' -p31 -NsS'model' p32 +NsS'model' +p33 g6 sS'z' -p33 +p34 g4 s.
\ No newline at end of file diff --git a/js/Linear/DOLLAR_f.js b/js/Linear/DOLLAR_f.js index 2d0d3cef..0e89c063 100644 --- a/js/Linear/DOLLAR_f.js +++ b/js/Linear/DOLLAR_f.js @@ -12,7 +12,7 @@ function DOLLAR_f() { this.model.evtin = new ScilabDouble([1-this.inh]); this.model.dstate = new ScilabDouble([z]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR_f\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); diff --git a/js/Linear/DOLLAR_f.pickle b/js/Linear/DOLLAR_f.pickle index a13815c6..1a4e2da9 100644 --- a/js/Linear/DOLLAR_f.pickle +++ b/js/Linear/DOLLAR_f.pickle @@ -71,22 +71,23 @@ p20 g14 sS'model.dep_ut' p21 -g10 -sS'exprs' +S'vector_boolean' p22 +sS'exprs' +p23 g14 sS'gr_i' -p23 +p24 g10 sS'y' -p24 +p25 g10 sS'x' -p25 -NsS'model' p26 +NsS'model' +p27 g4 sS'z' -p27 +p28 g2 s.
\ No newline at end of file diff --git a/js/Linear/DOLLAR_m.js b/js/Linear/DOLLAR_m.js index d4ff905b..9ccaa250 100644 --- a/js/Linear/DOLLAR_m.js +++ b/js/Linear/DOLLAR_m.js @@ -12,7 +12,7 @@ function DOLLAR_m() { this.model.evtin = new ScilabDouble([1-this.inh]); this.model.dstate = new ScilabDouble([z]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR_m\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); diff --git a/js/Linear/DOLLAR_m.pickle b/js/Linear/DOLLAR_m.pickle index f7c5f3ef..9722d530 100644 --- a/js/Linear/DOLLAR_m.pickle +++ b/js/Linear/DOLLAR_m.pickle @@ -87,22 +87,23 @@ p26 g17 sS'model.dep_ut' p27 -g13 -sS'exprs' +S'vector_boolean' p28 +sS'exprs' +p29 g17 sS'gr_i' -p29 +p30 g13 sS'y' -p30 +p31 g13 sS'x' -p31 -NsS'model' p32 +NsS'model' +p33 g6 sS'z' -p33 +p34 g4 s.
\ No newline at end of file diff --git a/js/Linear/GAINBLK.js b/js/Linear/GAINBLK.js index c4b5b6bd..89a5ca05 100644 --- a/js/Linear/GAINBLK.js +++ b/js/Linear/GAINBLK.js @@ -14,7 +14,7 @@ function GAINBLK() { this.model.out2 = new ScilabDouble([out2]); this.model.rpar = new ScilabDouble([this.gain]); 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.gain))]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAINBLK\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); diff --git a/js/Linear/GAINBLK.pickle b/js/Linear/GAINBLK.pickle index cb04b8b9..7da48052 100644 --- a/js/Linear/GAINBLK.pickle +++ b/js/Linear/GAINBLK.pickle @@ -87,25 +87,26 @@ S'string' p27 sS'model.dep_ut' p28 -g21 -sS'exprs' +S'vector_boolean' p29 +sS'exprs' +p30 g21 sS'gr_i' -p30 +p31 g21 sS'y' -p31 +p32 g21 sS'x' -p32 -NsS'model' p33 +NsS'model' +p34 g2 sS'ot' -p34 +p35 g5 sS'gain' -p35 +p36 g5 s.
\ No newline at end of file diff --git a/js/Linear/GAINBLK_f.js b/js/Linear/GAINBLK_f.js index 96bb2408..ee9759a4 100644 --- a/js/Linear/GAINBLK_f.js +++ b/js/Linear/GAINBLK_f.js @@ -10,7 +10,7 @@ function GAINBLK_f() { this.model.out = new ScilabDouble([out]); this.model.rpar = new ScilabDouble([this.gain]); 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.gain))]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAINBLK_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/Linear/GAINBLK_f.pickle b/js/Linear/GAINBLK_f.pickle index 5e42aab2..8cc5fe17 100644 --- a/js/Linear/GAINBLK_f.pickle +++ b/js/Linear/GAINBLK_f.pickle @@ -34,7 +34,7 @@ S'object' p7 sS'model.dep_ut' p8 -S'vector' +S'vector_boolean' p9 sS'arg1' p10 @@ -49,33 +49,34 @@ p13 g4 sS'exprs' p14 -g9 -sS'x.model' +S'vector' p15 -NsS'gr_i' +sS'x.model' p16 -g9 -sS'gain' +NsS'gr_i' p17 +g15 +sS'gain' +p18 g4 sS'model.in' -p18 +p19 g4 sS'graphics' -p19 +p20 g7 sS'y' -p20 -g9 -sS'x' p21 -NsS'model' +g15 +sS'x' p22 +NsS'model' +p23 g7 sS'typ' -p23 -g9 -sS'out' p24 +g15 +sS'out' +p25 g4 s.
\ No newline at end of file diff --git a/js/Linear/GAIN_f.js b/js/Linear/GAIN_f.js index e2840ef3..1588ff5f 100644 --- a/js/Linear/GAIN_f.js +++ b/js/Linear/GAIN_f.js @@ -10,7 +10,7 @@ function GAIN_f() { this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.gain]); 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.gain))],[strcat(sci2exp(in1))],[strcat(sci2exp(out))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAIN_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/Linear/GAIN_f.pickle b/js/Linear/GAIN_f.pickle index 0482236e..06f61c9b 100644 --- a/js/Linear/GAIN_f.pickle +++ b/js/Linear/GAIN_f.pickle @@ -34,7 +34,7 @@ S'object' p7 sS'model.dep_ut' p8 -S'vector' +S'vector_boolean' p9 sS'arg1' p10 @@ -55,28 +55,29 @@ sS'x.model' p16 NsS'gr_i' p17 -g9 -sS'gain' +S'vector' p18 +sS'gain' +p19 g4 sS'model.in' -p19 +p20 g4 sS'graphics' -p20 +p21 g7 sS'y' -p21 -g9 -sS'x' p22 -NsS'model' +g18 +sS'x' p23 +NsS'model' +p24 g7 sS'typ' -p24 -g9 -sS'out' p25 +g18 +sS'out' +p26 g4 s.
\ No newline at end of file diff --git a/js/Linear/INTEGRAL.js b/js/Linear/INTEGRAL.js index b49390be..b2237506 100644 --- a/js/Linear/INTEGRAL.js +++ b/js/Linear/INTEGRAL.js @@ -11,7 +11,7 @@ function INTEGRAL() { this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = string([[0],[0],[0],[this.maxp],[minp]]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); diff --git a/js/Linear/INTEGRAL.pickle b/js/Linear/INTEGRAL.pickle index 29133f78..9a75a132 100644 --- a/js/Linear/INTEGRAL.pickle +++ b/js/Linear/INTEGRAL.pickle @@ -100,19 +100,20 @@ p29 g22 sS'model.dep_ut' p30 -g7 -sS'exprs' +S'vector_boolean' p31 +sS'exprs' +p32 g22 sS'gr_i' -p32 +p33 g7 sS'y' -p33 +p34 g7 sS'x' -p34 -NsS'model' p35 +NsS'model' +p36 g4 s.
\ No newline at end of file diff --git a/js/Linear/INTEGRAL_f.js b/js/Linear/INTEGRAL_f.js index 06315b43..f12f476a 100644 --- a/js/Linear/INTEGRAL_f.js +++ b/js/Linear/INTEGRAL_f.js @@ -8,7 +8,7 @@ function INTEGRAL_f() { this.model.out = new ScilabDouble([1]); this.model.state = new ScilabDouble([this.x0]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = strcat(sci2exp(this.x0)); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL_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/Linear/INTEGRAL_f.pickle b/js/Linear/INTEGRAL_f.pickle index 616e0306..e935bbf7 100644 --- a/js/Linear/INTEGRAL_f.pickle +++ b/js/Linear/INTEGRAL_f.pickle @@ -43,36 +43,37 @@ sS'graphics.exprs' p11 NsS'model.dep_ut' p12 -g7 -sS'exprs' +S'vector_boolean' p13 +sS'exprs' +p14 g4 sS'x.model' -p14 -NsS'gr_i' p15 +NsS'gr_i' +p16 g7 sS'model.state' -p16 +p17 g4 sS'model.in' -p17 +p18 g4 sS'graphics' -p18 +p19 g9 sS'y' -p19 +p20 g7 sS'x' -p20 -NsS'model' p21 +NsS'model' +p22 g9 sS'typ' -p22 +p23 g7 sS'x0' -p23 +p24 g4 s.
\ No newline at end of file diff --git a/js/Linear/INTEGRAL_m.js b/js/Linear/INTEGRAL_m.js index 78a33647..3977d3c9 100644 --- a/js/Linear/INTEGRAL_m.js +++ b/js/Linear/INTEGRAL_m.js @@ -13,7 +13,7 @@ function INTEGRAL_m() { this.model.out2 = new ScilabDouble([1]); this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = string([[0],[0],[0],[this.maxp],[minp]]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL_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/Linear/INTEGRAL_m.pickle b/js/Linear/INTEGRAL_m.pickle index 3dec972a..5a9e7ec4 100644 --- a/js/Linear/INTEGRAL_m.pickle +++ b/js/Linear/INTEGRAL_m.pickle @@ -111,24 +111,25 @@ S'string' p33 sS'model.dep_ut' p34 -g9 -sS'exprs' +S'vector_boolean' p35 +sS'exprs' +p36 g33 sS'gr_i' -p36 +p37 g9 sS'graphics.exprs' -p37 -NsS'y' p38 +NsS'y' +p39 g9 sS'x' -p39 -NsS'model' p40 +NsS'model' +p41 g4 sS'ot' -p41 +p42 g2 s.
\ No newline at end of file diff --git a/js/Linear/PID.js b/js/Linear/PID.js index 43867618..179f12df 100644 --- a/js/Linear/PID.js +++ b/js/Linear/PID.js @@ -33,7 +33,7 @@ function PID() { this.model.outtyp = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["h"]); this.model.firing = new ScilabBoolean([false]); - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); this.model.rpar = new ScilabDouble([scs_m]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PID\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i); diff --git a/js/Linear/PID.pickle b/js/Linear/PID.pickle index eee87a0b..bb17417d 100644 --- a/js/Linear/PID.pickle +++ b/js/Linear/PID.pickle @@ -110,142 +110,143 @@ p32 g2 sS'model.dep_ut' p33 -g17 -sS'scs_m.objs[5-1]' +S'vector_boolean' p34 +sS'scs_m.objs[5-1]' +p35 g4 sS'newpar[size(newpar)+1-1]' -p35 +p36 g4 sS'to' -p36 +p37 g2 sS'ppath[2-1]' -p37 +p38 g4 sS'exprs[2-1]' -p38 +p39 g4 sS'scs_m.objs[12-1]' -p39 +p40 g4 sS'scs_m.objs[13-1]' -p40 +p41 g4 sS'd_old' -p41 -NsS'newpar' p42 +NsS'newpar' +p43 g10 sS'model.in2' -p43 +p44 g4 sS'scs_m.objs[6-1]' -p44 +p45 g4 sS'scs_m.objs[9-1]' -p45 +p46 g4 sS'xx2.graphics' -p46 +p47 g2 sS'i_old' -p47 -NsS'scs_m.objs[3-1]' p48 +NsS'scs_m.objs[3-1]' +p49 g4 sS'arg1.model.rpar.objs[ppath[3-1]-1]' -p49 +p50 g2 sS'ppath[1-1]' -p50 +p51 g4 sS'exprs[3-1]' -p51 +p52 g4 sS'scs_m.objs[14-1]' -p52 +p53 g4 sS'scs_m.objs[17-1]' -p53 +p54 g4 sS'model.in' -p54 +p55 g4 sS'scs_m.objs[4-1]' -p55 +p56 g4 sS'scs_m.objs[7-1]' -p56 +p57 g4 sS'typ' -p57 +p58 g10 sS'model.outtyp' -p58 +p59 g4 sS'p_old' -p59 -NsS'needcompile' p60 +NsS'needcompile' +p61 g4 sS'scs_m' -p61 +p62 g4 sS'arg1.model' -p62 +p63 g2 sS'xx3.graphics' -p63 +p64 g2 sS'model.blocktype' -p64 -S'string' p65 -sS'scs_m.objs[8-1]' +S'string' p66 +sS'scs_m.objs[8-1]' +p67 g4 sS'xx3.model' -p67 +p68 g2 sS'scs_m.objs[21-1]' -p68 +p69 g4 sS'scs_m.objs[15-1]' -p69 +p70 g4 sS'scs_m.objs[16-1]' -p70 +p71 g4 sS'o' -p71 +p72 g2 sS'scs_m.objs[1-1]' -p72 +p73 g4 sS'model.sim' -p73 -g65 -sS'scs_m.objs[11-1]' p74 +g66 +sS'scs_m.objs[11-1]' +p75 g4 sS'model.firing' -p75 -S'boolean' p76 -sS'arg1.model.rpar.objs[ppath[1-1]-1]' +S'boolean' p77 +sS'arg1.model.rpar.objs[ppath[1-1]-1]' +p78 g2 sS'y' -p78 +p79 g4 sS'x' -p79 +p80 g2 sS'model' -p80 +p81 g2 sS'arg1.model.rpar' -p81 +p82 g2 s.
\ No newline at end of file diff --git a/js/Linear/REGISTER.js b/js/Linear/REGISTER.js index 69f74e42..03e3b2a0 100644 --- a/js/Linear/REGISTER.js +++ b/js/Linear/REGISTER.js @@ -9,7 +9,7 @@ function REGISTER() { this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = strcat(string(this.z0),";"); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"REGISTER\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); diff --git a/js/Linear/REGISTER.pickle b/js/Linear/REGISTER.pickle index b62872a5..8c7cb6dc 100644 --- a/js/Linear/REGISTER.pickle +++ b/js/Linear/REGISTER.pickle @@ -75,19 +75,20 @@ S'string' p23 sS'model.dep_ut' p24 -g12 -sS'exprs' +S'vector_boolean' p25 +sS'exprs' +p26 g4 sS'gr_i' -p26 +p27 g12 sS'y' -p27 +p28 g12 sS'x' -p28 -NsS'model' p29 +NsS'model' +p30 g6 s.
\ No newline at end of file diff --git a/js/Linear/REGISTER_f.js b/js/Linear/REGISTER_f.js index 86ed6807..094eef62 100644 --- a/js/Linear/REGISTER_f.js +++ b/js/Linear/REGISTER_f.js @@ -9,7 +9,7 @@ function REGISTER_f() { this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = strcat(string(this.z0),";"); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"REGISTER_f\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2.5,2.5]),this.model,this.exprs,this.gr_i); diff --git a/js/Linear/REGISTER_f.pickle b/js/Linear/REGISTER_f.pickle index b26b470a..f52a8cc3 100644 --- a/js/Linear/REGISTER_f.pickle +++ b/js/Linear/REGISTER_f.pickle @@ -58,25 +58,26 @@ p17 g4 sS'model.dep_ut' p18 -g16 -sS'model.in' +S'vector_boolean' p19 +sS'model.in' +p20 g4 sS'graphics' -p20 +p21 g9 sS'y' -p21 +p22 g16 sS'x' -p22 -NsS'model' p23 +NsS'model' +p24 g9 sS'typ' -p24 +p25 g16 sS'model.blocktype' -p25 +p26 g2 s.
\ No newline at end of file diff --git a/js/Linear/SAMPHOLD.js b/js/Linear/SAMPHOLD.js index c942c6c6..70de60f7 100644 --- a/js/Linear/SAMPHOLD.js +++ b/js/Linear/SAMPHOLD.js @@ -8,7 +8,7 @@ function SAMPHOLD() { this.model.out = new ScilabDouble([-1]); this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); - 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),\"SAMPHOLD\",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/Linear/SAMPHOLD.pickle b/js/Linear/SAMPHOLD.pickle index f1cea574..b09e1bf1 100644 --- a/js/Linear/SAMPHOLD.pickle +++ b/js/Linear/SAMPHOLD.pickle @@ -36,26 +36,27 @@ p9 g8 sS'model.dep_ut' p10 -g6 -sS'model.out' +S'vector_boolean' p11 +sS'model.out' +p12 g8 sS'gr_i' -p12 +p13 g6 sS'model.in' -p13 +p14 g8 sS'y' -p14 +p15 g6 sS'x' -p15 -NsS'model' p16 -S'object' +NsS'model' p17 -sS'typ' +S'object' p18 +sS'typ' +p19 g6 s.
\ No newline at end of file diff --git a/js/Linear/SAMPHOLD_m.js b/js/Linear/SAMPHOLD_m.js index f9348de3..4ca5517d 100644 --- a/js/Linear/SAMPHOLD_m.js +++ b/js/Linear/SAMPHOLD_m.js @@ -11,7 +11,7 @@ function SAMPHOLD_m() { this.model.out2 = new ScilabDouble([-2]); this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPHOLD_m\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); diff --git a/js/Linear/SAMPHOLD_m.pickle b/js/Linear/SAMPHOLD_m.pickle index f07148fc..17ea2010 100644 --- a/js/Linear/SAMPHOLD_m.pickle +++ b/js/Linear/SAMPHOLD_m.pickle @@ -81,17 +81,18 @@ S'string' p25 sS'model.dep_ut' p26 -g9 -sS'gr_i' +S'vector_boolean' p27 +sS'gr_i' +p28 g9 sS'y' -p28 +p29 g9 sS'x' -p29 +p30 g2 sS'model' -p30 +p31 g2 s.
\ No newline at end of file diff --git a/js/Linear/SAMPLEHOLD_f.js b/js/Linear/SAMPLEHOLD_f.js index dca7f1d5..dae59724 100644 --- a/js/Linear/SAMPLEHOLD_f.js +++ b/js/Linear/SAMPLEHOLD_f.js @@ -8,7 +8,7 @@ function SAMPLEHOLD_f() { this.model.out = new ScilabDouble([-1]); this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); - 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),\"SAMPLEHOLD_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/Linear/SAMPLEHOLD_f.pickle b/js/Linear/SAMPLEHOLD_f.pickle index e0302878..418a8f45 100644 --- a/js/Linear/SAMPLEHOLD_f.pickle +++ b/js/Linear/SAMPLEHOLD_f.pickle @@ -35,26 +35,27 @@ p8 g7 sS'model.dep_ut' p9 -g5 -sS'model.out' +S'vector_boolean' p10 +sS'model.out' +p11 g7 sS'gr_i' -p11 +p12 g5 sS'model.in' -p12 +p13 g7 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/Linear/SOM_f.js b/js/Linear/SOM_f.js index 93c287fd..2682f8a8 100644 --- a/js/Linear/SOM_f.js +++ b/js/Linear/SOM_f.js @@ -8,7 +8,7 @@ function SOM_f() { this.model.out = new ScilabDouble([-1]); this.model.rpar = new ScilabDouble(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(1)],[sci2exp(sgn)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SOM_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/Linear/SOM_f.pickle b/js/Linear/SOM_f.pickle index bc3f8c1b..6dbd734b 100644 --- a/js/Linear/SOM_f.pickle +++ b/js/Linear/SOM_f.pickle @@ -52,26 +52,27 @@ p15 g13 sS'model.dep_ut' p16 -g13 -sS'str' +S'vector_boolean' p17 +sS'str' +p18 g6 sS'graphics' -p18 +p19 g9 sS'y' -p19 +p20 g13 sS'x' -p20 -NsS'model' p21 +NsS'model' +p22 g9 sS'typ' -p22 +p23 g13 sS'model.blocktype' -p23 -S'string' p24 +S'string' +p25 s.
\ No newline at end of file diff --git a/js/Linear/SUMMATION.js b/js/Linear/SUMMATION.js index 6dcc14b0..84a441a8 100644 --- a/js/Linear/SUMMATION.js +++ b/js/Linear/SUMMATION.js @@ -10,7 +10,7 @@ function SUMMATION() { this.model.out2 = new ScilabDouble([-2]); 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),\"SUMMATION\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,3]),this.model,this.exprs,this.gr_i); diff --git a/js/Linear/SUMMATION.pickle b/js/Linear/SUMMATION.pickle index 0b007c13..536650a3 100644 --- a/js/Linear/SUMMATION.pickle +++ b/js/Linear/SUMMATION.pickle @@ -88,24 +88,25 @@ p27 g5 sS'model.dep_ut' p28 -g24 -sS'exprs' +S'vector_boolean' p29 +sS'exprs' +p30 g5 sS'gr_i' -p30 +p31 g24 sS'y' -p31 +p32 g24 sS'x' -p32 -NsS'model' p33 +NsS'model' +p34 g2 sS'ot' -p34 -NsS'nout' p35 +NsS'nout' +p36 g10 s.
\ No newline at end of file diff --git a/js/Linear/SUM_f.js b/js/Linear/SUM_f.js index 8db2a6cf..7cf09c90 100644 --- a/js/Linear/SUM_f.js +++ b/js/Linear/SUM_f.js @@ -6,7 +6,7 @@ function SUM_f() { this.model.in = new ScilabDouble([-1],[-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.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUM_f\",sz(1),sz(2));"]); this.exprs = []; this.x = new standard_define(new ScilabDouble([1,1]),this.model,this.exprs,this.gr_i); diff --git a/js/Linear/SUM_f.pickle b/js/Linear/SUM_f.pickle index 35edcc28..6f8441b4 100644 --- a/js/Linear/SUM_f.pickle +++ b/js/Linear/SUM_f.pickle @@ -33,27 +33,28 @@ S'vector' p8 sS'model.dep_ut' p9 -g8 -sS'p' +S'vector_boolean' p10 +sS'p' +p11 g4 sS'gr_i' -p11 +p12 g8 sS'model.in' -p12 -S'matrix' p13 -sS'y' +S'matrix' p14 +sS'y' +p15 g8 sS'x' -p15 -NsS'model' p16 -S'object' +NsS'model' p17 -sS'typ' +S'object' p18 +sS'typ' +p19 g8 s.
\ No newline at end of file diff --git a/js/Linear/TCLSS.js b/js/Linear/TCLSS.js index 26b9d352..3fda1d85 100644 --- a/js/Linear/TCLSS.js +++ b/js/Linear/TCLSS.js @@ -17,7 +17,7 @@ function TCLSS() { this.model.state = new ScilabDouble([this.x0]); this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TCLSS\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); @@ -80,10 +80,10 @@ function TCLSS() { var mmm = [false,true]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = new ScilabDouble(mmm); + this.model.dep_ut = new ScilabBoolean(mmm); } } else { - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); } this.model.state = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble(rpar); diff --git a/js/Linear/TCLSS.pickle b/js/Linear/TCLSS.pickle index ae7a4f9f..c633f755 100644 --- a/js/Linear/TCLSS.pickle +++ b/js/Linear/TCLSS.pickle @@ -79,7 +79,7 @@ p20 g5 sS'mmm' p21 -S'vector' +S'vector_boolean' p22 sS'model.state' p23 @@ -95,26 +95,27 @@ p26 g8 sS'typ' p27 -g22 -sS'model.blocktype' +S'vector' p28 -S'string' +sS'model.blocktype' p29 -sS'model.dep_ut' +S'string' p30 +sS'model.dep_ut' +p31 g22 sS'exprs' -p31 +p32 g5 sS'gr_i' -p32 -g22 -sS'y' p33 -g22 -sS'x' +g28 +sS'y' p34 -NsS'model' +g28 +sS'x' p35 +NsS'model' +p36 g2 s.
\ No newline at end of file diff --git a/js/Linear/TCLSS_f.js b/js/Linear/TCLSS_f.js index 53257ece..a92c94d8 100644 --- a/js/Linear/TCLSS_f.js +++ b/js/Linear/TCLSS_f.js @@ -17,7 +17,7 @@ function TCLSS_f() { this.model.state = new ScilabDouble([this.x0]); this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TCLSS_f\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); @@ -80,10 +80,10 @@ function TCLSS_f() { var mmm = [false,true]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = new ScilabDouble(mmm); + this.model.dep_ut = new ScilabBoolean(mmm); } } else { - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); } this.model.state = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble(rpar); diff --git a/js/Linear/TCLSS_f.pickle b/js/Linear/TCLSS_f.pickle index ae7a4f9f..c633f755 100644 --- a/js/Linear/TCLSS_f.pickle +++ b/js/Linear/TCLSS_f.pickle @@ -79,7 +79,7 @@ p20 g5 sS'mmm' p21 -S'vector' +S'vector_boolean' p22 sS'model.state' p23 @@ -95,26 +95,27 @@ p26 g8 sS'typ' p27 -g22 -sS'model.blocktype' +S'vector' p28 -S'string' +sS'model.blocktype' p29 -sS'model.dep_ut' +S'string' p30 +sS'model.dep_ut' +p31 g22 sS'exprs' -p31 +p32 g5 sS'gr_i' -p32 -g22 -sS'y' p33 -g22 -sS'x' +g28 +sS'y' p34 -NsS'model' +g28 +sS'x' p35 +NsS'model' +p36 g2 s.
\ No newline at end of file diff --git a/js/Linear/TIME_DELAY.js b/js/Linear/TIME_DELAY.js index 2686f05e..89bc8dc3 100644 --- a/js/Linear/TIME_DELAY.js +++ b/js/Linear/TIME_DELAY.js @@ -12,7 +12,7 @@ function TIME_DELAY() { this.model.rpar = new ScilabDouble([this.T,this.init]); this.model.ipar = new ScilabDouble([this.N]); this.model.blocktype = new ScilabString(["x"]); - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = [[string(this.T)],[string(this.init)],[string(this.N)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TIME_DELAY\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([3.5,2]),this.model,this.exprs,this.gr_i); @@ -59,7 +59,7 @@ function TIME_DELAY() { this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.rpar = new ScilabDouble([this.T],[this.init]); this.model.ipar = new ScilabDouble([this.N]); - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); this.x.graphics = this.graphics; this.x.model = this.model; break; diff --git a/js/Linear/TIME_DELAY.pickle b/js/Linear/TIME_DELAY.pickle index 8a2589c0..b2bed6a4 100644 --- a/js/Linear/TIME_DELAY.pickle +++ b/js/Linear/TIME_DELAY.pickle @@ -79,20 +79,21 @@ S'string' p23 sS'model.dep_ut' p24 -g13 -sS'exprs' +S'vector_boolean' p25 -S'matrix' +sS'exprs' p26 -sS'gr_i' +S'matrix' p27 +sS'gr_i' +p28 g13 sS'y' -p28 +p29 g13 sS'x' -p29 -NsS'model' p30 +NsS'model' +p31 g2 s.
\ No newline at end of file diff --git a/js/Linear/VARIABLE_DELAY.js b/js/Linear/VARIABLE_DELAY.js index 9eade31c..d8cb881d 100644 --- a/js/Linear/VARIABLE_DELAY.js +++ b/js/Linear/VARIABLE_DELAY.js @@ -12,7 +12,7 @@ function VARIABLE_DELAY() { this.model.rpar = new ScilabDouble([this.T,this.init]); this.model.ipar = new ScilabDouble([this.N]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[string(this.T)],[string(this.init)],[string(this.N)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VARIABLE_DELAY\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); diff --git a/js/Linear/VARIABLE_DELAY.pickle b/js/Linear/VARIABLE_DELAY.pickle index 5b8ff7e1..77059d72 100644 --- a/js/Linear/VARIABLE_DELAY.pickle +++ b/js/Linear/VARIABLE_DELAY.pickle @@ -80,19 +80,20 @@ S'string' p24 sS'model.dep_ut' p25 -g13 -sS'exprs' +S'vector_boolean' p26 +sS'exprs' +p27 g17 sS'gr_i' -p27 +p28 g13 sS'y' -p28 +p29 g13 sS'x' -p29 -NsS'model' p30 +NsS'model' +p31 g2 s.
\ No newline at end of file |