diff options
author | Sunil Shetye | 2018-07-10 10:51:41 +0530 |
---|---|---|
committer | Sunil Shetye | 2018-07-10 11:24:53 +0530 |
commit | e99608a59243936dfe2e5f3aaa81411df3847f18 (patch) | |
tree | 6f588a3371c84c158558836a90ba99fb7b6d3a7f /js/Linear | |
parent | 30c83c60e309a3b94d7bb7dcf5cfebd5db1884cb (diff) | |
download | sci2js-e99608a59243936dfe2e5f3aaa81411df3847f18.tar.gz sci2js-e99608a59243936dfe2e5f3aaa81411df3847f18.tar.bz2 sci2js-e99608a59243936dfe2e5f3aaa81411df3847f18.zip |
allow expression in lterm
Diffstat (limited to 'js/Linear')
42 files changed, 250 insertions, 250 deletions
diff --git a/js/Linear/BIGSOM_f.js b/js/Linear/BIGSOM_f.js index 9bc85d52..3339ed52 100644 --- a/js/Linear/BIGSOM_f.js +++ b/js/Linear/BIGSOM_f.js @@ -34,7 +34,7 @@ function BIGSOM_f() { break; } in1 = -ones(size(this.sgn,"*"),1); - [model,graphics,ok] = check_io(this.model,graphics,in1,-1,[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,in1,-1,[],[]); if (ok) { this.model.rpar = this.sgn.slice(); graphics.exprs = exprs; diff --git a/js/Linear/BIGSOM_f.pickle b/js/Linear/BIGSOM_f.pickle index 44d77e11..d2bee77c 100644 --- a/js/Linear/BIGSOM_f.pickle +++ b/js/Linear/BIGSOM_f.pickle @@ -15,9 +15,9 @@ S'sgn' p1 S'matrix' p2 -sS'[model,graphics,ok]' +sS'model.sim' p3 -S'double' +S'list' p4 sS'model.in1' p5 @@ -33,46 +33,46 @@ p9 sS'arg1' p10 g9 -sS'graphics.exprs' +sS'[this.model,graphics,ok]' p11 -NsS'in1' +S'double' p12 -g4 -sS'model.rpar' +sS'graphics.exprs' p13 +NsS'in1' +p14 +g12 +sS'model.rpar' +p15 g2 sS'exprs' -p14 -g4 +p16 +g12 sS'x.model' -p15 +p17 NsS'gr_i' -p16 +p18 S'vector' -p17 +p19 sS'model.dep_ut' -p18 -g17 +p20 +g19 sS'graphics' -p19 +p21 g9 sS'y' -p20 -g17 -sS'x' -p21 -g4 -sS'model' p22 -g9 -sS'model.sim' +g19 +sS'x' p23 -S'list' +g12 +sS'model' p24 +g9 sS'typ' p25 -g17 +g19 sS'model.out' p26 -g4 +g12 s.
\ No newline at end of file diff --git a/js/Linear/CLSS.js b/js/Linear/CLSS.js index edb1f1df..2581ea97 100644 --- a/js/Linear/CLSS.js +++ b/js/Linear/CLSS.js @@ -74,7 +74,7 @@ function CLSS() { if (ms!=ns||!okD) { message(_("Matrix A is not square or D has wrong dimension")); } else { - [model,graphics,ok] = check_io(this.model,graphics,in1,out,[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,in1,out,[],[]); if (ok) { graphics.exprs = exprs; rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; diff --git a/js/Linear/CLSS.pickle b/js/Linear/CLSS.pickle index 3e1d0757..5da008f5 100644 --- a/js/Linear/CLSS.pickle +++ b/js/Linear/CLSS.pickle @@ -65,51 +65,51 @@ g8 sS'D' p18 g8 -sS'in1' +sS'[this.model,graphics,ok]' p19 g8 -sS'model.rpar' +sS'in1' p20 +g8 +sS'model.rpar' +p21 g5 sS'mmm' -p21 -S'vector' p22 -sS'model.state' +S'vector' p23 +sS'model.state' +p24 g8 sS'graphics.exprs' -p24 +p25 g8 sS'x0' -p25 +p26 g8 sS'typ' -p26 -g22 -sS'[model,graphics,ok]' p27 -g8 +g23 sS'model.blocktype' p28 S'string' p29 sS'model.dep_ut' p30 -g22 +g23 sS'exprs' p31 g5 sS'gr_i' p32 -g22 +g23 sS'okD' p33 S'boolean' p34 sS'y' p35 -g22 +g23 sS'x' p36 g8 diff --git a/js/Linear/CLSS_f.js b/js/Linear/CLSS_f.js index c2a8963b..00f1abee 100644 --- a/js/Linear/CLSS_f.js +++ b/js/Linear/CLSS_f.js @@ -64,7 +64,7 @@ function CLSS_f() { if (ms!=ns) { message("A matrix must be square"); } else { - [model,graphics,ok] = check_io(this.model,graphics,in1,out,[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,in1,out,[],[]); if (ok) { graphics.exprs = exprs; rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; diff --git a/js/Linear/CLSS_f.pickle b/js/Linear/CLSS_f.pickle index 3f244bc5..bedf22d9 100644 --- a/js/Linear/CLSS_f.pickle +++ b/js/Linear/CLSS_f.pickle @@ -66,30 +66,30 @@ g10 sS'D' p19 g10 -sS'in1' +sS'[this.model,graphics,ok]' p20 g10 -sS'model.rpar' +sS'in1' p21 +g10 +sS'model.rpar' +p22 g5 sS'mmm' -p22 +p23 g8 sS'model.state' -p23 +p24 g10 sS'graphics.exprs' -p24 +p25 g10 sS'x0' -p25 +p26 g10 sS'typ' -p26 -g8 -sS'[model,graphics,ok]' p27 -g10 +g8 sS'model.blocktype' p28 S'string' diff --git a/js/Linear/DELAYV_f.js b/js/Linear/DELAYV_f.js index 882d20ee..32b88214 100644 --- a/js/Linear/DELAYV_f.js +++ b/js/Linear/DELAYV_f.js @@ -58,7 +58,7 @@ function DELAYV_f() { ok = false; } if (ok) { - [model,graphics,ok] = check_io(this.model,graphics,[[this.nin],[1]],this.nin,1,[[1],[1]]); + [this.model,graphics,ok] = check_io(this.model,graphics,[[this.nin],[1]],this.nin,1,[[1],[1]]); } if (ok) { graphics.exprs = exprs; diff --git a/js/Linear/DELAYV_f.pickle b/js/Linear/DELAYV_f.pickle index 21ff94bb..64735027 100644 --- a/js/Linear/DELAYV_f.pickle +++ b/js/Linear/DELAYV_f.pickle @@ -65,18 +65,18 @@ g11 sS'nin' p20 g2 -sS'model.rpar' +sS'[this.model,graphics,ok]' p21 g2 -sS'T' +sS'model.rpar' p22 g2 -sS'graphics.exprs' +sS'T' p23 -NsS'z0' -p24 g2 -sS'[model,graphics,ok]' +sS'graphics.exprs' +p24 +NsS'z0' p25 g2 sS'ok' diff --git a/js/Linear/DLSS.js b/js/Linear/DLSS.js index 84562fd2..429e50be 100644 --- a/js/Linear/DLSS.js +++ b/js/Linear/DLSS.js @@ -73,7 +73,7 @@ function DLSS() { if (ms!=ns||!okD) { message(_("Matrix A is not square or D has wrong dimension")); } else { - [model,graphics,ok] = check_io(this.model,graphics,in1,out,1,[]); + [this.model,graphics,ok] = check_io(this.model,graphics,in1,out,1,[]); if (ok) { graphics.exprs = exprs; rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; diff --git a/js/Linear/DLSS.pickle b/js/Linear/DLSS.pickle index 43487590..ba90542f 100644 --- a/js/Linear/DLSS.pickle +++ b/js/Linear/DLSS.pickle @@ -72,27 +72,27 @@ g10 sS'D' p21 g10 -sS'in1' +sS'[this.model,graphics,ok]' p22 +g10 +sS'in1' +p23 g2 sS'model.rpar' -p23 +p24 g7 sS'mmm' -p24 +p25 g2 sS'graphics.exprs' -p25 +p26 g10 sS'x0' -p26 +p27 g10 sS'typ' -p27 -g2 -sS'[model,graphics,ok]' p28 -g10 +g2 sS'model.blocktype' p29 S'string' diff --git a/js/Linear/DLSS_f.js b/js/Linear/DLSS_f.js index aa18f3ee..f936cceb 100644 --- a/js/Linear/DLSS_f.js +++ b/js/Linear/DLSS_f.js @@ -63,7 +63,7 @@ function DLSS_f() { if (ms!=ns) { message("A matrix must be square"); } else { - [model,graphics,ok] = check_io(this.model,graphics,in1,out,1,[]); + [this.model,graphics,ok] = check_io(this.model,graphics,in1,out,1,[]); if (ok) { graphics.exprs = exprs; rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; diff --git a/js/Linear/DLSS_f.pickle b/js/Linear/DLSS_f.pickle index 0108f795..33a94865 100644 --- a/js/Linear/DLSS_f.pickle +++ b/js/Linear/DLSS_f.pickle @@ -72,27 +72,27 @@ g11 sS'D' p21 g11 -sS'in1' +sS'[this.model,graphics,ok]' p22 +g11 +sS'in1' +p23 g2 sS'model.rpar' -p23 +p24 g7 sS'mmm' -p24 +p25 g2 sS'graphics.exprs' -p25 +p26 g11 sS'x0' -p26 +p27 g11 sS'typ' -p27 -g2 -sS'[model,graphics,ok]' p28 -g11 +g2 sS'model.blocktype' p29 S'string' diff --git a/js/Linear/DOLLAR.js b/js/Linear/DOLLAR.js index 34525b0f..960f1660 100644 --- a/js/Linear/DOLLAR.js +++ b/js/Linear/DOLLAR.js @@ -86,7 +86,7 @@ function DOLLAR() { ok = false; } if (ok) { - [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),ones(1-this.inh,1),[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),ones(1-this.inh,1),[]); } if (ok) { graphics.exprs = exprs; diff --git a/js/Linear/DOLLAR.pickle b/js/Linear/DOLLAR.pickle index c49f542a..f1752657 100644 --- a/js/Linear/DOLLAR.pickle +++ b/js/Linear/DOLLAR.pickle @@ -61,17 +61,17 @@ p18 sS'model.sim' p19 g2 -sS'in1' +sS'[this.model,graphics,ok]' p20 g4 -sS'graphics.exprs' +sS'in1' p21 -NsS'typ' +g4 +sS'graphics.exprs' p22 -g13 -sS'[model,graphics,ok]' +NsS'typ' p23 -g4 +g13 sS'ot' p24 g4 diff --git a/js/Linear/DOLLAR_f.js b/js/Linear/DOLLAR_f.js index 0207d703..daf7ecc1 100644 --- a/js/Linear/DOLLAR_f.js +++ b/js/Linear/DOLLAR_f.js @@ -48,7 +48,7 @@ function DOLLAR_f() { } in1 = out; if (ok) { - [model,graphics,ok] = check_io(this.model,graphics,-1,-1,ones(1-this.inh,1),[]); + [this.model,graphics,ok] = check_io(this.model,graphics,-1,-1,ones(1-this.inh,1),[]); } if (ok) { graphics.exprs = exprs; diff --git a/js/Linear/DOLLAR_f.pickle b/js/Linear/DOLLAR_f.pickle index c5ad31a2..367e72b0 100644 --- a/js/Linear/DOLLAR_f.pickle +++ b/js/Linear/DOLLAR_f.pickle @@ -52,17 +52,17 @@ p15 sS'model.sim' p16 g15 -sS'in1' +sS'[this.model,graphics,ok]' p17 g2 -sS'graphics.exprs' +sS'in1' p18 -NsS'typ' +g2 +sS'graphics.exprs' p19 -g10 -sS'[model,graphics,ok]' +NsS'typ' p20 -g2 +g10 sS'model.blocktype' p21 g15 diff --git a/js/Linear/DOLLAR_m.js b/js/Linear/DOLLAR_m.js index 830e4d66..2e7e5501 100644 --- a/js/Linear/DOLLAR_m.js +++ b/js/Linear/DOLLAR_m.js @@ -86,7 +86,7 @@ function DOLLAR_m() { ok = false; } if (ok) { - [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),ones(1-this.inh,1),[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),ones(1-this.inh,1),[]); } if (ok) { graphics.exprs = exprs; diff --git a/js/Linear/DOLLAR_m.pickle b/js/Linear/DOLLAR_m.pickle index c49f542a..f1752657 100644 --- a/js/Linear/DOLLAR_m.pickle +++ b/js/Linear/DOLLAR_m.pickle @@ -61,17 +61,17 @@ p18 sS'model.sim' p19 g2 -sS'in1' +sS'[this.model,graphics,ok]' p20 g4 -sS'graphics.exprs' +sS'in1' p21 -NsS'typ' +g4 +sS'graphics.exprs' p22 -g13 -sS'[model,graphics,ok]' +NsS'typ' p23 -g4 +g13 sS'ot' p24 g4 diff --git a/js/Linear/GAINBLK.js b/js/Linear/GAINBLK.js index 78c6fd28..e399edfb 100644 --- a/js/Linear/GAINBLK.js +++ b/js/Linear/GAINBLK.js @@ -139,9 +139,9 @@ function GAINBLK() { if (ok) { [out,in1] = size(this.gain); if (out*in1!=1) { - [model,graphics,ok] = set_io(this.model,graphics,list([in1,-1],ot),list([out,-1],ot),[],[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list([in1,-1],ot),list([out,-1],ot),[],[]); } else { - [model,graphics,ok] = set_io(this.model,graphics,list([-1,-2],ot),list([-1,-2],ot),[],[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list([-1,-2],ot),list([-1,-2],ot),[],[]); } } if (ok) { diff --git a/js/Linear/GAINBLK.pickle b/js/Linear/GAINBLK.pickle index 352279f5..31b6e852 100644 --- a/js/Linear/GAINBLK.pickle +++ b/js/Linear/GAINBLK.pickle @@ -48,32 +48,32 @@ p13 sS'[out,in1]' p14 g5 -sS'model.out2' +sS'[this.model,graphics,ok]' p15 g5 -sS'in1' +sS'model.out2' p16 g5 -sS'in2' +sS'in1' p17 g5 -sS'model.rpar' +sS'in2' p18 g5 -sS'graphics.exprs' +sS'model.rpar' p19 -S'matrix' +g5 +sS'graphics.exprs' p20 -sS'typ' +S'matrix' p21 -S'vector' +sS'typ' p22 -sS'model.opar' +S'vector' p23 -g13 -sS'[model,graphics,ok]' +sS'model.opar' p24 -g5 +g13 sS'out2' p25 g5 @@ -87,16 +87,16 @@ S'string' p29 sS'model.dep_ut' p30 -g22 +g23 sS'exprs' p31 -g22 +g23 sS'gr_i' p32 -g22 +g23 sS'y' p33 -g22 +g23 sS'x' p34 g5 diff --git a/js/Linear/GAINBLK_f.js b/js/Linear/GAINBLK_f.js index 8cfbd59e..3c884a91 100644 --- a/js/Linear/GAINBLK_f.js +++ b/js/Linear/GAINBLK_f.js @@ -40,7 +40,7 @@ function GAINBLK_f() { message("Gain must have at least one element"); } else { [out,in1] = size(this.gain); - [model,graphics,ok] = check_io(this.model,graphics,in1,out,[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,in1,out,[],[]); if (ok) { graphics.exprs = exprs; this.model.rpar = this.gain.slice(); diff --git a/js/Linear/GAINBLK_f.pickle b/js/Linear/GAINBLK_f.pickle index 960ab456..8ffb67bc 100644 --- a/js/Linear/GAINBLK_f.pickle +++ b/js/Linear/GAINBLK_f.pickle @@ -40,39 +40,39 @@ p11 sS'[out,in1]' p12 g6 -sS'in1' +sS'[this.model,graphics,ok]' p13 g6 -sS'model.rpar' +sS'in1' p14 g6 -sS'gain' +sS'model.rpar' p15 g6 -sS'graphics.exprs' +sS'gain' p16 -NsS'typ' +g6 +sS'graphics.exprs' p17 -S'vector' +NsS'typ' p18 -sS'[model,graphics,ok]' +S'vector' p19 -g6 sS'model.blocktype' p20 g11 sS'model.dep_ut' p21 -g18 +g19 sS'exprs' p22 -g18 +g19 sS'gr_i' p23 -g18 +g19 sS'y' p24 -g18 +g19 sS'x' p25 g6 diff --git a/js/Linear/GAIN_f.js b/js/Linear/GAIN_f.js index 1245e513..3ac3a5e9 100644 --- a/js/Linear/GAIN_f.js +++ b/js/Linear/GAIN_f.js @@ -40,7 +40,7 @@ function GAIN_f() { message("Gain must have at least one element"); } else { [out,in1] = size(this.gain); - [model,graphics,ok] = check_io(this.model,graphics,in1,out,[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,in1,out,[],[]); if (ok) { graphics.exprs = exprs; this.model.rpar = this.gain.slice(); diff --git a/js/Linear/GAIN_f.pickle b/js/Linear/GAIN_f.pickle index 107d062b..323c5bfd 100644 --- a/js/Linear/GAIN_f.pickle +++ b/js/Linear/GAIN_f.pickle @@ -40,40 +40,40 @@ p11 sS'[out,in1]' p12 g6 -sS'in1' +sS'[this.model,graphics,ok]' p13 g6 -sS'model.rpar' +sS'in1' p14 g6 -sS'gain' +sS'model.rpar' p15 g6 -sS'graphics.exprs' +sS'gain' p16 -NsS'typ' +g6 +sS'graphics.exprs' p17 -S'vector' +NsS'typ' p18 -sS'[model,graphics,ok]' +S'vector' p19 -g6 sS'model.blocktype' p20 g11 sS'model.dep_ut' p21 -g18 +g19 sS'exprs' p22 S'matrix' p23 sS'gr_i' p24 -g18 +g19 sS'y' p25 -g18 +g19 sS'x' p26 g6 diff --git a/js/Linear/INTEGRAL.js b/js/Linear/INTEGRAL.js index 89a6d7f5..1e07521b 100644 --- a/js/Linear/INTEGRAL.js +++ b/js/Linear/INTEGRAL.js @@ -82,7 +82,7 @@ function INTEGRAL() { if (ok) { this.model.rpar = rpar; this.model.state = this.x0; - [model,graphics,ok] = check_io(this.model,graphics,size(this.x0,1)*[[1],[ones(this.reinit,1)]],size(this.x0,1),ones(this.reinit,1),[]); + [this.model,graphics,ok] = check_io(this.model,graphics,size(this.x0,1)*[[1],[ones(this.reinit,1)]],size(this.x0,1),ones(this.reinit,1),[]); } if (ok) { graphics.exprs = exprs; diff --git a/js/Linear/INTEGRAL.pickle b/js/Linear/INTEGRAL.pickle index ad29ee50..42d59c14 100644 --- a/js/Linear/INTEGRAL.pickle +++ b/js/Linear/INTEGRAL.pickle @@ -55,52 +55,52 @@ sS'model.sim' p14 S'list' p15 -sS'model.nmode' +sS'[this.model,graphics,ok]' p16 g4 -sS'model.rpar' +sS'model.nmode' p17 +g4 +sS'model.rpar' +p18 g6 sS'model.in1' -p18 +p19 g4 sS'satur' -p19 +p20 g4 sS'model.state' -p20 +p21 g4 sS'lowp' -p21 -S'string' p22 -sS'graphics.exprs' +S'string' p23 -NsS'x0' +sS'graphics.exprs' p24 +NsS'x0' +p25 g6 sS'model.nzcross' -p25 +p26 g4 sS'x.graphics.id' -p26 -g22 -sS'[model,graphics,ok]' p27 -g4 +g23 sS'ok' p28 S'boolean' p29 sS'model.blocktype' p30 -g22 +g23 sS'model.dep_ut' p31 g6 sS'exprs' p32 -g22 +g23 sS'gr_i' p33 g6 diff --git a/js/Linear/INTEGRAL_m.js b/js/Linear/INTEGRAL_m.js index a0fbcd6d..11639e30 100644 --- a/js/Linear/INTEGRAL_m.js +++ b/js/Linear/INTEGRAL_m.js @@ -124,7 +124,7 @@ function INTEGRAL_m() { if (ok) { in1 = [size(this.x0,1)*[[1],[ones(this.reinit,1)]],size(this.x0,2)*[[1],[ones(this.reinit,1)]]]; out = size(this.x0); - [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),ones(this.reinit,1),[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),ones(this.reinit,1),[]); } } if (ok) { diff --git a/js/Linear/INTEGRAL_m.pickle b/js/Linear/INTEGRAL_m.pickle index f90a27ce..76a2f5ed 100644 --- a/js/Linear/INTEGRAL_m.pickle +++ b/js/Linear/INTEGRAL_m.pickle @@ -68,34 +68,34 @@ p19 sS'Datatype' p20 g4 -sS'model.out2' +sS'[this.model,graphics,ok]' p21 g4 -sS'in1' +sS'model.out2' p22 +g4 +sS'in1' +p23 g8 sS'model.rpar' -p23 +p24 g8 sS'model.nmode' -p24 +p25 g4 sS'satur' -p25 +p26 g4 sS'model.state' -p26 +p27 g4 sS'lowp' -p27 +p28 g4 sS'graphics' -p28 +p29 g2 sS'model.nzcross' -p29 -g4 -sS'[model,graphics,ok]' p30 g4 sS'ok' diff --git a/js/Linear/REGISTER.js b/js/Linear/REGISTER.js index 80852342..34036efe 100644 --- a/js/Linear/REGISTER.js +++ b/js/Linear/REGISTER.js @@ -77,7 +77,7 @@ function REGISTER() { } if (ok) { in1 = [1,1]; - [model,graphics,ok] = set_io(this.model,graphics,list(in1,this.it),list(in1,this.it),1,[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,this.it),list(in1,this.it),1,[]); } if (ok) { graphics.exprs = exprs; diff --git a/js/Linear/REGISTER.pickle b/js/Linear/REGISTER.pickle index 3362101f..8ca0dc7f 100644 --- a/js/Linear/REGISTER.pickle +++ b/js/Linear/REGISTER.pickle @@ -49,17 +49,17 @@ g4 sS'model.sim' p15 g2 -sS'in1' +sS'[this.model,graphics,ok]' p16 +g4 +sS'in1' +p17 g13 sS'graphics.exprs' -p17 -S'matrix' p18 -sS'z0' +S'matrix' p19 -g4 -sS'[model,graphics,ok]' +sS'z0' p20 g4 sS'ok' diff --git a/js/Linear/SAMPHOLD_m.js b/js/Linear/SAMPHOLD_m.js index e1d95b25..b9ee78b1 100644 --- a/js/Linear/SAMPHOLD_m.js +++ b/js/Linear/SAMPHOLD_m.js @@ -44,7 +44,7 @@ function SAMPHOLD_m() { } if (ok) { in1 = [this.model.in1,this.model.in2]; - [model,graphics,ok] = set_io(this.model,graphics,list(in1,this.it),list(in1,this.it),1,[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,this.it),list(in1,this.it),1,[]); if (ok) { graphics.exprs = exprs; arg1.graphics = graphics; diff --git a/js/Linear/SAMPHOLD_m.pickle b/js/Linear/SAMPHOLD_m.pickle index adacb2d1..23b819b3 100644 --- a/js/Linear/SAMPHOLD_m.pickle +++ b/js/Linear/SAMPHOLD_m.pickle @@ -45,26 +45,26 @@ p13 sS'arg1.graphics' p14 g2 -sS'model.out2' +sS'[this.model,graphics,ok]' p15 g5 -sS'in1' +sS'model.out2' p16 +g5 +sS'in1' +p17 g9 sS'model.in1' -p17 +p18 g5 sS'model.outtyp' -p18 +p19 g5 sS'graphics.exprs' -p19 -NsS'typ' p20 -g9 -sS'[model,graphics,ok]' +NsS'typ' p21 -g5 +g9 sS'arg1.model' p22 g2 diff --git a/js/Linear/SUMMATION.js b/js/Linear/SUMMATION.js index 279d1bfb..dc3d3136 100644 --- a/js/Linear/SUMMATION.js +++ b/js/Linear/SUMMATION.js @@ -133,7 +133,7 @@ function SUMMATION() { } } if (ok) { - [model,graphics,ok] = set_io(this.model,graphics,list([in1,in2],it),list([nout,nout2],ot),[],[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list([in1,in2],it),list([nout,nout2],ot),[],[]); } if (ok) { this.model.rpar = new ScilabDouble([this.satur]); diff --git a/js/Linear/SUMMATION.pickle b/js/Linear/SUMMATION.pickle index 25cbaee4..30d2e08d 100644 --- a/js/Linear/SUMMATION.pickle +++ b/js/Linear/SUMMATION.pickle @@ -49,33 +49,33 @@ sS'model.sim' p14 S'list' p15 -sS'model.out2' +sS'[this.model,graphics,ok]' p16 g10 -sS'in1' +sS'model.out2' p17 g10 -sS'in2' +sS'in1' p18 g10 -sS'model.rpar' +sS'in2' p19 -NsS'graphics.exprs' +g10 +sS'model.rpar' p20 +NsS'graphics.exprs' +p21 g8 sS'nout2' -p21 +p22 g10 sS'model.ipar' -p22 +p23 g8 sS'typ' -p23 -S'vector' p24 -sS'[model,graphics,ok]' +S'vector' p25 -g10 sS'ok' p26 S'boolean' @@ -85,16 +85,16 @@ p28 g5 sS'model.dep_ut' p29 -g24 +g25 sS'exprs' p30 g10 sS'gr_i' p31 -g24 +g25 sS'y' p32 -g24 +g25 sS'x' p33 g10 diff --git a/js/Linear/TCLSS.js b/js/Linear/TCLSS.js index a6a16813..4b3ceb4c 100644 --- a/js/Linear/TCLSS.js +++ b/js/Linear/TCLSS.js @@ -66,7 +66,7 @@ function TCLSS() { if (ms!=ns) { message("A matrix must be square"); } else { - [model,graphics,ok] = check_io(this.model,graphics,[[in1],[ms]],out,1,[]); + [this.model,graphics,ok] = check_io(this.model,graphics,[[in1],[ms]],out,1,[]); if (ok) { graphics.exprs = exprs; rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; diff --git a/js/Linear/TCLSS.pickle b/js/Linear/TCLSS.pickle index 48406e0f..d48ebccf 100644 --- a/js/Linear/TCLSS.pickle +++ b/js/Linear/TCLSS.pickle @@ -72,30 +72,30 @@ g10 sS'D' p21 g10 -sS'in1' +sS'[this.model,graphics,ok]' p22 g10 -sS'model.rpar' +sS'in1' p23 +g10 +sS'model.rpar' +p24 g5 sS'mmm' -p24 +p25 g8 sS'model.state' -p25 +p26 g10 sS'graphics.exprs' -p26 +p27 g10 sS'x0' -p27 +p28 g10 sS'typ' -p28 -g8 -sS'[model,graphics,ok]' p29 -g10 +g8 sS'model.blocktype' p30 S'string' diff --git a/js/Linear/TCLSS_f.js b/js/Linear/TCLSS_f.js index 83b72024..7be4b972 100644 --- a/js/Linear/TCLSS_f.js +++ b/js/Linear/TCLSS_f.js @@ -66,7 +66,7 @@ function TCLSS_f() { if (ms!=ns) { message("A matrix must be square"); } else { - [model,graphics,ok] = check_io(this.model,graphics,[[in1],[ms]],out,1,[]); + [this.model,graphics,ok] = check_io(this.model,graphics,[[in1],[ms]],out,1,[]); if (ok) { graphics.exprs = exprs; rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; diff --git a/js/Linear/TCLSS_f.pickle b/js/Linear/TCLSS_f.pickle index 48406e0f..d48ebccf 100644 --- a/js/Linear/TCLSS_f.pickle +++ b/js/Linear/TCLSS_f.pickle @@ -72,30 +72,30 @@ g10 sS'D' p21 g10 -sS'in1' +sS'[this.model,graphics,ok]' p22 g10 -sS'model.rpar' +sS'in1' p23 +g10 +sS'model.rpar' +p24 g5 sS'mmm' -p24 +p25 g8 sS'model.state' -p25 +p26 g10 sS'graphics.exprs' -p26 +p27 g10 sS'x0' -p27 +p28 g10 sS'typ' -p28 -g8 -sS'[model,graphics,ok]' p29 -g10 +g8 sS'model.blocktype' p30 S'string' diff --git a/js/Linear/TIME_DELAY.js b/js/Linear/TIME_DELAY.js index 657102ad..817dab75 100644 --- a/js/Linear/TIME_DELAY.js +++ b/js/Linear/TIME_DELAY.js @@ -52,7 +52,7 @@ function TIME_DELAY() { ok = false; } if (ok) { - [model,graphics,ok] = check_io(this.model,graphics,[-1],-1,[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,[-1],-1,[],[]); } if (ok) { graphics.exprs = exprs; diff --git a/js/Linear/TIME_DELAY.pickle b/js/Linear/TIME_DELAY.pickle index a7a922b2..20e74cf1 100644 --- a/js/Linear/TIME_DELAY.pickle +++ b/js/Linear/TIME_DELAY.pickle @@ -46,26 +46,26 @@ p12 sS'nin' p13 g6 -sS'model.rpar' +sS'[this.model,graphics,ok]' p14 +g6 +sS'model.rpar' +p15 g8 sS'N' -p15 +p16 g6 sS'T' -p16 +p17 g6 sS'graphics.exprs' -p17 -NsS'model.ipar' p18 +NsS'model.ipar' +p19 g6 sS'typ' -p19 -g8 -sS'[model,graphics,ok]' p20 -g6 +g8 sS'ok' p21 S'boolean' diff --git a/js/Linear/VARIABLE_DELAY.js b/js/Linear/VARIABLE_DELAY.js index 1c1c4a10..6cbff388 100644 --- a/js/Linear/VARIABLE_DELAY.js +++ b/js/Linear/VARIABLE_DELAY.js @@ -52,7 +52,7 @@ function VARIABLE_DELAY() { ok = false; } if (ok) { - [model,graphics,ok] = check_io(this.model,graphics,[[-1],[1]],-1,[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,[[-1],[1]],-1,[],[]); } if (ok) { graphics.exprs = exprs; diff --git a/js/Linear/VARIABLE_DELAY.pickle b/js/Linear/VARIABLE_DELAY.pickle index d34840bd..3a7e576e 100644 --- a/js/Linear/VARIABLE_DELAY.pickle +++ b/js/Linear/VARIABLE_DELAY.pickle @@ -46,27 +46,27 @@ p12 sS'nin' p13 g6 -sS'model.rpar' +sS'[this.model,graphics,ok]' p14 -S'vector' +g6 +sS'model.rpar' p15 -sS'N' +S'vector' p16 +sS'N' +p17 g6 sS'T' -p17 +p18 g6 sS'graphics.exprs' -p18 -NsS'model.ipar' p19 +NsS'model.ipar' +p20 g6 sS'typ' -p20 -g15 -sS'[model,graphics,ok]' p21 -g6 +g16 sS'ok' p22 S'boolean' @@ -77,16 +77,16 @@ S'string' p25 sS'model.dep_ut' p26 -g15 +g16 sS'exprs' p27 g8 sS'gr_i' p28 -g15 +g16 sS'y' p29 -g15 +g16 sS'x' p30 g6 |