diff options
224 files changed, 1894 insertions, 1659 deletions
@@ -23,7 +23,7 @@ js/%.lex: macros/%.sci sci2jslex.py ./sci2jslex.py $< > js/$*.lex js/%.pickle: macros/%.sci sci2jsyacc.py parsetab.py sci2jslex.py - ./sci2jsyacc.py $< $@ 1 > js/$*.js.old 2> /dev/null + ./sci2jsyacc.py $< $@ 1 > js/$*.js.old 2> /dev/null && $(RM) js/$*.js.old js/%.js: macros/%.sci js/%.pickle sci2jsyacc.py parsetab.py sci2jslex.py ./sci2jsyacc.py $< js/$*.pickle 2 > $@ 2> js/$*.yacc diff --git a/combined.js b/combined.js index 96eb827f..4432b1ce 100644 --- a/combined.js +++ b/combined.js @@ -209,7 +209,7 @@ function DEMUX() { message("Block must have at least 2 and at most 31 output ports"); ok = false; } else { - [model,graphics,ok] = check_io(this.model,graphics,0,-transpose([1:this.out]),[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,0,-transpose([1:this.out]),[],[]); } } else { if (size(this.out,"*")<2||or(this.out==0)||size(this.out,"*")>31) { @@ -221,7 +221,7 @@ function DEMUX() { } else { nin = sum(this.out); } - [model,graphics,ok] = check_io(this.model,graphics,nin,this.out.slice(),[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,nin,this.out.slice(),[],[]); if (ok) { this.out = size(this.out,"*"); } @@ -280,7 +280,7 @@ function DEMUX_f() { message("Block must have at least 2 and at most 8 output ports"); ok = false; } else { - [model,graphics,ok] = check_io(this.model,graphics,0,-transpose([1:this.out]),[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,0,-transpose([1:this.out]),[],[]); } } else { if (size(this.out,"*")<2||size(this.out,"*")>8||or(this.out==0)) { @@ -292,7 +292,7 @@ function DEMUX_f() { } else { nin = sum(this.out); } - [model,graphics,ok] = check_io(this.model,graphics,nin,this.out.slice(),[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,nin,this.out.slice(),[],[]); if (ok) { this.out = size(this.out,"*"); } @@ -372,7 +372,7 @@ function ESELECT_f() { if (this.out<2) { message("Block must have at least two output ports"); } else { - [model,graphics,ok] = check_io(this.model,graphics,1,[],this.inh,[ones(this.out,1)]); + [this.model,graphics,ok] = check_io(this.model,graphics,1,[],this.inh,[ones(this.out,1)]); if (ok) { graphics.exprs = exprs; this.model.evtout = new ScilabDouble([ones(this.out,1)]); @@ -426,7 +426,7 @@ function EXTRACTOR() { } this.ind = int(this.ind); this.ind = this.ind.slice(); - [model,graphics,ok] = check_io(this.model,graphics,[-1],size(this.ind,1),[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,[-1],size(this.ind,1),[],[]); if (ok) { this.model.ipar = this.ind; graphics.exprs = exprs; @@ -848,7 +848,7 @@ function ISELECT_f() { if (this.z0>this.nout||this.z0<=0) { message("initial connected input is not a valid input port number"); } else { - [model,graphics,ok] = check_io(this.model,graphics,-1,-ones(this.nout,1),ones(this.nout,1),[]); + [this.model,graphics,ok] = check_io(this.model,graphics,-1,-ones(this.nout,1),ones(this.nout,1),[]); if (ok) { graphics.exprs = exprs; this.model.dstate = new ScilabDouble([this.z0-1]); @@ -923,7 +923,7 @@ function ISELECT_m() { if (ok) { out = [-ones(this.nout,1),-2*ones(this.nout,1)]; in1 = [-1,-2]; - [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),ones(this.nout,1),[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),ones(this.nout,1),[]); if (ok) { graphics.exprs = exprs; this.model.dstate = new ScilabDouble([this.z0]); @@ -977,7 +977,7 @@ function MUX() { message("Block must have at least two input ports and at most 31"); ok = false; } else { - [model,graphics,ok] = check_io(this.model,graphics,-transpose([1:this.in1]),0,[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,-transpose([1:this.in1]),0,[],[]); } } else { if (size(this.in1,"*")<2||or(this.in1==0)||size(this.in1,"*")>31) { @@ -989,7 +989,7 @@ function MUX() { } else { nout = sum(this.in1); } - [model,graphics,ok] = check_io(this.model,graphics,this.in1.slice(),nout,[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,this.in1.slice(),nout,[],[]); if (ok) { this.in1 = size(this.in1,"*"); } @@ -1046,7 +1046,7 @@ function MUX_f() { message("Block must have at least two input ports and at most eight"); ok = false; } else { - [model,graphics,ok] = check_io(this.model,graphics,-transpose([1:this.in1]),0,[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,-transpose([1:this.in1]),0,[],[]); } } else { if (size(this.in1,"*")<2||size(this.in1,"*")>8||or(this.in1==0)) { @@ -1058,7 +1058,7 @@ function MUX_f() { } else { nout = sum(this.in1); } - [model,graphics,ok] = check_io(this.model,graphics,this.in1.slice(),nout,[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,this.in1.slice(),nout,[],[]); if (ok) { this.in1 = size(this.in1,"*"); } @@ -1137,7 +1137,7 @@ function M_SWITCH() { } it = [[-1],[-2*ones(this.nin,1)]]; ot = -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) { graphics.exprs = exprs; this.model.ipar = [[this.base],[this.rule]]; @@ -1186,7 +1186,7 @@ function NRMSOM_f() { if (!ok) { break; } - [model,graphics,ok] = check_io(this.model,graphics,-ones(this.nin,1),-1,[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,-ones(this.nin,1),-1,[],[]); if (ok) { graphics.exprs = exprs; this.x.graphics = graphics; @@ -1243,7 +1243,7 @@ function RELAY_f() { if (this.z0>this.nin||this.z0<=0) { message("initial connected input is not a valid input port number"); } else { - [model,graphics,ok] = check_io(this.model,graphics,-ones(this.nin,1),-1,ones(this.nin,1),[]); + [this.model,graphics,ok] = check_io(this.model,graphics,-ones(this.nin,1),-1,ones(this.nin,1),[]); if (ok) { graphics.exprs = exprs; this.model.dstate = new ScilabString([this.z0-1]); @@ -1297,7 +1297,7 @@ function SCALAR2VECTOR() { ok = false; } if (ok) { - [model,graphics,ok] = check_io(this.model,graphics,[1],this.nout,[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,[1],this.nout,[],[]); } if (ok) { graphics.exprs = exprs; @@ -1353,7 +1353,7 @@ function SELECT_f() { if (this.z0>this.nin||this.z0<=0) { message("initial connected input is not a valid input port number"); } else { - [model,graphics,ok] = check_io(this.model,graphics,-ones(this.nin,1),-1,ones(this.nin,1),[]); + [this.model,graphics,ok] = check_io(this.model,graphics,-ones(this.nin,1),-1,ones(this.nin,1),[]); if (ok) { graphics.exprs = exprs; this.model.dstate = new ScilabDouble([this.z0-1]); @@ -1428,7 +1428,7 @@ function SELECT_m() { if (ok) { in1 = [-ones(this.nin,1),-2*ones(this.nin,1)]; out = [-1,-2]; - [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),ones(this.nin,1),[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),ones(this.nin,1),[]); if (ok) { graphics.exprs = exprs; this.model.dstate = new ScilabDouble([this.z0]); @@ -1442,6 +1442,53 @@ function SELECT_m() { return new BasicBlock(this.x); } } +/* autogenerated from "macros/Branching/SELF_SWITCH.sci" */ +function SELF_SWITCH() { + SELF_SWITCH.prototype.define = function SELF_SWITCH() { + this.stateOpen = true; + this.x = scicos_block(); + this.x.gui = "SELF_SWITCH"; + this.x.graphics.sz = [2,2]; + this.x.graphics.gr_i = []; + this.x.graphics.pin = 0; + this.x.graphics.pout = 0; + this.x.model.sim = "csuper"; + this.x.model.in1 = 1; + this.x.model.out = 1; + this.x.model.blocktype = "h"; + this.x.model.dep_ut = [false,false]; + this.x.model.rpar = this.genSwitchInnerDiagram[this.stateOpen-1]; + this.x.model.opar = list(this.stateOpen); + this.x.graphics.in_implicit = ["E"]; + this.x.graphics.in_style = ""; + this.x.graphics.out_implicit = ["E"]; + this.x.graphics.out_style = ""; + this.x.graphics.style = "SELF_SWITCH_OFF"; + return new BasicBlock(this.x); + } + SELF_SWITCH.prototype.details = function SELF_SWITCH() { + return this.x; + } + SELF_SWITCH.prototype.get = function SELF_SWITCH() { + var options = { + } + return options; + } + SELF_SWITCH.prototype.set = function SELF_SWITCH() { + this.x = arg1; + this.stateOpen = this.x.model.opar[1-1]; + this.x.model.rpar = this.genSwitchInnerDiagram[!this.stateOpen-1]; + this.x.model.opar = list(!this.stateOpen); + y = 0; + typ = list(); + if (this.stateOpen==false) { + this.x.graphics.style = "SELF_SWITCH_OFF"; + } else { + this.x.graphics.style = "SELF_SWITCH_ON"; + } + return new BasicBlock(this.x); + } +} /* autogenerated from "macros/Branching/SWITCH2.sci" */ function SWITCH2() { SWITCH2.prototype.define = function SWITCH2() { @@ -1590,7 +1637,7 @@ function SWITCH2_m() { it[3-1] = this.ot; in1 = [this.model.in1,this.model.in2]; out = [this.model.out,this.model.out2]; - [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,this.ot),[],[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,this.ot),[],[]); } if (ok) { this.x.graphics = graphics; @@ -1646,7 +1693,7 @@ function SWITCH_f() { if (this.z0>this.nin||this.z0<=0) { message("initial connected input is not a valid input port number"); } else { - [model,graphics,ok] = check_io(this.model,graphics,-ones(this.nin,1),-1,[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,-ones(this.nin,1),-1,[],[]); if (ok) { graphics.exprs = exprs; this.model.ipar = new ScilabString([this.z0-1]); @@ -3645,7 +3692,7 @@ function IFTHEL_f() { if (this.inh!=1) { this.inh = []; } - [model,graphics,ok] = check_io(this.model,graphics,1,[],this.inh,[[1],[1]]); + [this.model,graphics,ok] = check_io(this.model,graphics,1,[],this.inh,[[1],[1]]); if (ok) { graphics.exprs = exprs; this.model.evtin = this.inh; @@ -3869,7 +3916,7 @@ function M_freq() { if (ok) { this.model.opar = list(m, new ScilabDouble([double(den)]), new ScilabDouble([off]), new ScilabDouble([count])); mn = (2^size(m1,"*"))-1; - [model,graphics,ok] = set_io(this.model,graphics,list(),list(),1,ones(mn,1)); + [this.model,graphics,ok] = set_io(this.model,graphics,list(),list(),1,ones(mn,1)); if (mn>3) { graphics.sz = [40+(mn-3)*10,40]; } else { @@ -4617,7 +4664,7 @@ function BITCLEAR() { it = this.Datatype; ot = this.Datatype; 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),[],[]); } if (ok) { graphics.exprs = exprs; @@ -4711,7 +4758,7 @@ function BITSET() { it = this.Datatype; ot = this.Datatype; 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),[],[]); } if (ok) { graphics.exprs = exprs; @@ -5094,7 +5141,7 @@ function CONVERT() { in1 = [this.model.in1,this.model.in2]; out = [this.model.out,this.model.out2]; if (ok) { - [model,graphics,ok] = set_io(this.model,graphics,list(in1,this.it),list(out,this.ot),[],[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,this.it),list(out,this.ot),[],[]); } if (ok) { graphics.exprs = exprs; @@ -5495,7 +5542,7 @@ function EXTRACTBITS() { it = this.Datatype; ot = this.Datatype; 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),[],[]); } if (ok) { graphics.exprs = exprs; @@ -5611,7 +5658,7 @@ function INTMUL() { in1 = [this.model.in1,this.model.in2]; out = [this.model.out,this.model.out2]; if (ok) { - [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) { this.model.ipar = new ScilabDouble([this.np]); @@ -5788,7 +5835,7 @@ function LOGIC() { out = [ones(nout,1),ones(nout,1)]; it = 5*ones(1,nin); ot = 5*ones(1,nout); - [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),ones(1-this.herit,1),[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),ones(1-this.herit,1),[]); } if (ok) { graphics.exprs = exprs; @@ -5922,7 +5969,7 @@ function SHIFT() { ok = false; } if (ok) { - [model,graphics,ok] = set_io(this.model,graphics,list([-1,-2],it),list([-1,-2],ot),[],[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list([-1,-2],it),list([-1,-2],ot),[],[]); } if (ok) { this.model.ipar = new ScilabDouble([this.nb]); @@ -6057,7 +6104,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; @@ -6338,7 +6385,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()]]; @@ -6431,7 +6478,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()]]; @@ -6518,7 +6565,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; @@ -7001,7 +7048,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()]]; @@ -7093,7 +7140,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()]]; @@ -7208,7 +7255,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; @@ -7270,7 +7317,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; @@ -7373,7 +7420,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; @@ -7526,9 +7573,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) { @@ -7584,7 +7631,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(); @@ -7639,7 +7686,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(); @@ -7736,7 +7783,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; @@ -7919,7 +7966,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) { @@ -8140,7 +8187,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; @@ -8278,7 +8325,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; @@ -8501,7 +8548,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]); @@ -8610,7 +8657,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()]]; @@ -8710,7 +8757,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()]]; @@ -8796,7 +8843,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; @@ -8865,7 +8912,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; @@ -8970,7 +9017,7 @@ function CUMSUM() { out = [this.model.out,this.model.out2]; funtyp = 4; if (ok) { - [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) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); @@ -9076,7 +9123,7 @@ function EXTRACT() { funtyp = 4; if (ok) { label = exprs; - [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),[],[]); this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); graphics.exprs = label; arg1.graphics = graphics; @@ -9176,7 +9223,7 @@ function EXTTRI() { out = [this.model.out,this.model.out2]; funtyp = 4; if (ok) { - [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) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); @@ -9257,7 +9304,7 @@ function MATBKSL() { funtyp = 4; if (ok) { label = exprs; - [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),[],[]); this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); graphics.exprs = label; arg1.graphics = graphics; @@ -9325,7 +9372,7 @@ function MATCATH() { out = [-1,0]; it = -1*(ones(this.nin,1)); ot = -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),[],[]); if (ok) { funtyp = 4; this.model.sim = list(new ScilabString(["mat_cath"]), new ScilabDouble([funtyp])); @@ -9396,7 +9443,7 @@ function MATCATV() { it = -ones(this.nin,1); ot = -1; out = [0,-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),[],[]); if (ok) { funtyp = 4; this.model.sim = list(new ScilabString(["mat_catv"]), new ScilabDouble([funtyp])); @@ -9477,7 +9524,7 @@ function MATDET() { funtyp = 4; if (ok) { label = exprs; - [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),[],[]); this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); graphics.exprs = label; arg1.graphics = graphics; @@ -9556,7 +9603,7 @@ function MATDIAG() { funtyp = 4; if (ok) { label = exprs; - [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),[],[]); this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); graphics.exprs = label; arg1.graphics = graphics; @@ -9635,7 +9682,7 @@ function MATDIV() { funtyp = 4; if (ok) { label = exprs; - [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),[],[]); this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); graphics.exprs = label; arg1.graphics = graphics; @@ -9736,7 +9783,7 @@ function MATEIG() { in1 = [-1,-1]; funtyp = 4; if (ok) { - [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) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); @@ -9817,7 +9864,7 @@ function MATEXPM() { funtyp = 4; if (ok) { label = exprs; - [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),[],[]); this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); graphics.exprs = label; arg1.graphics = graphics; @@ -9896,7 +9943,7 @@ function MATINV() { funtyp = 4; if (ok) { label = exprs; - [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),[],[]); this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); graphics.exprs = label; arg1.graphics = graphics; @@ -9972,7 +10019,7 @@ function MATLU() { ok = false; } if (ok) { - [model,graphics,ok] = set_io(this.model,graphics,list([this.model.in1,this.model.in2],it),list([this.model.out,this.model.out2],ot),[],[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list([this.model.in1,this.model.in2],it),list([this.model.out,this.model.out2],ot),[],[]); } if (ok) { funtyp = 4; @@ -10056,7 +10103,7 @@ function MATMAGPHI() { } funtyp = 4; if (ok) { - [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) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); @@ -10218,7 +10265,7 @@ function MATMUL() { in1 = [[-1,-2],[1,1]]; 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) { label = exprs; this.model.ipar = new ScilabDouble([this.rule]); @@ -10300,7 +10347,7 @@ function MATPINV() { funtyp = 4; if (ok) { label = exprs; - [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),[],[]); this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); graphics.exprs = label; arg1.graphics = graphics; @@ -10405,7 +10452,7 @@ function MATRESH() { } if (ok) { label = this.lab; - [model,graphics,ok] = set_io(this.model,graphics,list(this.l1,it),list(this.out,ot),[],[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list(this.l1,it),list(this.out,ot),[],[]); } if (ok) { funtyp = 4; @@ -10513,7 +10560,7 @@ function MATSING() { } funtyp = 4; if (ok) { - [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) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); @@ -10620,7 +10667,7 @@ function MATSUM() { in1 = [this.model.in1,this.model.in2]; funtyp = 4; if (ok) { - [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) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); @@ -10695,7 +10742,7 @@ function MATTRAN() { funtyp = 4; if (ok) { label = exprs; - [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),[],[]); this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); graphics.exprs = label; arg1.graphics = graphics; @@ -10817,7 +10864,7 @@ function MATZREIM() { } funtyp = 4; if (ok) { - [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) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); @@ -10888,7 +10935,7 @@ function RICC() { it = [1,1,1]; ot = 1; label = exprs; - [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) { this.model.ipar = [[this.tpe],[this.mod]]; graphics.exprs = label; @@ -10970,7 +11017,7 @@ function ROOTCOEF() { funtyp = 4; if (ok) { label = exprs; - [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),[],[]); this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); graphics.exprs = label; arg1.graphics = graphics; @@ -11034,7 +11081,7 @@ function SQRT() { funtyp = 4; if (ok) { label = exprs; - [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),[],[]); this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); graphics.exprs = label; arg1.graphics = graphics; @@ -11144,7 +11191,7 @@ function SUBMAT() { funtyp = 4; label = exprs; if (ok) { - [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),[],[]); this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); graphics.exprs = label; arg1.graphics = graphics; @@ -11278,7 +11325,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; } @@ -11459,7 +11506,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 = []; @@ -11818,7 +11865,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]); @@ -11966,7 +12013,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) { @@ -12127,7 +12174,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)]]; @@ -12978,10 +13025,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) { @@ -13191,7 +13238,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); @@ -13349,7 +13396,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; @@ -13536,7 +13583,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); @@ -13889,7 +13936,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) { @@ -14133,7 +14180,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; @@ -14213,7 +14260,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; @@ -14371,7 +14418,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) { @@ -14505,7 +14552,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) { @@ -14651,7 +14698,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) { @@ -14769,7 +14816,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; @@ -14888,7 +14935,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; @@ -15683,9 +15730,9 @@ function MAXMIN() { } if (ok) { if (this.nin==1) { - [model,graphics,ok] = check_io(this.model,graphics,-1,1,[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,-1,1,[],[]); } else { - [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) { @@ -15883,7 +15930,7 @@ function PRODUCT() { } } if (ok) { - [model,graphics,ok] = check_io(this.model,graphics,in1,nout,[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,in1,nout,[],[]); } if (ok) { this.model.ipar = new ScilabDouble([this.sgn]); @@ -16399,7 +16446,7 @@ function PDE() { break; } if (!ok) { - [model,graphics,ok] = check_io(this.model,graphics,ones(k,1),out.slice(),[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,ones(k,1),out.slice(),[],[]); } label[1-1] = params_pde; label[2-1] = tt; @@ -16496,7 +16543,7 @@ function AFFICH_m() { message([["Some specified values are inconsistent:"],[" "],[mess]]); } if (ok) { - [model,graphics,ok] = set_io(this.model,graphics,list(this.in1,1),list(),ones(1-this.herit,1),[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list(this.in1,1),list(),ones(1-this.herit,1),[]); } if (ok) { this.model.ipar = [[this.font],[this.fontsize],[this.colr],[this.nt],[this.nd],[this.in1[1-1][1-1]]]; @@ -16697,7 +16744,7 @@ function CANIMXY() { } else { in1 = this.nbr_curves*ones(2,1); in2 = ones(2,1); - [model,graphics,ok] = set_io(this.model,graphics,list([in1,in2],ones(2,1)),list(),ones(1,1),[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list([in1,in2],ones(2,1)),list(),ones(1,1),[]); if (this.wpos==[]) { this.wpos = [[-1],[-1]]; } @@ -16841,7 +16888,7 @@ function CANIMXY3D() { } else { in1 = this.nbr_curves*ones(3,1); in2 = ones(3,1); - [model,graphics,ok] = set_io(this.model,graphics,list([in1,in2],ones(3,1)),list(),ones(1,1),[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list([in1,in2],ones(3,1)),list(),ones(1,1),[]); if (this.wpos==[]) { this.wpos = [[-1],[-1]]; } @@ -16942,7 +16989,7 @@ function CEVENTSCOPE() { ok = false; } if (ok) { - [model,graphics,ok] = set_io(this.model,graphics,list(),list(),ones(this.nclock,1),[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list(),list(),ones(this.nclock,1),[]); } else { message([["Some specified values are inconsistent:"],[" "],[mess]]); } @@ -17524,7 +17571,7 @@ function CMSCOPE() { this.in1 = this.in1.slice(); a = size(this.in1,1); in2 = ones(a,1); - [model,graphics,ok] = set_io(this.model,graphics,list([this.in1,in2],ones(a,1)),list(),ones(1-this.heritance,1),[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list([this.in1,in2],ones(a,1)),list(),ones(1-this.heritance,1),[]); } if (ok) { if (this.wpos==[]) { @@ -17651,7 +17698,7 @@ function CSCOPE() { message([["Some specified values are inconsistent:"],[" "],[mess]]); } if (ok) { - [model,graphics,ok] = set_io(this.model,graphics,list([-1,1],1),list(),ones(1-this.heritance,1),[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list([-1,1],1),list(),ones(1-this.heritance,1),[]); } if (ok) { if (this.wpos==[]) { @@ -17783,7 +17830,7 @@ function CSCOPXY() { } else { in1 = this.nbr_curves*ones(2,1); in2 = ones(2,1); - [model,graphics,ok] = set_io(this.model,graphics,list([in1,in2],ones(2,1)),list(),ones(1,1),[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list([in1,in2],ones(2,1)),list(),ones(1,1),[]); if (this.wpos==[]) { this.wpos = [[-1],[-1]]; } @@ -17920,7 +17967,7 @@ function CSCOPXY3D() { if (ok) { in1 = this.nbr_curves*ones(3,1); in2 = ones(3,1); - [model,graphics,ok] = set_io(this.model,graphics,list([in1,in2],ones(3,1)),list(),ones(1,1),[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list([in1,in2],ones(3,1)),list(),ones(1,1),[]); if (this.wpos==[]) { this.wpos = [[-1],[-1]]; } @@ -18119,7 +18166,7 @@ function TOWS_c() { } execstr("if type("+this.varnam+") <> 17 | or(fieldnames("+this.varnam+") <> [\"values\"; \"time\"]) then"+" message([\"Protected variable name.\"; \"Please choose another variable name.\"]);"+" ok = %f;"+" end","errcatch"); if (ok) { - [model,graphics,ok] = set_io(this.model,graphics,list([-1,-2],-1),list(),ones(1-this.herit,1),[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list([-1,-2],-1),list(),ones(1-this.herit,1),[]); if (this.herit==1) { this.model.blocktype = new ScilabString(["x"]); } else { @@ -18934,7 +18981,7 @@ function CONST_m() { } if (ok) { this.model.rpar = []; - [model,graphics,ok] = set_io(this.model,graphics,list(),list(nout,ot),[],[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list(),list(nout,ot),[],[]); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; @@ -19237,7 +19284,7 @@ function FROMWS_c() { } if (ok) { this.model.ipar = [[length(this.varnam)],[this._str2code[this.varnam-1]],[this.Method],[this.ZC],[this.OutEnd]]; - [model,graphics,ok] = set_io(this.model,graphics,list(),list([-1,-2],-1),1,1); + [this.model,graphics,ok] = set_io(this.model,graphics,list(),list([-1,-2],-1),1,1); if (ok) { graphics.exprs = exprs; this.x.graphics = graphics; @@ -19296,7 +19343,7 @@ function GENSIN_f() { ok = false; } if (ok) { - [model,graphics,ok] = check_io(this.model,graphics,[],1,[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,[],1,[],[]); this.model.rpar = [[this.M],[this.F],[this.P]]; this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); @@ -19989,7 +20036,7 @@ function RAND_m() { ok = false; } if (ok) { - [model,graphics,ok] = set_io(this.model,graphics,list([],[]),list(out,ot),1,[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list([],[]),list(out,ot),1,[]); if (ok) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([4])); graphics.exprs = exprs; @@ -20080,7 +20127,7 @@ function READAU_f() { } else if (this.swap!=0&&this.swap!=1) { block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %d.","Swap Mode",this.swap),msprintf("Must be in the interval %s.","[0, 1]")); } else { - [model,graphics,ok] = check_io(this.model,graphics,[],1,1,[]); + [this.model,graphics,ok] = check_io(this.model,graphics,[],1,1,[]); frmt1 = part(frmt1,1,3); if (ok) { ipar = [[length(this.fname1)],[this._str2code[frmt1-1]],[0],[this.N],[M],[this.swap],[offset,this._str2code[this.fname1-1]],[tmask1,outmask.slice()]]; @@ -20214,7 +20261,7 @@ function READC_f() { outpt = 1; } out = size(this.outmask,"*"); - [model,graphics,ok] = check_io(this.model,graphics,[],out,1,outpt); + [this.model,graphics,ok] = check_io(this.model,graphics,[],out,1,outpt); this.frmt1 = part(this.frmt1,1,3); if (ok) { if (ievt==0) { @@ -20337,7 +20384,7 @@ function RFILE_f() { ievt = 1; cout = 1; } - [model,graphics,ok] = check_io(this.model,graphics,[],nout,1,cout); + [this.model,graphics,ok] = check_io(this.model,graphics,[],nout,1,cout); if (ok) { if (ievt==0) { this.model.firing = []; @@ -20447,7 +20494,7 @@ function STEP() { if (ok) { this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); - [model,graphics,ok] = check_io(this.model,graphics,[],size(this.fi,"*"),1,1); + [this.model,graphics,ok] = check_io(this.model,graphics,[],size(this.fi,"*"),1,1); } if (ok) { this.model.firing = new ScilabDouble([this.temps]); @@ -20869,7 +20916,7 @@ function GENERAL_f() { nout = sum(this.out); [ok,this.in1,this.out,exprs] = scicos_getvalue("Set General Zero-Crossing parameters",["Input size","Number of event output"],list("vec",1,"vec",1),exprs); if (ok) { - [model,graphics,ok] = check_io(this.model,graphics,this.in1,[],[],ones(this.out,1)); + [this.model,graphics,ok] = check_io(this.model,graphics,this.in1,[],[],ones(this.out,1)); if (ok) { nout1 = this.out; nin1 = this.in1; @@ -21015,4 +21062,4 @@ function ZCROSS_f() { } } -/* made from 270/274 files */ +/* made from 271/274 files */ diff --git a/js/Branching/DEMUX.js b/js/Branching/DEMUX.js index f477a529..7879bc31 100644 --- a/js/Branching/DEMUX.js +++ b/js/Branching/DEMUX.js @@ -40,7 +40,7 @@ function DEMUX() { message("Block must have at least 2 and at most 31 output ports"); ok = false; } else { - [model,graphics,ok] = check_io(this.model,graphics,0,-transpose([1:this.out]),[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,0,-transpose([1:this.out]),[],[]); } } else { if (size(this.out,"*")<2||or(this.out==0)||size(this.out,"*")>31) { @@ -52,7 +52,7 @@ function DEMUX() { } else { nin = sum(this.out); } - [model,graphics,ok] = check_io(this.model,graphics,nin,this.out.slice(),[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,nin,this.out.slice(),[],[]); if (ok) { this.out = size(this.out,"*"); } diff --git a/js/Branching/DEMUX.pickle b/js/Branching/DEMUX.pickle index 0457a4f9..c677bac8 100644 --- a/js/Branching/DEMUX.pickle +++ b/js/Branching/DEMUX.pickle @@ -44,17 +44,17 @@ p13 sS'nin' p14 g8 -sS'graphics.exprs' +sS'[this.model,graphics,ok]' p15 -NsS'model.ipar' +g8 +sS'graphics.exprs' p16 +NsS'model.ipar' +p17 g8 sS'typ' -p17 -g6 -sS'[model,graphics,ok]' p18 -g8 +g6 sS'ok' p19 S'boolean' diff --git a/js/Branching/DEMUX_f.js b/js/Branching/DEMUX_f.js index 3ef295d7..a1176764 100644 --- a/js/Branching/DEMUX_f.js +++ b/js/Branching/DEMUX_f.js @@ -40,7 +40,7 @@ function DEMUX_f() { message("Block must have at least 2 and at most 8 output ports"); ok = false; } else { - [model,graphics,ok] = check_io(this.model,graphics,0,-transpose([1:this.out]),[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,0,-transpose([1:this.out]),[],[]); } } else { if (size(this.out,"*")<2||size(this.out,"*")>8||or(this.out==0)) { @@ -52,7 +52,7 @@ function DEMUX_f() { } else { nin = sum(this.out); } - [model,graphics,ok] = check_io(this.model,graphics,nin,this.out.slice(),[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,nin,this.out.slice(),[],[]); if (ok) { this.out = size(this.out,"*"); } diff --git a/js/Branching/DEMUX_f.pickle b/js/Branching/DEMUX_f.pickle index 0457a4f9..c677bac8 100644 --- a/js/Branching/DEMUX_f.pickle +++ b/js/Branching/DEMUX_f.pickle @@ -44,17 +44,17 @@ p13 sS'nin' p14 g8 -sS'graphics.exprs' +sS'[this.model,graphics,ok]' p15 -NsS'model.ipar' +g8 +sS'graphics.exprs' p16 +NsS'model.ipar' +p17 g8 sS'typ' -p17 -g6 -sS'[model,graphics,ok]' p18 -g8 +g6 sS'ok' p19 S'boolean' diff --git a/js/Branching/ESELECT_f.js b/js/Branching/ESELECT_f.js index faca22b4..a8945df6 100644 --- a/js/Branching/ESELECT_f.js +++ b/js/Branching/ESELECT_f.js @@ -61,7 +61,7 @@ function ESELECT_f() { if (this.out<2) { message("Block must have at least two output ports"); } else { - [model,graphics,ok] = check_io(this.model,graphics,1,[],this.inh,[ones(this.out,1)]); + [this.model,graphics,ok] = check_io(this.model,graphics,1,[],this.inh,[ones(this.out,1)]); if (ok) { graphics.exprs = exprs; this.model.evtout = new ScilabDouble([ones(this.out,1)]); diff --git a/js/Branching/ESELECT_f.pickle b/js/Branching/ESELECT_f.pickle index 94cd7c79..d1c81601 100644 --- a/js/Branching/ESELECT_f.pickle +++ b/js/Branching/ESELECT_f.pickle @@ -67,18 +67,18 @@ p20 sS'model.evtout' p21 g6 -sS'model.nmode' +sS'[this.model,graphics,ok]' p22 g6 -sS'exprs[3-1]' +sS'model.nmode' p23 +g6 +sS'exprs[3-1]' +p24 g17 sS'graphics.exprs' -p24 -NsS'model.nzcross' p25 -g6 -sS'[model,graphics,ok]' +NsS'model.nzcross' p26 g6 sS'model.blocktype' diff --git a/js/Branching/EXTRACTOR.js b/js/Branching/EXTRACTOR.js index ddfad024..c4e5d731 100644 --- a/js/Branching/EXTRACTOR.js +++ b/js/Branching/EXTRACTOR.js @@ -36,7 +36,7 @@ function EXTRACTOR() { } this.ind = int(this.ind); this.ind = this.ind.slice(); - [model,graphics,ok] = check_io(this.model,graphics,[-1],size(this.ind,1),[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,[-1],size(this.ind,1),[],[]); if (ok) { this.model.ipar = this.ind; graphics.exprs = exprs; diff --git a/js/Branching/EXTRACTOR.pickle b/js/Branching/EXTRACTOR.pickle index a17dfdb8..9be76d9e 100644 --- a/js/Branching/EXTRACTOR.pickle +++ b/js/Branching/EXTRACTOR.pickle @@ -11,64 +11,64 @@ p4 atp5 Rp6 .(dp0 -S'[model,graphics,ok]' +S'model.sim' p1 -S'double' +S'list' p2 sS'model.in1' 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'x.model' +g8 +sS'[this.model,graphics,ok]' p10 -NsS'model.out' +g4 +sS'graphics.exprs' p11 -g2 -sS'exprs' +NsS'x.model' p12 -S'vector' +NsS'model.out' p13 -sS'ind' +g4 +sS'exprs' p14 -g2 -sS'gr_i' +S'vector' p15 -g13 -sS'model.dep_ut' +sS'ind' p16 -g13 -sS'graphics' +g4 +sS'gr_i' p17 -g7 -sS'y' +g15 +sS'model.dep_ut' p18 -g13 -sS'x' +g15 +sS'graphics' p19 -g2 -sS'model' +g8 +sS'y' p20 -g7 -sS'model.ipar' +g15 +sS'x' p21 -g2 -sS'typ' +g4 +sS'model' p22 -g13 -sS'model.sim' +g8 +sS'model.ipar' p23 -S'list' +g4 +sS'typ' p24 +g15 s.
\ No newline at end of file diff --git a/js/Branching/ISELECT_f.js b/js/Branching/ISELECT_f.js index adaf51f0..1ed5f874 100644 --- a/js/Branching/ISELECT_f.js +++ b/js/Branching/ISELECT_f.js @@ -42,7 +42,7 @@ function ISELECT_f() { if (this.z0>this.nout||this.z0<=0) { message("initial connected input is not a valid input port number"); } else { - [model,graphics,ok] = check_io(this.model,graphics,-1,-ones(this.nout,1),ones(this.nout,1),[]); + [this.model,graphics,ok] = check_io(this.model,graphics,-1,-ones(this.nout,1),ones(this.nout,1),[]); if (ok) { graphics.exprs = exprs; this.model.dstate = new ScilabDouble([this.z0-1]); diff --git a/js/Branching/ISELECT_f.pickle b/js/Branching/ISELECT_f.pickle index 52099783..06398aa7 100644 --- a/js/Branching/ISELECT_f.pickle +++ b/js/Branching/ISELECT_f.pickle @@ -50,12 +50,12 @@ sS'model.sim' p15 S'list' p16 -sS'graphics.exprs' +sS'[this.model,graphics,ok]' p17 -NsS'z0' -p18 g2 -sS'[model,graphics,ok]' +sS'graphics.exprs' +p18 +NsS'z0' p19 g2 sS'model.blocktype' diff --git a/js/Branching/ISELECT_m.js b/js/Branching/ISELECT_m.js index 7a82ad23..c7506d3a 100644 --- a/js/Branching/ISELECT_m.js +++ b/js/Branching/ISELECT_m.js @@ -60,7 +60,7 @@ function ISELECT_m() { if (ok) { out = [-ones(this.nout,1),-2*ones(this.nout,1)]; in1 = [-1,-2]; - [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),ones(this.nout,1),[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),ones(this.nout,1),[]); if (ok) { graphics.exprs = exprs; this.model.dstate = new ScilabDouble([this.z0]); diff --git a/js/Branching/ISELECT_m.pickle b/js/Branching/ISELECT_m.pickle index b33f24bc..59aa7a37 100644 --- a/js/Branching/ISELECT_m.pickle +++ b/js/Branching/ISELECT_m.pickle @@ -67,30 +67,30 @@ p20 sS'model.evtout' p21 g7 -sS'model.out2' +sS'[this.model,graphics,ok]' p22 +g2 +sS'model.out2' +p23 g11 sS'in1' -p23 +p24 g7 sS'model.rpar' -p24 +p25 g7 sS'model.outtyp' -p25 +p26 g2 sS'model.state' -p26 +p27 g7 sS'graphics.exprs' -p27 -NsS'model.ipar' p28 +NsS'model.ipar' +p29 g7 sS'z0' -p29 -g2 -sS'[model,graphics,ok]' p30 g2 sS'ok' diff --git a/js/Branching/MUX.js b/js/Branching/MUX.js index 523f8f2d..0b29058d 100644 --- a/js/Branching/MUX.js +++ b/js/Branching/MUX.js @@ -38,7 +38,7 @@ function MUX() { message("Block must have at least two input ports and at most 31"); ok = false; } else { - [model,graphics,ok] = check_io(this.model,graphics,-transpose([1:this.in1]),0,[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,-transpose([1:this.in1]),0,[],[]); } } else { if (size(this.in1,"*")<2||or(this.in1==0)||size(this.in1,"*")>31) { @@ -50,7 +50,7 @@ function MUX() { } else { nout = sum(this.in1); } - [model,graphics,ok] = check_io(this.model,graphics,this.in1.slice(),nout,[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,this.in1.slice(),nout,[],[]); if (ok) { this.in1 = size(this.in1,"*"); } diff --git a/js/Branching/MUX.pickle b/js/Branching/MUX.pickle index 445d4e46..5d0e28dd 100644 --- a/js/Branching/MUX.pickle +++ b/js/Branching/MUX.pickle @@ -11,9 +11,9 @@ p4 atp5 Rp6 .(dp0 -S'[model,graphics,ok]' +S'model.sim' p1 -S'double' +S'list' p2 sS'model.in1' p3 @@ -34,48 +34,48 @@ p10 sS'arg1' p11 g10 -sS'graphics.exprs' +sS'[this.model,graphics,ok]' p12 -NsS'in1' +S'double' p13 -g2 -sS'model.out' +sS'graphics.exprs' p14 -g2 -sS'exprs' +NsS'in1' p15 +g13 +sS'model.out' +p16 +g13 +sS'exprs' +p17 g8 sS'x.model' -p16 +p18 NsS'gr_i' -p17 +p19 g4 sS'model.dep_ut' -p18 +p20 g4 sS'graphics' -p19 +p21 g10 sS'y' -p20 +p22 g4 sS'x' -p21 -g2 +p23 +g13 sS'model' -p22 +p24 g10 sS'model.ipar' -p23 -g2 +p25 +g13 sS'typ' -p24 +p26 g4 sS'nout' -p25 -g2 -sS'model.sim' -p26 -S'list' p27 +g13 s.
\ No newline at end of file diff --git a/js/Branching/MUX_f.js b/js/Branching/MUX_f.js index 1e197b51..5dcbbd19 100644 --- a/js/Branching/MUX_f.js +++ b/js/Branching/MUX_f.js @@ -38,7 +38,7 @@ function MUX_f() { message("Block must have at least two input ports and at most eight"); ok = false; } else { - [model,graphics,ok] = check_io(this.model,graphics,-transpose([1:this.in1]),0,[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,-transpose([1:this.in1]),0,[],[]); } } else { if (size(this.in1,"*")<2||size(this.in1,"*")>8||or(this.in1==0)) { @@ -50,7 +50,7 @@ function MUX_f() { } else { nout = sum(this.in1); } - [model,graphics,ok] = check_io(this.model,graphics,this.in1.slice(),nout,[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,this.in1.slice(),nout,[],[]); if (ok) { this.in1 = size(this.in1,"*"); } diff --git a/js/Branching/MUX_f.pickle b/js/Branching/MUX_f.pickle index 445d4e46..5d0e28dd 100644 --- a/js/Branching/MUX_f.pickle +++ b/js/Branching/MUX_f.pickle @@ -11,9 +11,9 @@ p4 atp5 Rp6 .(dp0 -S'[model,graphics,ok]' +S'model.sim' p1 -S'double' +S'list' p2 sS'model.in1' p3 @@ -34,48 +34,48 @@ p10 sS'arg1' p11 g10 -sS'graphics.exprs' +sS'[this.model,graphics,ok]' p12 -NsS'in1' +S'double' p13 -g2 -sS'model.out' +sS'graphics.exprs' p14 -g2 -sS'exprs' +NsS'in1' p15 +g13 +sS'model.out' +p16 +g13 +sS'exprs' +p17 g8 sS'x.model' -p16 +p18 NsS'gr_i' -p17 +p19 g4 sS'model.dep_ut' -p18 +p20 g4 sS'graphics' -p19 +p21 g10 sS'y' -p20 +p22 g4 sS'x' -p21 -g2 +p23 +g13 sS'model' -p22 +p24 g10 sS'model.ipar' -p23 -g2 +p25 +g13 sS'typ' -p24 +p26 g4 sS'nout' -p25 -g2 -sS'model.sim' -p26 -S'list' p27 +g13 s.
\ No newline at end of file diff --git a/js/Branching/M_SWITCH.js b/js/Branching/M_SWITCH.js index 93b27c32..e62e2877 100644 --- a/js/Branching/M_SWITCH.js +++ b/js/Branching/M_SWITCH.js @@ -60,7 +60,7 @@ function M_SWITCH() { } it = [[-1],[-2*ones(this.nin,1)]]; ot = -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) { graphics.exprs = exprs; this.model.ipar = [[this.base],[this.rule]]; diff --git a/js/Branching/M_SWITCH.pickle b/js/Branching/M_SWITCH.pickle index 83a55023..396fdd0d 100644 --- a/js/Branching/M_SWITCH.pickle +++ b/js/Branching/M_SWITCH.pickle @@ -49,26 +49,26 @@ p14 sS'nin' p15 g8 -sS'in1' +sS'[this.model,graphics,ok]' p16 +g8 +sS'in1' +p17 g5 sS'in2' -p17 +p18 g5 sS'base' -p18 +p19 g8 sS'graphics.exprs' -p19 -NsS'model.ipar' p20 +NsS'model.ipar' +p21 g5 sS'typ' -p21 -g10 -sS'[model,graphics,ok]' p22 -g8 +g10 sS'model.blocktype' p23 S'string' diff --git a/js/Branching/NRMSOM_f.js b/js/Branching/NRMSOM_f.js index 98d295c9..21cbd5ce 100644 --- a/js/Branching/NRMSOM_f.js +++ b/js/Branching/NRMSOM_f.js @@ -34,7 +34,7 @@ function NRMSOM_f() { if (!ok) { break; } - [model,graphics,ok] = check_io(this.model,graphics,-ones(this.nin,1),-1,[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,-ones(this.nin,1),-1,[],[]); if (ok) { graphics.exprs = exprs; this.x.graphics = graphics; diff --git a/js/Branching/NRMSOM_f.pickle b/js/Branching/NRMSOM_f.pickle index 22db145e..6d5e890b 100644 --- a/js/Branching/NRMSOM_f.pickle +++ b/js/Branching/NRMSOM_f.pickle @@ -11,9 +11,9 @@ p4 atp5 Rp6 .(dp0 -S'[model,graphics,ok]' +S'model.sim' p1 -S'double' +S'string' p2 sS'model.in1' p3 @@ -21,11 +21,11 @@ S'matrix' p4 sS'nin' p5 -g2 -sS'model.blocktype' +S'double' p6 -S'string' +sS'model.blocktype' p7 +g2 sS'x.graphics' p8 S'object' @@ -33,42 +33,42 @@ p9 sS'arg1' p10 g9 -sS'graphics.exprs' +sS'[this.model,graphics,ok]' p11 -NsS'in1' +g6 +sS'graphics.exprs' p12 +NsS'in1' +p13 g4 sS'model.out' -p13 -g2 -sS'exprs' p14 -S'vector' +g6 +sS'exprs' p15 -sS'x.model' +S'vector' p16 -NsS'gr_i' +sS'x.model' p17 -g15 -sS'model.dep_ut' +NsS'gr_i' p18 -g15 -sS'graphics' +g16 +sS'model.dep_ut' p19 +g16 +sS'graphics' +p20 g9 sS'y' -p20 -g15 -sS'x' p21 -g2 -sS'model' +g16 +sS'x' p22 -g9 -sS'model.sim' +g6 +sS'model' p23 -g7 +g9 sS'typ' p24 -g15 +g16 s.
\ No newline at end of file diff --git a/js/Branching/RELAY_f.js b/js/Branching/RELAY_f.js index 32e0ee29..910ce11e 100644 --- a/js/Branching/RELAY_f.js +++ b/js/Branching/RELAY_f.js @@ -44,7 +44,7 @@ function RELAY_f() { if (this.z0>this.nin||this.z0<=0) { message("initial connected input is not a valid input port number"); } else { - [model,graphics,ok] = check_io(this.model,graphics,-ones(this.nin,1),-1,ones(this.nin,1),[]); + [this.model,graphics,ok] = check_io(this.model,graphics,-ones(this.nin,1),-1,ones(this.nin,1),[]); if (ok) { graphics.exprs = exprs; this.model.dstate = new ScilabString([this.z0-1]); diff --git a/js/Branching/RELAY_f.pickle b/js/Branching/RELAY_f.pickle index 95b11b18..ad561191 100644 --- a/js/Branching/RELAY_f.pickle +++ b/js/Branching/RELAY_f.pickle @@ -54,17 +54,17 @@ g2 sS'i0' p17 g2 -sS'in1' +sS'[this.model,graphics,ok]' p18 +g2 +sS'in1' +p19 g9 sS'graphics.exprs' -p19 -NsS'typ' p20 -g13 -sS'[model,graphics,ok]' +NsS'typ' p21 -g2 +g13 sS'model.blocktype' p22 S'string' diff --git a/js/Branching/SCALAR2VECTOR.js b/js/Branching/SCALAR2VECTOR.js index ec37f19e..ec798670 100644 --- a/js/Branching/SCALAR2VECTOR.js +++ b/js/Branching/SCALAR2VECTOR.js @@ -39,7 +39,7 @@ function SCALAR2VECTOR() { ok = false; } if (ok) { - [model,graphics,ok] = check_io(this.model,graphics,[1],this.nout,[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,[1],this.nout,[],[]); } if (ok) { graphics.exprs = exprs; diff --git a/js/Branching/SCALAR2VECTOR.pickle b/js/Branching/SCALAR2VECTOR.pickle index 851c289e..60e23e74 100644 --- a/js/Branching/SCALAR2VECTOR.pickle +++ b/js/Branching/SCALAR2VECTOR.pickle @@ -11,65 +11,65 @@ p4 atp5 Rp6 .(dp0 -S'[model,graphics,ok]' +S'model.sim' p1 -S'double' +S'list' p2 sS'model.out' p3 -g2 -sS'ok' +S'double' p4 -S'boolean' +sS'ok' p5 -sS'model.blocktype' +S'boolean' p6 -S'string' +sS'model.blocktype' p7 -sS'x.graphics' +S'string' p8 -S'object' +sS'x.graphics' p9 -sS'arg1' +S'object' p10 -g9 -sS'graphics.exprs' +sS'arg1' p11 -NsS'model.in1' +g10 +sS'[this.model,graphics,ok]' p12 -g2 -sS'model.dep_ut' +g4 +sS'graphics.exprs' p13 -S'vector' +NsS'model.in1' p14 -sS'exprs' +g4 +sS'model.dep_ut' p15 -g14 -sS'x.model' +S'vector' p16 -NsS'gr_i' +sS'exprs' p17 -g14 -sS'graphics' +g16 +sS'x.model' p18 -g9 -sS'y' +NsS'gr_i' p19 -g14 -sS'x' +g16 +sS'graphics' p20 -g2 -sS'model' +g10 +sS'y' p21 -g9 -sS'model.sim' +g16 +sS'x' p22 -S'list' +g4 +sS'model' p23 +g10 sS'typ' p24 -g14 +g16 sS'nout' p25 -g2 +g4 s.
\ No newline at end of file diff --git a/js/Branching/SELECT_f.js b/js/Branching/SELECT_f.js index 4b287f3a..bf3a26de 100644 --- a/js/Branching/SELECT_f.js +++ b/js/Branching/SELECT_f.js @@ -42,7 +42,7 @@ function SELECT_f() { if (this.z0>this.nin||this.z0<=0) { message("initial connected input is not a valid input port number"); } else { - [model,graphics,ok] = check_io(this.model,graphics,-ones(this.nin,1),-1,ones(this.nin,1),[]); + [this.model,graphics,ok] = check_io(this.model,graphics,-ones(this.nin,1),-1,ones(this.nin,1),[]); if (ok) { graphics.exprs = exprs; this.model.dstate = new ScilabDouble([this.z0-1]); diff --git a/js/Branching/SELECT_f.pickle b/js/Branching/SELECT_f.pickle index 6e826cff..a7a1fa4b 100644 --- a/js/Branching/SELECT_f.pickle +++ b/js/Branching/SELECT_f.pickle @@ -50,15 +50,15 @@ p15 sS'nin' p16 g2 -sS'in1' +sS'[this.model,graphics,ok]' p17 +g2 +sS'in1' +p18 g9 sS'graphics.exprs' -p18 -NsS'z0' p19 -g2 -sS'[model,graphics,ok]' +NsS'z0' p20 g2 sS'model.blocktype' diff --git a/js/Branching/SELECT_m.js b/js/Branching/SELECT_m.js index 3fffd8e7..97f56b9e 100644 --- a/js/Branching/SELECT_m.js +++ b/js/Branching/SELECT_m.js @@ -60,7 +60,7 @@ function SELECT_m() { if (ok) { in1 = [-ones(this.nin,1),-2*ones(this.nin,1)]; out = [-1,-2]; - [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),ones(this.nin,1),[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),ones(this.nin,1),[]); if (ok) { graphics.exprs = exprs; this.model.dstate = new ScilabDouble([this.z0]); diff --git a/js/Branching/SELECT_m.pickle b/js/Branching/SELECT_m.pickle index 4a32d368..4eea246b 100644 --- a/js/Branching/SELECT_m.pickle +++ b/js/Branching/SELECT_m.pickle @@ -71,30 +71,30 @@ g12 sS'nin' p23 g2 -sS'model.out2' +sS'[this.model,graphics,ok]' p24 g2 -sS'in1' +sS'model.out2' p25 +g2 +sS'in1' +p26 g12 sS'model.rpar' -p26 +p27 g12 sS'model.outtyp' -p27 +p28 g2 sS'model.state' -p28 +p29 g12 sS'graphics.exprs' -p29 -NsS'model.ipar' p30 +NsS'model.ipar' +p31 g12 sS'z0' -p31 -g2 -sS'[model,graphics,ok]' p32 g2 sS'ok' diff --git a/js/Branching/SELF_SWITCH.js b/js/Branching/SELF_SWITCH.js index 4133e106..93975975 100644 --- a/js/Branching/SELF_SWITCH.js +++ b/js/Branching/SELF_SWITCH.js @@ -1,3 +1,47 @@ -Syntax error in input LexToken(DOT,'.',1,644) /* autogenerated from "macros/Branching/SELF_SWITCH.sci" */ -None +function SELF_SWITCH() { + SELF_SWITCH.prototype.define = function SELF_SWITCH() { + this.stateOpen = true; + this.x = scicos_block(); + this.x.gui = "SELF_SWITCH"; + this.x.graphics.sz = [2,2]; + this.x.graphics.gr_i = []; + this.x.graphics.pin = 0; + this.x.graphics.pout = 0; + this.x.model.sim = "csuper"; + this.x.model.in1 = 1; + this.x.model.out = 1; + this.x.model.blocktype = "h"; + this.x.model.dep_ut = [false,false]; + this.x.model.rpar = this.genSwitchInnerDiagram[this.stateOpen-1]; + this.x.model.opar = list(this.stateOpen); + this.x.graphics.in_implicit = ["E"]; + this.x.graphics.in_style = ""; + this.x.graphics.out_implicit = ["E"]; + this.x.graphics.out_style = ""; + this.x.graphics.style = "SELF_SWITCH_OFF"; + return new BasicBlock(this.x); + } + SELF_SWITCH.prototype.details = function SELF_SWITCH() { + return this.x; + } + SELF_SWITCH.prototype.get = function SELF_SWITCH() { + var options = { + } + return options; + } + SELF_SWITCH.prototype.set = function SELF_SWITCH() { + this.x = arg1; + this.stateOpen = this.x.model.opar[1-1]; + this.x.model.rpar = this.genSwitchInnerDiagram[!this.stateOpen-1]; + this.x.model.opar = list(!this.stateOpen); + y = 0; + typ = list(); + if (this.stateOpen==false) { + this.x.graphics.style = "SELF_SWITCH_OFF"; + } else { + this.x.graphics.style = "SELF_SWITCH_ON"; + } + return new BasicBlock(this.x); + } +} diff --git a/js/Branching/SELF_SWITCH.pickle b/js/Branching/SELF_SWITCH.pickle index 930a0fe1..f13830df 100644 --- a/js/Branching/SELF_SWITCH.pickle +++ b/js/Branching/SELF_SWITCH.pickle @@ -6,15 +6,133 @@ S'x' p2 aS'stateOpen' p3 -atp4 -Rp5 +aS'genSwitchInnerDiagram' +p4 +atp5 +Rp6 .(dp0 -S'diagram' +S'diagram.objs[1-1]' p1 -S'double' +S'object' p2 -sS'diagram.objs[1-1]' +sS'diagram.objs[4-1].model.ipar' p3 -S'object' +S'double' p4 +sS'x.model.dep_ut' +p5 +S'vector' +p6 +sS'diagram.objs[1-1].graphics.pout' +p7 +g4 +sS'x.graphics.out_style' +p8 +S'string' +p9 +sS'x.model' +p10 +g2 +sS'x.model.rpar' +p11 +g4 +sS'x.model.in1' +p12 +g4 +sS'x.model.out' +p13 +g4 +sS'diagram.objs[3-1]' +p14 +g2 +sS'diagram.objs[2-1]' +p15 +g2 +sS'x.graphics.gr_i' +p16 +g6 +sS'x.graphics.pout' +p17 +g4 +sS'diagram.objs[3-1].graphics.pout' +p18 +g4 +sS'x.model.blocktype' +p19 +g9 +sS'diagram.objs[2-1].graphics.pin' +p20 +g4 +sS'diagram.objs[7-1]' +p21 +g4 +sS'diagram.objs[6-1]' +p22 +g4 +sS'diagram.objs[5-1]' +p23 +g4 +sS'x.graphics.in_implicit' +p24 +g6 +sS'diagram.objs[3-1].model.rpar' +p25 +g4 +sS'diagram.objs[4-1]' +p26 +g2 +sS'x.graphics.in_style' +p27 +g9 +sS'stateOpen' +p28 +S'boolean' +p29 +sS'x.graphics.out_implicit' +p30 +g6 +sS'diagram.objs[4-1].graphics.pout' +p31 +g4 +sS'diagram' +p32 +g4 +sS'x.graphics.pin' +p33 +g4 +sS'x.model.opar' +p34 +S'list' +p35 +sS'typ' +p36 +g35 +sS'x.model.sim' +p37 +g9 +sS'diagram.objs[4-1].graphics.pin' +p38 +g6 +sS'x.graphics.style' +p39 +g9 +sS'diagram.objs[3-1].graphics.exprs' +p40 +g9 +sS'x.gui' +p41 +g9 +sS'x.graphics.sz' +p42 +g6 +sS'diagram.objs[4-1].graphics.exprs' +p43 +S'matrix' +p44 +sS'y' +p45 +g4 +sS'x' +p46 +g4 s.
\ No newline at end of file diff --git a/js/Branching/SWITCH2_m.js b/js/Branching/SWITCH2_m.js index d83240fb..c557205a 100644 --- a/js/Branching/SWITCH2_m.js +++ b/js/Branching/SWITCH2_m.js @@ -76,7 +76,7 @@ function SWITCH2_m() { it[3-1] = this.ot; in1 = [this.model.in1,this.model.in2]; out = [this.model.out,this.model.out2]; - [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,this.ot),[],[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,this.ot),[],[]); } if (ok) { this.x.graphics = graphics; diff --git a/js/Branching/SWITCH2_m.pickle b/js/Branching/SWITCH2_m.pickle index 8387667c..ecc77338 100644 --- a/js/Branching/SWITCH2_m.pickle +++ b/js/Branching/SWITCH2_m.pickle @@ -66,30 +66,30 @@ sS'model.sim' p19 S'list' p20 -sS'model.out2' +sS'[this.model,graphics,ok]' p21 g5 -sS'model.nmode' +sS'model.out2' p22 g5 -sS'model.rpar' +sS'model.nmode' p23 g5 -sS'in1' +sS'model.rpar' p24 +g5 +sS'in1' +p25 g9 sS'model.outtyp' -p25 +p26 g5 sS'graphics.exprs' -p26 -NsS'model.ipar' p27 +NsS'model.ipar' +p28 g9 sS'model.nzcross' -p28 -g5 -sS'[model,graphics,ok]' p29 g5 sS'ok' diff --git a/js/Branching/SWITCH_f.js b/js/Branching/SWITCH_f.js index c4e2b75a..dbd37d01 100644 --- a/js/Branching/SWITCH_f.js +++ b/js/Branching/SWITCH_f.js @@ -43,7 +43,7 @@ function SWITCH_f() { if (this.z0>this.nin||this.z0<=0) { message("initial connected input is not a valid input port number"); } else { - [model,graphics,ok] = check_io(this.model,graphics,-ones(this.nin,1),-1,[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,-ones(this.nin,1),-1,[],[]); if (ok) { graphics.exprs = exprs; this.model.ipar = new ScilabString([this.z0-1]); diff --git a/js/Branching/SWITCH_f.pickle b/js/Branching/SWITCH_f.pickle index 01f06e92..941bb77c 100644 --- a/js/Branching/SWITCH_f.pickle +++ b/js/Branching/SWITCH_f.pickle @@ -48,20 +48,20 @@ g6 sS'i0' p15 g6 -sS'in1' +sS'[this.model,graphics,ok]' p16 +g6 +sS'in1' +p17 g8 sS'graphics.exprs' -p17 -NsS'model.ipar' p18 +NsS'model.ipar' +p19 g6 sS'typ' -p19 -g11 -sS'[model,graphics,ok]' p20 -g6 +g11 sS'model.blocktype' p21 S'string' diff --git a/js/Events/IFTHEL_f.js b/js/Events/IFTHEL_f.js index 8af180bd..bdb52c06 100644 --- a/js/Events/IFTHEL_f.js +++ b/js/Events/IFTHEL_f.js @@ -53,7 +53,7 @@ function IFTHEL_f() { if (this.inh!=1) { this.inh = []; } - [model,graphics,ok] = check_io(this.model,graphics,1,[],this.inh,[[1],[1]]); + [this.model,graphics,ok] = check_io(this.model,graphics,1,[],this.inh,[[1],[1]]); if (ok) { graphics.exprs = exprs; this.model.evtin = this.inh; diff --git a/js/Events/IFTHEL_f.pickle b/js/Events/IFTHEL_f.pickle index b2df8700..4425c76f 100644 --- a/js/Events/IFTHEL_f.pickle +++ b/js/Events/IFTHEL_f.pickle @@ -63,19 +63,19 @@ sS'model.evtout' p20 S'matrix' p21 -sS'model.nmode' +sS'[this.model,graphics,ok]' p22 g6 -sS'graphics.exprs' +sS'model.nmode' p23 +g6 +sS'graphics.exprs' +p24 g16 sS'model.nzcross' -p24 -g6 -sS'model.sim[2]' p25 g6 -sS'[model,graphics,ok]' +sS'model.sim[2]' p26 g6 sS'model.blocktype' diff --git a/js/Events/M_freq.js b/js/Events/M_freq.js index c65c5362..2b7c556c 100644 --- a/js/Events/M_freq.js +++ b/js/Events/M_freq.js @@ -55,7 +55,7 @@ function M_freq() { if (ok) { this.model.opar = list(m, new ScilabDouble([double(den)]), new ScilabDouble([off]), new ScilabDouble([count])); mn = (2^size(m1,"*"))-1; - [model,graphics,ok] = set_io(this.model,graphics,list(),list(),1,ones(mn,1)); + [this.model,graphics,ok] = set_io(this.model,graphics,list(),list(),1,ones(mn,1)); if (mn>3) { graphics.sz = [40+(mn-3)*10,40]; } else { diff --git a/js/Events/M_freq.pickle b/js/Events/M_freq.pickle index 7fecf0ac..c059a6fd 100644 --- a/js/Events/M_freq.pickle +++ b/js/Events/M_freq.pickle @@ -57,24 +57,24 @@ sS'model.evtout' p17 S'matrix' p18 -sS'model.rpar' +sS'[this.model,graphics,ok]' p19 +g5 +sS'model.rpar' +p20 g14 sS'graphics.sz' -p20 +p21 g14 sS'offset' -p21 +p22 g14 sS'typ' -p22 +p23 g14 sS'model.opar' -p23 -g16 -sS'[model,graphics,ok]' p24 -g5 +g16 sS'ok' p25 g7 diff --git a/js/IntegerOp/BITCLEAR.js b/js/IntegerOp/BITCLEAR.js index 10177959..4d9758ec 100644 --- a/js/IntegerOp/BITCLEAR.js +++ b/js/IntegerOp/BITCLEAR.js @@ -81,7 +81,7 @@ function BITCLEAR() { it = this.Datatype; ot = this.Datatype; 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),[],[]); } if (ok) { graphics.exprs = exprs; diff --git a/js/IntegerOp/BITCLEAR.pickle b/js/IntegerOp/BITCLEAR.pickle index 9de3a7a9..f0b09f39 100644 --- a/js/IntegerOp/BITCLEAR.pickle +++ b/js/IntegerOp/BITCLEAR.pickle @@ -49,29 +49,29 @@ sS'model.sim' p14 S'list' p15 -sS'model.out2' +sS'[this.model,graphics,ok]' p16 g7 -sS'in1' +sS'model.out2' p17 +g7 +sS'in1' +p18 g10 sS'model.outtyp' -p18 +p19 g7 sS'graphics.exprs' -p19 -NsS'bit' p20 +NsS'bit' +p21 g7 sS'typ' -p21 +p22 g10 sS'model.opar' -p22 -g15 -sS'[model,graphics,ok]' p23 -g7 +g15 sS'ok' p24 S'boolean' diff --git a/js/IntegerOp/BITSET.js b/js/IntegerOp/BITSET.js index 72d334a9..f20d0619 100644 --- a/js/IntegerOp/BITSET.js +++ b/js/IntegerOp/BITSET.js @@ -79,7 +79,7 @@ function BITSET() { it = this.Datatype; ot = this.Datatype; 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),[],[]); } if (ok) { graphics.exprs = exprs; diff --git a/js/IntegerOp/BITSET.pickle b/js/IntegerOp/BITSET.pickle index 9de3a7a9..f0b09f39 100644 --- a/js/IntegerOp/BITSET.pickle +++ b/js/IntegerOp/BITSET.pickle @@ -49,29 +49,29 @@ sS'model.sim' p14 S'list' p15 -sS'model.out2' +sS'[this.model,graphics,ok]' p16 g7 -sS'in1' +sS'model.out2' p17 +g7 +sS'in1' +p18 g10 sS'model.outtyp' -p18 +p19 g7 sS'graphics.exprs' -p19 -NsS'bit' p20 +NsS'bit' +p21 g7 sS'typ' -p21 +p22 g10 sS'model.opar' -p22 -g15 -sS'[model,graphics,ok]' p23 -g7 +g15 sS'ok' p24 S'boolean' diff --git a/js/IntegerOp/CONVERT.js b/js/IntegerOp/CONVERT.js index 9b1f363f..32a89506 100644 --- a/js/IntegerOp/CONVERT.js +++ b/js/IntegerOp/CONVERT.js @@ -368,7 +368,7 @@ function CONVERT() { in1 = [this.model.in1,this.model.in2]; out = [this.model.out,this.model.out2]; if (ok) { - [model,graphics,ok] = set_io(this.model,graphics,list(in1,this.it),list(out,this.ot),[],[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,this.it),list(out,this.ot),[],[]); } if (ok) { graphics.exprs = exprs; diff --git a/js/IntegerOp/CONVERT.pickle b/js/IntegerOp/CONVERT.pickle index ac642a9d..b52bf187 100644 --- a/js/IntegerOp/CONVERT.pickle +++ b/js/IntegerOp/CONVERT.pickle @@ -55,29 +55,29 @@ sS'model.sim' p15 S'list' p16 -sS'model.out2' +sS'[this.model,graphics,ok]' p17 g5 -sS'in1' +sS'model.out2' p18 +g5 +sS'in1' +p19 g11 sS'model.rpar' -p19 +p20 g11 sS'model.outtyp' -p20 +p21 g5 sS'graphics.exprs' -p21 -NsS'model.ipar' p22 +NsS'model.ipar' +p23 g5 sS'typ' -p23 -g11 -sS'[model,graphics,ok]' p24 -g5 +g11 sS'ok' p25 S'boolean' diff --git a/js/IntegerOp/EXTRACTBITS.js b/js/IntegerOp/EXTRACTBITS.js index 767bb11e..70a1785b 100644 --- a/js/IntegerOp/EXTRACTBITS.js +++ b/js/IntegerOp/EXTRACTBITS.js @@ -228,7 +228,7 @@ function EXTRACTBITS() { it = this.Datatype; ot = this.Datatype; 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),[],[]); } if (ok) { graphics.exprs = exprs; diff --git a/js/IntegerOp/EXTRACTBITS.pickle b/js/IntegerOp/EXTRACTBITS.pickle index 3cf92c20..e5bdf3b7 100644 --- a/js/IntegerOp/EXTRACTBITS.pickle +++ b/js/IntegerOp/EXTRACTBITS.pickle @@ -56,33 +56,33 @@ sS'model.sim' p15 S'list' p16 -sS'model.out2' +sS'[this.model,graphics,ok]' p17 g7 -sS'in1' +sS'model.out2' p18 +g7 +sS'in1' +p19 g9 sS'model.outtyp' -p19 +p20 g7 sS'numb' -p20 +p21 g9 sS'graphics.exprs' -p21 -NsS'bit' p22 +NsS'bit' +p23 g7 sS'model.ipar' -p23 +p24 g9 sS'typ' -p24 +p25 g9 sS'bitstr' -p25 -g7 -sS'[model,graphics,ok]' p26 g7 sS'ok' diff --git a/js/IntegerOp/INTMUL.js b/js/IntegerOp/INTMUL.js index ebfeaa11..1c55465e 100644 --- a/js/IntegerOp/INTMUL.js +++ b/js/IntegerOp/INTMUL.js @@ -101,7 +101,7 @@ function INTMUL() { in1 = [this.model.in1,this.model.in2]; out = [this.model.out,this.model.out2]; if (ok) { - [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) { this.model.ipar = new ScilabDouble([this.np]); diff --git a/js/IntegerOp/INTMUL.pickle b/js/IntegerOp/INTMUL.pickle index b9fa4143..ab66f1de 100644 --- a/js/IntegerOp/INTMUL.pickle +++ b/js/IntegerOp/INTMUL.pickle @@ -55,29 +55,29 @@ sS'model.sim' p17 S'list' p18 -sS'model.out2' +sS'[this.model,graphics,ok]' p19 g10 -sS'in1' +sS'model.out2' p20 +g10 +sS'in1' +p21 g8 sS'model.rpar' -p21 +p22 g8 sS'model.outtyp' -p22 +p23 g10 sS'graphics.exprs' -p23 -NsS'model.ipar' p24 +NsS'model.ipar' +p25 g10 sS'typ' -p25 -g8 -sS'[model,graphics,ok]' p26 -g10 +g8 sS'ok' p27 S'boolean' diff --git a/js/IntegerOp/LOGIC.js b/js/IntegerOp/LOGIC.js index a05eadf5..523fdcae 100644 --- a/js/IntegerOp/LOGIC.js +++ b/js/IntegerOp/LOGIC.js @@ -60,7 +60,7 @@ function LOGIC() { out = [ones(nout,1),ones(nout,1)]; it = 5*ones(1,nin); ot = 5*ones(1,nout); - [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),ones(1-this.herit,1),[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),ones(1-this.herit,1),[]); } if (ok) { graphics.exprs = exprs; diff --git a/js/IntegerOp/LOGIC.pickle b/js/IntegerOp/LOGIC.pickle index fe110074..a09fede5 100644 --- a/js/IntegerOp/LOGIC.pickle +++ b/js/IntegerOp/LOGIC.pickle @@ -66,26 +66,26 @@ g5 sS'mat' p22 g12 -sS'model.out2' +sS'[this.model,graphics,ok]' p23 g5 -sS'in1' +sS'model.out2' p24 +g5 +sS'in1' +p25 g8 sS'model.outtyp' -p25 +p26 g5 sS'graphics.exprs' -p26 -NsS'typ' p27 +NsS'typ' +p28 g8 sS'model.opar' -p28 -g20 -sS'[model,graphics,ok]' p29 -g5 +g20 sS'ok' p30 g18 diff --git a/js/IntegerOp/SHIFT.js b/js/IntegerOp/SHIFT.js index 3df9033c..f291982a 100644 --- a/js/IntegerOp/SHIFT.js +++ b/js/IntegerOp/SHIFT.js @@ -118,7 +118,7 @@ function SHIFT() { ok = false; } if (ok) { - [model,graphics,ok] = set_io(this.model,graphics,list([-1,-2],it),list([-1,-2],ot),[],[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list([-1,-2],it),list([-1,-2],ot),[],[]); } if (ok) { this.model.ipar = new ScilabDouble([this.nb]); diff --git a/js/IntegerOp/SHIFT.pickle b/js/IntegerOp/SHIFT.pickle index 5c971890..fe2093d6 100644 --- a/js/IntegerOp/SHIFT.pickle +++ b/js/IntegerOp/SHIFT.pickle @@ -50,30 +50,30 @@ sS'model.sim' p14 S'list' p15 -sS'model.out2' +sS'[this.model,graphics,ok]' p16 g2 -sS'model.intyp' +sS'model.out2' p17 g2 -sS'model.rpar' +sS'model.intyp' p18 -S'vector' +g2 +sS'model.rpar' p19 -sS'model.outtyp' +S'vector' p20 +sS'model.outtyp' +p21 g2 sS'graphics.exprs' -p21 -NsS'model.ipar' p22 +NsS'model.ipar' +p23 g9 sS'typ' -p23 -g19 -sS'[model,graphics,ok]' p24 -g2 +g20 sS'ok' p25 S'boolean' @@ -84,16 +84,16 @@ S'string' p28 sS'model.dep_ut' p29 -g19 +g20 sS'exprs' p30 g9 sS'gr_i' p31 -g19 +g20 sS'y' p32 -g19 +g20 sS'x' p33 g2 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 diff --git a/js/MatrixOp/CUMSUM.js b/js/MatrixOp/CUMSUM.js index 46691ea3..3283e992 100644 --- a/js/MatrixOp/CUMSUM.js +++ b/js/MatrixOp/CUMSUM.js @@ -89,7 +89,7 @@ function CUMSUM() { out = [this.model.out,this.model.out2]; funtyp = 4; if (ok) { - [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) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); diff --git a/js/MatrixOp/CUMSUM.pickle b/js/MatrixOp/CUMSUM.pickle index 994a373c..a299c038 100644 --- a/js/MatrixOp/CUMSUM.pickle +++ b/js/MatrixOp/CUMSUM.pickle @@ -72,32 +72,32 @@ g2 sS'arg1.graphics' p23 g4 -sS'model.out2' +sS'[this.model,graphics,ok]' p24 g7 -sS'in1' +sS'model.out2' p25 +g7 +sS'in1' +p26 g2 sS'model.rpar' -p26 +p27 g2 sS'model.outtyp' -p27 +p28 g7 sS'model.state' -p28 +p29 g2 sS'graphics.exprs' -p29 -NsS'model.ipar' p30 -g2 -sS'typ' +NsS'model.ipar' p31 g2 -sS'[model,graphics,ok]' +sS'typ' p32 -g7 +g2 sS'arg1.model' p33 g4 diff --git a/js/MatrixOp/EXTRACT.js b/js/MatrixOp/EXTRACT.js index 86a14f92..a47073b4 100644 --- a/js/MatrixOp/EXTRACT.js +++ b/js/MatrixOp/EXTRACT.js @@ -90,7 +90,7 @@ function EXTRACT() { funtyp = 4; if (ok) { label = exprs; - [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),[],[]); this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/MatrixOp/EXTRACT.pickle b/js/MatrixOp/EXTRACT.pickle index ba83e454..d65c7d90 100644 --- a/js/MatrixOp/EXTRACT.pickle +++ b/js/MatrixOp/EXTRACT.pickle @@ -71,42 +71,42 @@ g2 sS'arg1.graphics' p23 g4 -sS'model.out2' +sS'[this.model,graphics,ok]' p24 g7 -sS'in1' +sS'model.out2' p25 +g7 +sS'in1' +p26 g2 sS'model.rpar' -p26 +p27 g2 sS'model.outtyp' -p27 +p28 g7 sS'b' -p28 +p29 g2 sS'model.state' -p29 +p30 g2 sS'graphics' -p30 +p31 g4 sS'ma' -p31 +p32 g7 sS'model.ipar' -p32 -g2 -sS'typ' p33 g2 -sS'a' +sS'typ' p34 g2 -sS'[model,graphics,ok]' +sS'a' p35 -g7 +g2 sS'arg1.model' p36 g4 diff --git a/js/MatrixOp/EXTTRI.js b/js/MatrixOp/EXTTRI.js index 6308b156..071ee74f 100644 --- a/js/MatrixOp/EXTTRI.js +++ b/js/MatrixOp/EXTTRI.js @@ -86,7 +86,7 @@ function EXTTRI() { out = [this.model.out,this.model.out2]; funtyp = 4; if (ok) { - [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) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); diff --git a/js/MatrixOp/EXTTRI.pickle b/js/MatrixOp/EXTTRI.pickle index 994a373c..a299c038 100644 --- a/js/MatrixOp/EXTTRI.pickle +++ b/js/MatrixOp/EXTTRI.pickle @@ -72,32 +72,32 @@ g2 sS'arg1.graphics' p23 g4 -sS'model.out2' +sS'[this.model,graphics,ok]' p24 g7 -sS'in1' +sS'model.out2' p25 +g7 +sS'in1' +p26 g2 sS'model.rpar' -p26 +p27 g2 sS'model.outtyp' -p27 +p28 g7 sS'model.state' -p28 +p29 g2 sS'graphics.exprs' -p29 -NsS'model.ipar' p30 -g2 -sS'typ' +NsS'model.ipar' p31 g2 -sS'[model,graphics,ok]' +sS'typ' p32 -g7 +g2 sS'arg1.model' p33 g4 diff --git a/js/MatrixOp/MATBKSL.js b/js/MatrixOp/MATBKSL.js index 90da221c..120a1e1e 100644 --- a/js/MatrixOp/MATBKSL.js +++ b/js/MatrixOp/MATBKSL.js @@ -65,7 +65,7 @@ function MATBKSL() { funtyp = 4; if (ok) { label = exprs; - [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),[],[]); this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/MatrixOp/MATBKSL.pickle b/js/MatrixOp/MATBKSL.pickle index 20810e7d..32187fe9 100644 --- a/js/MatrixOp/MATBKSL.pickle +++ b/js/MatrixOp/MATBKSL.pickle @@ -68,32 +68,32 @@ g2 sS'arg1.graphics' p23 g4 -sS'model.out2' +sS'[this.model,graphics,ok]' p24 g9 -sS'in1' +sS'model.out2' p25 +g9 +sS'in1' +p26 g2 sS'model.rpar' -p26 +p27 g2 sS'model.outtyp' -p27 +p28 g9 sS'model.state' -p28 +p29 g2 sS'graphics.exprs' -p29 -NsS'model.ipar' p30 -g2 -sS'typ' +NsS'model.ipar' p31 g2 -sS'[model,graphics,ok]' +sS'typ' p32 -g9 +g2 sS'arg1.model' p33 g4 diff --git a/js/MatrixOp/MATCATH.js b/js/MatrixOp/MATCATH.js index 480ac3dd..11fb146f 100644 --- a/js/MatrixOp/MATCATH.js +++ b/js/MatrixOp/MATCATH.js @@ -54,7 +54,7 @@ function MATCATH() { out = [-1,0]; it = -1*(ones(this.nin,1)); ot = -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),[],[]); if (ok) { funtyp = 4; this.model.sim = list(new ScilabString(["mat_cath"]), new ScilabDouble([funtyp])); diff --git a/js/MatrixOp/MATCATH.pickle b/js/MatrixOp/MATCATH.pickle index a6b8f95e..6f396cfb 100644 --- a/js/MatrixOp/MATCATH.pickle +++ b/js/MatrixOp/MATCATH.pickle @@ -67,35 +67,35 @@ g2 sS'arg1.graphics' p22 g4 -sS'model.out2' +sS'[this.model,graphics,ok]' p23 g7 -sS'in1' +sS'model.out2' p24 +g7 +sS'in1' +p25 g2 sS'model.rpar' -p25 +p26 g2 sS'model.in1' -p26 +p27 g12 sS'model.outtyp' -p27 +p28 g7 sS'model.state' -p28 +p29 g2 sS'graphics.exprs' -p29 -NsS'model.ipar' p30 -g2 -sS'typ' +NsS'model.ipar' p31 g2 -sS'[model,graphics,ok]' +sS'typ' p32 -g7 +g2 sS'arg1.model' p33 NsS'model.blocktype' diff --git a/js/MatrixOp/MATCATV.js b/js/MatrixOp/MATCATV.js index 4f5fd590..865e1f80 100644 --- a/js/MatrixOp/MATCATV.js +++ b/js/MatrixOp/MATCATV.js @@ -55,7 +55,7 @@ function MATCATV() { it = -ones(this.nin,1); ot = -1; out = [0,-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),[],[]); if (ok) { funtyp = 4; this.model.sim = list(new ScilabString(["mat_catv"]), new ScilabDouble([funtyp])); diff --git a/js/MatrixOp/MATCATV.pickle b/js/MatrixOp/MATCATV.pickle index 35105b55..d29515a3 100644 --- a/js/MatrixOp/MATCATV.pickle +++ b/js/MatrixOp/MATCATV.pickle @@ -67,35 +67,35 @@ g2 sS'arg1.graphics' p22 g4 -sS'model.out2' +sS'[this.model,graphics,ok]' p23 g7 -sS'in1' +sS'model.out2' p24 +g7 +sS'in1' +p25 g2 sS'model.rpar' -p25 +p26 g2 sS'model.in1' -p26 +p27 g12 sS'model.outtyp' -p27 +p28 g7 sS'model.state' -p28 +p29 g2 sS'graphics.exprs' -p29 -NsS'model.ipar' p30 -g2 -sS'typ' +NsS'model.ipar' p31 g2 -sS'[model,graphics,ok]' +sS'typ' p32 -g7 +g2 sS'arg1.model' p33 NsS'model.blocktype' diff --git a/js/MatrixOp/MATDET.js b/js/MatrixOp/MATDET.js index 9c0a203b..e9760077 100644 --- a/js/MatrixOp/MATDET.js +++ b/js/MatrixOp/MATDET.js @@ -65,7 +65,7 @@ function MATDET() { funtyp = 4; if (ok) { label = exprs; - [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),[],[]); this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/MatrixOp/MATDET.pickle b/js/MatrixOp/MATDET.pickle index 6d151ea7..f8728324 100644 --- a/js/MatrixOp/MATDET.pickle +++ b/js/MatrixOp/MATDET.pickle @@ -67,32 +67,32 @@ g2 sS'arg1.graphics' p22 g4 -sS'model.out2' +sS'[this.model,graphics,ok]' p23 g7 -sS'in1' +sS'model.out2' p24 +g7 +sS'in1' +p25 g2 sS'model.rpar' -p25 +p26 g2 sS'model.outtyp' -p26 +p27 g7 sS'model.state' -p27 +p28 g2 sS'graphics.exprs' -p28 -NsS'model.ipar' p29 -g2 -sS'typ' +NsS'model.ipar' p30 g2 -sS'[model,graphics,ok]' +sS'typ' p31 -g7 +g2 sS'arg1.model' p32 g4 diff --git a/js/MatrixOp/MATDIAG.js b/js/MatrixOp/MATDIAG.js index 4dba485a..f3cd3976 100644 --- a/js/MatrixOp/MATDIAG.js +++ b/js/MatrixOp/MATDIAG.js @@ -65,7 +65,7 @@ function MATDIAG() { funtyp = 4; if (ok) { label = exprs; - [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),[],[]); this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/MatrixOp/MATDIAG.pickle b/js/MatrixOp/MATDIAG.pickle index 6d151ea7..f8728324 100644 --- a/js/MatrixOp/MATDIAG.pickle +++ b/js/MatrixOp/MATDIAG.pickle @@ -67,32 +67,32 @@ g2 sS'arg1.graphics' p22 g4 -sS'model.out2' +sS'[this.model,graphics,ok]' p23 g7 -sS'in1' +sS'model.out2' p24 +g7 +sS'in1' +p25 g2 sS'model.rpar' -p25 +p26 g2 sS'model.outtyp' -p26 +p27 g7 sS'model.state' -p27 +p28 g2 sS'graphics.exprs' -p28 -NsS'model.ipar' p29 -g2 -sS'typ' +NsS'model.ipar' p30 g2 -sS'[model,graphics,ok]' +sS'typ' p31 -g7 +g2 sS'arg1.model' p32 g4 diff --git a/js/MatrixOp/MATDIV.js b/js/MatrixOp/MATDIV.js index f63de760..3243ef61 100644 --- a/js/MatrixOp/MATDIV.js +++ b/js/MatrixOp/MATDIV.js @@ -65,7 +65,7 @@ function MATDIV() { funtyp = 4; if (ok) { label = exprs; - [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),[],[]); this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/MatrixOp/MATDIV.pickle b/js/MatrixOp/MATDIV.pickle index 20810e7d..32187fe9 100644 --- a/js/MatrixOp/MATDIV.pickle +++ b/js/MatrixOp/MATDIV.pickle @@ -68,32 +68,32 @@ g2 sS'arg1.graphics' p23 g4 -sS'model.out2' +sS'[this.model,graphics,ok]' p24 g9 -sS'in1' +sS'model.out2' p25 +g9 +sS'in1' +p26 g2 sS'model.rpar' -p26 +p27 g2 sS'model.outtyp' -p27 +p28 g9 sS'model.state' -p28 +p29 g2 sS'graphics.exprs' -p29 -NsS'model.ipar' p30 -g2 -sS'typ' +NsS'model.ipar' p31 g2 -sS'[model,graphics,ok]' +sS'typ' p32 -g9 +g2 sS'arg1.model' p33 g4 diff --git a/js/MatrixOp/MATEIG.js b/js/MatrixOp/MATEIG.js index b6490e9f..bd8d9a1c 100644 --- a/js/MatrixOp/MATEIG.js +++ b/js/MatrixOp/MATEIG.js @@ -87,7 +87,7 @@ function MATEIG() { in1 = [-1,-1]; funtyp = 4; if (ok) { - [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) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); diff --git a/js/MatrixOp/MATEIG.pickle b/js/MatrixOp/MATEIG.pickle index 3abe7647..dced0534 100644 --- a/js/MatrixOp/MATEIG.pickle +++ b/js/MatrixOp/MATEIG.pickle @@ -72,32 +72,32 @@ g2 sS'arg1.graphics' p23 g4 -sS'model.out2' +sS'[this.model,graphics,ok]' p24 g7 -sS'in1' +sS'model.out2' p25 +g7 +sS'in1' +p26 g2 sS'model.rpar' -p26 +p27 g2 sS'model.outtyp' -p27 +p28 g7 sS'model.state' -p28 +p29 g2 sS'graphics.exprs' -p29 -NsS'model.ipar' p30 -g2 -sS'typ' +NsS'model.ipar' p31 g2 -sS'[model,graphics,ok]' +sS'typ' p32 -g7 +g2 sS'arg1.model' p33 NsS'label[9-1]' diff --git a/js/MatrixOp/MATEXPM.js b/js/MatrixOp/MATEXPM.js index 9a93cdac..d528759f 100644 --- a/js/MatrixOp/MATEXPM.js +++ b/js/MatrixOp/MATEXPM.js @@ -65,7 +65,7 @@ function MATEXPM() { funtyp = 4; if (ok) { label = exprs; - [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),[],[]); this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/MatrixOp/MATEXPM.pickle b/js/MatrixOp/MATEXPM.pickle index 6d151ea7..f8728324 100644 --- a/js/MatrixOp/MATEXPM.pickle +++ b/js/MatrixOp/MATEXPM.pickle @@ -67,32 +67,32 @@ g2 sS'arg1.graphics' p22 g4 -sS'model.out2' +sS'[this.model,graphics,ok]' p23 g7 -sS'in1' +sS'model.out2' p24 +g7 +sS'in1' +p25 g2 sS'model.rpar' -p25 +p26 g2 sS'model.outtyp' -p26 +p27 g7 sS'model.state' -p27 +p28 g2 sS'graphics.exprs' -p28 -NsS'model.ipar' p29 -g2 -sS'typ' +NsS'model.ipar' p30 g2 -sS'[model,graphics,ok]' +sS'typ' p31 -g7 +g2 sS'arg1.model' p32 g4 diff --git a/js/MatrixOp/MATINV.js b/js/MatrixOp/MATINV.js index d2418006..d43ab5fd 100644 --- a/js/MatrixOp/MATINV.js +++ b/js/MatrixOp/MATINV.js @@ -65,7 +65,7 @@ function MATINV() { funtyp = 4; if (ok) { label = exprs; - [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),[],[]); this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/MatrixOp/MATINV.pickle b/js/MatrixOp/MATINV.pickle index 6d151ea7..f8728324 100644 --- a/js/MatrixOp/MATINV.pickle +++ b/js/MatrixOp/MATINV.pickle @@ -67,32 +67,32 @@ g2 sS'arg1.graphics' p22 g4 -sS'model.out2' +sS'[this.model,graphics,ok]' p23 g7 -sS'in1' +sS'model.out2' p24 +g7 +sS'in1' +p25 g2 sS'model.rpar' -p25 +p26 g2 sS'model.outtyp' -p26 +p27 g7 sS'model.state' -p27 +p28 g2 sS'graphics.exprs' -p28 -NsS'model.ipar' p29 -g2 -sS'typ' +NsS'model.ipar' p30 g2 -sS'[model,graphics,ok]' +sS'typ' p31 -g7 +g2 sS'arg1.model' p32 g4 diff --git a/js/MatrixOp/MATLU.js b/js/MatrixOp/MATLU.js index a81521e3..4165a819 100644 --- a/js/MatrixOp/MATLU.js +++ b/js/MatrixOp/MATLU.js @@ -62,7 +62,7 @@ function MATLU() { ok = false; } if (ok) { - [model,graphics,ok] = set_io(this.model,graphics,list([this.model.in1,this.model.in2],it),list([this.model.out,this.model.out2],ot),[],[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list([this.model.in1,this.model.in2],it),list([this.model.out,this.model.out2],ot),[],[]); } if (ok) { funtyp = 4; diff --git a/js/MatrixOp/MATLU.pickle b/js/MatrixOp/MATLU.pickle index ff1230e1..85dd387e 100644 --- a/js/MatrixOp/MATLU.pickle +++ b/js/MatrixOp/MATLU.pickle @@ -67,32 +67,32 @@ p21 sS'model.evtout' p22 g2 -sS'model.out2' +sS'[this.model,graphics,ok]' p23 +g7 +sS'model.out2' +p24 g11 sS'model.intyp' -p24 +p25 g7 sS'model.rpar' -p25 +p26 g2 sS'model.outtyp' -p26 +p27 g2 sS'model.state' -p27 +p28 g2 sS'graphics.exprs' -p28 -NsS'model.ipar' p29 -g2 -sS'typ' +NsS'model.ipar' p30 g2 -sS'[model,graphics,ok]' +sS'typ' p31 -g7 +g2 sS'label[9-1]' p32 g2 diff --git a/js/MatrixOp/MATMAGPHI.js b/js/MatrixOp/MATMAGPHI.js index e46a7675..66f79ecf 100644 --- a/js/MatrixOp/MATMAGPHI.js +++ b/js/MatrixOp/MATMAGPHI.js @@ -68,7 +68,7 @@ function MATMAGPHI() { } funtyp = 4; if (ok) { - [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) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); diff --git a/js/MatrixOp/MATMAGPHI.pickle b/js/MatrixOp/MATMAGPHI.pickle index 3d381476..7457f5ff 100644 --- a/js/MatrixOp/MATMAGPHI.pickle +++ b/js/MatrixOp/MATMAGPHI.pickle @@ -70,32 +70,32 @@ g2 sS'arg1.graphics' p23 g4 -sS'model.out2' +sS'[this.model,graphics,ok]' p24 +g8 +sS'model.out2' +p25 g11 sS'in1' -p25 +p26 g11 sS'model.rpar' -p26 +p27 g2 sS'model.outtyp' -p27 +p28 g2 sS'model.state' -p28 +p29 g2 sS'graphics.exprs' -p29 -NsS'model.ipar' p30 -g2 -sS'typ' +NsS'model.ipar' p31 g2 -sS'[model,graphics,ok]' +sS'typ' p32 -g8 +g2 sS'arg1.model' p33 NsS'label[9-1]' diff --git a/js/MatrixOp/MATMUL.js b/js/MatrixOp/MATMUL.js index 4a0d6a2f..a3120182 100644 --- a/js/MatrixOp/MATMUL.js +++ b/js/MatrixOp/MATMUL.js @@ -146,7 +146,7 @@ function MATMUL() { in1 = [[-1,-2],[1,1]]; 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) { label = exprs; this.model.ipar = new ScilabDouble([this.rule]); diff --git a/js/MatrixOp/MATMUL.pickle b/js/MatrixOp/MATMUL.pickle index a4d88c1e..f7fd7b67 100644 --- a/js/MatrixOp/MATMUL.pickle +++ b/js/MatrixOp/MATMUL.pickle @@ -61,37 +61,37 @@ g8 sS'np' p19 g10 -sS'model.sim' +sS'[this.model,graphics,ok]' p20 -S'list' +g10 +sS'model.sim' p21 -sS'label[2-1]' +S'list' p22 +sS'label[2-1]' +p23 g10 sS'model.out2' -p23 +p24 g10 sS'in1' -p24 +p25 g14 sS'model.rpar' -p25 +p26 g14 sS'kmax' -p26 +p27 g10 sS'graphics' -p27 +p28 g2 sS'model.ipar' -p28 +p29 g10 sS'typ' -p29 -g8 -sS'[model,graphics,ok]' p30 -g10 +g8 sS'ot' p31 NsS'ok' diff --git a/js/MatrixOp/MATPINV.js b/js/MatrixOp/MATPINV.js index 6f4d578a..c055a359 100644 --- a/js/MatrixOp/MATPINV.js +++ b/js/MatrixOp/MATPINV.js @@ -65,7 +65,7 @@ function MATPINV() { funtyp = 4; if (ok) { label = exprs; - [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),[],[]); this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/MatrixOp/MATPINV.pickle b/js/MatrixOp/MATPINV.pickle index 6d151ea7..f8728324 100644 --- a/js/MatrixOp/MATPINV.pickle +++ b/js/MatrixOp/MATPINV.pickle @@ -67,32 +67,32 @@ g2 sS'arg1.graphics' p22 g4 -sS'model.out2' +sS'[this.model,graphics,ok]' p23 g7 -sS'in1' +sS'model.out2' p24 +g7 +sS'in1' +p25 g2 sS'model.rpar' -p25 +p26 g2 sS'model.outtyp' -p26 +p27 g7 sS'model.state' -p27 +p28 g2 sS'graphics.exprs' -p28 -NsS'model.ipar' p29 -g2 -sS'typ' +NsS'model.ipar' p30 g2 -sS'[model,graphics,ok]' +sS'typ' p31 -g7 +g2 sS'arg1.model' p32 g4 diff --git a/js/MatrixOp/MATRESH.js b/js/MatrixOp/MATRESH.js index 9fc73857..647cc3db 100644 --- a/js/MatrixOp/MATRESH.js +++ b/js/MatrixOp/MATRESH.js @@ -91,7 +91,7 @@ function MATRESH() { } if (ok) { label = this.lab; - [model,graphics,ok] = set_io(this.model,graphics,list(this.l1,it),list(this.out,ot),[],[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list(this.l1,it),list(this.out,ot),[],[]); } if (ok) { funtyp = 4; diff --git a/js/MatrixOp/MATRESH.pickle b/js/MatrixOp/MATRESH.pickle index e5f1a4cb..ca6a495b 100644 --- a/js/MatrixOp/MATRESH.pickle +++ b/js/MatrixOp/MATRESH.pickle @@ -71,32 +71,32 @@ g7 sS'arg1.graphics' p22 g4 -sS'model.out2' +sS'[this.model,graphics,ok]' p23 g7 -sS'model.intyp' +sS'model.out2' p24 g7 -sS'model.rpar' +sS'model.intyp' p25 +g7 +sS'model.rpar' +p26 g2 sS'model.outtyp' -p26 +p27 g7 sS'model.state' -p27 +p28 g2 sS'graphics.exprs' -p28 -NsS'model.ipar' p29 -g2 -sS'typ' +NsS'model.ipar' p30 g2 -sS'[model,graphics,ok]' +sS'typ' p31 -g7 +g2 sS'arg1.model' p32 NsS'label[9-1]' diff --git a/js/MatrixOp/MATSING.js b/js/MatrixOp/MATSING.js index 6074ea98..7f0bd2ec 100644 --- a/js/MatrixOp/MATSING.js +++ b/js/MatrixOp/MATSING.js @@ -90,7 +90,7 @@ function MATSING() { } funtyp = 4; if (ok) { - [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) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); diff --git a/js/MatrixOp/MATSING.pickle b/js/MatrixOp/MATSING.pickle index 3abe7647..dced0534 100644 --- a/js/MatrixOp/MATSING.pickle +++ b/js/MatrixOp/MATSING.pickle @@ -72,32 +72,32 @@ g2 sS'arg1.graphics' p23 g4 -sS'model.out2' +sS'[this.model,graphics,ok]' p24 g7 -sS'in1' +sS'model.out2' p25 +g7 +sS'in1' +p26 g2 sS'model.rpar' -p26 +p27 g2 sS'model.outtyp' -p27 +p28 g7 sS'model.state' -p28 +p29 g2 sS'graphics.exprs' -p29 -NsS'model.ipar' p30 -g2 -sS'typ' +NsS'model.ipar' p31 g2 -sS'[model,graphics,ok]' +sS'typ' p32 -g7 +g2 sS'arg1.model' p33 NsS'label[9-1]' diff --git a/js/MatrixOp/MATSUM.js b/js/MatrixOp/MATSUM.js index 4a1c7f54..d60e4191 100644 --- a/js/MatrixOp/MATSUM.js +++ b/js/MatrixOp/MATSUM.js @@ -91,7 +91,7 @@ function MATSUM() { in1 = [this.model.in1,this.model.in2]; funtyp = 4; if (ok) { - [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) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); diff --git a/js/MatrixOp/MATSUM.pickle b/js/MatrixOp/MATSUM.pickle index 994a373c..a299c038 100644 --- a/js/MatrixOp/MATSUM.pickle +++ b/js/MatrixOp/MATSUM.pickle @@ -72,32 +72,32 @@ g2 sS'arg1.graphics' p23 g4 -sS'model.out2' +sS'[this.model,graphics,ok]' p24 g7 -sS'in1' +sS'model.out2' p25 +g7 +sS'in1' +p26 g2 sS'model.rpar' -p26 +p27 g2 sS'model.outtyp' -p27 +p28 g7 sS'model.state' -p28 +p29 g2 sS'graphics.exprs' -p29 -NsS'model.ipar' p30 -g2 -sS'typ' +NsS'model.ipar' p31 g2 -sS'[model,graphics,ok]' +sS'typ' p32 -g7 +g2 sS'arg1.model' p33 g4 diff --git a/js/MatrixOp/MATTRAN.js b/js/MatrixOp/MATTRAN.js index c26cfbb1..847402cb 100644 --- a/js/MatrixOp/MATTRAN.js +++ b/js/MatrixOp/MATTRAN.js @@ -59,7 +59,7 @@ function MATTRAN() { funtyp = 4; if (ok) { label = exprs; - [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),[],[]); this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/MatrixOp/MATTRAN.pickle b/js/MatrixOp/MATTRAN.pickle index 58486968..924ff553 100644 --- a/js/MatrixOp/MATTRAN.pickle +++ b/js/MatrixOp/MATTRAN.pickle @@ -43,34 +43,34 @@ g5 sS'label' p12 g9 -sS'function_name' +sS'[this.model,graphics,ok]' p13 -S'string' +g5 +sS'function_name' p14 -sS'model.sim' +S'string' p15 -S'list' +sS'model.sim' p16 -sS'arg1.graphics' +S'list' p17 +sS'arg1.graphics' +p18 g2 sS'label[2-1]' -p18 +p19 g5 sS'model.out2' -p19 +p20 g5 sS'in1' -p20 +p21 g9 sS'graphics.exprs' -p21 -NsS'typ' p22 -g9 -sS'[model,graphics,ok]' +NsS'typ' p23 -g5 +g9 sS'arg1.model' p24 g2 diff --git a/js/MatrixOp/MATZREIM.js b/js/MatrixOp/MATZREIM.js index fdbcbc58..432b6148 100644 --- a/js/MatrixOp/MATZREIM.js +++ b/js/MatrixOp/MATZREIM.js @@ -68,7 +68,7 @@ function MATZREIM() { } funtyp = 4; if (ok) { - [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) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); diff --git a/js/MatrixOp/MATZREIM.pickle b/js/MatrixOp/MATZREIM.pickle index 4b66a7ce..da48cdb1 100644 --- a/js/MatrixOp/MATZREIM.pickle +++ b/js/MatrixOp/MATZREIM.pickle @@ -70,32 +70,32 @@ g2 sS'arg1.graphics' p23 g4 -sS'model.out2' +sS'[this.model,graphics,ok]' p24 +g8 +sS'model.out2' +p25 g11 sS'in1' -p25 +p26 g11 sS'model.rpar' -p26 +p27 g2 sS'model.outtyp' -p27 +p28 g2 sS'model.state' -p28 +p29 g2 sS'graphics.exprs' -p29 -NsS'model.ipar' p30 -g2 -sS'typ' +NsS'model.ipar' p31 g2 -sS'[model,graphics,ok]' +sS'typ' p32 -g8 +g2 sS'arg1.model' p33 NsS'label[9-1]' diff --git a/js/MatrixOp/RICC.js b/js/MatrixOp/RICC.js index aaf3745a..686cf3af 100644 --- a/js/MatrixOp/RICC.js +++ b/js/MatrixOp/RICC.js @@ -55,7 +55,7 @@ function RICC() { it = [1,1,1]; ot = 1; label = exprs; - [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) { this.model.ipar = [[this.tpe],[this.mod]]; graphics.exprs = label; diff --git a/js/MatrixOp/RICC.pickle b/js/MatrixOp/RICC.pickle index f477deec..5a4ca420 100644 --- a/js/MatrixOp/RICC.pickle +++ b/js/MatrixOp/RICC.pickle @@ -70,32 +70,32 @@ g2 sS'arg1.graphics' p23 g4 -sS'model.out2' +sS'[this.model,graphics,ok]' p24 g9 -sS'in1' +sS'model.out2' p25 +g9 +sS'in1' +p26 g2 sS'model.rpar' -p26 +p27 g2 sS'model.outtyp' -p27 +p28 g9 sS'model.state' -p28 +p29 g2 sS'graphics.exprs' -p29 -NsS'model.ipar' p30 +NsS'model.ipar' +p31 g13 sS'typ' -p31 -g2 -sS'[model,graphics,ok]' p32 -g9 +g2 sS'arg1.model' p33 g4 diff --git a/js/MatrixOp/ROOTCOEF.js b/js/MatrixOp/ROOTCOEF.js index 35ba9f40..b92ae12a 100644 --- a/js/MatrixOp/ROOTCOEF.js +++ b/js/MatrixOp/ROOTCOEF.js @@ -67,7 +67,7 @@ function ROOTCOEF() { funtyp = 4; if (ok) { label = exprs; - [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),[],[]); this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/MatrixOp/ROOTCOEF.pickle b/js/MatrixOp/ROOTCOEF.pickle index 7d3b8e19..38cb75d8 100644 --- a/js/MatrixOp/ROOTCOEF.pickle +++ b/js/MatrixOp/ROOTCOEF.pickle @@ -70,32 +70,32 @@ g2 sS'arg1.graphics' p23 g4 -sS'model.out2' +sS'[this.model,graphics,ok]' p24 g7 -sS'in1' +sS'model.out2' p25 +g7 +sS'in1' +p26 g2 sS'model.rpar' -p26 +p27 g2 sS'model.outtyp' -p27 +p28 g7 sS'model.state' -p28 +p29 g2 sS'graphics.exprs' -p29 -NsS'model.ipar' p30 -g2 -sS'typ' +NsS'model.ipar' p31 g2 -sS'[model,graphics,ok]' +sS'typ' p32 -g7 +g2 sS'arg1.model' p33 g4 diff --git a/js/MatrixOp/SQRT.js b/js/MatrixOp/SQRT.js index 24b08dfb..f9eeb3f7 100644 --- a/js/MatrixOp/SQRT.js +++ b/js/MatrixOp/SQRT.js @@ -50,7 +50,7 @@ function SQRT() { funtyp = 4; if (ok) { label = exprs; - [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),[],[]); this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/MatrixOp/SQRT.pickle b/js/MatrixOp/SQRT.pickle index cc8de48e..633e0a08 100644 --- a/js/MatrixOp/SQRT.pickle +++ b/js/MatrixOp/SQRT.pickle @@ -55,23 +55,23 @@ p17 sS'arg1.graphics' p18 g2 -sS'model.out2' +sS'[this.model,graphics,ok]' p19 g7 -sS'in1' +sS'model.out2' p20 +g7 +sS'in1' +p21 g5 sS'model.outtyp' -p21 +p22 g7 sS'graphics.exprs' -p22 -NsS'typ' p23 -g5 -sS'[model,graphics,ok]' +NsS'typ' p24 -g7 +g5 sS'arg1.model' p25 g2 diff --git a/js/MatrixOp/SUBMAT.js b/js/MatrixOp/SUBMAT.js index dc7e41e3..0876be30 100644 --- a/js/MatrixOp/SUBMAT.js +++ b/js/MatrixOp/SUBMAT.js @@ -96,7 +96,7 @@ function SUBMAT() { funtyp = 4; label = exprs; if (ok) { - [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),[],[]); this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/MatrixOp/SUBMAT.pickle b/js/MatrixOp/SUBMAT.pickle index 61574df6..a1b8771c 100644 --- a/js/MatrixOp/SUBMAT.pickle +++ b/js/MatrixOp/SUBMAT.pickle @@ -78,33 +78,33 @@ g2 sS'arg1.graphics' p23 g4 -sS'model.out2' +sS'[this.model,graphics,ok]' p24 g7 -sS'in1' +sS'model.out2' p25 +g7 +sS'in1' +p26 g2 sS'model.rpar' -p26 +p27 g2 sS'model.outtyp' -p27 +p28 g7 sS'model.state' -p28 +p29 g2 sS'graphics.exprs' -p29 -NsS'model.ipar' p30 +NsS'model.ipar' +p31 g15 sS'typ' -p31 +p32 g2 sS'label[6-1]' -p32 -g7 -sS'[model,graphics,ok]' p33 g7 sS'arg1.model' 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 diff --git a/js/NonLinear/MAXMIN.js b/js/NonLinear/MAXMIN.js index a40a5f0b..44dd32f3 100644 --- a/js/NonLinear/MAXMIN.js +++ b/js/NonLinear/MAXMIN.js @@ -50,9 +50,9 @@ function MAXMIN() { } if (ok) { if (this.nin==1) { - [model,graphics,ok] = check_io(this.model,graphics,-1,1,[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,-1,1,[],[]); } else { - [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) { diff --git a/js/NonLinear/MAXMIN.pickle b/js/NonLinear/MAXMIN.pickle index 6e28758b..9ea92f76 100644 --- a/js/NonLinear/MAXMIN.pickle +++ b/js/NonLinear/MAXMIN.pickle @@ -52,21 +52,21 @@ sS'model.sim' p15 S'list' p16 -sS'model.nmode' +sS'[this.model,graphics,ok]' p17 g6 -sS'graphics.exprs' +sS'model.nmode' p18 -NsS'x.graphics.style' +g6 +sS'graphics.exprs' p19 +NsS'x.graphics.style' +p20 g9 sS'model.ipar' -p20 -g6 -sS'model.nzcross' p21 g6 -sS'[model,graphics,ok]' +sS'model.nzcross' p22 g6 sS'ok' diff --git a/js/NonLinear/PRODUCT.js b/js/NonLinear/PRODUCT.js index fea149d1..446dd314 100644 --- a/js/NonLinear/PRODUCT.js +++ b/js/NonLinear/PRODUCT.js @@ -57,7 +57,7 @@ function PRODUCT() { } } if (ok) { - [model,graphics,ok] = check_io(this.model,graphics,in1,nout,[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,in1,nout,[],[]); } if (ok) { this.model.ipar = new ScilabDouble([this.sgn]); diff --git a/js/NonLinear/PRODUCT.pickle b/js/NonLinear/PRODUCT.pickle index f8cfe4af..829508f6 100644 --- a/js/NonLinear/PRODUCT.pickle +++ b/js/NonLinear/PRODUCT.pickle @@ -38,21 +38,21 @@ sS'model.sim' p11 S'list' p12 -sS'in1' +sS'[this.model,graphics,ok]' p13 g8 -sS'graphics.exprs' +sS'in1' p14 -NsS'model.ipar' +g8 +sS'graphics.exprs' p15 +NsS'model.ipar' +p16 g6 sS'typ' -p16 -S'vector' p17 -sS'[model,graphics,ok]' +S'vector' p18 -g8 sS'ok' p19 S'boolean' @@ -63,16 +63,16 @@ S'string' p22 sS'model.dep_ut' p23 -g17 +g18 sS'exprs' p24 g8 sS'gr_i' p25 -g17 +g18 sS'y' p26 -g17 +g18 sS'x' p27 g8 diff --git a/js/PDE/PDE.js b/js/PDE/PDE.js index 5bcbc6b0..cd1f48e1 100644 --- a/js/PDE/PDE.js +++ b/js/PDE/PDE.js @@ -127,7 +127,7 @@ function PDE() { break; } if (!ok) { - [model,graphics,ok] = check_io(this.model,graphics,ones(k,1),out.slice(),[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,ones(k,1),out.slice(),[],[]); } label[1-1] = params_pde; label[2-1] = tt; diff --git a/js/PDE/PDE.pickle b/js/PDE/PDE.pickle index 1a7d957b..c0ddc1ce 100644 --- a/js/PDE/PDE.pickle +++ b/js/PDE/PDE.pickle @@ -67,35 +67,35 @@ g2 sS'type_meth' p20 g2 -sS'label' +sS'label[2-1]' p21 -S'list' +NsS'label' p22 -sS'rdnom' +S'list' p23 +sS'rdnom' +p24 g2 sS'model.sim' -p24 -g22 -sS'label[2-1]' p25 -NsS'model.state' +g23 +sS'[this.model,graphics,ok]' p26 g2 -sS'delta' +sS'model.state' p27 g2 -sS'okk' +sS'delta' p28 +g2 +sS'okk' +p29 g4 sS'typ' -p29 -S'vector' p30 -sS'[ok1]' +S'vector' p31 -g2 -sS'[model,graphics,ok]' +sS'[ok1]' p32 g2 sS'model.blocktype' @@ -110,15 +110,15 @@ p36 g2 sS'model.dep_ut' p37 -g30 +g31 sS'gr_i' p38 -g30 +g31 sS'graphics.exprs' p39 NsS'y' p40 -g30 +g31 sS'x' p41 g2 diff --git a/js/Sinks/AFFICH_m.js b/js/Sinks/AFFICH_m.js index 67033419..d2aea4e3 100644 --- a/js/Sinks/AFFICH_m.js +++ b/js/Sinks/AFFICH_m.js @@ -83,7 +83,7 @@ function AFFICH_m() { message([["Some specified values are inconsistent:"],[" "],[mess]]); } if (ok) { - [model,graphics,ok] = set_io(this.model,graphics,list(this.in1,1),list(),ones(1-this.herit,1),[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list(this.in1,1),list(),ones(1-this.herit,1),[]); } if (ok) { this.model.ipar = [[this.font],[this.fontsize],[this.colr],[this.nt],[this.nd],[this.in1[1-1][1-1]]]; diff --git a/js/Sinks/AFFICH_m.pickle b/js/Sinks/AFFICH_m.pickle index 86e3b62f..c9b00e5d 100644 --- a/js/Sinks/AFFICH_m.pickle +++ b/js/Sinks/AFFICH_m.pickle @@ -76,23 +76,23 @@ p21 sS'mess' p22 g2 -sS'in1' +sS'[this.model,graphics,ok]' p23 +g7 +sS'in1' +p24 g17 sS'fontsize' -p24 +p25 g7 sS'graphics.exprs' -p25 -NsS'model.ipar' p26 +NsS'model.ipar' +p27 g2 sS'typ' -p27 -g17 -sS'[model,graphics,ok]' p28 -g7 +g17 sS'ok' p29 S'boolean' diff --git a/js/Sinks/CANIMXY.js b/js/Sinks/CANIMXY.js index 758842f7..75344310 100644 --- a/js/Sinks/CANIMXY.js +++ b/js/Sinks/CANIMXY.js @@ -106,7 +106,7 @@ function CANIMXY() { } else { in1 = this.nbr_curves*ones(2,1); in2 = ones(2,1); - [model,graphics,ok] = set_io(this.model,graphics,list([in1,in2],ones(2,1)),list(),ones(1,1),[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list([in1,in2],ones(2,1)),list(),ones(1,1),[]); if (this.wpos==[]) { this.wpos = [[-1],[-1]]; } diff --git a/js/Sinks/CANIMXY.pickle b/js/Sinks/CANIMXY.pickle index a88b9b7e..75a79f02 100644 --- a/js/Sinks/CANIMXY.pickle +++ b/js/Sinks/CANIMXY.pickle @@ -98,37 +98,37 @@ g2 sS'mess' p26 g4 -sS'in1' +sS'[this.model,graphics,ok]' p27 -S'string' +g2 +sS'in1' p28 -sS'in2' +S'string' p29 +sS'in2' +p30 g2 sS'N' -p30 +p31 g2 sS'model.rpar' -p31 +p32 g4 sS'graphics.exprs' -p32 -NsS'model.ipar' p33 +NsS'model.ipar' +p34 g4 sS'typ' -p34 -g22 -sS'[model,graphics,ok]' p35 -g2 +g22 sS'ok' p36 S'boolean' p37 sS'model.blocktype' p38 -g28 +g29 sS'model.dep_ut' p39 g22 diff --git a/js/Sinks/CANIMXY3D.js b/js/Sinks/CANIMXY3D.js index b110986b..ad6e0d19 100644 --- a/js/Sinks/CANIMXY3D.js +++ b/js/Sinks/CANIMXY3D.js @@ -122,7 +122,7 @@ function CANIMXY3D() { } else { in1 = this.nbr_curves*ones(3,1); in2 = ones(3,1); - [model,graphics,ok] = set_io(this.model,graphics,list([in1,in2],ones(3,1)),list(),ones(1,1),[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list([in1,in2],ones(3,1)),list(),ones(1,1),[]); if (this.wpos==[]) { this.wpos = [[-1],[-1]]; } diff --git a/js/Sinks/CANIMXY3D.pickle b/js/Sinks/CANIMXY3D.pickle index cf6ff376..f5875b67 100644 --- a/js/Sinks/CANIMXY3D.pickle +++ b/js/Sinks/CANIMXY3D.pickle @@ -78,75 +78,75 @@ p17 sS'model.evtin' p18 g17 -sS'model.firing' +sS'vec_x' p19 -S'vector' +g2 +sS'model.firing' p20 -sS'model.sim' +S'vector' p21 -S'list' +sS'model.sim' p22 -sS'mess' +S'list' p23 -g2 -sS'vec_x' +sS'mess' p24 g2 -sS'vec_y' +sS'[this.model,graphics,ok]' p25 +g17 +sS'vec_y' +p26 g2 sS'in1' -p26 -S'string' p27 -sS'in2' +S'string' p28 +sS'in2' +p29 g17 sS'N' -p29 +p30 g17 sS'size_siz' -p30 +p31 g17 sS'model.rpar' -p31 +p32 g2 sS'graphics.exprs' -p32 -NsS'model.ipar' p33 +NsS'model.ipar' +p34 g2 sS'typ' -p34 -g20 -sS'[model,graphics,ok]' p35 -g17 +g21 sS'ok' p36 S'boolean' p37 sS'model.blocktype' p38 -g27 +g28 sS'param3ds' p39 g2 sS'model.dep_ut' p40 -g20 +g21 sS'exprs' p41 g2 sS'gr_i' p42 -g20 +g21 sS'ipar' p43 g2 sS'y' p44 -g20 +g21 sS'x' p45 g17 diff --git a/js/Sinks/CEVENTSCOPE.js b/js/Sinks/CEVENTSCOPE.js index 1f612e6a..55a8493d 100644 --- a/js/Sinks/CEVENTSCOPE.js +++ b/js/Sinks/CEVENTSCOPE.js @@ -78,7 +78,7 @@ function CEVENTSCOPE() { ok = false; } if (ok) { - [model,graphics,ok] = set_io(this.model,graphics,list(),list(),ones(this.nclock,1),[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list(),list(),ones(this.nclock,1),[]); } else { message([["Some specified values are inconsistent:"],[" "],[mess]]); } diff --git a/js/Sinks/CEVENTSCOPE.pickle b/js/Sinks/CEVENTSCOPE.pickle index 5ca6d286..972e83a8 100644 --- a/js/Sinks/CEVENTSCOPE.pickle +++ b/js/Sinks/CEVENTSCOPE.pickle @@ -61,23 +61,23 @@ p16 sS'mess' p17 g2 -sS'model.rpar' +sS'[this.model,graphics,ok]' p18 g12 -sS'wdim' +sS'model.rpar' p19 +g12 +sS'wdim' +p20 g2 sS'model.ipar' -p20 +p21 g2 sS'typ' -p21 -S'vector' p22 -sS'nclock' +S'vector' p23 -g12 -sS'[model,graphics,ok]' +sS'nclock' p24 g12 sS'ok' @@ -90,19 +90,19 @@ S'string' p28 sS'model.dep_ut' p29 -g22 +g23 sS'exprs' p30 g2 sS'gr_i' p31 -g22 +g23 sS'ipar' p32 g2 sS'y' p33 -g22 +g23 sS'x' p34 g12 diff --git a/js/Sinks/CMSCOPE.js b/js/Sinks/CMSCOPE.js index 9d0db26d..be339e2c 100644 --- a/js/Sinks/CMSCOPE.js +++ b/js/Sinks/CMSCOPE.js @@ -121,7 +121,7 @@ function CMSCOPE() { this.in1 = this.in1.slice(); a = size(this.in1,1); in2 = ones(a,1); - [model,graphics,ok] = set_io(this.model,graphics,list([this.in1,in2],ones(a,1)),list(),ones(1-this.heritance,1),[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list([this.in1,in2],ones(a,1)),list(),ones(1-this.heritance,1),[]); } if (ok) { if (this.wpos==[]) { diff --git a/js/Sinks/CMSCOPE.pickle b/js/Sinks/CMSCOPE.pickle index 60bd2fc1..9849db15 100644 --- a/js/Sinks/CMSCOPE.pickle +++ b/js/Sinks/CMSCOPE.pickle @@ -98,34 +98,34 @@ p26 sS'mess' p27 g2 -sS'in1' +sS'[this.model,graphics,ok]' p28 +g21 +sS'in1' +p29 g2 sS'in2' -p29 +p30 g21 sS'N' -p30 +p31 g21 sS'yy' -p31 +p32 g2 sS'model.rpar' -p32 +p33 g2 sS'wdim' -p33 +p34 g2 sS'model.ipar' -p34 +p35 g2 sS'typ' -p35 +p36 g4 sS'a' -p36 -g21 -sS'[model,graphics,ok]' p37 g21 sS'ok' diff --git a/js/Sinks/CSCOPE.js b/js/Sinks/CSCOPE.js index 3c69cbed..97579a07 100644 --- a/js/Sinks/CSCOPE.js +++ b/js/Sinks/CSCOPE.js @@ -94,7 +94,7 @@ function CSCOPE() { message([["Some specified values are inconsistent:"],[" "],[mess]]); } if (ok) { - [model,graphics,ok] = set_io(this.model,graphics,list([-1,1],1),list(),ones(1-this.heritance,1),[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list([-1,1],1),list(),ones(1-this.heritance,1),[]); } if (ok) { if (this.wpos==[]) { diff --git a/js/Sinks/CSCOPE.pickle b/js/Sinks/CSCOPE.pickle index eaf9e114..e7fe344b 100644 --- a/js/Sinks/CSCOPE.pickle +++ b/js/Sinks/CSCOPE.pickle @@ -83,28 +83,28 @@ p21 sS'mess' p22 g2 -sS'model.in1' +sS'[this.model,graphics,ok]' p23 g10 -sS'model.rpar' +sS'model.in1' p24 +g10 +sS'model.rpar' +p25 g2 sS'N' -p25 +p26 g10 sS'wdim' -p26 +p27 g2 sS'model.ipar' -p27 +p28 g2 sS'typ' -p28 -S'vector' p29 -sS'[model,graphics,ok]' +S'vector' p30 -g10 sS'ok' p31 S'boolean' @@ -115,19 +115,19 @@ S'string' p34 sS'model.dep_ut' p35 -g29 +g30 sS'exprs' p36 g2 sS'gr_i' p37 -g29 +g30 sS'ipar' p38 g2 sS'y' p39 -g29 +g30 sS'x' p40 g10 diff --git a/js/Sinks/CSCOPXY.js b/js/Sinks/CSCOPXY.js index a5c63ce1..9364bf98 100644 --- a/js/Sinks/CSCOPXY.js +++ b/js/Sinks/CSCOPXY.js @@ -105,7 +105,7 @@ function CSCOPXY() { } else { in1 = this.nbr_curves*ones(2,1); in2 = ones(2,1); - [model,graphics,ok] = set_io(this.model,graphics,list([in1,in2],ones(2,1)),list(),ones(1,1),[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list([in1,in2],ones(2,1)),list(),ones(1,1),[]); if (this.wpos==[]) { this.wpos = [[-1],[-1]]; } diff --git a/js/Sinks/CSCOPXY.pickle b/js/Sinks/CSCOPXY.pickle index 7ce87c07..462dabd2 100644 --- a/js/Sinks/CSCOPXY.pickle +++ b/js/Sinks/CSCOPXY.pickle @@ -94,53 +94,53 @@ g2 sS'mess' p24 g4 -sS'in1' +sS'[this.model,graphics,ok]' p25 -S'string' +g2 +sS'in1' p26 -sS'in2' +S'string' p27 +sS'in2' +p28 g2 sS'N' -p28 +p29 g2 sS'model.rpar' -p29 +p30 g4 sS'graphics.exprs' -p30 -NsS'model.ipar' p31 +NsS'model.ipar' +p32 g4 sS'typ' -p32 -S'vector' p33 -sS'[model,graphics,ok]' +S'vector' p34 -g2 sS'ok' p35 S'boolean' p36 sS'model.blocktype' p37 -g26 +g27 sS'model.dep_ut' p38 -g33 +g34 sS'exprs' p39 g4 sS'gr_i' p40 -g33 +g34 sS'ipar' p41 g4 sS'y' p42 -g33 +g34 sS'x' p43 g2 diff --git a/js/Sinks/CSCOPXY3D.js b/js/Sinks/CSCOPXY3D.js index 80210a6a..7d0c7383 100644 --- a/js/Sinks/CSCOPXY3D.js +++ b/js/Sinks/CSCOPXY3D.js @@ -115,7 +115,7 @@ function CSCOPXY3D() { if (ok) { in1 = this.nbr_curves*ones(3,1); in2 = ones(3,1); - [model,graphics,ok] = set_io(this.model,graphics,list([in1,in2],ones(3,1)),list(),ones(1,1),[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list([in1,in2],ones(3,1)),list(),ones(1,1),[]); if (this.wpos==[]) { this.wpos = [[-1],[-1]]; } diff --git a/js/Sinks/CSCOPXY3D.pickle b/js/Sinks/CSCOPXY3D.pickle index 9a994034..e0b15b28 100644 --- a/js/Sinks/CSCOPXY3D.pickle +++ b/js/Sinks/CSCOPXY3D.pickle @@ -78,72 +78,72 @@ p17 sS'model.evtin' p18 g17 -sS'model.sim' +sS'vec_x' p19 -S'list' +g2 +sS'model.sim' p20 -sS'mess' +S'list' p21 -g2 -sS'vec_x' +sS'mess' p22 g2 -sS'vec_y' +sS'[this.model,graphics,ok]' p23 +g17 +sS'vec_y' +p24 g2 sS'in1' -p24 -S'string' p25 -sS'in2' +S'string' p26 +sS'in2' +p27 g17 sS'N' -p27 +p28 g17 sS'size_siz' -p28 +p29 g17 sS'model.rpar' -p29 +p30 g2 sS'graphics.exprs' -p30 -NsS'model.ipar' p31 +NsS'model.ipar' +p32 g2 sS'typ' -p32 -S'vector' p33 -sS'[model,graphics,ok]' +S'vector' p34 -g17 sS'ok' p35 S'boolean' p36 sS'model.blocktype' p37 -g25 +g26 sS'param3ds' p38 g2 sS'model.dep_ut' p39 -g33 +g34 sS'exprs' p40 g2 sS'gr_i' p41 -g33 +g34 sS'ipar' p42 g2 sS'y' p43 -g33 +g34 sS'x' p44 g17 diff --git a/js/Sinks/TOWS_c.js b/js/Sinks/TOWS_c.js index 64909f1f..7adc6837 100644 --- a/js/Sinks/TOWS_c.js +++ b/js/Sinks/TOWS_c.js @@ -59,7 +59,7 @@ function TOWS_c() { } execstr("if type("+this.varnam+") <> 17 | or(fieldnames("+this.varnam+") <> [\"values\"; \"time\"]) then"+" message([\"Protected variable name.\"; \"Please choose another variable name.\"]);"+" ok = %f;"+" end","errcatch"); if (ok) { - [model,graphics,ok] = set_io(this.model,graphics,list([-1,-2],-1),list(),ones(1-this.herit,1),[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list([-1,-2],-1),list(),ones(1-this.herit,1),[]); if (this.herit==1) { this.model.blocktype = new ScilabString(["x"]); } else { diff --git a/js/Sinks/TOWS_c.pickle b/js/Sinks/TOWS_c.pickle index 2a83b55e..7f443569 100644 --- a/js/Sinks/TOWS_c.pickle +++ b/js/Sinks/TOWS_c.pickle @@ -72,24 +72,24 @@ p21 sS'model.evtout' p22 g8 -sS'model.intyp' +sS'[this.model,graphics,ok]' p23 g5 -sS'model.rpar' +sS'model.intyp' p24 +g5 +sS'model.rpar' +p25 g8 sS'graphics.exprs' -p25 -NsS'model.ipar' p26 -S'matrix' +NsS'model.ipar' p27 -sS'typ' +S'matrix' p28 -g8 -sS'[model,graphics,ok]' +sS'typ' p29 -g5 +g8 sS'ok' p30 S'boolean' @@ -102,7 +102,7 @@ p33 g8 sS'exprs' p34 -g27 +g28 sS'r' p35 g31 diff --git a/js/Sources/CONST_m.js b/js/Sources/CONST_m.js index 53015ef6..fef8996f 100644 --- a/js/Sources/CONST_m.js +++ b/js/Sources/CONST_m.js @@ -66,7 +66,7 @@ function CONST_m() { } if (ok) { this.model.rpar = []; - [model,graphics,ok] = set_io(this.model,graphics,list(),list(nout,ot),[],[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list(),list(nout,ot),[],[]); graphics.exprs = exprs; this.x.graphics = graphics; this.x.model = this.model; diff --git a/js/Sources/CONST_m.pickle b/js/Sources/CONST_m.pickle index c84cd57c..08066956 100644 --- a/js/Sources/CONST_m.pickle +++ b/js/Sources/CONST_m.pickle @@ -43,23 +43,23 @@ p12 sS'C' p13 g8 -sS'model.out2' +sS'[this.model,graphics,ok]' p14 g6 -sS'model.rpar' +sS'model.out2' p15 +g6 +sS'model.rpar' +p16 g8 sS'graphics.exprs' -p16 -NsS'typ' p17 +NsS'typ' +p18 g8 sS'model.opar' -p18 -g12 -sS'[model,graphics,ok]' p19 -g6 +g12 sS'ok' p20 S'boolean' diff --git a/js/Sources/FROMWS_c.js b/js/Sources/FROMWS_c.js index 36c4ee6f..14ba597c 100644 --- a/js/Sources/FROMWS_c.js +++ b/js/Sources/FROMWS_c.js @@ -67,7 +67,7 @@ function FROMWS_c() { } if (ok) { this.model.ipar = [[length(this.varnam)],[this._str2code[this.varnam-1]],[this.Method],[this.ZC],[this.OutEnd]]; - [model,graphics,ok] = set_io(this.model,graphics,list(),list([-1,-2],-1),1,1); + [this.model,graphics,ok] = set_io(this.model,graphics,list(),list([-1,-2],-1),1,1); if (ok) { graphics.exprs = exprs; this.x.graphics = graphics; diff --git a/js/Sources/FROMWS_c.pickle b/js/Sources/FROMWS_c.pickle index 35ece113..f1ee6f38 100644 --- a/js/Sources/FROMWS_c.pickle +++ b/js/Sources/FROMWS_c.pickle @@ -65,27 +65,27 @@ p18 sS'model.evtout' p19 g14 -sS'model.out2' +sS'[this.model,graphics,ok]' p20 g5 -sS'ZC' +sS'model.out2' p21 g5 -sS'model.outtyp' +sS'ZC' p22 g5 -sS'graphics.exprs' +sS'model.outtyp' p23 -NsS'model.ipar' +g5 +sS'graphics.exprs' p24 -S'matrix' +NsS'model.ipar' p25 -sS'typ' +S'matrix' p26 -g14 -sS'[model,graphics,ok]' +sS'typ' p27 -g5 +g14 sS'ok' p28 S'boolean' @@ -98,7 +98,7 @@ p31 g14 sS'exprs' p32 -g25 +g26 sS'r' p33 g29 diff --git a/js/Sources/GENSIN_f.js b/js/Sources/GENSIN_f.js index cc03f8a5..cf12b389 100644 --- a/js/Sources/GENSIN_f.js +++ b/js/Sources/GENSIN_f.js @@ -45,7 +45,7 @@ function GENSIN_f() { ok = false; } if (ok) { - [model,graphics,ok] = check_io(this.model,graphics,[],1,[],[]); + [this.model,graphics,ok] = check_io(this.model,graphics,[],1,[],[]); this.model.rpar = [[this.M],[this.F],[this.P]]; this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); diff --git a/js/Sources/GENSIN_f.pickle b/js/Sources/GENSIN_f.pickle index 4176a2e1..df4eda8e 100644 --- a/js/Sources/GENSIN_f.pickle +++ b/js/Sources/GENSIN_f.pickle @@ -43,23 +43,23 @@ sS'model.sim' p12 S'string' p13 -sS'model.out2' +sS'[this.model,graphics,ok]' p14 g8 -sS'model.rpar' +sS'model.out2' p15 +g8 +sS'model.rpar' +p16 g5 sS'model.outtyp' -p16 +p17 g8 sS'graphics.exprs' -p17 -NsS'typ' p18 -g10 -sS'[model,graphics,ok]' +NsS'typ' p19 -g8 +g10 sS'ok' p20 S'boolean' diff --git a/js/Sources/RAND_m.js b/js/Sources/RAND_m.js index e3eaf483..e6948b14 100644 --- a/js/Sources/RAND_m.js +++ b/js/Sources/RAND_m.js @@ -79,7 +79,7 @@ function RAND_m() { ok = false; } if (ok) { - [model,graphics,ok] = set_io(this.model,graphics,list([],[]),list(out,ot),1,[]); + [this.model,graphics,ok] = set_io(this.model,graphics,list([],[]),list(out,ot),1,[]); if (ok) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([4])); graphics.exprs = exprs; diff --git a/js/Sources/RAND_m.pickle b/js/Sources/RAND_m.pickle index 8a76169d..39f505ac 100644 --- a/js/Sources/RAND_m.pickle +++ b/js/Sources/RAND_m.pickle @@ -72,39 +72,39 @@ p21 sS'model.evtout' p22 g12 -sS'model.out2' +sS'[this.model,graphics,ok]' p23 g8 -sS'model.intyp' +sS'model.out2' p24 +g8 +sS'model.intyp' +p25 g12 sS'model.rpar' -p25 +p26 g12 sS'model.outtyp' -p26 +p27 g8 sS'flag' -p27 +p28 g8 sS'model.state' -p28 +p29 g12 sS'graphics.exprs' -p29 -NsS'dt' p30 +NsS'dt' +p31 g8 sS'model.ipar' -p31 +p32 g8 sS'typ' -p32 +p33 g12 sS'a' -p33 -g8 -sS'[model,graphics,ok]' p34 g8 sS'b' diff --git a/js/Sources/READAU_f.js b/js/Sources/READAU_f.js index 3c141b05..d5ac60f2 100644 --- a/js/Sources/READAU_f.js +++ b/js/Sources/READAU_f.js @@ -74,7 +74,7 @@ function READAU_f() { } else if (this.swap!=0&&this.swap!=1) { block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %d.","Swap Mode",this.swap),msprintf("Must be in the interval %s.","[0, 1]")); } else { - [model,graphics,ok] = check_io(this.model,graphics,[],1,1,[]); + [this.model,graphics,ok] = check_io(this.model,graphics,[],1,1,[]); frmt1 = part(frmt1,1,3); if (ok) { ipar = [[length(this.fname1)],[this._str2code[frmt1-1]],[0],[this.N],[M],[this.swap],[offset,this._str2code[this.fname1-1]],[tmask1,outmask.slice()]]; diff --git a/js/Sources/READAU_f.pickle b/js/Sources/READAU_f.pickle index 2f1b37a2..f8221ee6 100644 --- a/js/Sources/READAU_f.pickle +++ b/js/Sources/READAU_f.pickle @@ -77,25 +77,25 @@ NsS'model.sim' p23 S'list' p24 -sS'M' +sS'[this.model,graphics,ok]' p25 g12 -sS'N' +sS'M' p26 g12 -sS'offset' +sS'N' p27 g12 -sS'model.ipar' +sS'offset' p28 +g12 +sS'model.ipar' +p29 g4 sS'typ' -p29 +p30 g2 sS'imask' -p30 -g12 -sS'[model,graphics,ok]' p31 g12 sS'model.blocktype' diff --git a/js/Sources/READC_f.js b/js/Sources/READC_f.js index 53601adf..f1ca9912 100644 --- a/js/Sources/READC_f.js +++ b/js/Sources/READC_f.js @@ -113,7 +113,7 @@ function READC_f() { outpt = 1; } out = size(this.outmask,"*"); - [model,graphics,ok] = check_io(this.model,graphics,[],out,1,outpt); + [this.model,graphics,ok] = check_io(this.model,graphics,[],out,1,outpt); this.frmt1 = part(this.frmt1,1,3); if (ok) { if (ievt==0) { diff --git a/js/Sources/READC_f.pickle b/js/Sources/READC_f.pickle index fb05e8e1..db1450ac 100644 --- a/js/Sources/READC_f.pickle +++ b/js/Sources/READC_f.pickle @@ -103,25 +103,25 @@ g10 sS'M' p29 g2 -sS'fmts' +sS'[this.model,graphics,ok]' p30 +g2 +sS'fmts' +p31 g10 sS'N' -p31 +p32 g2 sS'graphics' -p32 +p33 g6 sS'model.ipar' -p33 +p34 g4 sS'typ' -p34 +p35 g10 sS'imask' -p35 -g2 -sS'[model,graphics,ok]' p36 g2 sS'model.blocktype' diff --git a/js/Sources/RFILE_f.js b/js/Sources/RFILE_f.js index 68a5b065..5eb2f0f4 100644 --- a/js/Sources/RFILE_f.js +++ b/js/Sources/RFILE_f.js @@ -97,7 +97,7 @@ function RFILE_f() { ievt = 1; cout = 1; } - [model,graphics,ok] = check_io(this.model,graphics,[],nout,1,cout); + [this.model,graphics,ok] = check_io(this.model,graphics,[],nout,1,cout); if (ok) { if (ievt==0) { this.model.firing = []; diff --git a/js/Sources/RFILE_f.pickle b/js/Sources/RFILE_f.pickle index 81197c15..15cd3698 100644 --- a/js/Sources/RFILE_f.pickle +++ b/js/Sources/RFILE_f.pickle @@ -85,22 +85,22 @@ g2 sS'exprs[6-1]' p25 g13 -sS'N' +sS'[this.model,graphics,ok]' p26 g2 -sS'graphics' +sS'N' p27 +g2 +sS'graphics' +p28 g9 sS'model.ipar' -p28 +p29 g4 sS'typ' -p29 +p30 g13 sS'imask' -p30 -g2 -sS'[model,graphics,ok]' p31 g2 sS'model.blocktype' diff --git a/js/Sources/STEP.js b/js/Sources/STEP.js index d2bb8443..2a5a4252 100644 --- a/js/Sources/STEP.js +++ b/js/Sources/STEP.js @@ -57,7 +57,7 @@ function STEP() { if (ok) { this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); - [model,graphics,ok] = check_io(this.model,graphics,[],size(this.fi,"*"),1,1); + [this.model,graphics,ok] = check_io(this.model,graphics,[],size(this.fi,"*"),1,1); } if (ok) { this.model.firing = new ScilabDouble([this.temps]); diff --git a/js/Sources/STEP.pickle b/js/Sources/STEP.pickle index d2ae7496..de429ad0 100644 --- a/js/Sources/STEP.pickle +++ b/js/Sources/STEP.pickle @@ -48,50 +48,50 @@ p13 sS'model.evtout' p14 g8 -sS'model.out2' +sS'[this.model,graphics,ok]' p15 g8 -sS'in1' +sS'model.out2' p16 -S'string' +g8 +sS'in1' p17 -sS'model.rpar' +S'string' p18 +sS'model.rpar' +p19 g5 sS'model.outtyp' -p19 +p20 g8 sS'graphics.exprs' -p20 -NsS'fi' p21 -g17 -sS'typ' +NsS'fi' p22 -S'vector' +g18 +sS'typ' p23 -sS'[model,graphics,ok]' +S'vector' p24 -g8 sS'ok' p25 S'boolean' p26 sS'model.blocktype' p27 -g17 +g18 sS'model.dep_ut' p28 -g23 +g24 sS'exprs' p29 g5 sS'gr_i' p30 -g23 +g24 sS'y' p31 -g23 +g24 sS'x' p32 g8 diff --git a/js/Threshold/GENERAL_f.js b/js/Threshold/GENERAL_f.js index 39b84a58..dc095719 100644 --- a/js/Threshold/GENERAL_f.js +++ b/js/Threshold/GENERAL_f.js @@ -42,7 +42,7 @@ function GENERAL_f() { nout = sum(this.out); [ok,this.in1,this.out,exprs] = scicos_getvalue("Set General Zero-Crossing parameters",["Input size","Number of event output"],list("vec",1,"vec",1),exprs); if (ok) { - [model,graphics,ok] = check_io(this.model,graphics,this.in1,[],[],ones(this.out,1)); + [this.model,graphics,ok] = check_io(this.model,graphics,this.in1,[],[],ones(this.out,1)); if (ok) { nout1 = this.out; nin1 = this.in1; diff --git a/js/Threshold/GENERAL_f.pickle b/js/Threshold/GENERAL_f.pickle index b3adc804..d8de13a3 100644 --- a/js/Threshold/GENERAL_f.pickle +++ b/js/Threshold/GENERAL_f.pickle @@ -64,21 +64,21 @@ g8 sS'rp.slice(1-1,nout1).slice(1-1,2*n)' p21 g8 -sS'in1' +sS'[this.model,graphics,ok]' p22 g8 -sS'model.rpar' +sS'in1' p23 +g8 +sS'model.rpar' +p24 g5 sS'graphics' -p24 +p25 g2 sS'nout1' -p25 -NsS'model.nzcross' p26 -g8 -sS'[model,graphics,ok]' +NsS'model.nzcross' p27 g8 sS'model.blocktype' diff --git a/sci2jsyacc.py b/sci2jsyacc.py index f47db97f..4e0be853 100755 --- a/sci2jsyacc.py +++ b/sci2jsyacc.py @@ -666,14 +666,44 @@ def p_getvaluearg4_expression(p): # define ltermarraylist -def p_ltermarraylist_ltermarraylist_comma_ltermvar(p): - '''ltermarraylist : ltermarraylist COMMA ltermvar - | ltermarraylist COMMA MODEL''' +def p_ltermarraylist_ltermarraylist_comma_ltermarraylisterm(p): + 'ltermarraylist : ltermarraylist COMMA ltermarraylistterm' p[0] = '%s,%s' % (p[1], p[3]) -def p_ltermarraylist_ltermvar(p): - '''ltermarraylist : ltermvar - | MODEL''' +def p_ltermarraylist_ltermarraylistterm(p): + 'ltermarraylist : ltermarraylistterm' + p[0] = '%s' % (p[1]) + +def p_ltermarraylistterm_ltermvar(p): + '''ltermarraylistterm : VAR + | MODEL''' + var = '%s' % (p[1]) + add_local_var(var) + if var in GLOBAL_VARS: + p[0] = 'this.%s' % (var) + else: + p[0] = '%s' % (var) + +def p_ltermarraylistterm_ltermvar_dot_var(p): + 'ltermarraylistterm : VAR DOT VAR' + var = '%s' % (p[1]) + add_local_var(var) + if var in GLOBAL_VARS: + p[0] = 'this.%s.%s' % (var, p[3]) + else: + p[0] = '%s.%s' % (var, p[3]) + +def p_ltermarraylistterm_in(p): + 'ltermarraylistterm : IN' + var = '%s1' % (p[1]) + add_local_var(var) + if var in GLOBAL_VARS: + p[0] = 'this.%s' % (var) + else: + p[0] = '%s' % (var) + +def p_ltermarraylistterm_prevar(p): + 'ltermarraylistterm : PREVAR' p[0] = '%s' % (p[1]) # end define ltermarraylist @@ -869,24 +899,24 @@ def p_clearvar_clearvar_var(p): # B(2:$-1) def p_lterm_ltermvar_slice(p): - 'lterm : ltermvar OPENBRACKET expression COLON expression CLOSEBRACKET' + 'lterm : lterm OPENBRACKET expression COLON expression CLOSEBRACKET' p[0] = '%s.slice(%s-1,%s)' % (p[1], p[3][0], p[5][0]) # B(2) def p_lterm_ltermvar_index(p): - 'lterm : ltermvar OPENBRACKET expression CLOSEBRACKET' + 'lterm : lterm OPENBRACKET expression CLOSEBRACKET' p[0] = '%s[%s-1]' % (p[1], p[3][0]) # B(2:$-1,1:n) def p_lterm_ltermvar_slice_slice(p): - 'lterm : ltermvar OPENBRACKET expression COLON expression COMMA expression COLON expression CLOSEBRACKET' + 'lterm : lterm OPENBRACKET expression COLON expression COMMA expression COLON expression CLOSEBRACKET' p[0] = '%s.slice(%s-1,%s).slice(%s-1,%s)' % (p[1], p[3][0], p[5][0], p[7][0], p[9][0]) # B(2,3) # B($-2)(3) def p_lterm_ltermvar_index_index(p): - '''lterm : ltermvar OPENBRACKET expression COMMA expression CLOSEBRACKET - | ltermvar OPENBRACKET expression CLOSEOPENBRACKET expression CLOSEBRACKET''' + '''lterm : lterm OPENBRACKET expression COMMA expression CLOSEBRACKET + | lterm OPENBRACKET expression CLOSEOPENBRACKET expression CLOSEBRACKET''' base = '%s[%s-1]' % (p[1], p[3][0]) p[0] = '%s[%s-1]' % (base, p[5][0]) @@ -895,21 +925,17 @@ def p_lterm_ltermarraylist(p): 'lterm : OPENSQBRACKET ltermarraylist CLOSESQBRACKET' p[0] = '[%s]' % (p[2]) -def p_lterm_ltermvar(p): - 'lterm : ltermvar' - p[0] = '%s' % (p[1]) - def p_ltermvar_ltermvar_dot_var(p): - '''ltermvar : ltermvar DOT VAR - | ltermvar DOT MODEL''' + '''lterm : lterm DOT VAR + | lterm DOT MODEL''' p[0] = '%s.%s' % (p[1], p[3]) def p_ltermvar_ltermvar_dot_in(p): - 'ltermvar : ltermvar DOT IN' + 'lterm : lterm DOT IN' p[0] = '%s.%s1' % (p[1], p[3]) def p_ltermvar_var(p): - 'ltermvar : VAR' + 'lterm : VAR' var = p[1] add_local_var(var) if var in GLOBAL_VARS: @@ -919,7 +945,7 @@ def p_ltermvar_var(p): # in def p_ltermvar_in(p): - 'ltermvar : IN' + 'lterm : IN' var = p[1] + '1' add_local_var(var) if var in GLOBAL_VARS: @@ -928,7 +954,7 @@ def p_ltermvar_in(p): p[0] = '%s' % (var) def p_ltermvar_prevar(p): - 'ltermvar : PREVAR' + 'lterm : PREVAR' p[0] = '%s' % (p[1]) # end define lterm |