diff options
| author | Sunil Shetye | 2018-07-13 15:37:42 +0530 |
|---|---|---|
| committer | Sunil Shetye | 2018-07-15 07:11:58 +0530 |
| commit | 6ee02952c836bb31e9b51783e6a16724fba64637 (patch) | |
| tree | bde996b5477f57f4faca4ba3a173bed2fdf0c359 /js/Misc | |
| parent | 214ade87a6cef2bf55f9b9f2848ffafc02f37f18 (diff) | |
| download | sci2js-6ee02952c836bb31e9b51783e6a16724fba64637.tar.gz sci2js-6ee02952c836bb31e9b51783e6a16724fba64637.tar.bz2 sci2js-6ee02952c836bb31e9b51783e6a16724fba64637.zip | |
change in1 to in
Diffstat (limited to 'js/Misc')
74 files changed, 767 insertions, 893 deletions
diff --git a/js/Misc/AUTOMAT.js b/js/Misc/AUTOMAT.js index 47fd3137..834a9e15 100644 --- a/js/Misc/AUTOMAT.js +++ b/js/Misc/AUTOMAT.js @@ -13,7 +13,7 @@ function AUTOMAT() { var rpar = [this.X0]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["automat"]), new ScilabDouble([10004])); - this.model.in1 = new ScilabDouble([2*NX+1],[2*NX+1]); + this.model.in = new ScilabDouble([2*NX+1],[2*NX+1]); this.model.out = new ScilabDouble([2],[2*NX]); this.model.state = new ScilabDouble([ones(2*NX,1)]); this.model.nzcross = new ScilabDouble([1]); @@ -36,10 +36,7 @@ function AUTOMAT() { return options; } AUTOMAT.prototype.set = function AUTOMAT() { - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var ipar = this.model.ipar; var NMode = ipar[1-1]; var NX = ipar[3-1]; diff --git a/js/Misc/AUTOMAT.pickle b/js/Misc/AUTOMAT.pickle index f6e87b0c..f93dffcd 100644 --- a/js/Misc/AUTOMAT.pickle +++ b/js/Misc/AUTOMAT.pickle @@ -27,52 +27,52 @@ S'NMode_old' p1 S'double' p2 -sS'arg1' +sS'model.in' p3 -S'object' +S'matrix' p4 -sS'graphics.exprs' +sS'arg1' p5 -NsS'rpar' +S'object' p6 -S'vector' +sS'graphics.exprs' p7 -sS'ModifEncore' +NsS'rpar' p8 -S'boolean' +S'vector' p9 -sS'model.out' +sS'ModifEncore' p10 -S'matrix' +S'boolean' p11 -sS'exprs.slice(NMode_old+6-1,NMode+5)' +sS'model.out' p12 +g4 +sS'exprs.slice(NMode_old+6-1,NMode+5)' +p13 g2 sS'MSG' -p13 -S'string' p14 -sS'XP' +S'string' p15 -g11 -sS'MaxModes' +sS'XP' p16 -g2 -sS'nzcross' +g4 +sS'MaxModes' p17 g2 -sS'model.in1' +sS'nzcross' p18 -g11 +g2 sS'MSG0' p19 -g14 +g15 sS'MSG3' p20 -g14 +g15 sS'MSG2' p21 -g14 +g15 sS'model.nzcross' p22 g2 @@ -81,19 +81,19 @@ p23 g2 sS'graphics.gr_i[1-1][1-1]' p24 -g14 +g15 sS'C2' p25 -g7 +g9 sS'X0' p26 -g7 +g9 sS'model.firing' p27 g2 sS'OUT' p28 -g7 +g9 sS'model.sim' p29 S'list' @@ -103,37 +103,37 @@ p31 g2 sS'model.rpar' p32 -g7 +g9 sS'CX' p33 -g14 +g15 sS'INP[i-1][1-1]' p34 g2 sS'VEC' p35 -g14 +g15 sS'GTV' p36 -g14 +g15 sS'graphics' p37 -g4 +g6 sS'model.state' p38 g2 sS'exprs.slice(NMode+6-1,NMode_old+5)' p39 -g7 +g9 sS'model.ipar' p40 -g11 +g4 sS'typ' p41 -g7 +g9 sS'C1' p42 -g7 +g9 sS'NMode' p43 g2 @@ -142,37 +142,37 @@ p44 g2 sS'model.blocktype' p45 -g14 +g15 sS'x.graphics' p46 -g4 +g6 sS'INP' p47 g2 sS'x.model' p48 -g4 +g6 sS'model.dep_ut' p49 -g7 +g9 sS'exprs' p50 -g11 +g4 sS'gr_i' p51 -g7 +g9 sS'ipar' p52 -g11 +g4 sS'y' p53 -g7 +g9 sS'x' p54 g2 sS'model' p55 -g4 +g6 sS'Minitial' p56 g2 diff --git a/js/Misc/BACKLASH.js b/js/Misc/BACKLASH.js index 7a97b2bd..b80aa2a1 100644 --- a/js/Misc/BACKLASH.js +++ b/js/Misc/BACKLASH.js @@ -4,7 +4,7 @@ function BACKLASH() { this.exprs = [["0"],["1"],["1"]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["backlash"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([0],[1]); this.model.nzcross = new ScilabDouble([2]); @@ -30,10 +30,7 @@ function BACKLASH() { this.gap = arguments[0]["gap"] this.zcr = arguments[0]["zcr"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var rpar = this.model.rpar; while (true) { [ok,this.ini,this.gap,this.zcr,this.exprs] = scicos_getvalue("Set backlash parameters",["initial output","gap","use zero-crossing (0:no, 1:yes)"],list("vec",1,"vec",1,"vec",1),this.exprs); diff --git a/js/Misc/BACKLASH.pickle b/js/Misc/BACKLASH.pickle index 045121b8..e07d65e3 100644 --- a/js/Misc/BACKLASH.pickle +++ b/js/Misc/BACKLASH.pickle @@ -25,7 +25,7 @@ S'model.sim' p1 S'list' p2 -sS'model.in1' +sS'model.out' p3 S'double' p4 @@ -64,26 +64,26 @@ p18 sS'model.dep_ut' p19 g18 -sS'graphics' +sS'model.in' p20 +g4 +sS'graphics' +p21 g8 sS'y' -p21 +p22 g18 sS'x' -p22 +p23 g4 sS'model' -p23 +p24 g8 sS'rpar[1-1]' -p24 -NsS'typ' p25 +NsS'typ' +p26 g18 sS'rpar[2-1]' -p26 -NsS'model.out' p27 -g4 -s.
\ No newline at end of file +Ns.
\ No newline at end of file diff --git a/js/Misc/BOUNCE.js b/js/Misc/BOUNCE.js index 2436898c..5b1111ec 100644 --- a/js/Misc/BOUNCE.js +++ b/js/Misc/BOUNCE.js @@ -25,7 +25,7 @@ function BOUNCE() { var state = transpose(state); this.model = scicos_model(); this.model.sim = list(new ScilabString(["bounce_ball"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.out = new ScilabDouble([n],[n]); this.model.state = new ScilabDouble(state.slice()); this.model.rpar = new ScilabDouble([this.rpar1],[this.rpar2],[this.walls],[this.g],[this.C]); @@ -66,10 +66,7 @@ function BOUNCE() { this.g = parseFloat(arguments[0]["g"]) this.C = parseFloat(arguments[0]["C"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")<9) { this.exprs[8-1] = "9.81"; this.exprs[9-1] = "0"; diff --git a/js/Misc/BOUNCE.pickle b/js/Misc/BOUNCE.pickle index d1e22a27..62455ca7 100644 --- a/js/Misc/BOUNCE.pickle +++ b/js/Misc/BOUNCE.pickle @@ -33,38 +33,38 @@ p15 atp16 Rp17 .(dp0 -S'arg1' +S'model.in' p1 -S'object' +S'vector' p2 -sS'graphics.exprs' +sS'arg1' p3 -NsS'xd' +S'object' p4 -S'matrix' +sS'graphics.exprs' p5 -sS'x.model' +NsS'xd' p6 -NsS'model.out' +S'matrix' p7 -g5 -sS'xt' +sS'x.model' p8 -S'vector' +NsS'model.out' p9 -sS'model.in1' +g7 +sS'xt' p10 -g9 +g2 sS'x.graphics' p11 -g2 +g4 sS'model.nzcross' p12 S'double' p13 sS'state' p14 -g9 +g2 sS'exprs[9-1]' p15 S'string' @@ -78,13 +78,13 @@ p19 g13 sS'yd' p20 -g5 +g7 sS'model.rpar' p21 -g5 +g7 sS'walls' p22 -g5 +g7 sS'rpar1' p23 g13 @@ -93,13 +93,13 @@ p24 g13 sS'graphics' p25 -g2 +g4 sS'model.ipar' p26 -g9 +g2 sS'typ' p27 -g9 +g2 sS'exprs[8-1]' p28 g16 @@ -118,31 +118,31 @@ p33 g13 sS'model.dep_ut' p34 -g9 +g2 sS'n' p35 g13 sS'exprs' p36 -g5 +g7 sS'gr_i' p37 -g9 +g2 sS'ipar' p38 -g9 +g2 sS'y' p39 -g5 +g7 sS'x' p40 g13 sS'model' p41 -g2 +g4 sS'ipar[k-1]' p42 NsS'model.state' p43 -g9 +g2 s.
\ No newline at end of file diff --git a/js/Misc/BOUNCEXY.js b/js/Misc/BOUNCEXY.js index 3039d82b..3218aa73 100644 --- a/js/Misc/BOUNCEXY.js +++ b/js/Misc/BOUNCEXY.js @@ -11,7 +11,7 @@ function BOUNCEXY() { this.ymax = 15; this.model = scicos_model(); this.model.sim = list(new ScilabString(["bouncexy"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1],[-1]); + this.model.in = new ScilabDouble([-1],[-1]); this.model.in2 = new ScilabDouble([1],[1]); this.model.intyp = new ScilabDouble([1],[1]); this.model.evtin = new ScilabDouble([1]); @@ -61,10 +61,7 @@ function BOUNCEXY() { this.ymin = parseFloat(arguments[0]["ymin"]) this.ymax = parseFloat(arguments[0]["ymax"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var dstate = this.model.dstate; while (true) { [ok,this.clrs,this.siz,this.win,this.imode,this.xmin,this.xmax,this.ymin,this.ymax,this.exprs] = scicos_getvalue("Set Scope parameters",["colors","radii","window number (-1 for automatic)","animation mode (0,1)","Xmin","Xmax","Ymin","Ymax"],list("vec",-1,"vec",-1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); diff --git a/js/Misc/BOUNCEXY.pickle b/js/Misc/BOUNCEXY.pickle index 51806beb..d0b7c403 100644 --- a/js/Misc/BOUNCEXY.pickle +++ b/js/Misc/BOUNCEXY.pickle @@ -69,7 +69,7 @@ g4 sS'model.in2' p16 g2 -sS'model.in1' +sS'model.intyp' p17 g2 sS'z[6*(i-1)+2-1]' @@ -106,10 +106,10 @@ g2 sS'imode' p29 g4 -sS'model.intyp' +sS'model.rpar' p30 g2 -sS'model.rpar' +sS'model.in' p31 g2 sS'graphics' diff --git a/js/Misc/BPLATFORM.js b/js/Misc/BPLATFORM.js index 59014bfa..fc8529a9 100644 --- a/js/Misc/BPLATFORM.js +++ b/js/Misc/BPLATFORM.js @@ -10,7 +10,7 @@ function BPLATFORM() { this.ymax = 15; this.model = scicos_model(); this.model.sim = list(new ScilabString(["bplatform2"]), new ScilabDouble([5])); - this.model.in1 = new ScilabDouble([1],[1]); + this.model.in = new ScilabDouble([1],[1]); this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([0]); this.model.rpar = new ScilabDouble([this.plen],[this.csiz],[this.phi],[this.xmin],[this.xmax],[this.ymin],[this.ymax]); @@ -45,10 +45,7 @@ function BPLATFORM() { this.ymin = parseFloat(arguments[0]["ymin"]) this.ymax = parseFloat(arguments[0]["ymax"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var dstate = this.model.dstate; while (true) { [ok,this.plen,this.csiz,this.phi,this.xmin,this.xmax,this.ymin,this.ymax,this.exprs] = scicos_getvalue("Set Scope parameters",["pendulum length","cart size (square side)","slope","Xmin","Xmax","Ymin","Ymax"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); diff --git a/js/Misc/BPLATFORM.pickle b/js/Misc/BPLATFORM.pickle index af17dc6e..31705ba2 100644 --- a/js/Misc/BPLATFORM.pickle +++ b/js/Misc/BPLATFORM.pickle @@ -55,32 +55,32 @@ g2 sS'ymin' p11 g2 -sS'model.in1' -p12 -g8 sS'ymax' -p13 +p12 g2 sS'x.graphics' -p14 +p13 g4 sS'model.evtin' -p15 +p14 g2 sS'model.sim' -p16 +p15 S'list' -p17 +p16 sS'phi' -p18 +p17 g2 sS'mess' -p19 +p18 g8 sS'csiz' -p20 +p19 g2 sS'model.rpar' +p20 +g8 +sS'model.in' p21 g8 sS'graphics.exprs' diff --git a/js/Misc/CBLOCK.js b/js/Misc/CBLOCK.js index 9e443562..34958153 100644 --- a/js/Misc/CBLOCK.js +++ b/js/Misc/CBLOCK.js @@ -15,7 +15,7 @@ function CBLOCK() { this.ng = 0; this.model = scicos_model(); this.model.sim = list(new ScilabString([" "]), new ScilabDouble([2004])); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([out]); this.model.evtin = new ScilabDouble(clkin); this.model.evtout = new ScilabDouble(clkout); @@ -70,9 +70,6 @@ function CBLOCK() { this.depu = parseBoolean(arguments[0]["depu"]) this.dept = parseBoolean(arguments[0]["dept"]) this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; while (true) { [ok,this.function_name,this.impli,this.i,this.o,this.ci,this.co,this.xx,this.ng,this.z,this.rpar,this.ipar,this.auto0,this.depu,this.dept,this.lab] = scicos_getvalue("Set C-Block2 block parameters",["simulation function","is block implicit? (y,n)","input ports sizes","output ports sizes","input event ports sizes","output events ports sizes","initial continuous state","number of zero crossing surfaces","initial discrete state","Real parameters vector","Integer parameters vector","initial firing vector (<0 for no firing)","direct feedthrough (y or n)","time dependence (y or n)"],list("str",1,"str",1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",1,"vec",-1,"vec",-1,"vec",-1,"vec","sum(%6)","str",1,"str",1),label[1-1]); @@ -141,7 +138,7 @@ function CBLOCK() { var ok = tmpvar1[2]; if (ok) { this.model.sim = list(new ScilabDouble([funam]), new ScilabDouble([funtyp])); - this.model.in1 = new ScilabDouble([this.i]); + this.model.in = new ScilabDouble([this.i]); this.model.out = new ScilabDouble([this.o]); this.model.evtin = new ScilabDouble([this.ci]); this.model.evtout = new ScilabDouble([this.co]); diff --git a/js/Misc/CBLOCK.pickle b/js/Misc/CBLOCK.pickle index af698327..aeb5ed82 100644 --- a/js/Misc/CBLOCK.pickle +++ b/js/Misc/CBLOCK.pickle @@ -87,70 +87,70 @@ g2 sS'out' p17 g2 -sS'model.in1' -p18 -g2 sS'nevin' -p19 +p18 g2 sS'clkin' -p20 +p19 g8 sS'x.graphics' -p21 +p20 g5 sS'model.nzcross' -p22 +p21 g2 sS'tt' -p23 +p22 g2 sS'label' -p24 +p23 S'list' -p25 +p24 sS'nx' -p26 +p25 g2 sS'nz' -p27 +p26 g2 sS'z0' -p28 +p27 g8 sS'model.evtin' -p29 +p28 g8 sS'model.firing' -p30 +p29 g8 sS'nevout' -p31 +p30 g2 sS'model.sim' -p32 -g25 +p31 +g24 sS'model.evtout' -p33 +p32 g8 sS'clkout' -p34 +p33 g8 sS'auto' -p35 +p34 g8 sS'label[2-1]' -p36 +p35 g2 sS'in1' -p37 +p36 g2 sS'model.rpar' -p38 +p37 g8 sS'model.state' -p39 +p38 g8 +sS'model.in' +p39 +g2 sS'graphics' p40 g5 diff --git a/js/Misc/CBLOCK4.js b/js/Misc/CBLOCK4.js index 9596ae7c..ff7cd776 100644 --- a/js/Misc/CBLOCK4.js +++ b/js/Misc/CBLOCK4.js @@ -4,14 +4,14 @@ function CBLOCK4() { var funam = "toto"; this.model = scicos_model(); this.model.sim = list(new ScilabString([" "]), new ScilabDouble([2004])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.in2 = new ScilabDouble([1]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); this.model.dep_ut = new ScilabDouble([true,false]); - var label = list([[funam],["n"],[sci2exp([this.model.in1,this.model.in2])],[sci2exp(this.model.intyp)],[sci2exp([this.model.out,this.model.out2])],[sci2exp(this.model.outtyp)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.odstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.opar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]],[]); + var label = list([[funam],["n"],[sci2exp([this.model.in,this.model.in2])],[sci2exp(this.model.intyp)],[sci2exp([this.model.out,this.model.out2])],[sci2exp(this.model.outtyp)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.odstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.opar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]],[]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CBLOCK4\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,label,this.gr_i); return new BasicBlock(this.x); @@ -64,9 +64,6 @@ function CBLOCK4() { this.depu = parseBoolean(arguments[0]["depu"]) this.dept = parseBoolean(arguments[0]["dept"]) this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; while (true) { [ok,this.function_name,this.impli,this.in1,this.it,this.out,this.ot,this.ci,this.co,this.xx,this.z,this.oz,this.rpar,this.ipar,this.opar,this.nmode,this.nzcr,this.auto0,this.depu,this.dept,this.lab] = scicos_getvalue("Set C-Block4 block parameters",["Simulation function","Is block implicit? (y,n)","Input ports sizes","Input ports type","Output port sizes","Output ports type","Input event ports sizes","Output events ports sizes","Initial continuous state","Initial discrete state","Initial object state","Real parameters vector","Integer parameters vector","Object parameters list","Number of modes","Number of zero crossings","Initial firing vector (<0 for no firing)","Direct feedthrough (y or n)","Time dependence (y or n)"],list("str",1,"str",1,"mat",[-1,2],"vec",-1,"mat",[-1,2],"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"lis",-1,"vec",-1,"vec",-1,"lis",-1,"vec",1,"vec",1,"vec","sum(%8)","str",1,"str",1),label[1-1]); diff --git a/js/Misc/CBLOCK4.pickle b/js/Misc/CBLOCK4.pickle index aefd22d2..4d3566f0 100644 --- a/js/Misc/CBLOCK4.pickle +++ b/js/Misc/CBLOCK4.pickle @@ -80,71 +80,71 @@ g3 sS'xx' p11 g9 -sS'model.intyp' -p12 -g3 sS'funtyp' -p13 +p12 g3 sS'funam' -p14 +p13 S'string' -p15 +p14 sS'model.dstate' -p16 +p15 g9 sS'model.in2' -p17 +p16 g3 -sS'model.in1' -p18 +sS'model.intyp' +p17 g3 sS'nevin' -p19 +p18 g3 sS'x.graphics' -p20 +p19 g6 sS'model.nzcross' -p21 +p20 NsS'tt' -p22 +p21 g3 sS'label' -p23 +p22 S'list' -p24 +p23 sS'nx' -p25 +p24 g3 sS'nz' -p26 +p25 g3 sS'model.firing' -p27 +p26 NsS'nevout' -p28 +p27 g3 sS'model.sim' -p29 -g24 +p28 +g23 sS'label[2-1]' -p30 +p29 g3 sS'model.out2' -p31 +p30 g3 sS'model.nmode' -p32 +p31 NsS'model.rpar' -p33 +p32 g9 sS'model.outtyp' -p34 +p33 g3 sS'model.state' -p35 +p34 g9 +sS'model.in' +p35 +g3 sS'graphics' p36 g6 diff --git a/js/Misc/CONSTRAINT2_c.js b/js/Misc/CONSTRAINT2_c.js index 71667091..7812d35e 100644 --- a/js/Misc/CONSTRAINT2_c.js +++ b/js/Misc/CONSTRAINT2_c.js @@ -6,7 +6,7 @@ function CONSTRAINT2_c() { this.id = [0]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["constraint_c"]), new ScilabDouble([10004])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1],[1]); this.model.state = new ScilabDouble([this.x0],[this.xd0]); this.model.ipar = new ScilabDouble(this.id); @@ -33,10 +33,7 @@ function CONSTRAINT2_c() { this.xd0 = inverse(arguments[0]["xd0"]) this.id = inverse(arguments[0]["id"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { var ask_again = false; [ok,this.x0,this.xd0,this.id,this.exprs] = scicos_getvalue("Set Constraint block parameters",["Initial guess values of states x","Initial guess values of derivative x\'","Id(i)=1: if x\'(i) is present in the feedback, else Id(i)=0"],list("vec",-1,"vec",-1,"vec",-1),this.exprs); @@ -73,7 +70,7 @@ function CONSTRAINT2_c() { this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.state = new ScilabDouble([this.x0],[this.xd0]); this.model.out = new ScilabDouble([N],[N]); - this.model.in1 = new ScilabDouble([N]); + this.model.in = new ScilabDouble([N]); this.model.ipar = new ScilabDouble(this.id); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Misc/CONSTRAINT2_c.pickle b/js/Misc/CONSTRAINT2_c.pickle index 44576d32..ab82e036 100644 --- a/js/Misc/CONSTRAINT2_c.pickle +++ b/js/Misc/CONSTRAINT2_c.pickle @@ -41,29 +41,29 @@ p8 sS'id' p9 g6 -sS'model.in1' -p10 -S'double' -p11 sS'x.graphics' -p12 +p10 g2 sS'Nid' -p13 -g11 +p11 +S'double' +p12 sS'model.sim' -p14 +p13 S'list' -p15 +p14 sS'N' -p16 -g11 +p15 +g12 sS'Nxd' -p17 -g11 +p16 +g12 sS'model.state' -p18 +p17 g8 +sS'model.in' +p18 +g12 sS'graphics.exprs' p19 NsS'x0' @@ -84,13 +84,13 @@ p25 g6 sS'exprs' p26 -g15 +g14 sS'gr_i' p27 g6 sS'id[i-1]' p28 -g11 +g12 sS'ask_again' p29 S'boolean' @@ -100,7 +100,7 @@ p31 g6 sS'x' p32 -g11 +g12 sS'model' p33 g2 diff --git a/js/Misc/CONSTRAINT_c.js b/js/Misc/CONSTRAINT_c.js index 3340e545..895c1f8b 100644 --- a/js/Misc/CONSTRAINT_c.js +++ b/js/Misc/CONSTRAINT_c.js @@ -4,7 +4,7 @@ function CONSTRAINT_c() { this.x0 = [[0],[0]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["constraint_c"]), new ScilabDouble([10004])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.ipar = new ScilabDouble([0]); this.model.state = new ScilabDouble(this.x0); @@ -26,10 +26,7 @@ function CONSTRAINT_c() { CONSTRAINT_c.prototype.set = function CONSTRAINT_c() { this.x0 = inverse(arguments[0]["x0"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.x0,this.exprs] = scicos_getvalue("Set solver block parameters","Initial guess values",list("vec",-1),this.exprs); if (!ok) { @@ -48,7 +45,7 @@ function CONSTRAINT_c() { this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.state = new ScilabDouble([this.x0],[zeros(N,1)]); this.model.out = new ScilabDouble([N]); - this.model.in1 = new ScilabDouble([N]); + this.model.in = new ScilabDouble([N]); this.model.ipar = new ScilabDouble([-1*ones(N,1)]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Misc/CONSTRAINT_c.pickle b/js/Misc/CONSTRAINT_c.pickle index 40a25edd..081ea36e 100644 --- a/js/Misc/CONSTRAINT_c.pickle +++ b/js/Misc/CONSTRAINT_c.pickle @@ -38,34 +38,34 @@ p9 g8 sS'graphics.exprs' p10 -NsS'model.in1' +NsS'model.dep_ut' p11 -g4 -sS'model.dep_ut' -p12 S'vector' -p13 +p12 sS'N' -p14 +p13 g4 sS'exprs' -p15 +p14 g6 sS'x.model' -p16 +p15 NsS'gr_i' -p17 -g13 +p16 +g12 sS'model.state' -p18 +p17 S'matrix' +p18 +sS'model.in' p19 +g4 sS'graphics' p20 g8 sS'y' p21 -g13 +g12 sS'x' p22 g4 @@ -77,8 +77,8 @@ p24 g4 sS'typ' p25 -g13 +g12 sS'x0' p26 -g19 +g18 s.
\ No newline at end of file diff --git a/js/Misc/DEADBAND.js b/js/Misc/DEADBAND.js index 7feab424..82f8cb60 100644 --- a/js/Misc/DEADBAND.js +++ b/js/Misc/DEADBAND.js @@ -6,7 +6,7 @@ function DEADBAND() { var rpar = [[this.maxp],[this.minp]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["deadband"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.nzcross = new ScilabDouble([2]); this.model.nmode = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); @@ -34,10 +34,7 @@ function DEADBAND() { this.minp = parseFloat(arguments[0]["minp"]) this.zeroc = arguments[0]["zeroc"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.maxp,this.minp,this.zeroc,this.exprs] = scicos_getvalue("Set Deadband parameters",["End of dead band","Start of dead band","zero crossing (0:no, 1:yes)"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Misc/DEADBAND.pickle b/js/Misc/DEADBAND.pickle index 5bc0ae5c..64da890e 100644 --- a/js/Misc/DEADBAND.pickle +++ b/js/Misc/DEADBAND.pickle @@ -32,38 +32,38 @@ sS'rpar' p4 S'matrix' p5 -sS'model.out' +sS'minp' p6 S'double' p7 sS'x.model' p8 -NsS'minp' +NsS'model.out' p9 g7 -sS'model.in1' -p10 -g7 sS'x.graphics' -p11 +p10 g2 sS'typ' -p12 +p11 S'vector' -p13 +p12 sS'maxp' -p14 +p13 g7 sS'model.sim' -p15 +p14 S'list' -p16 +p15 sS'model.nmode' -p17 +p16 g7 sS'model.rpar' -p18 +p17 g5 +sS'model.in' +p18 +g7 sS'graphics.exprs' p19 NsS'model.nzcross' @@ -75,16 +75,16 @@ S'string' p22 sS'model.dep_ut' p23 -g13 +g12 sS'exprs' p24 g5 sS'gr_i' p25 -g13 +g12 sS'y' p26 -g13 +g12 sS'x' p27 g7 diff --git a/js/Misc/DEBUG.js b/js/Misc/DEBUG.js index 6312c951..ac82e092 100644 --- a/js/Misc/DEBUG.js +++ b/js/Misc/DEBUG.js @@ -18,8 +18,6 @@ function DEBUG() { return options; } DEBUG.prototype.set = function DEBUG() { - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; var textmp = this.exprs[2-1]; var ok = true; diff --git a/js/Misc/DEBUG_SCICOS.js b/js/Misc/DEBUG_SCICOS.js index 8400a7cd..d30188c8 100644 --- a/js/Misc/DEBUG_SCICOS.js +++ b/js/Misc/DEBUG_SCICOS.js @@ -13,8 +13,6 @@ function DEBUG_SCICOS() { return options; } DEBUG_SCICOS.prototype.set = function DEBUG_SCICOS() { - arg1.gui = "DEBUG"; - var tmpvar0 = DEBUG("set",arg1); this.x = tmpvar0[0]; var y = tmpvar0[1]; var typ = tmpvar0[2]; diff --git a/js/Misc/DIFF_f.js b/js/Misc/DIFF_f.js index 07b59247..cd928692 100644 --- a/js/Misc/DIFF_f.js +++ b/js/Misc/DIFF_f.js @@ -4,7 +4,7 @@ function DIFF_f() { this.x0 = [[0],[0]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["diffblk"]), new ScilabDouble([10001])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.state = new ScilabDouble(this.x0); this.model.blocktype = new ScilabString(["c"]); @@ -28,10 +28,7 @@ function DIFF_f() { this.x0 = inverse(arguments[0]["x0"]) this.xd0 = arguments[0]["xd0"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.x0,this.xd0,this.exprs] = scicos_getvalue("Set continuous linear system parameters",["Initial state","Initial Derivative"],list("vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Misc/DIFF_f.pickle b/js/Misc/DIFF_f.pickle index a0e81b2c..726d3c27 100644 --- a/js/Misc/DIFF_f.pickle +++ b/js/Misc/DIFF_f.pickle @@ -23,7 +23,7 @@ S'model.sim' p1 S'list' p2 -sS'model.in1' +sS'model.out' p3 S'double' p4 @@ -47,21 +47,21 @@ p12 NsS'model.dep_ut' p13 g8 -sS'model.out' -p14 -g4 sS'exprs' -p15 +p14 S'matrix' -p16 +p15 sS'x.model' -p17 +p16 NsS'gr_i' -p18 +p17 g8 sS'model.state' +p18 +g15 +sS'model.in' p19 -g16 +g4 sS'graphics' p20 g10 @@ -79,5 +79,5 @@ p24 g8 sS'x0' p25 -g16 +g15 s.
\ No newline at end of file diff --git a/js/Misc/DSUPER.js b/js/Misc/DSUPER.js index 3773cf7a..cb3364e8 100644 --- a/js/Misc/DSUPER.js +++ b/js/Misc/DSUPER.js @@ -14,10 +14,7 @@ function DSUPER() { DSUPER.prototype.set = function DSUPER() { var y = this.needcompile; var typ = list(); - this.graphics = arg1.graphics; if ((length(this.graphics.exprs)==0)) { - warnBlockByUID(arg1.model.label,"Invalid masked block."); - this.x = arg1; return; } this.exprs = this.graphics.exprs[1-1]; @@ -25,15 +22,12 @@ function DSUPER() { var btitre = this.graphics.exprs[2-1][2-1][1-1]; var bitems = this.graphics.exprs[2-1][2-1].slice(2-1,$); if (exprs0==[]) { - this.x = arg1; return; } - var context = [arg1.model.rpar.props.context]; var tmpvar0 = script2var(context,PREVAR_scicos_context); var PREVAR_scicos_context = tmpvar0[0]; var ierr = tmpvar0[1]; if (ierr!=0) { - this.x = arg1; return; } var tt = "scicos_context."+exprs0[1-1]; @@ -44,7 +38,6 @@ function DSUPER() { var scicos_context = PREVAR_scicos_context; execstr("[ok,"+tt+",exprs]=scicos_getvalue(btitre,bitems,ss,exprs)"); if (this.ok) { - this.x = arg1; var PREVAR_scicos_context = scicos_context; var sblock = this.x.model.rpar; var tmpvar1 = do_eval(sblock,list(),scicos_context); @@ -56,7 +49,6 @@ function DSUPER() { this.x.graphics.exprs[1-1] = this.exprs; this.x.model.rpar = sblock; } else { - this.x = arg1; } return new BasicBlock(this.x); } diff --git a/js/Misc/EDGETRIGGER.js b/js/Misc/EDGETRIGGER.js index 6c27dd25..dca05409 100644 --- a/js/Misc/EDGETRIGGER.js +++ b/js/Misc/EDGETRIGGER.js @@ -4,7 +4,7 @@ function EDGETRIGGER() { this.edge = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["edgetrig"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([0]); this.model.nzcross = new ScilabDouble([1]); @@ -28,10 +28,7 @@ function EDGETRIGGER() { EDGETRIGGER.prototype.set = function EDGETRIGGER() { this.edge = parseFloat(arguments[0]["edge"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.edge,this.exprs] = scicos_getvalue("Set edge trigger block parameters",["rising (1), falling (-1), both (0)"],list("vec",1),this.exprs); if (!ok) { diff --git a/js/Misc/EDGETRIGGER.pickle b/js/Misc/EDGETRIGGER.pickle index a3f569ae..6d5d505a 100644 --- a/js/Misc/EDGETRIGGER.pickle +++ b/js/Misc/EDGETRIGGER.pickle @@ -21,7 +21,7 @@ S'model.sim' p1 S'list' p2 -sS'model.in1' +sS'model.out' p3 S'double' p4 @@ -41,33 +41,33 @@ p10 g9 sS'graphics.exprs' p11 -NsS'model.out' +NsS'model.dep_ut' p12 -g4 -sS'gr_i' -p13 S'vector' +p13 +sS'gr_i' p14 +g13 sS'model.nzcross' p15 g4 sS'exprs' p16 -g14 +g13 sS'x.model' p17 NsS'edge' p18 g4 -sS'model.dep_ut' +sS'model.in' p19 -g14 +g4 sS'graphics' p20 g9 sS'y' p21 -g14 +g13 sS'x' p22 g4 @@ -79,5 +79,5 @@ p24 g4 sS'typ' p25 -g14 +g13 s.
\ No newline at end of file diff --git a/js/Misc/EDGE_TRIGGER.js b/js/Misc/EDGE_TRIGGER.js index 1288a52d..c97300b6 100644 --- a/js/Misc/EDGE_TRIGGER.js +++ b/js/Misc/EDGE_TRIGGER.js @@ -74,7 +74,7 @@ function EDGE_TRIGGER() { lnk={}; this.model = scicos_model(); this.model.sim = new ScilabString(["csuper"]); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.evtout = new ScilabDouble([1]); this.model.rpar = scs_m_1; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EDGE_TRIGGER\",sz(1),sz(2));"]); @@ -90,8 +90,6 @@ function EDGE_TRIGGER() { return options; } EDGE_TRIGGER.prototype.set = function EDGE_TRIGGER() { - for (i=1;i<=length(arg1.model.rpar.objs);i+=1) { - var o = arg1.model.rpar.objs[i-1]; if (typeof(o)=="Block"&&o.gui=="EDGETRIGGER") { var ppath = list(i); break; @@ -108,20 +106,19 @@ function EDGE_TRIGGER() { spath[$+1-1] = "objs"; spath[$+1-1] = path[k-1]; } - var xx = arg1[spath-1]; execstr("xxn="+xx.gui+"(\'set\',xx)"); if (diffobjs(this.xxn,xx)) { this.model = xx.model; var model_n = this.xxn.model; if (!is_modelica_block(xx)) { var modified = or(this.model.sim!=model_n.sim)||!isequal(this.model.state,model_n.state)||!isequal(this.model.dstate,model_n.dstate)||!isequal(this.model.rpar,model_n.rpar)||!isequal(this.model.ipar,model_n.ipar)||!isequal(this.model.label,model_n.label); - if (or(this.model.in1!=model_n.in1)||or(this.model.out!=model_n.out)) { + if (or(this.model.in!=model_n.in)||or(this.model.out!=model_n.out)) { var needcompile = 1; } if (or(this.model.firing!=model_n.firing)) { var needcompile = 2; } - if ((size(this.model.in1,"*")!=size(model_n.in1,"*"))||(size(this.model.out,"*")!=size(model_n.out,"*"))) { + if ((size(this.model.in,"*")!=size(model_n.in,"*"))||(size(this.model.out,"*")!=size(model_n.out,"*"))) { var needcompile = 4; } if (this.model.sim=="input"||this.model.sim=="output") { @@ -150,12 +147,10 @@ function EDGE_TRIGGER() { var needcompile = 4; } } - arg1[spath-1] = this.xxn; newpar[size(newpar)+1-1] = path; var y = max(y,needcompile); } } - this.x = arg1; var typ = newpar; return new BasicBlock(this.x); } diff --git a/js/Misc/EDGE_TRIGGER.pickle b/js/Misc/EDGE_TRIGGER.pickle index 66a780dd..69db91d2 100644 --- a/js/Misc/EDGE_TRIGGER.pickle +++ b/js/Misc/EDGE_TRIGGER.pickle @@ -57,77 +57,77 @@ g10 sS'graphics.orig' p17 g2 -sS'model.in1' -p18 -g6 sS'model.ipar' -p19 +p18 g6 sS'model.nzcross' -p20 +p19 g6 sS'blk' -p21 +p20 g10 sS'newpar[size(newpar)+1-1]' -p22 +p21 NsS'scs_m_1' -p23 +p22 g10 sS'eqn' -p24 +p23 g10 sS'np' -p25 +p24 g6 sS'blk.model' -p26 +p25 NsS'graphics.pein' -p27 +p26 g6 sS'lnk.from' -p28 +p27 g2 sS'scs_m_1.objs[2-1]' -p29 +p28 g10 sS'model.sim' -p30 +p29 S'string' -p31 +p30 sS'model.evtout' -p32 +p31 g6 sS'spath' -p33 +p32 g8 sS'newpar' -p34 +p33 g8 sS'model.evtin' -p35 +p34 g2 sS'graphics.pout' -p36 +p35 g6 sS'model.nmode' -p37 +p36 g6 sS'model_n' -p38 +p37 g10 sS'arg1[spath-1]' -p39 +p38 g10 sS'scs_m_1.objs[4-1]' -p40 +p39 g10 sS'graphics.pin' -p41 +p40 g6 sS'model.rpar' -p42 +p41 g10 +sS'model.in' +p42 +g6 sS'scs_m_1.objs[5-1]' p43 g6 diff --git a/js/Misc/ENDBLK.js b/js/Misc/ENDBLK.js index 21116c3a..5f1739ea 100644 --- a/js/Misc/ENDBLK.js +++ b/js/Misc/ENDBLK.js @@ -18,8 +18,6 @@ function ENDBLK() { return options; } ENDBLK.prototype.set = function ENDBLK() { - for (i=1;i<=length(arg1.model.rpar.objs);i+=1) { - var o = arg1.model.rpar.objs[i-1]; if (typeof(o)=="Block"&&o.gui=="END_c") { var ppath = list(i); break; @@ -36,20 +34,19 @@ function ENDBLK() { spath[$+1-1] = "objs"; spath[$+1-1] = path[k-1]; } - var xx = arg1[spath-1]; execstr("xxn="+xx.gui+"(\'set\',xx)"); if (!isequalbitwise(this.xxn,xx)) { this.model = xx.model; var model_n = this.xxn.model; if (!is_modelica_block(xx)) { var modified = or(this.model.sim!=model_n.sim)||!isequal(this.model.state,model_n.state)||!isequal(this.model.dstate,model_n.dstate)||!isequal(this.model.odstate,model_n.odstate)||!isequal(this.model.rpar,model_n.rpar)||!isequal(this.model.ipar,model_n.ipar)||!isequal(this.model.opar,model_n.opar)||!isequal(this.model.label,model_n.label); - if (or(this.model.in1!=model_n.in1)||or(this.model.out!=model_n.out)||or(this.model.in2!=model_n.in2)||or(this.model.out2!=model_n.out2)||or(this.model.outtyp!=model_n.outtyp)||or(this.model.intyp!=model_n.intyp)) { + if (or(this.model.in!=model_n.in)||or(this.model.out!=model_n.out)||or(this.model.in2!=model_n.in2)||or(this.model.out2!=model_n.out2)||or(this.model.outtyp!=model_n.outtyp)||or(this.model.intyp!=model_n.intyp)) { var needcompile = 1; } if (or(this.model.firing!=model_n.firing)) { var needcompile = 2; } - if ((size(this.model.in1,"*")!=size(model_n.in1,"*"))||(size(this.model.out,"*")!=size(model_n.out,"*"))||(size(this.model.evtin,"*")!=size(model_n.evtin,"*"))) { + if ((size(this.model.in,"*")!=size(model_n.in,"*"))||(size(this.model.out,"*")!=size(model_n.out,"*"))||(size(this.model.evtin,"*")!=size(model_n.evtin,"*"))) { var needcompile = 4; } if (this.model.sim=="input"||this.model.sim=="output") { @@ -78,12 +75,10 @@ function ENDBLK() { var needcompile = 4; } } - arg1[spath-1] = this.xxn; newpar[size(newpar)+1-1] = path; var y = max(y,needcompile); } } - this.x = arg1; var typ = newpar; return new BasicBlock(this.x); } diff --git a/js/Misc/EXPRESSION.pickle b/js/Misc/EXPRESSION.pickle index 9ecf333f..a10233a3 100644 --- a/js/Misc/EXPRESSION.pickle +++ b/js/Misc/EXPRESSION.pickle @@ -57,38 +57,38 @@ g10 sS'out' p13 g10 -sS'model.in1' -p14 -S'matrix' -p15 sS'x.graphics' -p16 +p14 g2 sS'%mm' -p17 +p15 g10 sS'typ' -p18 +p16 g7 sS'%head' -p19 +p17 g5 sS'%ok1' -p20 +p18 S'boolean' -p21 +p19 sS'model.sim' -p22 +p20 S'list' -p23 +p21 sS'in1' -p24 -g15 +p22 +S'matrix' +p23 sS'model.rpar' -p25 +p24 NsS'model.nmode' +p25 +NsS'model.in' p26 -NsS'graphics.exprs' +g23 +sS'graphics.exprs' p27 NsS'model.ipar' p28 @@ -99,13 +99,13 @@ p30 g7 sS'ok' p31 -g21 +g19 sS'model.dep_ut' p32 g7 sS'exprs' p33 -g15 +g23 sS'gr_i' p34 g7 diff --git a/js/Misc/Extract_Activation.js b/js/Misc/Extract_Activation.js index c832f96f..845c47ca 100644 --- a/js/Misc/Extract_Activation.js +++ b/js/Misc/Extract_Activation.js @@ -79,7 +79,7 @@ function Extract_Activation() { lnk={}; this.model = scicos_model(); this.model.sim = new ScilabString(["csuper"]); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.evtout = new ScilabDouble([1]); this.model.rpar = scs_m_1; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Extract_Activation\",sz(1),sz(2));"]); @@ -95,7 +95,6 @@ function Extract_Activation() { return options; } Extract_Activation.prototype.set = function Extract_Activation() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/Misc/Extract_Activation.pickle b/js/Misc/Extract_Activation.pickle index ec0f50df..c30f31f0 100644 --- a/js/Misc/Extract_Activation.pickle +++ b/js/Misc/Extract_Activation.pickle @@ -38,55 +38,55 @@ g4 sS'graphics.orig' p10 g2 -sS'model.in1' -p11 -g4 sS'typ' -p12 +p11 g2 sS'blk' -p13 +p12 g8 sS'model.evtin' -p14 +p13 g2 sS'blk.model' -p15 +p14 NsS'graphics.pein' -p16 +p15 g4 sS'lnk.from' -p17 +p16 g2 sS'scs_m_1.objs[2-1]' -p18 +p17 g8 sS'model.sim' -p19 +p18 S'string' -p20 +p19 sS'model.evtout' -p21 +p20 g4 sS'scs_m_1.objs[8-1]' -p22 +p21 g4 sS'scs_m_1' -p23 +p22 g8 sS'model.nmode' -p24 +p23 g4 sS'model.rpar' -p25 +p24 g8 sS'graphics.sz' -p26 +p25 g2 sS'y' -p27 +p26 g2 sS'graphics.pin' +p27 +g4 +sS'model.in' p28 g4 sS'graphics.exprs' diff --git a/js/Misc/HYSTHERESIS.js b/js/Misc/HYSTHERESIS.js index a4ef4c44..241ed150 100644 --- a/js/Misc/HYSTHERESIS.js +++ b/js/Misc/HYSTHERESIS.js @@ -7,7 +7,7 @@ function HYSTHERESIS() { var rpar = [[1],[0],[1],[0]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["hystheresis"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble(rpar); this.model.nzcross = new ScilabDouble([this.nzz]); @@ -39,10 +39,7 @@ function HYSTHERESIS() { this.out_low = arguments[0]["out_low"] this.nzz = parseFloat(arguments[0]["nzz"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.high_lim,this.low_lim,this.out_high,this.out_low,this.nzz,this.exprs] = scicos_getvalue("Set parameters",["switch on at","switch off at","output when on","output when off","use zero crossing: yes (1), no (0)"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Misc/HYSTHERESIS.pickle b/js/Misc/HYSTHERESIS.pickle index 22118741..d7daefca 100644 --- a/js/Misc/HYSTHERESIS.pickle +++ b/js/Misc/HYSTHERESIS.pickle @@ -42,27 +42,27 @@ NsS'model.out' p7 S'double' p8 -sS'model.in1' -p9 -g8 sS'x.graphics' -p10 +p9 g2 sS'typ' -p11 +p10 S'vector' -p12 +p11 sS'model.sim' -p13 +p12 S'list' +p13 +sS'in1' p14 -sS'model.nmode' -p15 g8 sS'model.rpar' -p16 +p15 g5 -sS'in1' +sS'model.nmode' +p16 +g8 +sS'model.in' p17 g8 sS'graphics.exprs' @@ -79,19 +79,19 @@ p22 g8 sS'model.dep_ut' p23 -g12 +g11 sS'exprs' p24 g5 sS'gr_i' p25 -g12 +g11 sS'ipar' p26 -g12 +g11 sS'y' p27 -g12 +g11 sS'x' p28 g8 diff --git a/js/Misc/IMPSPLIT_f.js b/js/Misc/IMPSPLIT_f.js index 6abfab60..da3bf6ed 100644 --- a/js/Misc/IMPSPLIT_f.js +++ b/js/Misc/IMPSPLIT_f.js @@ -8,7 +8,7 @@ function IMPSPLIT_f() { mo.inputs = "n"; mo.outputs = [["n"],["n"]]; this.model.equations = new ScilabDouble([mo]); - this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); + this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.x = standard_define([1,1]/3,this.model,[],[]); this.x.graphics.in_implicit = ["I"]; @@ -24,7 +24,6 @@ function IMPSPLIT_f() { return options; } IMPSPLIT_f.prototype.set = function IMPSPLIT_f() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/Misc/IMPSPLIT_f.pickle b/js/Misc/IMPSPLIT_f.pickle index c3f3ee9a..99827fe0 100644 --- a/js/Misc/IMPSPLIT_f.pickle +++ b/js/Misc/IMPSPLIT_f.pickle @@ -19,45 +19,45 @@ S'model.sim' p1 S'string' p2 -sS'model.in1' +sS'model.equations' p3 S'double' p4 -sS'model.equations' -p5 -g4 sS'x.graphics.out_implicit' -p6 +p5 S'vector' -p7 +p6 sS'mo' -p8 +p7 S'object' -p9 +p8 sS'mo.inputs' -p10 +p9 g2 sS'mo.model' -p11 +p10 g2 sS'model.out' -p12 +p11 g4 sS'x.graphics.in_implicit' +p12 +g6 +sS'model.in' p13 -g7 +g4 sS'y' p14 -g7 +g6 sS'x' p15 g4 sS'model' p16 -g9 +g8 sS'typ' p17 -g7 +g6 sS'mo.outputs' p18 S'matrix' diff --git a/js/Misc/LOGICAL_OP.js b/js/Misc/LOGICAL_OP.js index 4910a7b4..b7d0569c 100644 --- a/js/Misc/LOGICAL_OP.js +++ b/js/Misc/LOGICAL_OP.js @@ -6,7 +6,7 @@ function LOGICAL_OP() { this.nin = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["logicalop"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble(in1); + this.model.in = new ScilabDouble(in1); this.model.out = new ScilabDouble([-1]); this.model.ipar = new ScilabDouble(ipar); this.model.blocktype = new ScilabString(["c"]); @@ -34,10 +34,7 @@ function LOGICAL_OP() { this.Datatype = arguments[0]["Datatype"] this.tp = parseFloat(arguments[0]["tp"]) this.exprs = inverse(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,1)==2) { this.exprs = [[this.exprs],[sci2exp(1)],[sci2exp(0)]]; } diff --git a/js/Misc/LOGICAL_OP.pickle b/js/Misc/LOGICAL_OP.pickle index 59b44b2a..27047612 100644 --- a/js/Misc/LOGICAL_OP.pickle +++ b/js/Misc/LOGICAL_OP.pickle @@ -50,32 +50,32 @@ g8 sS'graphics.style' p12 g8 -sS'model.in1' -p13 -S'matrix' -p14 sS'x.graphics' -p15 +p13 g2 sS'tp' -p16 +p14 g10 sS'label' -p17 +p15 g5 sS'model.sim' -p18 +p16 S'list' -p19 +p17 sS'nin' -p20 +p18 g10 sS'in1' +p19 +S'matrix' +p20 +sS'model.in' p21 -g14 +g20 sS'graphics.exprs' p22 -g14 +g20 sS'model.ipar' p23 g8 @@ -94,7 +94,7 @@ p28 g10 sS'exprs' p29 -g14 +g20 sS'gr_i' p30 g8 diff --git a/js/Misc/MBLOCK.js b/js/Misc/MBLOCK.js index e1ee5947..0dadcc51 100644 --- a/js/Misc/MBLOCK.js +++ b/js/Misc/MBLOCK.js @@ -23,7 +23,7 @@ function MBLOCK() { this.model.sim = list(new ScilabString([mo.model]), new ScilabDouble([30004])); mo.inputs = this.in1; mo.outputs = this.out; - this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"r"),1)]); + this.model.in = new ScilabDouble([ones(size(mo.inputs,"r"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"r"),1)]); this.model.equations = mo; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MBLOCK\",sz(1),sz(2));"]); @@ -56,9 +56,6 @@ function MBLOCK() { this.pprop = inverse(arguments[0]["pprop"]) this.Tfunam = arguments[0]["Tfunam"] this.lab_1 = arguments[0]["lab_1"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; if (this.type[this.exprs-1]==15) { var paramv = list(); @@ -69,7 +66,7 @@ function MBLOCK() { } this.exprs = tlist(["MBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],this.exprs[1-1][1-1],this.exprs[1-1][2-1],this.exprs[1-1][3-1],this.exprs[1-1][4-1],this.exprs[1-1][5-1],paramv,sci2exp(this.pprop.slice()),this.exprs[1-1][7-1],this.exprs[2-1]); } - this.lab_1 = list(this.exprs.in1,this.exprs.intype,this.exprs.out,this.exprs.outtype,this.exprs.param,this.exprs.pprop,this.exprs.nameF); + this.lab_1 = list(this.exprs.in,this.exprs.intype,this.exprs.out,this.exprs.outtype,this.exprs.param,this.exprs.pprop,this.exprs.nameF); var lab_2 = this.exprs.paramv; while (true) { [ok,this.Tin,this.Tintype,this.Tout,this.Touttype,this.Tparam,this.pprop,this.Tfunam,this.lab_1] = scicos_getvalue("Set Modelica generic block parameters",["Input variables: ","Input variables types: ","Output variables: ","Output variables types:","Parameters in Modelica:","Parameters properties: ","Function name: "],list("str",-1,"str",-1,"str",-1,"str",-1,"str",-1,"vec",-1,"str",-1),this.lab_1); @@ -268,7 +265,7 @@ function MBLOCK() { this.model.rpar = new ScilabDouble([this.model.rpar],[paramv[i-1].slice()]); } this.model.sim[1-1] = new ScilabDouble([this.funam]); - this.exprs.in1 = this.lab_1[1-1]; + this.exprs.in = this.lab_1[1-1]; this.exprs.intype = this.lab_1[2-1]; this.exprs.out = this.lab_1[3-1]; this.exprs.outtype = this.lab_1[4-1]; diff --git a/js/Misc/MBLOCK.pickle b/js/Misc/MBLOCK.pickle index cb0d67a2..6054d6b8 100644 --- a/js/Misc/MBLOCK.pickle +++ b/js/Misc/MBLOCK.pickle @@ -47,147 +47,147 @@ S'rhs_txt' p1 S'string' p2 -sS'model.sim' -p3 -S'list' -p4 sS'arg1' -p5 +p3 S'object' -p6 +p4 sS'graphics.gr_i[1-1][1-1]' -p7 +p5 g2 sS'graphics.exprs' -p8 -g6 +p6 +g4 sS'outtypex' -p9 +p7 S'double' -p10 +p8 sS'mo.model' -p11 +p9 g2 sS'ierr' -p12 -g10 +p10 +g8 sS'exprs.paramv[i-1]' -p13 -g10 +p11 +g8 sS'lab_2_tmp' +p12 +S'list' +p13 +sS'x.model' p14 g4 -sS'x.model' -p15 -g6 sS'exprs.outtype' -p16 -g10 +p15 +g8 sS'exprs.intype' -p17 -g10 +p16 +g8 sS'exprs.nameF' +p17 +g8 +sS'exprs.in' p18 -g10 -sS'exprs.funtxt' -p19 -S'vector' -p20 +g8 sS'graphics.out_implicit' -p21 +p19 NsS'out' -p22 +p20 S'matrix' -p23 +p21 sS'nameF' -p24 +p22 g2 sS'lab_2_tmp[i-1]' -p25 -g10 +p23 +g8 sS'exprs.pprop' -p26 -g10 +p24 +g8 sS'Tparam_lab' -p27 -g10 +p25 +g8 sS'exprs.out' -p28 -g10 +p26 +g8 sS'graphics.in_implicit' -p29 +p27 NsS'typ' -p30 -g20 +p28 +S'vector' +p29 sS'getvalue_txt' -p31 +p30 g2 sS'mo.inputs' -p32 -g20 +p31 +g29 sS'param' +p32 +g21 +sS'gr_i' p33 -g23 +g29 sS'paramv' p34 -g4 -sS'gr_i' +g13 +sS'exprs.funtxt' p35 -g20 +g29 sS'x.graphics.in_implicit' p36 -g20 +g29 sS'mo.parameters' p37 -g4 +g13 sS'Tparam_sz' p38 -g10 +g8 sS'pprop' p39 -g23 +g21 sS'model.out' p40 -g10 -sS'exprs.in1' +g8 +sS'model.sim' p41 -g10 +g13 sS'model.equations' p42 -g6 +g4 sS'mo.outputs' p43 -g23 +g21 sS'intype' p44 -g20 +g29 sS'x.graphics.out_implicit' p45 -g23 +g21 sS'in1' p46 -g20 +g29 sS'model.rpar' p47 -g23 -sS'model.in1' -p48 -g10 +g21 sS'lhs_txt' -p49 +p48 g2 sS'outtype' +p49 +g21 +sS'model.in' p50 -g23 +g8 sS'graphics' p51 -g6 +g4 sS'intypex' p52 -g10 +g8 sS'lab_1' p53 -g4 +g13 sS'lab_2' p54 NsS'paramv[$+1-1]' @@ -202,27 +202,27 @@ p58 g2 sS'exprs.param' p59 -g10 +g8 sS'model.sim[1-1]' p60 NsS'mo' p61 -g6 +g4 sS'x.graphics' p62 -g6 +g4 sS'pprop[$+1-1]' p63 -g10 +g8 sS'model.dep_ut' p64 -g20 +g29 sS'exprs.paramv' p65 -g4 +g13 sS'exprs' p66 -g10 +g8 sS'lab_2[$+1-1]' p67 g2 @@ -234,14 +234,14 @@ p69 g2 sS'y' p70 -g20 +g29 sS'x' p71 -g10 +g8 sS'model' p72 -g6 +g4 sS'tt' p73 -g20 +g29 s.
\ No newline at end of file diff --git a/js/Misc/MEMORY_f.js b/js/Misc/MEMORY_f.js index 684e0463..e19c1b2f 100644 --- a/js/Misc/MEMORY_f.js +++ b/js/Misc/MEMORY_f.js @@ -6,7 +6,7 @@ function MEMORY_f() { this.exprs = [[string(z)],[string(1)]]; this.model = scicos_model(); this.model.sim = new ScilabString(["memo"]); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([in1]); this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([0]); @@ -31,10 +31,7 @@ function MEMORY_f() { this.a = arguments[0]["a"] this.inh = parseFloat(arguments[0]["inh"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.a,this.inh,this.exprs] = scicos_getvalue("Set memory block parameters",["initial condition","Inherit (1: no, 0: yes)"],list("vec",-1,"vec",1),this.exprs); if (!ok) { @@ -58,7 +55,7 @@ function MEMORY_f() { if (ok) { this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.rpar = new ScilabDouble([this.a]); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([out]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Misc/MEMORY_f.pickle b/js/Misc/MEMORY_f.pickle index b10dd11b..80e99e9d 100644 --- a/js/Misc/MEMORY_f.pickle +++ b/js/Misc/MEMORY_f.pickle @@ -41,23 +41,23 @@ g2 sS'out' p9 g2 -sS'model.in1' -p10 -g2 sS'x.graphics' -p11 +p10 g4 sS'model.evtin' -p12 +p11 g2 sS'model.sim' -p13 +p12 S'string' -p14 +p13 sS'in1' -p15 +p14 g2 sS'model.rpar' +p15 +g2 +sS'model.in' p16 g2 sS'graphics.exprs' @@ -72,7 +72,7 @@ S'boolean' p21 sS'model.blocktype' p22 -g14 +g13 sS'model.dep_ut' p23 g19 diff --git a/js/Misc/MPBLOCK.js b/js/Misc/MPBLOCK.js index 7570905b..2ceff438 100644 --- a/js/Misc/MPBLOCK.js +++ b/js/Misc/MPBLOCK.js @@ -23,7 +23,7 @@ function MPBLOCK() { this.model.sim = list(new ScilabString([mo.model]), new ScilabDouble([10004])); mo.inputs = this.in1; mo.outputs = this.out; - this.model.in1 = new ScilabDouble([ones(size(mo.inputs,"r"),1)]); + this.model.in = new ScilabDouble([ones(size(mo.inputs,"r"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"r"),1)]); this.model.equations = mo; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MPBLOCK\",sz(1),sz(2));"]); @@ -41,9 +41,6 @@ function MPBLOCK() { return options; } MPBLOCK.prototype.set = function MPBLOCK() { - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; if (this.type[this.exprs-1]==15) { var paramv = list(); @@ -54,7 +51,7 @@ function MPBLOCK() { } this.exprs = tlist(["MPBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],this.exprs[1-1][1-1],this.exprs[1-1][2-1],this.exprs[1-1][3-1],this.exprs[1-1][4-1],this.exprs[1-1][5-1],paramv,sci2exp(pprop.slice()),this.exprs[1-1][7-1],this.exprs[2-1]); } - var lab_1 = list(this.exprs.in1,this.exprs.intype,this.exprs.out,this.exprs.outtype,this.exprs.param,this.exprs.pprop,this.exprs.nameF); + var lab_1 = list(this.exprs.in,this.exprs.intype,this.exprs.out,this.exprs.outtype,this.exprs.param,this.exprs.pprop,this.exprs.nameF); var lab_2 = this.exprs.paramv; while (true) { var tmpvar0 = getvalue("Set Modelica generic block parameters",[["Input variables: "],["Input variables types: "],["Output variables: "],["Output variables types:"],["Parameters in Modelica:"],["Parameters properties: "],["Model name in packages:"]],list("str",-1,"str",-1,"str",-1,"str",-1,"str",-1,"vec",-1,"str",-1),lab_1); @@ -252,7 +249,7 @@ function MPBLOCK() { this.model.rpar = new ScilabDouble([this.model.rpar],[double(paramv[i-1].slice())]); } this.model.sim[1-1] = new ScilabDouble([this.funam]); - this.exprs.in1 = lab_1[1-1]; + this.exprs.in = lab_1[1-1]; this.exprs.intype = lab_1[2-1]; this.exprs.out = lab_1[3-1]; this.exprs.outtype = lab_1[4-1]; diff --git a/js/Misc/MPBLOCK.pickle b/js/Misc/MPBLOCK.pickle index f7e22d8c..0fadb8a9 100644 --- a/js/Misc/MPBLOCK.pickle +++ b/js/Misc/MPBLOCK.pickle @@ -31,51 +31,51 @@ S'rhs_txt' p1 S'string' p2 -sS'model.sim' -p3 -S'list' -p4 sS'ee' -p5 +p3 S'double' -p6 +p4 sS'arg1' -p7 +p5 S'object' -p8 +p6 sS'graphics.gr_i[1-1][1-1]' -p9 +p7 g2 sS'graphics.exprs' -p10 -g8 -sS'outtypex' -p11 +p8 g6 +sS'outtypex' +p9 +g4 sS'mo.model' -p12 +p10 g2 sS'ierr' -p13 -g6 +p11 +g4 sS'exprs.paramv[i-1]' -p14 -g6 -sS'lab_2_tmp' -p15 +p12 g4 +sS'lab_2_tmp' +p13 +S'list' +p14 sS'x.model' -p16 -g8 -sS'exprs.outtype' -p17 +p15 g6 +sS'exprs.outtype' +p16 +g4 sS'exprs.intype' -p18 -g6 +p17 +g4 sS'exprs.nameF' +p18 +g4 +sS'exprs.in' p19 -g6 +g4 sS'graphics.out_implicit' p20 NsS'out' @@ -87,16 +87,16 @@ p23 g2 sS'lab_2_tmp[i-1]' p24 -g6 +g4 sS'exprs.pprop' p25 -g6 +g4 sS'Tparam_lab' p26 -g6 +g4 sS'exprs.out' p27 -g6 +g4 sS'graphics.in_implicit' p28 NsS'typ' @@ -114,7 +114,7 @@ p33 g30 sS'paramv' p34 -g4 +g14 sS'gr_i' p35 g30 @@ -123,22 +123,22 @@ p36 g30 sS'mo.parameters' p37 -g4 +g14 sS'Tparam_sz' p38 -g6 +g4 sS'pprop' p39 g30 sS'model.out' p40 -g6 -sS'exprs.in1' +g4 +sS'model.sim' p41 -g6 +g14 sS'model.equations' p42 -g8 +g6 sS'mo.outputs' p43 g22 @@ -154,24 +154,24 @@ g30 sS'model.rpar' p47 g22 -sS'model.in1' -p48 -g6 sS'lhs_txt' -p49 +p48 g2 sS'outtype' -p50 +p49 g22 +sS'model.in' +p50 +g4 sS'graphics' p51 -g8 +g6 sS'intypex' p52 -g6 +g4 sS'lab_1' p53 -g4 +g14 sS'lab_2' p54 NsS'paramv[$+1-1]' @@ -186,18 +186,18 @@ p58 g2 sS'exprs.param' p59 -g6 +g4 sS'model.sim[1-1]' p60 NsS'mo' p61 -g8 +g6 sS'x.graphics' p62 -g8 +g6 sS'pprop[$+1-1]' p63 -g6 +g4 sS'model.dep_ut' p64 g30 @@ -206,7 +206,7 @@ p65 g2 sS'exprs' p66 -g6 +g4 sS'lab_2[$+1-1]' p67 g2 @@ -221,11 +221,11 @@ p70 g30 sS'x' p71 -g6 +g4 sS'model' p72 -g8 +g6 sS'exprs.paramv' p73 -g4 +g14 s.
\ No newline at end of file diff --git a/js/Misc/PAL_f.js b/js/Misc/PAL_f.js index 22da4d26..e853f63d 100644 --- a/js/Misc/PAL_f.js +++ b/js/Misc/PAL_f.js @@ -5,7 +5,7 @@ function PAL_f() { scs.props.title = "Palette"; this.model = scicos_model(); this.model.sim = new ScilabString(["palette"]); - this.model.in1 = new ScilabDouble([]); + this.model.in = new ScilabDouble([]); this.model.out = new ScilabDouble([]); this.model.rpar = new ScilabDouble([scs]); this.model.blocktype = new ScilabString(["h"]); @@ -24,14 +24,10 @@ function PAL_f() { return options; } PAL_f.prototype.set = function PAL_f() { - var tmpvar0 = scicos(arg1.model.rpar); this.x = tmpvar0[0]; var newparameters = tmpvar0[1]; var needcompile = tmpvar0[2]; var edited = tmpvar0[3]; - arg1.graphics.id = this.x.props.title[1-1]; - arg1.model.rpar = this.x; - this.x = arg1; var y = []; var typ = []; %exit = resume(false) diff --git a/js/Misc/PAL_f.pickle b/js/Misc/PAL_f.pickle index 50b9152f..7e78d5e8 100644 --- a/js/Misc/PAL_f.pickle +++ b/js/Misc/PAL_f.pickle @@ -26,57 +26,57 @@ p4 sS'model.blocktype' p5 g2 -sS'model.dep_ut' -p6 -S'vector' -p7 sS'arg1' -p8 +p6 g4 sS'scs.props' -p9 +p7 g4 -sS'model.in1' -p10 -g7 +sS'model.dep_ut' +p8 +S'vector' +p9 sS'scs.props.title' -p11 +p10 g2 sS'x.props' -p12 +p11 g4 sS'model.out' -p13 -g7 +p12 +g9 sS'gr_i' -p14 -g7 +p13 +g9 sS'model.rpar' -p15 +p14 S'double' -p16 +p15 sS'scs' -p17 +p16 g4 +sS'model.in' +p17 +g9 sS'y' p18 -g7 +g9 sS'x' p19 -g16 +g15 sS'model' p20 g4 sS'x.graphics.id' p21 -g16 +g15 sS'typ' p22 -g7 +g9 sS'arg1.model.rpar' p23 g4 sS'arg1.graphics.id' p24 -g16 +g15 s.
\ No newline at end of file diff --git a/js/Misc/PENDULUM_ANIM.js b/js/Misc/PENDULUM_ANIM.js index 1faf9f7f..c6264f51 100644 --- a/js/Misc/PENDULUM_ANIM.js +++ b/js/Misc/PENDULUM_ANIM.js @@ -10,7 +10,7 @@ function PENDULUM_ANIM() { this.ymax = 5; this.model = scicos_model(); this.model.sim = list(new ScilabString(["anim_pen"]), new ScilabDouble([5])); - this.model.in1 = new ScilabDouble([1],[1]); + this.model.in = new ScilabDouble([1],[1]); this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([0]); this.model.rpar = new ScilabDouble([this.plen],[this.csiz],[this.phi],[this.xmin],[this.xmax],[this.ymin],[this.ymax]); @@ -45,10 +45,7 @@ function PENDULUM_ANIM() { this.ymin = parseFloat(arguments[0]["ymin"]) this.ymax = parseFloat(arguments[0]["ymax"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var dstate = this.model.dstate; while (true) { [ok,this.plen,this.csiz,this.phi,this.xmin,this.xmax,this.ymin,this.ymax,this.exprs] = scicos_getvalue("Set Scope parameters",["pendulum length","cart size (square side)","slope","Xmin","Xmax","Ymin","Ymax"],list("vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1,"vec",1),this.exprs); diff --git a/js/Misc/PENDULUM_ANIM.pickle b/js/Misc/PENDULUM_ANIM.pickle index af17dc6e..31705ba2 100644 --- a/js/Misc/PENDULUM_ANIM.pickle +++ b/js/Misc/PENDULUM_ANIM.pickle @@ -55,32 +55,32 @@ g2 sS'ymin' p11 g2 -sS'model.in1' -p12 -g8 sS'ymax' -p13 +p12 g2 sS'x.graphics' -p14 +p13 g4 sS'model.evtin' -p15 +p14 g2 sS'model.sim' -p16 +p15 S'list' -p17 +p16 sS'phi' -p18 +p17 g2 sS'mess' -p19 +p18 g8 sS'csiz' -p20 +p19 g2 sS'model.rpar' +p20 +g8 +sS'model.in' p21 g8 sS'graphics.exprs' diff --git a/js/Misc/RATELIMITER.js b/js/Misc/RATELIMITER.js index dd065a28..10022a5a 100644 --- a/js/Misc/RATELIMITER.js +++ b/js/Misc/RATELIMITER.js @@ -6,7 +6,7 @@ function RATELIMITER() { var rpar = [[this.maxp],[this.minp]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["ratelimiter"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); @@ -30,10 +30,7 @@ function RATELIMITER() { this.maxp = parseFloat(arguments[0]["maxp"]) this.minp = parseFloat(arguments[0]["minp"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.maxp,this.minp,this.exprs] = scicos_getvalue("Set rate limiter parameters",["max slope","min slope"],list("vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Misc/RATELIMITER.pickle b/js/Misc/RATELIMITER.pickle index e089b9bc..d2922df3 100644 --- a/js/Misc/RATELIMITER.pickle +++ b/js/Misc/RATELIMITER.pickle @@ -23,7 +23,7 @@ S'model.sim' p1 S'list' p2 -sS'model.in1' +sS'model.out' p3 S'double' p4 @@ -65,22 +65,22 @@ p19 sS'model.dep_ut' p20 g19 -sS'graphics' +sS'model.in' p21 +g4 +sS'graphics' +p22 g9 sS'y' -p22 +p23 g19 sS'x' -p23 +p24 g4 sS'model' -p24 +p25 g9 sS'typ' -p25 -g19 -sS'model.out' p26 -g4 +g19 s.
\ No newline at end of file diff --git a/js/Misc/RELATIONALOP.js b/js/Misc/RELATIONALOP.js index aa9801f3..1bc6fdef 100644 --- a/js/Misc/RELATIONALOP.js +++ b/js/Misc/RELATIONALOP.js @@ -5,7 +5,7 @@ function RELATIONALOP() { var label = "<"; this.model = scicos_model(); this.model.sim = list(new ScilabString(["relationalop"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1],[1]); + this.model.in = new ScilabDouble([1],[1]); this.model.out = new ScilabDouble([1]); this.model.ipar = new ScilabDouble(ipar); this.model.blocktype = new ScilabString(["c"]); @@ -32,10 +32,7 @@ function RELATIONALOP() { this.zcr = parseFloat(arguments[0]["zcr"]) this.Datatype = arguments[0]["Datatype"] this.exprs = inverse(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,1)==2) { this.exprs = [[this.exprs],[sci2exp(1)]]; } diff --git a/js/Misc/RELATIONALOP.pickle b/js/Misc/RELATIONALOP.pickle index 9387c264..474e3399 100644 --- a/js/Misc/RELATIONALOP.pickle +++ b/js/Misc/RELATIONALOP.pickle @@ -51,32 +51,32 @@ g8 sS'graphics.style' p13 g8 -sS'model.in1' -p14 -S'matrix' -p15 sS'x.graphics' -p16 +p14 g2 sS'typ' -p17 +p15 g8 sS'label' -p18 +p16 g5 sS'model.sim' -p19 +p17 S'list' -p20 +p18 sS'model.nmode' -p21 +p19 g10 sS'in1' +p20 +S'matrix' +p21 +sS'model.in' p22 -g15 +g21 sS'graphics.exprs' p23 -g15 +g21 sS'x.graphics.style' p24 g8 @@ -98,7 +98,7 @@ p30 g10 sS'exprs' p31 -g15 +g21 sS'gr_i' p32 g8 diff --git a/js/Misc/SPLIT_f.js b/js/Misc/SPLIT_f.js index cd072345..86282c59 100644 --- a/js/Misc/SPLIT_f.js +++ b/js/Misc/SPLIT_f.js @@ -3,7 +3,7 @@ function SPLIT_f() { SPLIT_f.prototype.define = function SPLIT_f() { this.model = scicos_model(); this.model.sim = new ScilabString(["lsplit"]); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1],[-1],[-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); @@ -19,7 +19,6 @@ function SPLIT_f() { return options; } SPLIT_f.prototype.set = function SPLIT_f() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/Misc/SPLIT_f.pickle b/js/Misc/SPLIT_f.pickle index 90f5dbc2..2575c12c 100644 --- a/js/Misc/SPLIT_f.pickle +++ b/js/Misc/SPLIT_f.pickle @@ -19,32 +19,32 @@ S'model.sim' p1 S'string' p2 -sS'model.in1' -p3 -S'double' -p4 sS'model.blocktype' -p5 +p3 g2 sS'model.dep_ut' -p6 +p4 S'vector' -p7 +p5 sS'model.out' -p8 +p6 S'matrix' +p7 +sS'model.in' +p8 +S'double' p9 sS'y' p10 -g7 +g5 sS'x' p11 -g4 +g9 sS'model' p12 S'object' p13 sS'typ' p14 -g7 +g5 s.
\ No newline at end of file diff --git a/js/Misc/SUPER_f.js b/js/Misc/SUPER_f.js index 9ffae6bb..e9280aa1 100644 --- a/js/Misc/SUPER_f.js +++ b/js/Misc/SUPER_f.js @@ -13,7 +13,7 @@ function SUPER_f() { scs.objs[2-1] = out; this.model = scicos_model(); this.model.sim = new ScilabString(["super"]); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([scs]); this.model.blocktype = new ScilabString(["h"]); @@ -31,7 +31,6 @@ function SUPER_f() { return options; } SUPER_f.prototype.set = function SUPER_f() { - xcos(arg1.model.rpar); return new SuperBlock(this.x); } } diff --git a/js/Misc/SUPER_f.pickle b/js/Misc/SUPER_f.pickle index 28d079d5..965e905e 100644 --- a/js/Misc/SUPER_f.pickle +++ b/js/Misc/SUPER_f.pickle @@ -15,42 +15,42 @@ p6 atp7 Rp8 .(dp0 -S'arg1' +S'scs.objs[2-1]' p1 S'object' p2 -sS'scs.objs[1-1]' +sS'arg1' p3 g2 -sS'scs.props.title' +sS'scs.objs[1-1]' p4 -S'string' +g2 +sS'scs.props.title' p5 -sS'model.out' +S'string' p6 -S'double' +sS'model.out' p7 -sS'scs' +S'double' p8 -g7 -sS'out' +sS'scs' p9 -g2 -sS'model.in1' +g8 +sS'out' p10 -g7 +g2 sS'model.sim' p11 -g5 +g6 sS'in1' p12 g2 sS'model.rpar' p13 -g7 -sS'scs.objs[2-1]' +g8 +sS'model.in' p14 -g2 +g8 sS'in1.graphics.orig' p15 S'vector' @@ -69,7 +69,7 @@ p20 g2 sS'model.blocktype' p21 -g5 +g6 sS'model.dep_ut' p22 g16 @@ -84,7 +84,7 @@ p25 g16 sS'x' p26 -g7 +g8 sS'model' p27 g2 diff --git a/js/Misc/TEXT_f.js b/js/Misc/TEXT_f.js index 77de720a..f459c135 100644 --- a/js/Misc/TEXT_f.js +++ b/js/Misc/TEXT_f.js @@ -31,11 +31,8 @@ function TEXT_f() { this.font = parseFloat(arguments[0]["font"]) this.siz = parseFloat(arguments[0]["siz"]) this.exprs = inverse(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; var orig = this.graphics.orig; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")==1) { this.exprs = [[this.exprs],["3"],["1"]]; } diff --git a/js/Misc/c_block.js b/js/Misc/c_block.js index 82443e22..a75b4337 100644 --- a/js/Misc/c_block.js +++ b/js/Misc/c_block.js @@ -13,7 +13,7 @@ function c_block() { this.funam = "toto"; this.model = scicos_model(); this.model.sim = list(new ScilabString([" "]), new ScilabDouble([2001])); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([out]); this.model.evtin = new ScilabDouble(clkin); this.model.evtout = new ScilabDouble(clkout); @@ -47,9 +47,6 @@ function c_block() { this.rpar = inverse(arguments[0]["rpar"]) this.funam = arguments[0]["funam"] this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; while (true) { [ok,this.i,this.o,this.rpar,this.funam,this.lab] = scicos_getvalue("Set C_block parameters",["input ports sizes","output port sizes","System parameters vector","function name"],list("vec",-1,"vec",-1,"vec",-1,"str",-1),label[1-1]); @@ -66,7 +63,7 @@ function c_block() { this.o = int(this.o.slice()); var no = size(this.o,1); var tt = label[2-1]; - if (this.model.sim[1-1]!=this.funam||size(this.model.in1,"*")!=size(this.i,"*")||size(this.model.out,"*")!=size(this.o,"*")) { + if (this.model.sim[1-1]!=this.funam||size(this.model.in,"*")!=size(this.i,"*")||size(this.model.out,"*")!=size(this.o,"*")) { var tt = []; } var tmpvar0 = CFORTR(this.funam,tt,this.i,this.o); diff --git a/js/Misc/c_block.pickle b/js/Misc/c_block.pickle index ed1b3b80..609f4f1a 100644 --- a/js/Misc/c_block.pickle +++ b/js/Misc/c_block.pickle @@ -61,55 +61,55 @@ g9 sS'ni' p15 g9 -sS'model.in1' -p16 -g9 sS'clkin' -p17 +p16 g3 sS'x.graphics' -p18 +p17 g5 sS'z0' -p19 +p18 g3 sS'tt' -p20 +p19 g3 sS'label' -p21 +p20 S'list' -p22 +p21 sS'model.evtin' -p23 +p22 g3 sS'model.firing' -p24 +p23 g3 sS'model.sim' -p25 -g22 +p24 +g21 sS'model.evtout' -p26 +p25 g3 sS'clkout' -p27 +p26 g3 sS'auto' -p28 +p27 g3 sS'label[2-1]' -p29 +p28 g3 sS'in1' -p30 +p29 g9 sS'model.rpar' -p31 +p30 g3 sS'model.state' -p32 +p31 g3 +sS'model.in' +p32 +g9 sS'graphics.exprs' p33 NsS'x0' diff --git a/js/Misc/fortran_block.js b/js/Misc/fortran_block.js index af2470bc..69e90760 100644 --- a/js/Misc/fortran_block.js +++ b/js/Misc/fortran_block.js @@ -3,7 +3,7 @@ function fortran_block() { fortran_block.prototype.define = function fortran_block() { this.model = scicos_model(); this.model.sim = list(new ScilabString([" "]), new ScilabDouble([1001])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([]); this.model.evtout = new ScilabDouble([]); @@ -15,7 +15,7 @@ function fortran_block() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); this.funam = "forty"; - var label = list([[sci2exp(this.model.in1)],[sci2exp(this.model.out)],[strcat(sci2exp(this.model.rpar))],[this.funam]],list([])); + var label = list([[sci2exp(this.model.in)],[sci2exp(this.model.out)],[strcat(sci2exp(this.model.rpar))],[this.funam]],list([])); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"fortran_block\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,label,this.gr_i); return new BasicBlock(this.x); @@ -38,9 +38,6 @@ function fortran_block() { this.rpar = inverse(arguments[0]["rpar"]) this.funam = arguments[0]["funam"] this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; while (true) { [ok,this.i,this.o,this.rpar,this.funam,this.lab] = scicos_getvalue("Set fortran_block parameters",["input ports sizes","output port sizes","System parameters vector","function name"],list("vec",-1,"vec",-1,"vec",-1,"str",-1),label[1-1]); @@ -57,7 +54,7 @@ function fortran_block() { this.o = int(this.o.slice()); var no = size(this.o,1); var tt = label[2-1]; - if (this.model.sim[1-1]!=this.funam||size(this.model.in1,"*")!=size(this.i,"*")||size(this.model.out,"*")!=size(this.o,"*")) { + if (this.model.sim[1-1]!=this.funam||size(this.model.in,"*")!=size(this.i,"*")||size(this.model.out,"*")!=size(this.o,"*")) { var tt = []; } var tmpvar0 = FORTR(this.funam,tt,this.i,this.o); diff --git a/js/Misc/fortran_block.pickle b/js/Misc/fortran_block.pickle index 3c9327de..468f2187 100644 --- a/js/Misc/fortran_block.pickle +++ b/js/Misc/fortran_block.pickle @@ -58,40 +58,40 @@ p13 sS'ni' p14 g13 -sS'model.in1' -p15 -g13 sS'x.graphics' -p16 +p15 g5 sS'tt' -p17 +p16 g3 sS'label' -p18 +p17 S'list' -p19 +p18 sS'model.evtin' -p20 +p19 g3 sS'model.firing' -p21 +p20 g3 sS'model.sim' -p22 -g19 +p21 +g18 sS'model.evtout' -p23 +p22 g3 sS'label[2-1]' -p24 +p23 g3 sS'model.rpar' -p25 +p24 g3 sS'model.state' -p26 +p25 g3 +sS'model.in' +p26 +g13 sS'graphics.exprs' p27 NsS'model.ipar' diff --git a/js/Misc/func_block.js b/js/Misc/func_block.js index 20190ebe..5c35f244 100644 --- a/js/Misc/func_block.js +++ b/js/Misc/func_block.js @@ -3,7 +3,7 @@ function func_block() { func_block.prototype.define = function func_block() { this.model = scicos_model(); this.model.sim = new ScilabString([" "]); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); @@ -21,10 +21,7 @@ function func_block() { return options; } func_block.prototype.set = function func_block() { - this.model = arg1.model; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.x = arg1; this.model = this.x.model; var tmpvar0 = genfunc(this.exprs); var ok = tmpvar0[0]; diff --git a/js/Misc/func_block.pickle b/js/Misc/func_block.pickle index 1c7eb85f..0f6235b8 100644 --- a/js/Misc/func_block.pickle +++ b/js/Misc/func_block.pickle @@ -19,7 +19,7 @@ S'model.sim' p1 S'string' p2 -sS'model.in1' +sS'model.out' p3 S'double' p4 @@ -35,27 +35,27 @@ p8 g7 sS'graphics.exprs' p9 -NsS'model.out' +NsS'model.dep_ut' p10 -g4 -sS'exprs' +S'vector' p11 +sS'exprs' +p12 g2 sS'x.model' -p12 -NsS'gr_i' p13 -S'vector' +NsS'gr_i' p14 -sS'model.dep_ut' +g11 +sS'model.in' p15 -g14 +g4 sS'graphics' p16 g7 sS'y' p17 -g14 +g11 sS'x' p18 g4 @@ -64,5 +64,5 @@ p19 g7 sS'typ' p20 -g14 +g11 s.
\ No newline at end of file diff --git a/js/Misc/generic_block.js b/js/Misc/generic_block.js index ecab32f5..07044219 100644 --- a/js/Misc/generic_block.js +++ b/js/Misc/generic_block.js @@ -5,7 +5,7 @@ function generic_block() { this.function_name = "sinblk"; this.funtyp = 1; this.model.sim = list(new ScilabString([this.function_name]), new ScilabDouble([this.funtyp])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([]); this.model.evtout = new ScilabDouble([]); @@ -16,7 +16,7 @@ function generic_block() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); - var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp(this.model.in1)],[sci2exp(this.model.out)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.firing)],["y"],["n"]]; + var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp(this.model.in)],[sci2exp(this.model.out)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.firing)],["y"],["n"]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,label,this.gr_i); return new BasicBlock(this.x); @@ -57,9 +57,6 @@ function generic_block() { this.depu = parseBoolean(arguments[0]["depu"]) this.dept = parseBoolean(arguments[0]["dept"]) this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; @@ -120,10 +117,7 @@ function generic_block() { this.model.ipar = new ScilabDouble([this.ipar]); this.model.firing = new ScilabDouble([this.auto0]); this.model.dep_ut = new ScilabDouble(dep_ut); - arg1.model = this.model; this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - this.x = arg1; break; } } diff --git a/js/Misc/generic_block.pickle b/js/Misc/generic_block.pickle index e0a29524..03c75a64 100644 --- a/js/Misc/generic_block.pickle +++ b/js/Misc/generic_block.pickle @@ -75,39 +75,39 @@ g2 sS'model.dstate' p13 g8 -sS'model.in1' -p14 -g2 sS'label' -p15 +p14 S'matrix' -p16 +p15 sS'model.evtin' -p17 +p16 g8 sS'model.firing' -p18 +p17 g8 sS'function_name' -p19 +p18 S'string' -p20 +p19 sS'model.sim' -p21 +p20 S'list' -p22 +p21 sS'model.evtout' -p23 +p22 g8 sS'arg1.graphics' -p24 +p23 g5 sS'model.rpar' -p25 +p24 g8 sS'model.state' -p26 +p25 g8 +sS'model.in' +p26 +g2 sS'graphics' p27 g5 @@ -131,7 +131,7 @@ S'boolean' p34 sS'model.blocktype' p35 -g20 +g19 sS'i' p36 g2 diff --git a/js/Misc/generic_block2.js b/js/Misc/generic_block2.js index 71079407..218ea693 100644 --- a/js/Misc/generic_block2.js +++ b/js/Misc/generic_block2.js @@ -5,7 +5,7 @@ function generic_block2() { this.function_name = "sinblk"; this.funtyp = 1; this.model.sim = list(new ScilabString([this.function_name]), new ScilabDouble([this.funtyp])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([]); this.model.evtout = new ScilabDouble([]); @@ -16,7 +16,7 @@ function generic_block2() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabDouble([true,false]); - var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp(this.model.in1)],[sci2exp(this.model.out)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]]; + var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp(this.model.in)],[sci2exp(this.model.out)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block2\",sz(1),sz(2));"]); this.x = standard_define([2,2],this.model,label,this.gr_i); return new BasicBlock(this.x); @@ -61,9 +61,6 @@ function generic_block2() { this.depu = parseBoolean(arguments[0]["depu"]) this.dept = parseBoolean(arguments[0]["dept"]) this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; @@ -126,10 +123,7 @@ function generic_block2() { this.model.nzcross = new ScilabDouble([this.nzcr]); this.model.nmode = new ScilabDouble([this.nmode]); this.model.dep_ut = new ScilabDouble(dep_ut); - arg1.model = this.model; this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - this.x = arg1; break; } } diff --git a/js/Misc/generic_block2.pickle b/js/Misc/generic_block2.pickle index 93899811..9d27db23 100644 --- a/js/Misc/generic_block2.pickle +++ b/js/Misc/generic_block2.pickle @@ -79,43 +79,43 @@ g2 sS'model.dstate' p13 g8 -sS'model.in1' -p14 -g2 sS'model.nzcross' -p15 +p14 NsS'label' -p16 +p15 S'matrix' -p17 +p16 sS'model.evtin' -p18 +p17 g8 sS'model.firing' -p19 +p18 g8 sS'function_name' -p20 +p19 S'string' -p21 +p20 sS'model.sim' -p22 +p21 S'list' -p23 +p22 sS'model.evtout' -p24 +p23 g8 sS'arg1.graphics' -p25 +p24 g5 sS'model.nmode' -p26 +p25 NsS'model.rpar' -p27 +p26 g8 sS'model.state' -p28 +p27 g8 +sS'model.in' +p28 +g2 sS'graphics' p29 g5 @@ -139,7 +139,7 @@ S'boolean' p36 sS'model.blocktype' p37 -g21 +g20 sS'i' p38 g2 diff --git a/js/Misc/generic_block3.js b/js/Misc/generic_block3.js index 92f07aba..c0a7e2b4 100644 --- a/js/Misc/generic_block3.js +++ b/js/Misc/generic_block3.js @@ -5,14 +5,14 @@ function generic_block3() { this.function_name = "sinblk"; this.funtyp = 4; this.model.sim = list(new ScilabString([this.function_name]), new ScilabDouble([this.funtyp])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.in2 = new ScilabDouble([1]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); this.model.dep_ut = new ScilabDouble([true,false]); - var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp([this.model.in1,this.model.in2])],[sci2exp(this.model.intyp)],[sci2exp([this.model.out,this.model.out2]),sci2exp(this.model.outtyp)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.odstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.opar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]]; + var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp([this.model.in,this.model.in2])],[sci2exp(this.model.intyp)],[sci2exp([this.model.out,this.model.out2]),sci2exp(this.model.outtyp)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.odstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.opar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block3\",sz(1),sz(2));"]); this.x = standard_define([4,2],this.model,label,this.gr_i); return new BasicBlock(this.x); @@ -65,9 +65,6 @@ function generic_block3() { this.depu = parseBoolean(arguments[0]["depu"]) this.dept = parseBoolean(arguments[0]["dept"]) this.lab = arguments[0]["lab"] - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; var label = this.graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; @@ -138,10 +135,7 @@ function generic_block3() { this.model.nzcross = new ScilabDouble([this.nzcr]); this.model.nmode = new ScilabDouble([this.nmode]); this.model.dep_ut = new ScilabDouble(dep_ut); - arg1.model = this.model; this.graphics.exprs = new ScilabDouble([label]); - arg1.graphics = this.graphics; - this.x = arg1; break; } } diff --git a/js/Misc/generic_block3.pickle b/js/Misc/generic_block3.pickle index 769cacf9..fafdff3f 100644 --- a/js/Misc/generic_block3.pickle +++ b/js/Misc/generic_block3.pickle @@ -79,57 +79,57 @@ p9 sS'xx' p10 g9 -sS'model.intyp' -p11 -g3 sS'funtyp' -p12 +p11 g3 sS'model.out' -p13 +p12 g3 sS'model.dstate' -p14 +p13 g9 sS'model.in2' -p15 +p14 g3 -sS'model.in1' -p16 +sS'model.intyp' +p15 g3 sS'model.nzcross' -p17 +p16 NsS'label' -p18 +p17 S'matrix' -p19 +p18 sS'model.firing' -p20 +p19 NsS'function_name' -p21 +p20 S'string' -p22 +p21 sS'model.sim' -p23 +p22 S'list' -p24 +p23 sS'arg1.graphics' -p25 +p24 g6 sS'model.out2' -p26 +p25 g3 sS'model.nmode' -p27 +p26 NsS'model.rpar' -p28 +p27 g9 sS'model.outtyp' -p29 +p28 g3 sS'model.state' -p30 +p29 g9 +sS'model.in' +p30 +g3 sS'graphics' p31 g6 diff --git a/js/Misc/scifunc_block.js b/js/Misc/scifunc_block.js index 1b119b75..b0eb30c6 100644 --- a/js/Misc/scifunc_block.js +++ b/js/Misc/scifunc_block.js @@ -12,7 +12,7 @@ function scifunc_block() { this.rpar = []; this.model = scicos_model(); this.model.sim = list(new ScilabString(["scifunc"]), new ScilabDouble([3])); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([out]); this.model.evtin = new ScilabDouble(clkin); this.model.evtout = new ScilabDouble(clkout); @@ -58,9 +58,6 @@ function scifunc_block() { this.deptime = arguments[0]["deptime"] this.lab = arguments[0]["lab"] var needcompile = 0; - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; if (size(this.exprs[1-1],"*")==8) { this.exprs[1-1][9-1] = "0"; diff --git a/js/Misc/scifunc_block.pickle b/js/Misc/scifunc_block.pickle index 62d40dcc..96aa9782 100644 --- a/js/Misc/scifunc_block.pickle +++ b/js/Misc/scifunc_block.pickle @@ -73,62 +73,62 @@ g3 sS'ni' p15 g3 -sS'model.in1' -p16 -g3 sS'model.ipar' -p17 +p16 g3 sS'clkin' -p18 +p17 g9 sS'dep_ut[2-1]' -p19 +p18 S'boolean' -p20 +p19 sS'no' -p21 +p20 g3 sS'z0' -p22 +p21 g9 sS'auto' -p23 +p22 g9 sS'model.evtin' -p24 +p23 g9 sS'exprs[2-1]' -p25 +p24 NsS'model.firing' -p26 +p25 g9 sS'model.sim' -p27 +p26 S'list' -p28 +p27 sS'model.evtout' -p29 +p28 g9 sS'clkout' -p30 +p29 g9 sS'exprs[1-1][9-1]' -p31 +p30 S'string' -p32 +p31 sS'in1' -p33 +p32 g3 sS'model.rpar' -p34 +p33 g9 sS'nci' -p35 +p34 g3 sS'model.state' -p36 +p35 g9 +sS'model.in' +p36 +g3 sS'nco' p37 g3 @@ -140,16 +140,16 @@ p39 g3 sS'typ' p40 -g32 +g31 sS'model.opar' p41 -g28 +g27 sS'needcompile' p42 g3 sS'model.blocktype' p43 -g32 +g31 sS'i' p44 g3 @@ -164,7 +164,7 @@ p47 g3 sS'exprs' p48 -g28 +g27 sS'gr_i' p49 g9 diff --git a/js/Misc/scifunc_block_m.js b/js/Misc/scifunc_block_m.js index b895df36..002bef48 100644 --- a/js/Misc/scifunc_block_m.js +++ b/js/Misc/scifunc_block_m.js @@ -13,7 +13,7 @@ function scifunc_block_m() { var it = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["scifunc"]), new ScilabDouble([3])); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.in2 = new ScilabDouble([in1]); this.model.intyp = new ScilabDouble([it]); this.model.out = new ScilabDouble([out]); @@ -63,9 +63,6 @@ function scifunc_block_m() { this.deptime = arguments[0]["deptime"] this.lab = arguments[0]["lab"] var needcompile = 0; - this.x = arg1; - this.model = arg1.model; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; while (true) { [ok,this.i,this.o,this.ci,this.co,this.xx,this.z,this.rpar,this.auto0,this.deptime,this.lab] = scicos_getvalue([["Set scifunc_block parameters"],["only regular blocks supported"]],["input ports sizes","output port sizes","input event ports sizes","output events ports sizes","initial continuous state","initial discrete state","System parameters vector","initial firing vector (<0 for no firing)","is block always active (0:no, 1:yes)"],list("mat",[-1,2],"mat",[-2,2],"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",-1,"vec",1),this.exprs[1-1]); diff --git a/js/Misc/scifunc_block_m.pickle b/js/Misc/scifunc_block_m.pickle index 626c343d..44d38606 100644 --- a/js/Misc/scifunc_block_m.pickle +++ b/js/Misc/scifunc_block_m.pickle @@ -61,79 +61,79 @@ p10 sS'xx' p11 g10 -sS'model.intyp' -p12 -g3 sS'model.out' -p13 +p12 g3 sS'model.dstate' -p14 +p13 g10 sS'out' -p15 +p14 g3 sS'ni' -p16 +p15 g3 -sS'model.in1' -p17 +sS'model.intyp' +p16 g3 sS'model.ipar' -p18 +p17 g3 sS'clkin' -p19 +p18 g10 sS'dep_ut[2-1]' -p20 +p19 S'boolean' -p21 +p20 sS'no' -p22 +p21 g3 sS'z0' -p23 +p22 g10 sS'model.evtin' -p24 +p23 g10 sS'exprs[2-1]' -p25 +p24 NsS'model.firing' -p26 +p25 g10 sS'model.sim' -p27 +p26 S'list' -p28 +p27 sS'model.evtout' -p29 +p28 g10 sS'clkout' -p30 +p29 g10 sS'model.in2' -p31 +p30 g3 sS'auto' -p32 +p31 g10 sS'model.out2' -p33 +p32 g3 sS'in1' -p34 +p33 g3 sS'model.rpar' -p35 +p34 g10 sS'nci' -p36 +p35 g3 sS'model.state' -p37 +p36 g10 +sS'model.in' +p37 +g3 sS'nco' p38 g3 @@ -152,7 +152,7 @@ S'string' p43 sS'model.opar' p44 -g28 +g27 sS'needcompile' p45 g3 @@ -173,7 +173,7 @@ p50 g10 sS'exprs' p51 -g28 +g27 sS'gr_i' p52 g10 |