diff options
Diffstat (limited to 'js/Misc')
35 files changed, 351 insertions, 351 deletions
diff --git a/js/Misc/AUTOMAT.js b/js/Misc/AUTOMAT.js index 22543bfd..27ef497f 100644 --- a/js/Misc/AUTOMAT.js +++ b/js/Misc/AUTOMAT.js @@ -120,7 +120,7 @@ function AUTOMAT() { } } if (!ModifEncore) { - [model,graphics,this.ok] = check_io(this.model,graphics,INP,OUT,[],[1]); + [this.model,graphics,this.ok] = check_io(this.model,graphics,INP,OUT,[],[1]); if (!this.ok) { break; } diff --git a/js/Misc/AUTOMAT.pickle b/js/Misc/AUTOMAT.pickle index 193e56b5..71efa914 100644 --- a/js/Misc/AUTOMAT.pickle +++ b/js/Misc/AUTOMAT.pickle @@ -17,153 +17,153 @@ p7 atp8 Rp9 .(dp0 -S'[model,graphics,this.ok]' +S'NMode_old' p1 S'double' p2 -sS'NMode_old' -p3 -g2 sS'arg1' -p4 +p3 S'object' -p5 +p4 sS'graphics.exprs' -p6 +p5 NsS'rpar' -p7 +p6 S'vector' -p8 +p7 sS'model.out' -p9 +p8 S'matrix' -p10 +p9 sS'exprs.slice(NMode_old+6-1,NMode+5)' -p11 +p10 g2 sS'MSG' -p12 +p11 S'string' -p13 +p12 sS'ModifEncore' -p14 +p13 S'boolean' -p15 +p14 sS'MaxModes' -p16 +p15 g2 sS'nzcross' -p17 +p16 g2 sS'model.in1' -p18 -g10 +p17 +g9 sS'MSG0' -p19 -g13 +p18 +g12 sS'MSG3' -p20 -g13 +p19 +g12 sS'MSG2' -p21 -g13 +p20 +g12 sS'model.nzcross' -p22 +p21 g2 sS'XP' -p23 -g10 +p22 +g9 sS'NX' -p24 +p23 g2 sS'graphics.gr_i[1-1][1-1]' -p25 -g13 +p24 +g12 sS'C2' -p26 -g8 +p25 +g7 sS'X0' -p27 -g8 +p26 +g7 sS'model.firing' -p28 +p27 g2 sS'OUT' -p29 -g8 +p28 +g7 sS'model.sim' -p30 +p29 S'list' -p31 +p30 sS'model.evtout' -p32 +p31 g2 sS'model.rpar' -p33 -g8 +p32 +g7 sS'y' -p34 -g8 +p33 +g7 sS'CX' -p35 -g13 +p34 +g12 sS'INP[i-1][1-1]' -p36 +p35 g2 sS'VEC' -p37 -g13 +p36 +g12 sS'GTV' -p38 -g13 +p37 +g12 sS'graphics' -p39 -g5 +p38 +g4 sS'model.state' -p40 +p39 g2 sS'exprs.slice(NMode+6-1,NMode_old+5)' -p41 -g8 +p40 +g7 sS'model.ipar' -p42 -g10 +p41 +g9 sS'typ' -p43 -g8 +p42 +g7 sS'C1' -p44 -g8 +p43 +g7 sS'NMode' -p45 +p44 g2 sS'Ci' -p46 +p45 g2 sS'model.blocktype' +p46 +g12 +sS'[this.model,graphics,this.ok]' p47 -g13 +g2 sS'x.graphics' p48 -g5 +g4 sS'INP' p49 g2 sS'x.model' p50 -g5 +g4 sS'model.dep_ut' p51 -g8 +g7 sS'exprs' p52 -g10 +g9 sS'gr_i' p53 -g8 +g7 sS'ipar' p54 -g10 +g9 sS'[rXP,cXP]' p55 g2 @@ -172,7 +172,7 @@ p56 g2 sS'model' p57 -g5 +g4 sS'Minitial' p58 g2 diff --git a/js/Misc/BOUNCE.js b/js/Misc/BOUNCE.js index 59bb4eb6..d2b87f3f 100644 --- a/js/Misc/BOUNCE.js +++ b/js/Misc/BOUNCE.js @@ -102,7 +102,7 @@ function BOUNCE() { if (!ok) { break; } - [model,graphics,ok] = check_io(this.model,graphics,[],[n,n],[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,[],[n,n],[],[]); if (ok) { k = 1; ipar = []; diff --git a/js/Misc/BOUNCE.pickle b/js/Misc/BOUNCE.pickle index 892a17c2..f4654542 100644 --- a/js/Misc/BOUNCE.pickle +++ b/js/Misc/BOUNCE.pickle @@ -70,36 +70,36 @@ p18 sS'C' p19 g13 -sS'yd' +sS'[this.model,graphics,ok]' p20 +g13 +sS'yd' +p21 g5 sS'model.rpar' -p21 +p22 g5 sS'walls' -p22 +p23 g5 sS'rpar1' -p23 +p24 g13 sS'rpar2' -p24 +p25 g13 sS'graphics' -p25 +p26 g2 sS'model.ipar' -p26 +p27 g9 sS'typ' -p27 +p28 g9 sS'exprs[8-1]' -p28 -g16 -sS'[model,graphics,ok]' p29 -g13 +g16 sS'ok' p30 S'boolean' @@ -110,10 +110,9 @@ g16 sS'g' p33 g13 -sS'k' +sS'ipar[k-1]' p34 -g13 -sS'model.dep_ut' +NsS'model.dep_ut' p35 g9 sS'n' @@ -137,9 +136,10 @@ g13 sS'model' p42 g2 -sS'ipar[k-1]' +sS'k' p43 -NsS'model.state' +g13 +sS'model.state' p44 g9 s.
\ No newline at end of file diff --git a/js/Misc/CBLOCK.js b/js/Misc/CBLOCK.js index d1c5fcf4..62d3d677 100644 --- a/js/Misc/CBLOCK.js +++ b/js/Misc/CBLOCK.js @@ -132,7 +132,7 @@ function CBLOCK() { break; } } else { - [model,graphics,ok] = check_io(this.model,graphics,this.i,this.o,this.ci,this.co); + [this.model,graphics,ok] = check_io(this.model,graphics,this.i,this.o,this.ci,this.co); if (ok) { this.model.sim = list(new ScilabDouble([funam]), new ScilabDouble([funtyp])); this.model.in1 = new ScilabDouble([this.i]); diff --git a/js/Misc/CBLOCK.pickle b/js/Misc/CBLOCK.pickle index ed2aecaf..c55e2a3a 100644 --- a/js/Misc/CBLOCK.pickle +++ b/js/Misc/CBLOCK.pickle @@ -115,54 +115,54 @@ g8 sS'model.evtin' p29 g8 -sS'model.firing' +sS'label[2-1]' p30 +g2 +sS'model.firing' +p31 g8 sS'nevout' -p31 +p32 g2 sS'model.sim' -p32 +p33 g25 sS'model.evtout' -p33 +p34 g8 sS'[ok,tt,cancel]' -p34 +p35 g2 sS'clkout' -p35 -g8 -sS'auto' p36 g8 -sS'label[2-1]' +sS'auto' p37 +g8 +sS'[this.model,graphics,ok]' +p38 g2 sS'in1' -p38 +p39 g2 sS'model.rpar' -p39 +p40 g8 sS'model.state' -p40 +p41 g8 sS'graphics' -p41 +p42 g5 sS'x0' -p42 +p43 g8 sS'model.ipar' -p43 +p44 g8 sS'typ' -p44 -g14 -sS'[model,graphics,ok]' p45 -g2 +g14 sS'ok' p46 S'boolean' diff --git a/js/Misc/CBLOCK4.js b/js/Misc/CBLOCK4.js index 182deb67..c99b5d9d 100644 --- a/js/Misc/CBLOCK4.js +++ b/js/Misc/CBLOCK4.js @@ -117,7 +117,7 @@ function CBLOCK4() { tt = []; } tt = label[2-1]; - [model,graphics,ok] = set_io(this.model,graphics,list(this.in1,this.it),list(this.out,this.ot),this.ci,this.co); + [this.model,graphics,ok] = set_io(this.model,graphics,list(this.in1,this.it),list(this.out,this.ot),this.ci,this.co); } if (ok) { while (true) { diff --git a/js/Misc/CBLOCK4.pickle b/js/Misc/CBLOCK4.pickle index e420d0be..e9c89e6b 100644 --- a/js/Misc/CBLOCK4.pickle +++ b/js/Misc/CBLOCK4.pickle @@ -116,49 +116,49 @@ g3 sS'nz' p26 g3 -sS'model.firing' +sS'label[2-1]' p27 -NsS'nevout' +g3 +sS'model.firing' p28 +NsS'nevout' +p29 g3 sS'model.sim' -p29 +p30 g24 sS'[ok,tt,cancel]' -p30 -g3 -sS'label[2-1]' p31 g3 -sS'model.out2' +sS'[this.model,graphics,ok]' p32 g3 -sS'model.nmode' +sS'model.out2' p33 -NsS'model.rpar' +g3 +sS'model.nmode' p34 +NsS'model.rpar' +p35 g9 sS'model.outtyp' -p35 +p36 g3 sS'model.state' -p36 +p37 g9 sS'graphics' -p37 +p38 g6 sS'model.ipar' -p38 +p39 g3 sS'typ' -p39 +p40 g9 sS'model.opar' -p40 -NsS'[model,graphics,ok]' p41 -g3 -sS'ok' +NsS'ok' p42 S'boolean' p43 diff --git a/js/Misc/CONSTRAINT_c.js b/js/Misc/CONSTRAINT_c.js index 5eedd1cd..07500b5b 100644 --- a/js/Misc/CONSTRAINT_c.js +++ b/js/Misc/CONSTRAINT_c.js @@ -39,7 +39,7 @@ function CONSTRAINT_c() { if (N<=0) { message("number of states (constraints) must be > 0 "); } else { - [model,graphics,ok] = check_io(this.model,graphics,N,N,[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,N,N,[],[]); if (ok) { graphics.exprs = exprs; this.model.state = [[this.x0],[zeros(N,1)]]; diff --git a/js/Misc/CONSTRAINT_c.pickle b/js/Misc/CONSTRAINT_c.pickle index 8690a781..b9a1caca 100644 --- a/js/Misc/CONSTRAINT_c.pickle +++ b/js/Misc/CONSTRAINT_c.pickle @@ -11,71 +11,71 @@ p4 atp5 Rp6 .(dp0 -S'[model,graphics,ok]' +S'model.sim' p1 -S'double' +S'list' p2 sS'model.out' p3 -g2 -sS'model.blocktype' +S'double' p4 -S'string' +sS'model.blocktype' p5 -sS'x.graphics' +S'string' p6 -S'object' +sS'x.graphics' p7 -sS'arg1' +S'object' p8 -g7 -sS'graphics.exprs' +sS'arg1' p9 -NsS'model.in1' +g8 +sS'[this.model,graphics,ok]' p10 -g2 -sS'model.dep_ut' +g4 +sS'graphics.exprs' p11 -S'vector' +NsS'model.in1' p12 -sS'N' +g4 +sS'model.dep_ut' p13 -g2 -sS'exprs' +S'vector' p14 -g5 -sS'x.model' +sS'N' p15 -NsS'gr_i' +g4 +sS'exprs' p16 -g12 -sS'model.state' +g6 +sS'x.model' p17 -S'matrix' +NsS'gr_i' p18 -sS'graphics' +g14 +sS'model.state' p19 -g7 -sS'y' +S'matrix' p20 -g12 -sS'x' +sS'graphics' p21 -g2 -sS'model' +g8 +sS'y' p22 -g7 -sS'model.ipar' +g14 +sS'x' p23 -g2 -sS'typ' +g4 +sS'model' p24 -g12 -sS'x0' +g8 +sS'model.ipar' p25 -g18 -sS'model.sim' +g4 +sS'typ' p26 -S'list' +g14 +sS'x0' p27 +g20 s.
\ No newline at end of file diff --git a/js/Misc/EXPRESSION.pickle b/js/Misc/EXPRESSION.pickle index 0c6b49b1..d7c7385a 100644 --- a/js/Misc/EXPRESSION.pickle +++ b/js/Misc/EXPRESSION.pickle @@ -78,25 +78,25 @@ sS'model.sim' p23 S'list' p24 -sS'in1' +sS'[this.model,graphics,ok]' p25 +g10 +sS'in1' +p26 g15 sS'model.rpar' -p26 -NsS'model.nmode' p27 -NsS'graphics.exprs' +NsS'model.nmode' p28 -NsS'model.ipar' +NsS'graphics.exprs' p29 -NsS'model.nzcross' +NsS'model.ipar' p30 -NsS'%nz' +NsS'model.nzcross' p31 -g7 -sS'[model,graphics,ok]' +NsS'%nz' p32 -g10 +g7 sS'ok' p33 g21 diff --git a/js/Misc/LOGICAL_OP.js b/js/Misc/LOGICAL_OP.js index 1fc868cd..12f553df 100644 --- a/js/Misc/LOGICAL_OP.js +++ b/js/Misc/LOGICAL_OP.js @@ -93,10 +93,10 @@ function LOGICAL_OP() { in1 = [-ones(this.nin,1),-2*ones(this.nin,1)]; if ((this.rule!=5)&&(this.nin==1)) { out = [1,1]; - [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); } else { out = [-1,-2]; - [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); } } if (ok) { diff --git a/js/Misc/LOGICAL_OP.pickle b/js/Misc/LOGICAL_OP.pickle index 786c81a0..51f0a704 100644 --- a/js/Misc/LOGICAL_OP.pickle +++ b/js/Misc/LOGICAL_OP.pickle @@ -64,21 +64,21 @@ p19 sS'nin' p20 g10 -sS'in1' +sS'[this.model,graphics,ok]' p21 +g10 +sS'in1' +p22 g14 sS'graphics.exprs' -p22 +p23 g14 sS'model.ipar' -p23 -g8 -sS'typ' p24 g8 -sS'[model,graphics,ok]' +sS'typ' p25 -g10 +g8 sS'ok' p26 S'boolean' diff --git a/js/Misc/MBLOCK.js b/js/Misc/MBLOCK.js index aa14318e..17758ca7 100644 --- a/js/Misc/MBLOCK.js +++ b/js/Misc/MBLOCK.js @@ -180,7 +180,7 @@ function MBLOCK() { if (ok) { intypex = find(this.intype=="I"); outtypex = find(this.outtype=="I"); - [model,graphics,ok] = set_io(this.model,graphics,list([ones(this.in1),ones(this.in1)],ones(this.in1)),list([ones(this.out),ones(this.out)],ones(this.out)),[],[],intypex,outtypex); + [this.model,graphics,ok] = set_io(this.model,graphics,list([ones(this.in1),ones(this.in1)],ones(this.in1)),list([ones(this.out),ones(this.out)],ones(this.out)),[],[],intypex,outtypex); } if (ok) { Tparam_lab = evstr(this.Tparam); diff --git a/js/Misc/MBLOCK.pickle b/js/Misc/MBLOCK.pickle index 518419e3..639839ac 100644 --- a/js/Misc/MBLOCK.pickle +++ b/js/Misc/MBLOCK.pickle @@ -145,59 +145,59 @@ g5 sS'Tparam_sz' p41 g11 -sS'pprop' +sS'mo.outputs' p42 g24 -sS'model.out' +sS'pprop' p43 +g24 +sS'model.out' +p44 g11 sS'exprs.in1' -p44 +p45 g11 sS'model.equations' -p45 -g7 -sS'mo.outputs' p46 -g24 -sS'intype' +g7 +sS'[this.model,graphics,ok]' p47 +g11 +sS'intype' +p48 g21 sS'x.graphics.out_implicit' -p48 +p49 g24 sS'in1' -p49 +p50 g21 sS'model.rpar' -p50 +p51 g24 sS'model.in1' -p51 +p52 g11 sS'lhs_txt' -p52 +p53 g2 sS'outtype' -p53 +p54 g24 sS'graphics' -p54 +p55 g7 sS'intypex' -p55 +p56 g11 sS'lab_1' -p56 +p57 g5 sS'lab_2' -p57 -NsS'paramv[$+1-1]' p58 -g2 -sS'[model,graphics,ok]' +NsS'paramv[$+1-1]' p59 -g11 +g2 sS'ok' p60 S'boolean' diff --git a/js/Misc/MEMORY_f.js b/js/Misc/MEMORY_f.js index a69822d5..c410b3c2 100644 --- a/js/Misc/MEMORY_f.js +++ b/js/Misc/MEMORY_f.js @@ -44,7 +44,7 @@ function MEMORY_f() { } else { this.inh = 1; } - [model,graphics,ok] = check_io(this.model,graphics,-1,-1,this.inh,[]); + [this.model,graphics,ok] = check_io(this.model,graphics,-1,-1,this.inh,[]); out = size(this.a,"*"); if (out==0) { ok = false; diff --git a/js/Misc/MEMORY_f.pickle b/js/Misc/MEMORY_f.pickle index 7bd771a3..409f298f 100644 --- a/js/Misc/MEMORY_f.pickle +++ b/js/Misc/MEMORY_f.pickle @@ -48,21 +48,21 @@ sS'model.sim' p13 S'string' p14 -sS'in1' +sS'[this.model,graphics,ok]' p15 g2 -sS'model.rpar' +sS'in1' p16 g2 -sS'graphics.exprs' +sS'model.rpar' p17 -NsS'typ' +g2 +sS'graphics.exprs' p18 -S'vector' +NsS'typ' p19 -sS'[model,graphics,ok]' +S'vector' p20 -g2 sS'ok' p21 S'boolean' @@ -72,17 +72,17 @@ p23 g14 sS'model.dep_ut' p24 -g19 +g20 sS'exprs' p25 S'matrix' p26 sS'gr_i' p27 -g19 +g20 sS'y' p28 -g19 +g20 sS'x' p29 g2 diff --git a/js/Misc/MPBLOCK.js b/js/Misc/MPBLOCK.js index c09db580..447f64bf 100644 --- a/js/Misc/MPBLOCK.js +++ b/js/Misc/MPBLOCK.js @@ -165,7 +165,7 @@ function MPBLOCK() { if (ok) { intypex = find(this.intype=="I"); outtypex = find(this.outtype=="I"); - [model,graphics,ok] = set_io(this.model,graphics,list([ones(this.in1),ones(this.in1)],ones(this.in1)),list([ones(this.out),ones(this.out)],ones(this.out)),[],[],intypex,outtypex); + [this.model,graphics,ok] = set_io(this.model,graphics,list([ones(this.in1),ones(this.in1)],ones(this.in1)),list([ones(this.out),ones(this.out)],ones(this.out)),[],[],intypex,outtypex); } if (ok) { Tparam_lab = evstr(Tparam); diff --git a/js/Misc/MPBLOCK.pickle b/js/Misc/MPBLOCK.pickle index 64d62a78..2bb44bab 100644 --- a/js/Misc/MPBLOCK.pickle +++ b/js/Misc/MPBLOCK.pickle @@ -129,59 +129,59 @@ g5 sS'Tparam_sz' p41 g7 -sS'pprop' +sS'mo.outputs' p42 +g23 +sS'pprop' +p43 g31 sS'model.out' -p43 +p44 g7 sS'exprs.in1' -p44 +p45 g7 sS'model.equations' -p45 -g9 -sS'mo.outputs' p46 -g23 -sS'intype' +g9 +sS'[this.model,graphics,ok]' p47 +g7 +sS'intype' +p48 g31 sS'x.graphics.out_implicit' -p48 +p49 g23 sS'in1' -p49 +p50 g31 sS'model.rpar' -p50 +p51 g23 sS'model.in1' -p51 +p52 g7 sS'lhs_txt' -p52 +p53 g2 sS'outtype' -p53 +p54 g23 sS'graphics' -p54 +p55 g9 sS'intypex' -p55 +p56 g7 sS'lab_1' -p56 +p57 g5 sS'lab_2' -p57 -NsS'paramv[$+1-1]' p58 -g2 -sS'[model,graphics,ok]' +NsS'paramv[$+1-1]' p59 -g7 +g2 sS'ok' p60 S'boolean' diff --git a/js/Misc/RELATIONALOP.js b/js/Misc/RELATIONALOP.js index 7782c82f..1575cac2 100644 --- a/js/Misc/RELATIONALOP.js +++ b/js/Misc/RELATIONALOP.js @@ -74,7 +74,7 @@ function RELATIONALOP() { ot = this.Datatype; in1 = [[-1,-2],[-1,-2]]; out = [-1,-2]; - [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); } if (ok) { if (this.rule==0) { diff --git a/js/Misc/RELATIONALOP.pickle b/js/Misc/RELATIONALOP.pickle index 69b20621..708c065e 100644 --- a/js/Misc/RELATIONALOP.pickle +++ b/js/Misc/RELATIONALOP.pickle @@ -62,25 +62,25 @@ sS'model.sim' p19 S'list' p20 -sS'model.nmode' +sS'[this.model,graphics,ok]' p21 g10 -sS'in1' +sS'model.nmode' p22 +g10 +sS'in1' +p23 g15 sS'graphics.exprs' -p23 +p24 g15 sS'x.graphics.style' -p24 +p25 g8 sS'model.ipar' -p25 +p26 g8 sS'model.nzcross' -p26 -g10 -sS'[model,graphics,ok]' p27 g10 sS'ok' diff --git a/js/Misc/c_block.js b/js/Misc/c_block.js index 97c818c9..f84d26d0 100644 --- a/js/Misc/c_block.js +++ b/js/Misc/c_block.js @@ -73,7 +73,7 @@ function c_block() { if (!ok) { break; } - [model,graphics,ok] = check_io(this.model,graphics,this.i,this.o,[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,this.i,this.o,[],[]); if (ok) { this.model.sim[1] = new ScilabString([this.funam]); this.model.rpar = this.rpar; diff --git a/js/Misc/c_block.pickle b/js/Misc/c_block.pickle index bb191268..a07a6553 100644 --- a/js/Misc/c_block.pickle +++ b/js/Misc/c_block.pickle @@ -82,47 +82,47 @@ p24 g3 sS'model.sim[1]' p25 -NsS'model.firing' +NsS'label[2-1]' p26 g3 -sS'model.sim' +sS'model.firing' p27 +g3 +sS'model.sim' +p28 g22 sS'model.evtout' -p28 -g3 -sS'clkout' p29 g3 -sS'auto' +sS'clkout' p30 g3 -sS'label[2-1]' +sS'auto' p31 g3 -sS'in1' +sS'[this.model,graphics,ok]' p32 g9 -sS'model.rpar' +sS'in1' p33 +g9 +sS'model.rpar' +p34 g3 sS'model.state' -p34 +p35 g3 sS'graphics.exprs' -p35 -NsS'x0' p36 +NsS'x0' +p37 g3 sS'model.ipar' -p37 +p38 g9 sS'typ' -p38 -g13 -sS'[model,graphics,ok]' p39 -g9 +g13 sS'model.blocktype' p40 g13 diff --git a/js/Misc/fortran_block.js b/js/Misc/fortran_block.js index 185431a2..5e0f951a 100644 --- a/js/Misc/fortran_block.js +++ b/js/Misc/fortran_block.js @@ -64,7 +64,7 @@ function fortran_block() { if (!ok) { break; } - [model,graphics,ok] = check_io(this.model,graphics,this.i,this.o,[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,this.i,this.o,[],[]); if (ok) { this.model.sim[1] = new ScilabString([this.funam]); this.model.rpar = this.rpar; diff --git a/js/Misc/fortran_block.pickle b/js/Misc/fortran_block.pickle index 862c80a8..532ee457 100644 --- a/js/Misc/fortran_block.pickle +++ b/js/Misc/fortran_block.pickle @@ -73,35 +73,35 @@ p21 g3 sS'model.sim[1]' p22 -NsS'model.firing' +NsS'label[2-1]' p23 g3 -sS'model.sim' +sS'model.firing' p24 +g3 +sS'model.sim' +p25 g19 sS'model.evtout' -p25 -g3 -sS'label[2-1]' p26 g3 -sS'model.rpar' +sS'[this.model,graphics,ok]' p27 +g13 +sS'model.rpar' +p28 g3 sS'model.state' -p28 +p29 g3 sS'graphics.exprs' -p29 -NsS'model.ipar' p30 +NsS'model.ipar' +p31 g13 sS'typ' -p31 -g3 -sS'[model,graphics,ok]' p32 -g13 +g3 sS'model.blocktype' p33 g9 diff --git a/js/Misc/generic_block.js b/js/Misc/generic_block.js index 17ce3c1a..702943ca 100644 --- a/js/Misc/generic_block.js +++ b/js/Misc/generic_block.js @@ -104,7 +104,7 @@ function generic_block() { } dep_ut = [this.depu,this.dept]; if (ok) { - [model,graphics,ok] = check_io(this.model,graphics,this.i,this.o,this.ci,this.co); + [this.model,graphics,ok] = check_io(this.model,graphics,this.i,this.o,this.ci,this.co); } if (ok) { if (this.funtyp==3) { diff --git a/js/Misc/generic_block.pickle b/js/Misc/generic_block.pickle index b85d5610..fa54565c 100644 --- a/js/Misc/generic_block.pickle +++ b/js/Misc/generic_block.pickle @@ -96,25 +96,25 @@ g8 sS'arg1.graphics' p24 g5 -sS'model.rpar' +sS'[this.model,graphics,ok]' p25 +g2 +sS'model.rpar' +p26 g8 sS'model.state' -p26 +p27 g8 sS'graphics' -p27 +p28 g5 sS'model.ipar' -p28 +p29 g8 sS'typ' -p29 +p30 g8 sS'needcompile' -p30 -g2 -sS'[model,graphics,ok]' p31 g2 sS'arg1.model' diff --git a/js/Misc/generic_block2.js b/js/Misc/generic_block2.js index 4e44d3df..aa827d03 100644 --- a/js/Misc/generic_block2.js +++ b/js/Misc/generic_block2.js @@ -108,7 +108,7 @@ function generic_block2() { } dep_ut = [this.depu,this.dept]; if (ok) { - [model,graphics,ok] = check_io(this.model,graphics,this.i,this.o,this.ci,this.co); + [this.model,graphics,ok] = check_io(this.model,graphics,this.i,this.o,this.ci,this.co); } if (ok) { if (this.funtyp==3) { diff --git a/js/Misc/generic_block2.pickle b/js/Misc/generic_block2.pickle index d839dc0d..70e8d610 100644 --- a/js/Misc/generic_block2.pickle +++ b/js/Misc/generic_block2.pickle @@ -102,27 +102,27 @@ g8 sS'arg1.graphics' p25 g5 -sS'model.nmode' +sS'[this.model,graphics,ok]' p26 -NsS'model.rpar' +g2 +sS'model.nmode' p27 +NsS'model.rpar' +p28 g8 sS'model.state' -p28 +p29 g8 sS'graphics' -p29 +p30 g5 sS'model.ipar' -p30 +p31 g8 sS'typ' -p31 +p32 g8 sS'needcompile' -p32 -g2 -sS'[model,graphics,ok]' p33 g2 sS'arg1.model' diff --git a/js/Misc/generic_block3.js b/js/Misc/generic_block3.js index 42830ce9..a185a2a2 100644 --- a/js/Misc/generic_block3.js +++ b/js/Misc/generic_block3.js @@ -118,7 +118,7 @@ function generic_block3() { } dep_ut = [this.depu,this.dept]; if (ok) { - [model,graphics,ok] = set_io(this.model,graphics,list(this.in1,this.it),list(this.out,this.ot),this.ci,this.co); + [this.model,graphics,ok] = set_io(this.model,graphics,list(this.in1,this.it),list(this.out,this.ot),this.ci,this.co); } if (ok) { if (this.funtyp==3) { diff --git a/js/Misc/generic_block3.pickle b/js/Misc/generic_block3.pickle index 3a9f0c8d..a7a2fa07 100644 --- a/js/Misc/generic_block3.pickle +++ b/js/Misc/generic_block3.pickle @@ -110,35 +110,35 @@ p24 sS'arg1.graphics' p25 g6 -sS'model.out2' +sS'[this.model,graphics,ok]' p26 g3 -sS'model.nmode' +sS'model.out2' p27 -NsS'model.rpar' +g3 +sS'model.nmode' p28 +NsS'model.rpar' +p29 g9 sS'model.outtyp' -p29 +p30 g3 sS'model.state' -p30 +p31 g9 sS'graphics' -p31 +p32 g6 sS'model.ipar' -p32 +p33 g3 sS'typ' -p33 +p34 g9 sS'model.opar' -p34 -NsS'needcompile' p35 -g3 -sS'[model,graphics,ok]' +NsS'needcompile' p36 g3 sS'arg1.model' diff --git a/js/Misc/scifunc_block.js b/js/Misc/scifunc_block.js index a1ebbde9..83c45670 100644 --- a/js/Misc/scifunc_block.js +++ b/js/Misc/scifunc_block.js @@ -88,7 +88,7 @@ function scifunc_block() { if (!ok) { break; } - [model,graphics,ok] = check_io(this.model,graphics,this.i,this.o,this.ci,this.co); + [this.model,graphics,ok] = check_io(this.model,graphics,this.i,this.o,this.ci,this.co); if (ok) { auto = this.auto0; this.model.state = this.xx; diff --git a/js/Misc/scifunc_block.pickle b/js/Misc/scifunc_block.pickle index 5b5a4ce0..06dc21d7 100644 --- a/js/Misc/scifunc_block.pickle +++ b/js/Misc/scifunc_block.pickle @@ -111,37 +111,37 @@ sS'exprs[1-1][9-1]' p31 S'string' p32 -sS'in1' +sS'[this.model,graphics,ok]' p33 g3 -sS'model.rpar' +sS'in1' p34 +g3 +sS'model.rpar' +p35 g9 sS'nci' -p35 +p36 g3 sS'model.state' -p36 +p37 g9 sS'nco' -p37 +p38 g3 sS'x0' -p38 +p39 g9 sS'nrp' -p39 +p40 g3 sS'typ' -p40 +p41 g32 sS'model.opar' -p41 +p42 g28 sS'needcompile' -p42 -g3 -sS'[model,graphics,ok]' p43 g3 sS'model.blocktype' diff --git a/js/Misc/scifunc_block_m.js b/js/Misc/scifunc_block_m.js index 0b7d0ba1..e96e9bdb 100644 --- a/js/Misc/scifunc_block_m.js +++ b/js/Misc/scifunc_block_m.js @@ -90,7 +90,7 @@ function scifunc_block_m() { if (!ok) { break; } - [model,graphics,ok] = set_io(this.model,graphics,list(this.i,it),list(this.o,ot),this.ci,this.co); + [this.model,graphics,ok] = set_io(this.model,graphics,list(this.i,it),list(this.o,ot),this.ci,this.co); if (ok) { auto = this.auto0; this.model.state = this.xx; diff --git a/js/Misc/scifunc_block_m.pickle b/js/Misc/scifunc_block_m.pickle index 870b4d8a..58448010 100644 --- a/js/Misc/scifunc_block_m.pickle +++ b/js/Misc/scifunc_block_m.pickle @@ -116,44 +116,44 @@ g3 sS'auto' p33 g10 -sS'model.out2' +sS'[this.model,graphics,ok]' p34 g3 -sS'in1' +sS'model.out2' p35 g3 -sS'model.rpar' +sS'in1' p36 +g3 +sS'model.rpar' +p37 g10 sS'nci' -p37 +p38 g3 sS'model.state' -p38 +p39 g10 sS'nco' -p39 +p40 g3 sS'model.outtyp' -p40 +p41 g3 sS'x0' -p41 +p42 g10 sS'nrp' -p42 +p43 g3 sS'typ' -p43 -S'string' p44 -sS'model.opar' +S'string' p45 +sS'model.opar' +p46 g29 sS'needcompile' -p46 -g3 -sS'[model,graphics,ok]' p47 g3 sS'z' @@ -161,7 +161,7 @@ p48 g10 sS'model.blocktype' p49 -g44 +g45 sS'x.graphics' p50 g6 |