diff options
Diffstat (limited to 'js/Linear')
58 files changed, 392 insertions, 334 deletions
diff --git a/js/Linear/BIGSOM_f.js b/js/Linear/BIGSOM_f.js index b0a75d52..1a8f47b6 100644 --- a/js/Linear/BIGSOM_f.js +++ b/js/Linear/BIGSOM_f.js @@ -25,23 +25,23 @@ function BIGSOM_f() { BIGSOM_f.prototype.set = function BIGSOM_f() { this.sgn = inverse(arguments[0]["sgn"]) this.x = arg1; - var graphics = arg1.graphics; + this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = graphics.exprs; + var exprs = this.graphics.exprs; while (true) { [ok,this.sgn,exprs] = scicos_getvalue("Set sum block parameters","Inputs ports signs/gain",list("vec",-1),exprs); if (!ok) { break; } var in1 = -ones(size(this.sgn,"*"),1); - var tmpvar0 = check_io(this.model,graphics,in1,-1,[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = check_io(this.model,this.graphics,in1,-1,[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { this.model.rpar = new ScilabDouble(this.sgn.slice()); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/BIGSOM_f.pickle b/js/Linear/BIGSOM_f.pickle index a4b3bc4b..dab5333b 100644 --- a/js/Linear/BIGSOM_f.pickle +++ b/js/Linear/BIGSOM_f.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'sgn' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'sgn' p1 diff --git a/js/Linear/CLR.js b/js/Linear/CLR.js index 5edba5dd..2eb7da63 100644 --- a/js/Linear/CLR.js +++ b/js/Linear/CLR.js @@ -33,8 +33,8 @@ function CLR() { this.num = arguments[0]["num"] this.den = arguments[0]["den"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; var x0 = this.model.state; var rpar = this.model.rpar; @@ -54,14 +54,14 @@ function CLR() { } if (ok) { var H = cont_frm(this.num,this.den); - var tmpvar0 = H.slice(2-1,5) - var A = tmpvar0[0] - var B = tmpvar0[1] - var C = tmpvar0[2] + var tmpvar0 = H.slice(2-1,5); + var A = tmpvar0[0]; + var B = tmpvar0[1]; + var C = tmpvar0[2]; var D = tmpvar0[3]; - graphics.exprs = exprs; - var tmpvar1 = size(A) - var ns1 = tmpvar1[0] + this.graphics.exprs = new ScilabDouble([exprs]); + var tmpvar1 = size(A); + var ns1 = tmpvar1[0]; var ns1 = tmpvar1[1]; var rpar = [[matrix(A,ns1*ns1,1)],[matrix(B,ns1,1)],[matrix(C,ns1,1)],[D]]; if (norm(D,1)!=0) { @@ -79,7 +79,7 @@ function CLR() { } this.model.state = new ScilabDouble(x0); this.model.rpar = new ScilabDouble(rpar); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/CLR.pickle b/js/Linear/CLR.pickle index a0c8eaad..26e70f19 100644 --- a/js/Linear/CLR.pickle +++ b/js/Linear/CLR.pickle @@ -10,8 +10,10 @@ aS'num' p4 aS'den' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/Linear/CLR_f.js b/js/Linear/CLR_f.js index 0d56c799..86f80362 100644 --- a/js/Linear/CLR_f.js +++ b/js/Linear/CLR_f.js @@ -33,8 +33,8 @@ function CLR_f() { this.num = arguments[0]["num"] this.den = arguments[0]["den"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; var x0 = this.model.state; var rpar = this.model.rpar; @@ -54,14 +54,14 @@ function CLR_f() { } if (ok) { var H = cont_frm(this.num,this.den); - var tmpvar0 = H.slice(2-1,5) - var A = tmpvar0[0] - var B = tmpvar0[1] - var C = tmpvar0[2] + var tmpvar0 = H.slice(2-1,5); + var A = tmpvar0[0]; + var B = tmpvar0[1]; + var C = tmpvar0[2]; var D = tmpvar0[3]; - graphics.exprs = exprs; - var tmpvar1 = size(A) - var ns1 = tmpvar1[0] + this.graphics.exprs = new ScilabDouble([exprs]); + var tmpvar1 = size(A); + var ns1 = tmpvar1[0]; var ns1 = tmpvar1[1]; var rpar = [[matrix(A,ns1*ns1,1)],[matrix(B,ns1,1)],[matrix(C,ns1,1)],[D]]; if (norm(D,1)!=0) { @@ -79,7 +79,7 @@ function CLR_f() { } this.model.state = new ScilabDouble(x0); this.model.rpar = new ScilabDouble(rpar); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/CLR_f.pickle b/js/Linear/CLR_f.pickle index a0c8eaad..26e70f19 100644 --- a/js/Linear/CLR_f.pickle +++ b/js/Linear/CLR_f.pickle @@ -10,8 +10,10 @@ aS'num' p4 aS'den' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/Linear/CLSS.js b/js/Linear/CLSS.js index 3c095238..1d417592 100644 --- a/js/Linear/CLSS.js +++ b/js/Linear/CLSS.js @@ -41,8 +41,8 @@ function CLSS() { this.D = parseFloat(arguments[0]["D"]) this.x0 = parseFloat(arguments[0]["x0"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; if (size(exprs,"*")==7) { var exprs = exprs[[1:4,7]-1]; } @@ -60,8 +60,8 @@ function CLSS() { if (in1==0) { var in1 = []; } - var tmpvar0 = size(this.A) - var ms = tmpvar0[0] + var tmpvar0 = size(this.A); + var ms = tmpvar0[0]; var ns = tmpvar0[1]; var okD = true; if (size(this.D,"*")!=size(this.C,1)*size(this.B,2)) { @@ -76,12 +76,12 @@ function CLSS() { if (ms!=ns||!okD) { message(_("Matrix A is not square or D has wrong dimension")); } else { - var tmpvar1 = check_io(this.model,graphics,in1,out,[],[]) - this.model = tmpvar1[0] - var graphics = tmpvar1[1] + var tmpvar1 = check_io(this.model,this.graphics,in1,out,[],[]); + this.model = tmpvar1[0]; + this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; if (this.D!=[]) { if (norm(this.D,1)!=0) { @@ -97,7 +97,7 @@ function CLSS() { } this.model.state = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble(rpar); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/CLSS.pickle b/js/Linear/CLSS.pickle index 321fe50f..fd7725aa 100644 --- a/js/Linear/CLSS.pickle +++ b/js/Linear/CLSS.pickle @@ -10,14 +10,16 @@ aS'B' p4 aS'D' p5 -aS'x' +aS'graphics' p6 -aS'model' +aS'x' p7 -aS'x0' +aS'model' p8 -atp9 -Rp10 +aS'x0' +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/Linear/CLSS_f.js b/js/Linear/CLSS_f.js index 09f6465f..de3fd53e 100644 --- a/js/Linear/CLSS_f.js +++ b/js/Linear/CLSS_f.js @@ -41,8 +41,8 @@ function CLSS_f() { this.D = parseFloat(arguments[0]["D"]) this.x0 = parseFloat(arguments[0]["x0"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; if (size(exprs,"*")==7) { var exprs = exprs[[1:4,7]-1]; } @@ -60,18 +60,18 @@ function CLSS_f() { if (in1==0) { var in1 = []; } - var tmpvar0 = size(this.A) - var ms = tmpvar0[0] + var tmpvar0 = size(this.A); + var ms = tmpvar0[0]; var ns = tmpvar0[1]; if (ms!=ns) { message("A matrix must be square"); } else { - var tmpvar1 = check_io(this.model,graphics,in1,out,[],[]) - this.model = tmpvar1[0] - var graphics = tmpvar1[1] + var tmpvar1 = check_io(this.model,this.graphics,in1,out,[],[]); + this.model = tmpvar1[0]; + this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; if (this.D!=[]) { if (norm(this.D,1)!=0) { @@ -87,7 +87,7 @@ function CLSS_f() { } this.model.state = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble(rpar); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/CLSS_f.pickle b/js/Linear/CLSS_f.pickle index 5800baa1..1746730e 100644 --- a/js/Linear/CLSS_f.pickle +++ b/js/Linear/CLSS_f.pickle @@ -10,14 +10,16 @@ aS'B' p4 aS'D' p5 -aS'x' +aS'graphics' p6 -aS'model' +aS'x' p7 -aS'x0' +aS'model' p8 -atp9 -Rp10 +aS'x0' +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/Linear/DELAYV_f.js b/js/Linear/DELAYV_f.js index 6e3ada84..fe839f0d 100644 --- a/js/Linear/DELAYV_f.js +++ b/js/Linear/DELAYV_f.js @@ -37,8 +37,8 @@ function DELAYV_f() { this.zz0 = inverse(arguments[0]["zz0"]) this.T = parseFloat(arguments[0]["T"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; this.nin = this.model.in1[1-1]; var z0 = this.model.dstate; @@ -58,16 +58,16 @@ function DELAYV_f() { var ok = false; } if (ok) { - var tmpvar0 = check_io(this.model,graphics,[[this.nin],[1]],this.nin,1,[[1],[1]]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = check_io(this.model,this.graphics,[[this.nin],[1]],this.nin,1,[[1],[1]]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.dstate = new ScilabDouble([this.zz0.slice()],[told]); this.model.rpar = new ScilabDouble([this.T/(size(this.zz0,"*"))]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/DELAYV_f.pickle b/js/Linear/DELAYV_f.pickle index caf0384e..b7b3bf9b 100644 --- a/js/Linear/DELAYV_f.pickle +++ b/js/Linear/DELAYV_f.pickle @@ -2,18 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'nin' p2 -aS'model' +aS'zz0' p3 -aS'nin' -p4 aS'T' +p4 +aS'graphics' p5 -aS'zz0' +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'model.dstate' p1 diff --git a/js/Linear/DIFF_c.js b/js/Linear/DIFF_c.js index 057264bf..8f18e1a8 100644 --- a/js/Linear/DIFF_c.js +++ b/js/Linear/DIFF_c.js @@ -28,8 +28,8 @@ function DIFF_c() { this.x0 = inverse(arguments[0]["x0"]) this.xd0 = inverse(arguments[0]["xd0"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { var ask_again = false; @@ -50,11 +50,11 @@ function DIFF_c() { var ask_again = true; } if (!ask_again) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.state = new ScilabDouble([this.x0],[this.xd0]); this.model.out = new ScilabDouble([N]); this.model.in1 = new ScilabDouble([N]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/DIFF_c.pickle b/js/Linear/DIFF_c.pickle index 6422fab4..89e4ed9e 100644 --- a/js/Linear/DIFF_c.pickle +++ b/js/Linear/DIFF_c.pickle @@ -6,12 +6,14 @@ S'x' p2 aS'model' p3 -aS'x0' -p4 aS'xd0' +p4 +aS'x0' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/Linear/DLR.js b/js/Linear/DLR.js index 2f686ae0..d28ee566 100644 --- a/js/Linear/DLR.js +++ b/js/Linear/DLR.js @@ -34,8 +34,8 @@ function DLR() { this.num = arguments[0]["num"] this.den = arguments[0]["den"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; var x0 = this.model.dstate; var ns = prod(size(x0)); @@ -52,14 +52,14 @@ function DLR() { } if (ok) { var H = cont_frm(this.num,this.den); - var tmpvar0 = H.slice(2-1,5) - var A = tmpvar0[0] - var B = tmpvar0[1] - var C = tmpvar0[2] + var tmpvar0 = H.slice(2-1,5); + var A = tmpvar0[0]; + var B = tmpvar0[1]; + var C = tmpvar0[2]; var D = tmpvar0[3]; - graphics.exprs = exprs; - var tmpvar1 = size(A) - var ns1 = tmpvar1[0] + this.graphics.exprs = new ScilabDouble([exprs]); + var tmpvar1 = size(A); + var ns1 = tmpvar1[0]; var ns1 = tmpvar1[1]; if (ns1<=ns) { var x0 = x0.slice(1-1,ns1); @@ -77,7 +77,7 @@ function DLR() { if (or(this.model.dep_ut!=mmm)) { this.model.dep_ut = new ScilabDouble(mmm); } - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/DLR.pickle b/js/Linear/DLR.pickle index 8a5f2aa6..fb9f58b1 100644 --- a/js/Linear/DLR.pickle +++ b/js/Linear/DLR.pickle @@ -10,8 +10,10 @@ aS'num' p4 aS'den' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/Linear/DLR_f.js b/js/Linear/DLR_f.js index f2702d0e..07b4f8c7 100644 --- a/js/Linear/DLR_f.js +++ b/js/Linear/DLR_f.js @@ -34,8 +34,8 @@ function DLR_f() { this.num = arguments[0]["num"] this.den = arguments[0]["den"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; var x0 = this.model.dstate; var ns = prod(size(x0)); @@ -52,14 +52,14 @@ function DLR_f() { } if (ok) { var H = cont_frm(this.num,this.den); - var tmpvar0 = H.slice(2-1,5) - var A = tmpvar0[0] - var B = tmpvar0[1] - var C = tmpvar0[2] + var tmpvar0 = H.slice(2-1,5); + var A = tmpvar0[0]; + var B = tmpvar0[1]; + var C = tmpvar0[2]; var D = tmpvar0[3]; - graphics.exprs = exprs; - var tmpvar1 = size(A) - var ns1 = tmpvar1[0] + this.graphics.exprs = new ScilabDouble([exprs]); + var tmpvar1 = size(A); + var ns1 = tmpvar1[0]; var ns1 = tmpvar1[1]; if (ns1<=ns) { var x0 = x0.slice(1-1,ns1); @@ -77,7 +77,7 @@ function DLR_f() { if (or(this.model.dep_ut!=mmm)) { this.model.dep_ut = new ScilabDouble(mmm); } - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/DLR_f.pickle b/js/Linear/DLR_f.pickle index 44d413c7..78175358 100644 --- a/js/Linear/DLR_f.pickle +++ b/js/Linear/DLR_f.pickle @@ -10,8 +10,10 @@ aS'num' p4 aS'den' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/Linear/DLSS.js b/js/Linear/DLSS.js index eb201209..c3145a36 100644 --- a/js/Linear/DLSS.js +++ b/js/Linear/DLSS.js @@ -40,8 +40,8 @@ function DLSS() { this.D = parseFloat(arguments[0]["D"]) this.x0 = parseFloat(arguments[0]["x0"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; if (size(exprs,"*")==7) { var exprs = exprs[[1:4,7]-1]; } @@ -59,8 +59,8 @@ function DLSS() { if (in1==0) { var in1 = []; } - var tmpvar0 = size(this.A) - var ms = tmpvar0[0] + var tmpvar0 = size(this.A); + var ms = tmpvar0[0]; var ns = tmpvar0[1]; var okD = true; if (size(this.D,"*")!=size(this.C,1)*size(this.B,2)) { @@ -75,12 +75,12 @@ function DLSS() { if (ms!=ns||!okD) { message(_("Matrix A is not square or D has wrong dimension")); } else { - var tmpvar1 = check_io(this.model,graphics,in1,out,1,[]) - this.model = tmpvar1[0] - var graphics = tmpvar1[1] + var tmpvar1 = check_io(this.model,this.graphics,in1,out,1,[]); + this.model = tmpvar1[0]; + this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; if (this.D!=[]) { if (norm(this.D,1)!=0) { @@ -96,7 +96,7 @@ function DLSS() { } this.model.dstate = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble(rpar); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/DLSS.pickle b/js/Linear/DLSS.pickle index 2dfb7e72..00de4180 100644 --- a/js/Linear/DLSS.pickle +++ b/js/Linear/DLSS.pickle @@ -10,14 +10,16 @@ aS'B' p4 aS'D' p5 -aS'x' +aS'graphics' p6 -aS'model' +aS'x' p7 -aS'x0' +aS'model' p8 -atp9 -Rp10 +aS'x0' +p9 +atp10 +Rp11 .(dp0 S'model.dstate' p1 diff --git a/js/Linear/DLSS_f.js b/js/Linear/DLSS_f.js index 84024be5..6842290e 100644 --- a/js/Linear/DLSS_f.js +++ b/js/Linear/DLSS_f.js @@ -40,8 +40,8 @@ function DLSS_f() { this.D = parseFloat(arguments[0]["D"]) this.x0 = parseFloat(arguments[0]["x0"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; if (size(exprs,"*")==7) { var exprs = exprs[[1:4,7]-1]; } @@ -59,18 +59,18 @@ function DLSS_f() { if (in1==0) { var in1 = []; } - var tmpvar0 = size(this.A) - var ms = tmpvar0[0] + var tmpvar0 = size(this.A); + var ms = tmpvar0[0]; var ns = tmpvar0[1]; if (ms!=ns) { message("A matrix must be square"); } else { - var tmpvar1 = check_io(this.model,graphics,in1,out,1,[]) - this.model = tmpvar1[0] - var graphics = tmpvar1[1] + var tmpvar1 = check_io(this.model,this.graphics,in1,out,1,[]); + this.model = tmpvar1[0]; + this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; if (this.D!=[]) { if (norm(this.D,1)!=0) { @@ -86,7 +86,7 @@ function DLSS_f() { } this.model.dstate = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble(rpar); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/DLSS_f.pickle b/js/Linear/DLSS_f.pickle index c8c627de..d32ef081 100644 --- a/js/Linear/DLSS_f.pickle +++ b/js/Linear/DLSS_f.pickle @@ -10,14 +10,16 @@ aS'B' p4 aS'D' p5 -aS'x' +aS'graphics' p6 -aS'model' +aS'x' p7 -aS'x0' +aS'model' p8 -atp9 -Rp10 +aS'x0' +p9 +atp10 +Rp11 .(dp0 S'model.dstate' p1 diff --git a/js/Linear/DOLLAR.js b/js/Linear/DOLLAR.js index 15ecd057..4d0a382c 100644 --- a/js/Linear/DOLLAR.js +++ b/js/Linear/DOLLAR.js @@ -31,8 +31,8 @@ function DOLLAR() { this.a = arguments[0]["a"] this.inh = parseFloat(arguments[0]["inh"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; if (size(exprs,"*")<2) { exprs[2-1] = "0"; @@ -86,14 +86,14 @@ function DOLLAR() { var ok = false; } if (ok) { - var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),ones(1-this.inh,1),[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),ones(1-this.inh,1),[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/DOLLAR.pickle b/js/Linear/DOLLAR.pickle index 032d6ef5..3b29c2b1 100644 --- a/js/Linear/DOLLAR.pickle +++ b/js/Linear/DOLLAR.pickle @@ -4,16 +4,18 @@ p0 ((lp1 S'a' p2 -aS'x' +aS'inh' p3 -aS'model' +aS'graphics' p4 -aS'inh' +aS'x' p5 -aS'type' +aS'model' p6 -atp7 -Rp8 +aS'type' +p7 +atp8 +Rp9 .(dp0 S'model.odstate' p1 diff --git a/js/Linear/DOLLAR_f.js b/js/Linear/DOLLAR_f.js index bdc2ea92..e9ef5da5 100644 --- a/js/Linear/DOLLAR_f.js +++ b/js/Linear/DOLLAR_f.js @@ -31,8 +31,8 @@ function DOLLAR_f() { this.a = arguments[0]["a"] this.inh = parseFloat(arguments[0]["inh"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; if (size(exprs,"*")<2) { exprs[2-1] = "0"; @@ -48,17 +48,17 @@ function DOLLAR_f() { } var in1 = out; if (ok) { - var tmpvar0 = check_io(this.model,graphics,-1,-1,ones(1-this.inh,1),[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = check_io(this.model,this.graphics,-1,-1,ones(1-this.inh,1),[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.dstate = new ScilabDouble([this.a]); this.model.in1 = new ScilabDouble(in1); this.model.out = new ScilabDouble(out); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/DOLLAR_f.pickle b/js/Linear/DOLLAR_f.pickle index 3693edac..2d4dde29 100644 --- a/js/Linear/DOLLAR_f.pickle +++ b/js/Linear/DOLLAR_f.pickle @@ -10,8 +10,10 @@ aS'model' p4 aS'inh' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/Linear/DOLLAR_m.js b/js/Linear/DOLLAR_m.js index 34d93154..fa02bcf1 100644 --- a/js/Linear/DOLLAR_m.js +++ b/js/Linear/DOLLAR_m.js @@ -31,8 +31,8 @@ function DOLLAR_m() { this.a = arguments[0]["a"] this.inh = parseFloat(arguments[0]["inh"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; if (size(exprs,"*")<2) { exprs[2-1] = "0"; @@ -86,14 +86,14 @@ function DOLLAR_m() { var ok = false; } if (ok) { - var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),ones(1-this.inh,1),[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),ones(1-this.inh,1),[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/DOLLAR_m.pickle b/js/Linear/DOLLAR_m.pickle index 032d6ef5..3b29c2b1 100644 --- a/js/Linear/DOLLAR_m.pickle +++ b/js/Linear/DOLLAR_m.pickle @@ -4,16 +4,18 @@ p0 ((lp1 S'a' p2 -aS'x' +aS'inh' p3 -aS'model' +aS'graphics' p4 -aS'inh' +aS'x' p5 -aS'type' +aS'model' p6 -atp7 -Rp8 +aS'type' +p7 +atp8 +Rp9 .(dp0 S'model.odstate' p1 diff --git a/js/Linear/GAINBLK.js b/js/Linear/GAINBLK.js index e84f60ef..3cdb1087 100644 --- a/js/Linear/GAINBLK.js +++ b/js/Linear/GAINBLK.js @@ -34,8 +34,8 @@ function GAINBLK() { this.gain = parseFloat(arguments[0]["gain"]) this.over = arguments[0]["over"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; if (size(exprs,"*")==1) { var exprs = [[exprs],[sci2exp(0)]]; @@ -137,24 +137,24 @@ function GAINBLK() { this.model.opar = list(this.gain.slice()); } if (ok) { - var tmpvar0 = size(this.gain) - var out = tmpvar0[0] + var tmpvar0 = size(this.gain); + var out = tmpvar0[0]; var in1 = tmpvar0[1]; if (out*in1!=1) { - var tmpvar1 = set_io(this.model,graphics,list([in1,-1],ot),list([out,-1],ot),[],[]) - this.model = tmpvar1[0] - var graphics = tmpvar1[1] + var tmpvar1 = set_io(this.model,this.graphics,list([in1,-1],ot),list([out,-1],ot),[],[]); + this.model = tmpvar1[0]; + this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; } else { - var tmpvar2 = set_io(this.model,graphics,list([-1,-2],ot),list([-1,-2],ot),[],[]) - this.model = tmpvar2[0] - var graphics = tmpvar2[1] + var tmpvar2 = set_io(this.model,this.graphics,list([-1,-2],ot),list([-1,-2],ot),[],[]); + this.model = tmpvar2[0]; + this.graphics = tmpvar2[1]; var ok = tmpvar2[2]; } } if (ok) { - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble(exprs); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/GAINBLK.pickle b/js/Linear/GAINBLK.pickle index 4d9f0cbf..f102ec25 100644 --- a/js/Linear/GAINBLK.pickle +++ b/js/Linear/GAINBLK.pickle @@ -10,8 +10,10 @@ aS'over' p4 aS'gain' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/Linear/GAINBLK_f.js b/js/Linear/GAINBLK_f.js index 614fc461..a2525140 100644 --- a/js/Linear/GAINBLK_f.js +++ b/js/Linear/GAINBLK_f.js @@ -28,8 +28,8 @@ function GAINBLK_f() { GAINBLK_f.prototype.set = function GAINBLK_f() { this.gain = parseFloat(arguments[0]["gain"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.gain,exprs] = scicos_getvalue("Set gain block parameters",["Gain"],list("mat",[-1,-1]),exprs[1-1]); @@ -39,17 +39,17 @@ function GAINBLK_f() { if (this.gain==[]) { message("Gain must have at least one element"); } else { - var tmpvar0 = size(this.gain) - var out = tmpvar0[0] + var tmpvar0 = size(this.gain); + var out = tmpvar0[0]; var in1 = tmpvar0[1]; - var tmpvar1 = check_io(this.model,graphics,in1,out,[],[]) - this.model = tmpvar1[0] - var graphics = tmpvar1[1] + var tmpvar1 = check_io(this.model,this.graphics,in1,out,[],[]); + this.model = tmpvar1[0]; + this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble(this.gain.slice()); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/GAINBLK_f.pickle b/js/Linear/GAINBLK_f.pickle index c9ead743..093ec5d1 100644 --- a/js/Linear/GAINBLK_f.pickle +++ b/js/Linear/GAINBLK_f.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'gain' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Linear/GAIN_f.js b/js/Linear/GAIN_f.js index 25b99662..d6f8880f 100644 --- a/js/Linear/GAIN_f.js +++ b/js/Linear/GAIN_f.js @@ -28,8 +28,8 @@ function GAIN_f() { GAIN_f.prototype.set = function GAIN_f() { this.gain = parseFloat(arguments[0]["gain"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.gain,exprs] = scicos_getvalue("Set gain block parameters",["Gain"],list("mat",[-1,-1]),exprs[1-1]); @@ -39,17 +39,17 @@ function GAIN_f() { if (this.gain==[]) { message("Gain must have at least one element"); } else { - var tmpvar0 = size(this.gain) - var out = tmpvar0[0] + var tmpvar0 = size(this.gain); + var out = tmpvar0[0]; var in1 = tmpvar0[1]; - var tmpvar1 = check_io(this.model,graphics,in1,out,[],[]) - this.model = tmpvar1[0] - var graphics = tmpvar1[1] + var tmpvar1 = check_io(this.model,this.graphics,in1,out,[],[]); + this.model = tmpvar1[0]; + this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble(this.gain.slice()); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/GAIN_f.pickle b/js/Linear/GAIN_f.pickle index e204ca44..f5ef8591 100644 --- a/js/Linear/GAIN_f.pickle +++ b/js/Linear/GAIN_f.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'gain' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Linear/INTEGRAL.js b/js/Linear/INTEGRAL.js index 9fc1fc16..177029f6 100644 --- a/js/Linear/INTEGRAL.js +++ b/js/Linear/INTEGRAL.js @@ -38,8 +38,8 @@ function INTEGRAL() { this.maxp = parseFloat(arguments[0]["maxp"]) this.lowp = arguments[0]["lowp"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.x0,this.reinit,this.satur,this.maxp,this.lowp,exprs] = scicos_getvalue("Set Integral block parameters",["Initial Condition","With re-intialization (1:yes, 0:no)","With saturation (1:yes, 0:no)","Upper limit","Lower limit"],list("vec",-1,"vec",1,"vec",1,"vec",-1,"vec",-1),exprs); @@ -82,14 +82,14 @@ function INTEGRAL() { if (ok) { this.model.rpar = new ScilabDouble(rpar); this.model.state = new ScilabDouble(this.x0); - var tmpvar0 = check_io(this.model,graphics,size(this.x0,1)*[[1],[ones(this.reinit,1)]],size(this.x0,1),ones(this.reinit,1),[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = check_io(this.model,this.graphics,size(this.x0,1)*[[1],[ones(this.reinit,1)]],size(this.x0,1),ones(this.reinit,1),[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/INTEGRAL.pickle b/js/Linear/INTEGRAL.pickle index 7fadba67..715932be 100644 --- a/js/Linear/INTEGRAL.pickle +++ b/js/Linear/INTEGRAL.pickle @@ -10,14 +10,16 @@ aS'satur' p4 aS'lowp' p5 -aS'x' +aS'graphics' p6 -aS'model' +aS'x' p7 -aS'x0' +aS'model' p8 -atp9 -Rp10 +aS'x0' +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/Linear/INTEGRAL_f.js b/js/Linear/INTEGRAL_f.js index 5c4b7197..4c0836d1 100644 --- a/js/Linear/INTEGRAL_f.js +++ b/js/Linear/INTEGRAL_f.js @@ -25,17 +25,17 @@ function INTEGRAL_f() { INTEGRAL_f.prototype.set = function INTEGRAL_f() { this.x0 = parseFloat(arguments[0]["x0"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.x0,exprs] = scicos_getvalue("Set continuous linear system parameters","Initial state",list("vec",1),exprs); if (!ok) { break; } - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.state = new ScilabDouble([this.x0]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/INTEGRAL_f.pickle b/js/Linear/INTEGRAL_f.pickle index 6112b9f9..9f391ce4 100644 --- a/js/Linear/INTEGRAL_f.pickle +++ b/js/Linear/INTEGRAL_f.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'x0' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Linear/INTEGRAL_m.js b/js/Linear/INTEGRAL_m.js index 75ed7a6f..2cc71ad9 100644 --- a/js/Linear/INTEGRAL_m.js +++ b/js/Linear/INTEGRAL_m.js @@ -39,8 +39,8 @@ function INTEGRAL_m() { this.maxp = parseFloat(arguments[0]["maxp"]) this.lowp = parseFloat(arguments[0]["lowp"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.x0,this.reinit,this.satur,this.maxp,this.lowp,exprs] = scicos_getvalue("Set Integral block parameters",["Initial Condition","With re-intialization (1:yes, 0:no)","With saturation (1:yes, 0:no)","Upper limit","Lower limit"],list("mat",[-1,-1],"vec",1,"vec",1,"mat",[-1,-1],"mat",[-1,-1]),exprs); @@ -124,15 +124,15 @@ function INTEGRAL_m() { if (ok) { var in1 = [size(this.x0,1)*[[1],[ones(this.reinit,1)]],size(this.x0,2)*[[1],[ones(this.reinit,1)]]]; var out = size(this.x0); - var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),ones(this.reinit,1),[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,it),list(out,ot),ones(this.reinit,1),[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } } if (ok) { - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/INTEGRAL_m.pickle b/js/Linear/INTEGRAL_m.pickle index 7538823d..70608a46 100644 --- a/js/Linear/INTEGRAL_m.pickle +++ b/js/Linear/INTEGRAL_m.pickle @@ -10,14 +10,16 @@ aS'satur' p4 aS'lowp' p5 -aS'x' +aS'graphics' p6 -aS'model' +aS'x' p7 -aS'x0' +aS'model' p8 -atp9 -Rp10 +aS'x0' +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/Linear/REGISTER.js b/js/Linear/REGISTER.js index 54f732f1..0a5a8d40 100644 --- a/js/Linear/REGISTER.js +++ b/js/Linear/REGISTER.js @@ -29,8 +29,8 @@ function REGISTER() { this.z0 = parseFloat(arguments[0]["z0"]) this.it = arguments[0]["it"] this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; if (size(exprs,1)==1) { var exprs = [[exprs],[sci2exp(1)]]; @@ -77,14 +77,14 @@ function REGISTER() { } if (ok) { var in1 = [1,1]; - var tmpvar0 = set_io(this.model,graphics,list(in1,this.it),list(in1,this.it),1,[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,this.it),list(in1,this.it),1,[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble(exprs); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/REGISTER.pickle b/js/Linear/REGISTER.pickle index 7d82ed1e..2798b374 100644 --- a/js/Linear/REGISTER.pickle +++ b/js/Linear/REGISTER.pickle @@ -10,8 +10,10 @@ aS'z0' p4 aS'it' p5 -atp6 -Rp7 +aS'graphics' +p6 +atp7 +Rp8 .(dp0 S'model.odstate' p1 diff --git a/js/Linear/REGISTER_f.js b/js/Linear/REGISTER_f.js index da798aa3..e0e94fb4 100644 --- a/js/Linear/REGISTER_f.js +++ b/js/Linear/REGISTER_f.js @@ -26,8 +26,8 @@ function REGISTER_f() { REGISTER_f.prototype.set = function REGISTER_f() { this.z0 = parseFloat(arguments[0]["z0"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.z0,exprs] = scicos_getvalue("Set delay parameters","Register initial condition",list("vec",-1),exprs); @@ -39,9 +39,9 @@ function REGISTER_f() { var ok = false; } if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.dstate = new ScilabDouble([this.z0]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/REGISTER_f.pickle b/js/Linear/REGISTER_f.pickle index 961e104f..f2f06042 100644 --- a/js/Linear/REGISTER_f.pickle +++ b/js/Linear/REGISTER_f.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'z0' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/Linear/SAMPHOLD_m.js b/js/Linear/SAMPHOLD_m.js index 7d183a79..1dc31704 100644 --- a/js/Linear/SAMPHOLD_m.js +++ b/js/Linear/SAMPHOLD_m.js @@ -30,8 +30,8 @@ function SAMPHOLD_m() { this.it = arguments[0]["it"] this.x = arg1; this.x.model.firing = []; - var graphics = arg1.graphics; - var label = graphics.exprs; + this.graphics = arg1.graphics; + var label = this.graphics.exprs; this.model = arg1.model; while (true) { [ok,this.it,exprs] = scicos_getvalue("Set parameters Block",["Datatype(1=real double 2=Complex 3=int32 ...)"],list("vec",1),label); @@ -44,13 +44,13 @@ function SAMPHOLD_m() { } if (ok) { var in1 = [this.model.in1,this.model.in2]; - var tmpvar0 = set_io(this.model,graphics,list(in1,this.it),list(in1,this.it),1,[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list(in1,this.it),list(in1,this.it),1,[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { - graphics.exprs = exprs; - arg1.graphics = graphics; + this.graphics.exprs = new ScilabDouble([exprs]); + arg1.graphics = this.graphics; arg1.model = this.model; this.x = arg1; break; diff --git a/js/Linear/SAMPHOLD_m.pickle b/js/Linear/SAMPHOLD_m.pickle index c7f11ba6..3b628187 100644 --- a/js/Linear/SAMPHOLD_m.pickle +++ b/js/Linear/SAMPHOLD_m.pickle @@ -8,8 +8,10 @@ aS'model' p3 aS'it' p4 -atp5 -Rp6 +aS'graphics' +p5 +atp6 +Rp7 .(dp0 S'arg1' p1 diff --git a/js/Linear/SOM_f.js b/js/Linear/SOM_f.js index d7450565..2cd2b7bf 100644 --- a/js/Linear/SOM_f.js +++ b/js/Linear/SOM_f.js @@ -24,16 +24,16 @@ function SOM_f() { } SOM_f.prototype.set = function SOM_f() { this.x = arg1; - var graphics = arg1.graphics; + this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = graphics.exprs; + var exprs = this.graphics.exprs; if (size(exprs,"*")==2) { var exprs = exprs[2-1]; } if (size(exprs,"*")!=3) { var exprs = string(this.model.rpar); } - if (graphics.flip) { + if (this.graphics.flip) { var labs = ["down","left","up"]; } else { var labs = ["down","right","up"]; diff --git a/js/Linear/SOM_f.pickle b/js/Linear/SOM_f.pickle index 4663fc19..4b1a3d37 100644 --- a/js/Linear/SOM_f.pickle +++ b/js/Linear/SOM_f.pickle @@ -6,8 +6,10 @@ S'x' p2 aS'model' p3 -atp4 -Rp5 +aS'graphics' +p4 +atp5 +Rp6 .(dp0 S'model.sim' p1 diff --git a/js/Linear/SUMMATION.js b/js/Linear/SUMMATION.js index 96182040..4f8390c6 100644 --- a/js/Linear/SUMMATION.js +++ b/js/Linear/SUMMATION.js @@ -32,9 +32,9 @@ function SUMMATION() { this.sgn = inverse(arguments[0]["sgn"]) this.satur = arguments[0]["satur"] this.x = arg1; - var graphics = arg1.graphics; + this.graphics = arg1.graphics; this.model = arg1.model; - var exprs = graphics.exprs; + var exprs = this.graphics.exprs; if (size(exprs,1)==1) { var exprs = [[sci2exp(1)],[exprs],[sci2exp(0)]]; } else if (size(exprs,1)==2) { @@ -133,16 +133,16 @@ function SUMMATION() { } } if (ok) { - var tmpvar0 = set_io(this.model,graphics,list([in1,in2],it),list([nout,nout2],ot),[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = set_io(this.model,this.graphics,list([in1,in2],it),list([nout,nout2],ot),[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { this.model.rpar = new ScilabDouble([this.satur]); this.model.ipar = new ScilabDouble([this.sgn]); - graphics.exprs = exprs; - this.x.graphics = graphics; + this.graphics.exprs = new ScilabDouble(exprs); + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/SUMMATION.pickle b/js/Linear/SUMMATION.pickle index 9645ce38..a06d452b 100644 --- a/js/Linear/SUMMATION.pickle +++ b/js/Linear/SUMMATION.pickle @@ -4,16 +4,18 @@ p0 ((lp1 S'Datatype' p2 -aS'x' +aS'graphics' p3 -aS'model' -p4 aS'satur' -p5 +p4 aS'sgn' +p5 +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/Linear/TCLSS.js b/js/Linear/TCLSS.js index 552810c5..980ca35b 100644 --- a/js/Linear/TCLSS.js +++ b/js/Linear/TCLSS.js @@ -43,8 +43,8 @@ function TCLSS() { this.D = parseFloat(arguments[0]["D"]) this.x0 = parseFloat(arguments[0]["x0"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; if (size(exprs,"*")==7) { var exprs = exprs[[1:4,7]-1]; @@ -62,18 +62,18 @@ function TCLSS() { if (in1==0) { var in1 = []; } - var tmpvar0 = size(this.A) - var ms = tmpvar0[0] + var tmpvar0 = size(this.A); + var ms = tmpvar0[0]; var ns = tmpvar0[1]; if (ms!=ns) { message("A matrix must be square"); } else { - var tmpvar1 = check_io(this.model,graphics,[[in1],[ms]],out,1,[]) - this.model = tmpvar1[0] - var graphics = tmpvar1[1] + var tmpvar1 = check_io(this.model,this.graphics,[[in1],[ms]],out,1,[]); + this.model = tmpvar1[0]; + this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; if (this.D!=[]) { if (norm(this.D,1)!=0) { @@ -94,7 +94,7 @@ function TCLSS() { } else { this.model.sim = list(new ScilabString(["tcsltj4"]), new ScilabDouble([4])); } - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/TCLSS.pickle b/js/Linear/TCLSS.pickle index 24d42f9f..bea58fef 100644 --- a/js/Linear/TCLSS.pickle +++ b/js/Linear/TCLSS.pickle @@ -10,14 +10,16 @@ aS'B' p4 aS'D' p5 -aS'x' +aS'graphics' p6 -aS'model' +aS'x' p7 -aS'x0' +aS'model' p8 -atp9 -Rp10 +aS'x0' +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/Linear/TCLSS_f.js b/js/Linear/TCLSS_f.js index da69f8aa..fbed9355 100644 --- a/js/Linear/TCLSS_f.js +++ b/js/Linear/TCLSS_f.js @@ -43,8 +43,8 @@ function TCLSS_f() { this.D = parseFloat(arguments[0]["D"]) this.x0 = parseFloat(arguments[0]["x0"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; if (size(exprs,"*")==7) { var exprs = exprs[[1:4,7]-1]; @@ -62,18 +62,18 @@ function TCLSS_f() { if (in1==0) { var in1 = []; } - var tmpvar0 = size(this.A) - var ms = tmpvar0[0] + var tmpvar0 = size(this.A); + var ms = tmpvar0[0]; var ns = tmpvar0[1]; if (ms!=ns) { message("A matrix must be square"); } else { - var tmpvar1 = check_io(this.model,graphics,[[in1],[ms]],out,1,[]) - this.model = tmpvar1[0] - var graphics = tmpvar1[1] + var tmpvar1 = check_io(this.model,this.graphics,[[in1],[ms]],out,1,[]); + this.model = tmpvar1[0]; + this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); var rpar = [[this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]]; if (this.D!=[]) { if (norm(this.D,1)!=0) { @@ -94,7 +94,7 @@ function TCLSS_f() { } else { this.model.sim = list(new ScilabString(["tcsltj"]), new ScilabDouble([1])); } - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/TCLSS_f.pickle b/js/Linear/TCLSS_f.pickle index 24d42f9f..bea58fef 100644 --- a/js/Linear/TCLSS_f.pickle +++ b/js/Linear/TCLSS_f.pickle @@ -10,14 +10,16 @@ aS'B' p4 aS'D' p5 -aS'x' +aS'graphics' p6 -aS'model' +aS'x' p7 -aS'x0' +aS'model' p8 -atp9 -Rp10 +aS'x0' +p9 +atp10 +Rp11 .(dp0 S'arg1' p1 diff --git a/js/Linear/TIME_DELAY.js b/js/Linear/TIME_DELAY.js index a4cee6f2..157612ae 100644 --- a/js/Linear/TIME_DELAY.js +++ b/js/Linear/TIME_DELAY.js @@ -34,8 +34,8 @@ function TIME_DELAY() { this.init = parseFloat(arguments[0]["init"]) this.N = parseFloat(arguments[0]["N"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; var nin = this.model.in1[1-1]; while (true) { @@ -52,17 +52,17 @@ function TIME_DELAY() { var ok = false; } if (ok) { - var tmpvar0 = check_io(this.model,graphics,[-1],-1,[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = check_io(this.model,this.graphics,[-1],-1,[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble([this.T],[this.init]); this.model.ipar = new ScilabDouble([this.N]); this.model.dep_ut = new ScilabDouble([false,true]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/TIME_DELAY.pickle b/js/Linear/TIME_DELAY.pickle index b4c2bf5b..6c948019 100644 --- a/js/Linear/TIME_DELAY.pickle +++ b/js/Linear/TIME_DELAY.pickle @@ -2,18 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'N' p2 -aS'model' -p3 aS'init' -p4 +p3 aS'T' +p4 +aS'graphics' p5 -aS'N' +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 diff --git a/js/Linear/VARIABLE_DELAY.js b/js/Linear/VARIABLE_DELAY.js index ef78520f..35b7cff9 100644 --- a/js/Linear/VARIABLE_DELAY.js +++ b/js/Linear/VARIABLE_DELAY.js @@ -34,8 +34,8 @@ function VARIABLE_DELAY() { this.init = parseFloat(arguments[0]["init"]) this.N = parseFloat(arguments[0]["N"]) this.x = arg1; - var graphics = arg1.graphics; - var exprs = graphics.exprs; + this.graphics = arg1.graphics; + var exprs = this.graphics.exprs; this.model = arg1.model; var nin = this.model.in1[1-1]; while (true) { @@ -52,16 +52,16 @@ function VARIABLE_DELAY() { var ok = false; } if (ok) { - var tmpvar0 = check_io(this.model,graphics,[[-1],[1]],-1,[],[]) - this.model = tmpvar0[0] - var graphics = tmpvar0[1] + var tmpvar0 = check_io(this.model,this.graphics,[[-1],[1]],-1,[],[]); + this.model = tmpvar0[0]; + this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { - graphics.exprs = exprs; + this.graphics.exprs = new ScilabDouble([exprs]); this.model.rpar = new ScilabDouble([this.T],[this.init]); this.model.ipar = new ScilabDouble([this.N]); - this.x.graphics = graphics; + this.x.graphics = this.graphics; this.x.model = this.model; break; } diff --git a/js/Linear/VARIABLE_DELAY.pickle b/js/Linear/VARIABLE_DELAY.pickle index 7f7ec489..8960040c 100644 --- a/js/Linear/VARIABLE_DELAY.pickle +++ b/js/Linear/VARIABLE_DELAY.pickle @@ -2,18 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'N' p2 -aS'model' -p3 aS'init' -p4 +p3 aS'T' +p4 +aS'graphics' p5 -aS'N' +aS'x' p6 -atp7 -Rp8 +aS'model' +p7 +atp8 +Rp9 .(dp0 S'arg1' p1 |