diff options
Diffstat (limited to 'js/NonLinear')
55 files changed, 442 insertions, 386 deletions
diff --git a/js/NonLinear/ABSBLK_f.js b/js/NonLinear/ABSBLK_f.js index 058d4895..3d5ab9ed 100644 --- a/js/NonLinear/ABSBLK_f.js +++ b/js/NonLinear/ABSBLK_f.js @@ -1,14 +1,14 @@ /* autogenerated from "macros/NonLinear/ABSBLK_f.sci" */ function ABSBLK_f() { ABSBLK_f.prototype.define = function ABSBLK_f() { - model = scicos_model(); - model.sim = list("absblk",1); - model.in1 = -1; - model.out = -1; - model.blocktype = "c"; - model.dep_ut = [true,false]; + this.model = scicos_model(); + this.model.sim = list("absblk",1); + this.model.in1 = new ScilabDouble(-1); + this.model.out = new ScilabDouble(-1); + this.model.blocktype = new ScilabString("c"); + this.model.dep_ut = [true,false]; gr_i = []; - this.x = standard_define([2,2],model,[],gr_i); + this.x = standard_define([2,2],this.model,[],gr_i); return new BasicBlock(this.x); } ABSBLK_f.prototype.details = function ABSBLK_f() { diff --git a/js/NonLinear/ABSBLK_f.pickle b/js/NonLinear/ABSBLK_f.pickle index 857864e5..0f2abe38 100644 --- a/js/NonLinear/ABSBLK_f.pickle +++ b/js/NonLinear/ABSBLK_f.pickle @@ -4,8 +4,10 @@ p0 ((lp1 S'x' p2 -atp3 -Rp4 +aS'model' +p3 +atp4 +Rp5 .(dp0 S'model.sim' p1 diff --git a/js/NonLinear/ABS_VALUE.js b/js/NonLinear/ABS_VALUE.js index 1d2e63c2..fa386164 100644 --- a/js/NonLinear/ABS_VALUE.js +++ b/js/NonLinear/ABS_VALUE.js @@ -2,17 +2,17 @@ function ABS_VALUE() { ABS_VALUE.prototype.define = function ABS_VALUE() { nu = -1; - model = scicos_model(); - model.sim = list("absolute_value",4); - model.in1 = nu; - model.out = nu; - model.nzcross = nu; - model.nmode = nu; - model.blocktype = "c"; - model.dep_ut = [true,false]; + this.model = scicos_model(); + this.model.sim = list("absolute_value",4); + this.model.in1 = new ScilabDouble(nu); + this.model.out = new ScilabDouble(nu); + this.model.nzcross = new ScilabDouble(nu); + this.model.nmode = new ScilabDouble(nu); + this.model.blocktype = new ScilabString("c"); + this.model.dep_ut = [true,false]; exprs = [string([1])]; gr_i = []; - this.x = standard_define([2,2],model,exprs,gr_i); + this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } ABS_VALUE.prototype.details = function ABS_VALUE() { @@ -29,7 +29,7 @@ function ABS_VALUE() { this.x = arg1; graphics = arg1.graphics; exprs = graphics.exprs; - model = arg1.model; + this.model = arg1.model; while (true) { [ok,this.zcr,exprs] = scicos_getvalue("Set block parameters",["use zero_crossing (1: yes) (0:no)"],list("vec",1),exprs); if (!ok) { @@ -38,14 +38,14 @@ function ABS_VALUE() { graphics.exprs = exprs; if (ok) { if (this.zcr!=0) { - model.nmode = -1; - model.nzcross = -1; + this.model.nmode = new ScilabDouble(-1); + this.model.nzcross = new ScilabDouble(-1); } else { - model.nmode = 0; - model.nzcross = 0; + this.model.nmode = new ScilabDouble(0); + this.model.nzcross = new ScilabDouble(0); } this.x.graphics = graphics; - this.x.model = model; + this.x.model = this.model; break; } } diff --git a/js/NonLinear/ABS_VALUE.pickle b/js/NonLinear/ABS_VALUE.pickle index 835aded5..083f7a74 100644 --- a/js/NonLinear/ABS_VALUE.pickle +++ b/js/NonLinear/ABS_VALUE.pickle @@ -4,10 +4,12 @@ p0 ((lp1 S'x' p2 -aS'zcr' +aS'model' p3 -atp4 -Rp5 +aS'zcr' +p4 +atp5 +Rp6 .(dp0 S'model.sim' p1 diff --git a/js/NonLinear/COSBLK_f.js b/js/NonLinear/COSBLK_f.js index 0b510327..0ef60f6e 100644 --- a/js/NonLinear/COSBLK_f.js +++ b/js/NonLinear/COSBLK_f.js @@ -2,14 +2,14 @@ function COSBLK_f() { COSBLK_f.prototype.define = function COSBLK_f() { in1 = 1; - model = scicos_model(); - model.sim = "cosblk"; - model.in1 = -1; - model.out = -1; - model.blocktype = "c"; - model.dep_ut = [true,false]; + this.model = scicos_model(); + this.model.sim = new ScilabString("cosblk"); + this.model.in1 = new ScilabDouble(-1); + this.model.out = new ScilabDouble(-1); + this.model.blocktype = new ScilabString("c"); + this.model.dep_ut = [true,false]; gr_i = []; - this.x = standard_define([2,2],model,[],gr_i); + this.x = standard_define([2,2],this.model,[],gr_i); return new BasicBlock(this.x); } COSBLK_f.prototype.details = function COSBLK_f() { diff --git a/js/NonLinear/COSBLK_f.pickle b/js/NonLinear/COSBLK_f.pickle index 4250eb27..84c2e7e0 100644 --- a/js/NonLinear/COSBLK_f.pickle +++ b/js/NonLinear/COSBLK_f.pickle @@ -4,8 +4,10 @@ p0 ((lp1 S'x' p2 -atp3 -Rp4 +aS'model' +p3 +atp4 +Rp5 .(dp0 S'model.sim' p1 diff --git a/js/NonLinear/DLRADAPT_f.js b/js/NonLinear/DLRADAPT_f.js index c04d1814..6a39a40b 100644 --- a/js/NonLinear/DLRADAPT_f.js +++ b/js/NonLinear/DLRADAPT_f.js @@ -7,20 +7,20 @@ function DLRADAPT_f() { this.g = [[1],[1]]; this.last_u = []; this.last_y = [[0],[0]]; - model = scicos_model(); - model.sim = "dlradp"; - model.in1 = [[1],[1]]; - model.out = 1; - model.evtin = 1; - model.dstate = [[this.last_u],[this.last_y]]; - model.rpar = [[this.p.slice()],[real(this.rn.slice())],[imag(this.rn.slice())],[real(this.rd.slice())],[imag(this.rd.slice())],[this.g.slice()]]; - model.ipar = [[0],[2],[2]]; - model.blocktype = "d"; - model.firing = []; - model.dep_ut = [true,false]; + this.model = scicos_model(); + this.model.sim = new ScilabString("dlradp"); + this.model.in1 = [[1],[1]]; + this.model.out = new ScilabDouble(1); + this.model.evtin = new ScilabDouble(1); + this.model.dstate = [[this.last_u],[this.last_y]]; + this.model.rpar = [[this.p.slice()],[real(this.rn.slice())],[imag(this.rn.slice())],[real(this.rd.slice())],[imag(this.rd.slice())],[this.g.slice()]]; + this.model.ipar = [[0],[2],[2]]; + this.model.blocktype = new ScilabString("d"); + this.model.firing = []; + this.model.dep_ut = [true,false]; exprs = [[sci2exp(this.p)],[sci2exp(this.rn)],[sci2exp(this.rd,0)],[sci2exp(this.g)],[sci2exp(this.last_u)],[sci2exp(this.last_y)]]; gr_i = []; - this.x = standard_define([2,2],model,exprs,gr_i); + this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } DLRADAPT_f.prototype.details = function DLRADAPT_f() { @@ -47,7 +47,7 @@ function DLRADAPT_f() { this.x = arg1; graphics = arg1.graphics; exprs = graphics.exprs; - model = arg1.model; + this.model = arg1.model; while (true) { [ok,this.p,this.rn,this.rd,this.g,this.last_u,this.last_y,exprs] = scicos_getvalue("Set block parameters",["Vector of p mesh points","Numerator roots (one line for each mesh)","Denominator roots (one line for each mesh)","Vector of gain at mesh points","past inputs (Num degree values)","past outputs (Den degree values)"],list("vec",-1,"mat",[-1,-1],"mat",["size(%1,\'*\')","-1"],"vec","size(%1,\'*\')","vec","size(%2,2)","vec","size(%3,2)"),exprs); if (!ok) { @@ -62,12 +62,12 @@ function DLRADAPT_f() { } else { rpar = [[this.p.slice()],[real(this.rn.slice())],[imag(this.rn.slice())],[real(this.rd.slice())],[imag(this.rd.slice())],[this.g.slice()]]; ipar = [[m],[n],[npt]]; - model.dstate = [[this.last_u.slice()],[this.last_y.slice()]]; - model.rpar = rpar; - model.ipar = ipar; + this.model.dstate = [[this.last_u.slice()],[this.last_y.slice()]]; + this.model.rpar = rpar; + this.model.ipar = ipar; graphics.exprs = exprs; this.x.graphics = graphics; - this.x.model = model; + this.x.model = this.model; break; } } diff --git a/js/NonLinear/DLRADAPT_f.pickle b/js/NonLinear/DLRADAPT_f.pickle index 71032709..42c4b32e 100644 --- a/js/NonLinear/DLRADAPT_f.pickle +++ b/js/NonLinear/DLRADAPT_f.pickle @@ -14,10 +14,12 @@ aS'p' p6 aS'x' p7 -aS'rn' +aS'model' p8 -atp9 -Rp10 +aS'rn' +p9 +atp10 +Rp11 .(dp0 S'model.dstate' p1 diff --git a/js/NonLinear/EXPBLK_f.js b/js/NonLinear/EXPBLK_f.js index 5d5c28f6..2aa0a2c4 100644 --- a/js/NonLinear/EXPBLK_f.js +++ b/js/NonLinear/EXPBLK_f.js @@ -3,16 +3,16 @@ function EXPBLK_f() { EXPBLK_f.prototype.define = function EXPBLK_f() { in1 = 1; this.a = math.E; - model = scicos_model(); - model.sim = "expblk"; - model.in1 = -1; - model.out = -1; - model.rpar = this.a; - model.blocktype = "c"; - model.dep_ut = [true,false]; + this.model = scicos_model(); + this.model.sim = new ScilabString("expblk"); + this.model.in1 = new ScilabDouble(-1); + this.model.out = new ScilabDouble(-1); + this.model.rpar = new ScilabDouble(this.a); + this.model.blocktype = new ScilabString("c"); + this.model.dep_ut = [true,false]; exprs = ["%e"]; gr_i = []; - this.x = standard_define([2,2],model,exprs,gr_i); + this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } EXPBLK_f.prototype.details = function EXPBLK_f() { @@ -28,7 +28,7 @@ function EXPBLK_f() { this.x = arg1; graphics = arg1.graphics; exprs = graphics.exprs; - model = arg1.model; + this.model = arg1.model; if (size(exprs,"*")==2) { exprs = exprs[2-1]; } @@ -41,9 +41,9 @@ function EXPBLK_f() { message("a^u : a must be positive"); } else { graphics.exprs = exprs; - model.rpar = this.a; + this.model.rpar = new ScilabDouble(this.a); this.x.graphics = graphics; - this.x.model = model; + this.x.model = this.model; break; } } diff --git a/js/NonLinear/EXPBLK_f.pickle b/js/NonLinear/EXPBLK_f.pickle index adee4513..d1f963e2 100644 --- a/js/NonLinear/EXPBLK_f.pickle +++ b/js/NonLinear/EXPBLK_f.pickle @@ -6,8 +6,10 @@ S'a' p2 aS'x' p3 -atp4 -Rp5 +aS'model' +p4 +atp5 +Rp6 .(dp0 S'a' p1 diff --git a/js/NonLinear/EXPBLK_m.js b/js/NonLinear/EXPBLK_m.js index 784a2f1b..cb002f76 100644 --- a/js/NonLinear/EXPBLK_m.js +++ b/js/NonLinear/EXPBLK_m.js @@ -3,20 +3,20 @@ function EXPBLK_m() { EXPBLK_m.prototype.define = function EXPBLK_m() { in1 = 1; this.a = math.E; - model = scicos_model(); - model.sim = list("expblk_m",4); - model.in1 = -1; - model.in2 = -2; - model.out = -1; - model.out2 = -2; - model.intyp = 1; - model.outtyp = 1; - model.rpar = this.a; - model.blocktype = "c"; - model.dep_ut = [true,false]; + this.model = scicos_model(); + this.model.sim = list("expblk_m",4); + this.model.in1 = new ScilabDouble(-1); + this.model.in2 = new ScilabDouble(-2); + this.model.out = new ScilabDouble(-1); + this.model.out2 = new ScilabDouble(-2); + this.model.intyp = new ScilabDouble(1); + this.model.outtyp = new ScilabDouble(1); + this.model.rpar = new ScilabDouble(this.a); + this.model.blocktype = new ScilabString("c"); + this.model.dep_ut = [true,false]; exprs = ["%e"]; gr_i = []; - this.x = standard_define([2,2],model,exprs,gr_i); + this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } EXPBLK_m.prototype.details = function EXPBLK_m() { @@ -32,7 +32,7 @@ function EXPBLK_m() { this.x = arg1; graphics = arg1.graphics; exprs = graphics.exprs; - model = arg1.model; + this.model = arg1.model; if (size(exprs,"*")==2) { exprs = exprs[2-1]; } @@ -45,9 +45,9 @@ function EXPBLK_m() { message("a^u : a must be positive"); } else { graphics.exprs = exprs; - model.rpar = this.a; + this.model.rpar = new ScilabDouble(this.a); this.x.graphics = graphics; - this.x.model = model; + this.x.model = this.model; break; } } diff --git a/js/NonLinear/EXPBLK_m.pickle b/js/NonLinear/EXPBLK_m.pickle index 12c33242..e3a3b116 100644 --- a/js/NonLinear/EXPBLK_m.pickle +++ b/js/NonLinear/EXPBLK_m.pickle @@ -6,8 +6,10 @@ S'a' p2 aS'x' p3 -atp4 -Rp5 +aS'model' +p4 +atp5 +Rp6 .(dp0 S'arg1' p1 diff --git a/js/NonLinear/FSV_f.js b/js/NonLinear/FSV_f.js index d29bcb9e..957153ed 100644 --- a/js/NonLinear/FSV_f.js +++ b/js/NonLinear/FSV_f.js @@ -2,15 +2,15 @@ function FSV_f() { FSV_f.prototype.define = function FSV_f() { in1 = 1; - model = scicos_model(); - model.sim = list("fsv",1); - model.in1 = in1; - model.out = in1; - model.blocktype = "c"; - model.dep_ut = [true,false]; + this.model = scicos_model(); + this.model.sim = list("fsv",1); + this.model.in1 = new ScilabDouble(in1); + this.model.out = new ScilabDouble(in1); + this.model.blocktype = new ScilabString("c"); + this.model.dep_ut = [true,false]; exprs = " "; gr_i = []; - this.x = standard_define([2,2],model,exprs,gr_i); + this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } FSV_f.prototype.details = function FSV_f() { diff --git a/js/NonLinear/FSV_f.pickle b/js/NonLinear/FSV_f.pickle index 595df316..e4655d80 100644 --- a/js/NonLinear/FSV_f.pickle +++ b/js/NonLinear/FSV_f.pickle @@ -4,8 +4,10 @@ p0 ((lp1 S'x' p2 -atp3 -Rp4 +aS'model' +p3 +atp4 +Rp5 .(dp0 S'model.sim' p1 diff --git a/js/NonLinear/INTRP2BLK_f.js b/js/NonLinear/INTRP2BLK_f.js index 16d28b77..9c16b0e5 100644 --- a/js/NonLinear/INTRP2BLK_f.js +++ b/js/NonLinear/INTRP2BLK_f.js @@ -4,17 +4,17 @@ function INTRP2BLK_f() { this.a = [[0],[1]]; this.b = [[0],[1]]; this.c = [[0,1],[1,2]]; - model = scicos_model(); - model.sim = list("intrp2",1); - model.in1 = [[1],[1]]; - model.out = 1; - model.rpar = [[this.a],[this.b],[this.c.slice()]]; - model.ipar = [[2],[2]]; - model.blocktype = "c"; - model.dep_ut = [true,false]; + this.model = scicos_model(); + this.model.sim = list("intrp2",1); + this.model.in1 = [[1],[1]]; + this.model.out = new ScilabDouble(1); + this.model.rpar = [[this.a],[this.b],[this.c.slice()]]; + this.model.ipar = [[2],[2]]; + this.model.blocktype = new ScilabString("c"); + this.model.dep_ut = [true,false]; exprs = [[strcat(sci2exp(this.a))],[strcat(sci2exp(this.b))],[strcat(sci2exp(this.c,0))]]; gr_i = []; - this.x = standard_define([3,2],model,exprs,gr_i); + this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } INTRP2BLK_f.prototype.details = function INTRP2BLK_f() { @@ -35,7 +35,7 @@ function INTRP2BLK_f() { this.x = arg1; graphics = arg1.graphics; exprs = graphics.exprs; - model = arg1.model; + this.model = arg1.model; while (true) { [ok,this.a,this.b,this.c,exprs] = scicos_getvalue("Set Interpolation block parameters",["X coord.","Y coord.","Z values"],list("vec",-1,"vec",-1,"mat",[-1,-1]),exprs); if (!ok) { @@ -48,10 +48,10 @@ function INTRP2BLK_f() { } else { if (ok) { graphics.exprs = exprs; - model.rpar = [[this.a.slice()],[this.b.slice()],[this.c.slice()]]; - model.ipar = [[size(this.a,"*")],[size(this.b,"*")]]; + this.model.rpar = [[this.a.slice()],[this.b.slice()],[this.c.slice()]]; + this.model.ipar = [[size(this.a,"*")],[size(this.b,"*")]]; this.x.graphics = graphics; - this.x.model = model; + this.x.model = this.model; break; } } diff --git a/js/NonLinear/INTRP2BLK_f.pickle b/js/NonLinear/INTRP2BLK_f.pickle index aedc2222..ee63e135 100644 --- a/js/NonLinear/INTRP2BLK_f.pickle +++ b/js/NonLinear/INTRP2BLK_f.pickle @@ -6,12 +6,14 @@ S'a' p2 aS'x' p3 -aS'c' +aS'model' p4 aS'b' p5 -atp6 -Rp7 +aS'c' +p6 +atp7 +Rp8 .(dp0 S'a' p1 diff --git a/js/NonLinear/INTRPLBLK_f.js b/js/NonLinear/INTRPLBLK_f.js index 60b67324..935ed84f 100644 --- a/js/NonLinear/INTRPLBLK_f.js +++ b/js/NonLinear/INTRPLBLK_f.js @@ -3,16 +3,16 @@ function INTRPLBLK_f() { INTRPLBLK_f.prototype.define = function INTRPLBLK_f() { this.a = [[0],[1]]; this.b = [[0],[1]]; - model = scicos_model(); - model.sim = "intrpl"; - model.in1 = 1; - model.out = 1; - model.rpar = [[this.a],[this.b]]; - model.blocktype = "c"; - model.dep_ut = [true,false]; + this.model = scicos_model(); + this.model.sim = new ScilabString("intrpl"); + this.model.in1 = new ScilabDouble(1); + this.model.out = new ScilabDouble(1); + this.model.rpar = [[this.a],[this.b]]; + this.model.blocktype = new ScilabString("c"); + this.model.dep_ut = [true,false]; exprs = [[strcat(sci2exp(this.a))],[strcat(sci2exp(this.b))]]; gr_i = []; - this.x = standard_define([2,2],model,exprs,gr_i); + this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } INTRPLBLK_f.prototype.details = function INTRPLBLK_f() { @@ -31,7 +31,7 @@ function INTRPLBLK_f() { this.x = arg1; graphics = arg1.graphics; exprs = graphics.exprs; - model = arg1.model; + this.model = arg1.model; while (true) { [ok,this.a,this.b,exprs] = scicos_getvalue("Set Interpolation block parameters",["X coord.","Y coord."],list("vec",-1,"vec",-1),exprs); if (!ok) { @@ -44,9 +44,9 @@ function INTRPLBLK_f() { } else { if (ok) { graphics.exprs = exprs; - model.rpar = [[this.a.slice()],[this.b.slice()]]; + this.model.rpar = [[this.a.slice()],[this.b.slice()]]; this.x.graphics = graphics; - this.x.model = model; + this.x.model = this.model; break; } } diff --git a/js/NonLinear/INTRPLBLK_f.pickle b/js/NonLinear/INTRPLBLK_f.pickle index 81a74125..89166c16 100644 --- a/js/NonLinear/INTRPLBLK_f.pickle +++ b/js/NonLinear/INTRPLBLK_f.pickle @@ -6,10 +6,12 @@ S'a' p2 aS'x' p3 -aS'b' +aS'model' p4 -atp5 -Rp6 +aS'b' +p5 +atp6 +Rp7 .(dp0 S'a' p1 diff --git a/js/NonLinear/INVBLK.js b/js/NonLinear/INVBLK.js index 5d8b700c..b212b08b 100644 --- a/js/NonLinear/INVBLK.js +++ b/js/NonLinear/INVBLK.js @@ -2,15 +2,15 @@ function INVBLK() { INVBLK.prototype.define = function INVBLK() { in1 = -1; - model = scicos_model(); - model.sim = list("invblk4",4); - model.in1 = in1; - model.out = in1; - model.blocktype = "c"; - model.dep_ut = [true,false]; + this.model = scicos_model(); + this.model.sim = list("invblk4",4); + this.model.in1 = new ScilabDouble(in1); + this.model.out = new ScilabDouble(in1); + this.model.blocktype = new ScilabString("c"); + this.model.dep_ut = [true,false]; exprs = " "; gr_i = []; - this.x = standard_define([2,2],model,exprs,gr_i); + this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } INVBLK.prototype.details = function INVBLK() { diff --git a/js/NonLinear/INVBLK.pickle b/js/NonLinear/INVBLK.pickle index 595df316..e4655d80 100644 --- a/js/NonLinear/INVBLK.pickle +++ b/js/NonLinear/INVBLK.pickle @@ -4,8 +4,10 @@ p0 ((lp1 S'x' p2 -atp3 -Rp4 +aS'model' +p3 +atp4 +Rp5 .(dp0 S'model.sim' p1 diff --git a/js/NonLinear/INVBLK_f.js b/js/NonLinear/INVBLK_f.js index 9cde7bbb..513f88b2 100644 --- a/js/NonLinear/INVBLK_f.js +++ b/js/NonLinear/INVBLK_f.js @@ -2,15 +2,15 @@ function INVBLK_f() { INVBLK_f.prototype.define = function INVBLK_f() { in1 = -1; - model = scicos_model(); - model.sim = "invblk"; - model.in1 = in1; - model.out = in1; - model.blocktype = "c"; - model.dep_ut = [true,false]; + this.model = scicos_model(); + this.model.sim = new ScilabString("invblk"); + this.model.in1 = new ScilabDouble(in1); + this.model.out = new ScilabDouble(in1); + this.model.blocktype = new ScilabString("c"); + this.model.dep_ut = [true,false]; exprs = " "; gr_i = []; - this.x = standard_define([2,2],model,exprs,gr_i); + this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } INVBLK_f.prototype.details = function INVBLK_f() { diff --git a/js/NonLinear/INVBLK_f.pickle b/js/NonLinear/INVBLK_f.pickle index 102457e9..465556a6 100644 --- a/js/NonLinear/INVBLK_f.pickle +++ b/js/NonLinear/INVBLK_f.pickle @@ -4,8 +4,10 @@ p0 ((lp1 S'x' p2 -atp3 -Rp4 +aS'model' +p3 +atp4 +Rp5 .(dp0 S'model.sim' p1 diff --git a/js/NonLinear/LOGBLK_f.js b/js/NonLinear/LOGBLK_f.js index 0af1aac0..c29da31c 100644 --- a/js/NonLinear/LOGBLK_f.js +++ b/js/NonLinear/LOGBLK_f.js @@ -3,16 +3,16 @@ function LOGBLK_f() { LOGBLK_f.prototype.define = function LOGBLK_f() { in1 = 1; this.a = math.E; - model = scicos_model(); - model.sim = "logblk"; - model.in1 = -1; - model.out = -1; - model.rpar = this.a; - model.blocktype = "c"; - model.dep_ut = [true,false]; + this.model = scicos_model(); + this.model.sim = new ScilabString("logblk"); + this.model.in1 = new ScilabDouble(-1); + this.model.out = new ScilabDouble(-1); + this.model.rpar = new ScilabDouble(this.a); + this.model.blocktype = new ScilabString("c"); + this.model.dep_ut = [true,false]; exprs = "%e"; gr_i = []; - this.x = standard_define([2,2],model,exprs,gr_i); + this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } LOGBLK_f.prototype.details = function LOGBLK_f() { @@ -28,7 +28,7 @@ function LOGBLK_f() { this.x = arg1; graphics = arg1.graphics; exprs = graphics.exprs; - model = arg1.model; + this.model = arg1.model; if (size(exprs,"*")==2) { exprs = exprs[2-1]; } @@ -42,9 +42,9 @@ function LOGBLK_f() { } else { if (ok) { graphics.exprs = exprs; - model.rpar = this.a; + this.model.rpar = new ScilabDouble(this.a); this.x.graphics = graphics; - this.x.model = model; + this.x.model = this.model; break; } } diff --git a/js/NonLinear/LOGBLK_f.pickle b/js/NonLinear/LOGBLK_f.pickle index ab05e8c5..f54919a2 100644 --- a/js/NonLinear/LOGBLK_f.pickle +++ b/js/NonLinear/LOGBLK_f.pickle @@ -6,8 +6,10 @@ S'a' p2 aS'x' p3 -atp4 -Rp5 +aS'model' +p4 +atp5 +Rp6 .(dp0 S'a' p1 diff --git a/js/NonLinear/LOOKUP2D.js b/js/NonLinear/LOOKUP2D.js index 06d5819a..bc8e4d59 100644 --- a/js/NonLinear/LOOKUP2D.js +++ b/js/NonLinear/LOOKUP2D.js @@ -1,7 +1,7 @@ /* autogenerated from "macros/NonLinear/LOOKUP2D.sci" */ function LOOKUP2D() { LOOKUP2D.prototype.define = function LOOKUP2D() { - model = scicos_model(); + this.model = scicos_model(); this.xx = [1:4]; this.yy = [1:3]; this.zz = [[4,5,6],[16,19,20],[10,18,23],[6,3,-1]]; @@ -9,16 +9,16 @@ function LOOKUP2D() { Graf = "n"; Nx = length(this.xx); Ny = length(this.yy); - model.sim = list("lookup2d",4); - model.in1 = [[1],[1]]; - model.out = 1; - model.rpar = [[this.xx.slice()],[this.yy.slice()],[this.zz.slice()]]; - model.ipar = [[Nx],[Ny],[this.Method]]; - model.blocktype = "c"; - model.dep_ut = [true,false]; + this.model.sim = list("lookup2d",4); + this.model.in1 = [[1],[1]]; + this.model.out = new ScilabDouble(1); + this.model.rpar = [[this.xx.slice()],[this.yy.slice()],[this.zz.slice()]]; + this.model.ipar = [[Nx],[Ny],[this.Method]]; + this.model.blocktype = new ScilabString("c"); + this.model.dep_ut = [true,false]; exprs = list(strcat(sci2exp(this.xx)),strcat(sci2exp(this.yy)),strcat(sci2exp(this.zz)),sci2exp(this.Method),Graf); gr_i = []; - this.x = standard_define([2.5,2],model,exprs,gr_i); + this.x = standard_define([2.5,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } LOOKUP2D.prototype.details = function LOOKUP2D() { @@ -41,7 +41,7 @@ function LOOKUP2D() { this.Method = parseFloat(arguments[0]["Method"]) this.graf = arguments[0]["graf"] this.x = arg1; - model = arg1.model; + this.model = arg1.model; graphics = arg1.graphics; exprs = graphics.exprs; ok = false; @@ -101,10 +101,10 @@ function LOOKUP2D() { curwin = save_curwin; gh.figure_id = curwin; } - model.rpar = [[this.xx.slice()],[this.yy.slice()],[this.zz.slice()]]; - model.ipar = [[nx],[ny],[mtd]]; + this.model.rpar = [[this.xx.slice()],[this.yy.slice()],[this.zz.slice()]]; + this.model.ipar = [[nx],[ny],[mtd]]; graphics.exprs = exprs; - this.x.model = model; + this.x.model = this.model; this.x.graphics = graphics; break; } diff --git a/js/NonLinear/LOOKUP2D.pickle b/js/NonLinear/LOOKUP2D.pickle index 50350631..a5f3175b 100644 --- a/js/NonLinear/LOOKUP2D.pickle +++ b/js/NonLinear/LOOKUP2D.pickle @@ -12,12 +12,14 @@ aS'zz' p5 aS'x' p6 -aS'Method' +aS'model' p7 -aS'graf' +aS'Method' p8 -atp9 -Rp10 +aS'graf' +p9 +atp10 +Rp11 .(dp0 S'[ny,my]' p1 diff --git a/js/NonLinear/LOOKUP_c.pickle b/js/NonLinear/LOOKUP_c.pickle index 5b625185..f90d540c 100644 --- a/js/NonLinear/LOOKUP_c.pickle +++ b/js/NonLinear/LOOKUP_c.pickle @@ -4,30 +4,32 @@ p0 ((lp1 S'rparin' p2 -aS'extrapo' +aS'curwin' p3 -aS'yy' +aS'extrapo' p4 -aS'xx' +aS'yy' p5 -aS'ixy' +aS'xx' p6 -aS'iparin' +aS'ixy' p7 -aS'argn' +aS'iparin' p8 -aS'xy' +aS'argn' p9 -aS'x' +aS'xy' p10 -aS'curwin' +aS'x' p11 -aS'Method' +aS'model' p12 -aS'graf' +aS'Method' p13 -atp14 -Rp15 +aS'graf' +p14 +atp15 +Rp16 .(dp0 S'mean4' p1 diff --git a/js/NonLinear/LOOKUP_f.js b/js/NonLinear/LOOKUP_f.js index 287cd87d..7ba988cc 100644 --- a/js/NonLinear/LOOKUP_f.js +++ b/js/NonLinear/LOOKUP_f.js @@ -1,15 +1,15 @@ /* autogenerated from "macros/NonLinear/LOOKUP_f.sci" */ function LOOKUP_f() { LOOKUP_f.prototype.define = function LOOKUP_f() { - model = scicos_model(); - model.sim = "lookup"; - model.in1 = 1; - model.out = 1; - model.rpar = [[-2],[-1],[1],[2],[-1],[1],[-1],[1]]; - model.blocktype = "c"; - model.dep_ut = [true,false]; + this.model = scicos_model(); + this.model.sim = new ScilabString("lookup"); + this.model.in1 = new ScilabDouble(1); + this.model.out = new ScilabDouble(1); + this.model.rpar = [[-2],[-1],[1],[2],[-1],[1],[-1],[1]]; + this.model.blocktype = new ScilabString("c"); + this.model.dep_ut = [true,false]; gr_i = []; - this.x = standard_define([2,2],model,[],gr_i); + this.x = standard_define([2,2],this.model,[],gr_i); return new BasicBlock(this.x); } LOOKUP_f.prototype.details = function LOOKUP_f() { @@ -24,8 +24,8 @@ function LOOKUP_f() { this.x = arg1; graphics = arg1.graphics; exprs = graphics.exprs; - model = arg1.model; - rpar = model.rpar; + this.model = arg1.model; + rpar = this.model.rpar; n = size(rpar,"*")/2; xx = rpar.slice(1-1,n); yy = rpar.slice(n+1-1,2*n); @@ -45,9 +45,9 @@ function LOOKUP_f() { ok = false; } if (ok) { - model.rpar = [[xx.slice()],[yy.slice()]]; + this.model.rpar = [[xx.slice()],[yy.slice()]]; this.x.graphics = graphics; - this.x.model = model; + this.x.model = this.model; break; } } diff --git a/js/NonLinear/LOOKUP_f.pickle b/js/NonLinear/LOOKUP_f.pickle index 602b724e..51951b20 100644 --- a/js/NonLinear/LOOKUP_f.pickle +++ b/js/NonLinear/LOOKUP_f.pickle @@ -4,8 +4,10 @@ p0 ((lp1 S'x' p2 -atp3 -Rp4 +aS'model' +p3 +atp4 +Rp5 .(dp0 S'arg1' p1 diff --git a/js/NonLinear/MAXMIN.js b/js/NonLinear/MAXMIN.js index 5c55ad5c..1b4004c0 100644 --- a/js/NonLinear/MAXMIN.js +++ b/js/NonLinear/MAXMIN.js @@ -1,16 +1,16 @@ /* autogenerated from "macros/NonLinear/MAXMIN.sci" */ function MAXMIN() { MAXMIN.prototype.define = function MAXMIN() { - model = scicos_model(); - model.sim = list("minmax",4); - model.out = 1; - model.in1 = -1; - model.blocktype = "c"; - model.dep_ut = [true,false]; - model.ipar = 0; + this.model = scicos_model(); + this.model.sim = list("minmax",4); + this.model.out = new ScilabDouble(1); + this.model.in1 = new ScilabDouble(-1); + this.model.blocktype = new ScilabString("c"); + this.model.dep_ut = [true,false]; + this.model.ipar = new ScilabDouble(0); exprs = [string(transpose([2,1,1]))]; gr_i = []; - this.x = standard_define([2,2],model,exprs,gr_i); + this.x = standard_define([2,2],this.model,exprs,gr_i); this.x.graphics.style = "MAXMIN;displayedLabel=MAX"; return new BasicBlock(this.x); } @@ -32,7 +32,7 @@ function MAXMIN() { this.x = arg1; graphics = arg1.graphics; exprs = graphics.exprs; - model = arg1.model; + this.model = arg1.model; while (true) { [ok,this.mm,this.nin,this.zcr,exprs] = scicos_getvalue("Set Max/Min block parameters",["Min (1) or Max (2) ","Number of input vectors (1 or 2)","zero-crossing (1: yes, 0;no)"],list("vec",1,"vec",1,"vec",1),exprs); if (!ok) { @@ -50,19 +50,19 @@ function MAXMIN() { } if (ok) { if (this.nin==1) { - [model,graphics,ok] = check_io(model,graphics,-1,1,[],[]); + [model,graphics,ok] = check_io(this.model,graphics,-1,1,[],[]); } else { - [model,graphics,ok] = check_io(model,graphics,[-1,-1],-1,[],[]); + [model,graphics,ok] = check_io(this.model,graphics,[-1,-1],-1,[],[]); } } if (ok) { - model.nzcross = this.zcr; + this.model.nzcross = new ScilabDouble(this.zcr); if (this.nin==1) { - model.nmode = abs(this.zcr); + this.model.nmode = new ScilabDouble(abs(this.zcr)); } else { - model.nmode = this.zcr; + this.model.nmode = new ScilabDouble(this.zcr); } - model.ipar = this.mm; + this.model.ipar = new ScilabDouble(this.mm); if (this.mm==1) { label = "MIN"; } else { @@ -71,7 +71,7 @@ function MAXMIN() { graphics.style = "MAXMIN;displayedLabel="+label; graphics.exprs = exprs; this.x.graphics = graphics; - this.x.model = model; + this.x.model = this.model; break; } } diff --git a/js/NonLinear/MAXMIN.pickle b/js/NonLinear/MAXMIN.pickle index 7f130392..a653fc5d 100644 --- a/js/NonLinear/MAXMIN.pickle +++ b/js/NonLinear/MAXMIN.pickle @@ -6,12 +6,14 @@ S'mm' p2 aS'x' p3 -aS'nin' +aS'model' p4 -aS'zcr' +aS'nin' p5 -atp6 -Rp7 +aS'zcr' +p6 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/NonLinear/MAX_f.js b/js/NonLinear/MAX_f.js index 0f186bb6..d5819afc 100644 --- a/js/NonLinear/MAX_f.js +++ b/js/NonLinear/MAX_f.js @@ -2,16 +2,16 @@ function MAX_f() { MAX_f.prototype.define = function MAX_f() { in1 = -1; - model = scicos_model(); - model.sim = "maxblk"; - model.in1 = in1; - model.out = 1; - model.dstate = [[0],[0]]; - model.blocktype = "c"; - model.dep_ut = [true,false]; + this.model = scicos_model(); + this.model.sim = new ScilabString("maxblk"); + this.model.in1 = new ScilabDouble(in1); + this.model.out = new ScilabDouble(1); + this.model.dstate = [[0],[0]]; + this.model.blocktype = new ScilabString("c"); + this.model.dep_ut = [true,false]; exprs = " "; gr_i = []; - this.x = standard_define([2,2],model,exprs,gr_i); + this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } MAX_f.prototype.details = function MAX_f() { diff --git a/js/NonLinear/MAX_f.pickle b/js/NonLinear/MAX_f.pickle index 362a6e75..c5fee5b1 100644 --- a/js/NonLinear/MAX_f.pickle +++ b/js/NonLinear/MAX_f.pickle @@ -4,8 +4,10 @@ p0 ((lp1 S'x' p2 -atp3 -Rp4 +aS'model' +p3 +atp4 +Rp5 .(dp0 S'model.sim' p1 diff --git a/js/NonLinear/MIN_f.js b/js/NonLinear/MIN_f.js index 82796940..62ee772a 100644 --- a/js/NonLinear/MIN_f.js +++ b/js/NonLinear/MIN_f.js @@ -2,16 +2,16 @@ function MIN_f() { MIN_f.prototype.define = function MIN_f() { in1 = -1; - model = scicos_model(); - model.sim = "minblk"; - model.in1 = in1; - model.out = 1; - model.dstate = [[0],[0]]; - model.blocktype = "c"; - model.dep_ut = [true,false]; + this.model = scicos_model(); + this.model.sim = new ScilabString("minblk"); + this.model.in1 = new ScilabDouble(in1); + this.model.out = new ScilabDouble(1); + this.model.dstate = [[0],[0]]; + this.model.blocktype = new ScilabString("c"); + this.model.dep_ut = [true,false]; exprs = sci2exp(in1); gr_i = []; - this.x = standard_define([2,2],model,exprs,gr_i); + this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } MIN_f.prototype.details = function MIN_f() { diff --git a/js/NonLinear/MIN_f.pickle b/js/NonLinear/MIN_f.pickle index a8357dc1..56aba182 100644 --- a/js/NonLinear/MIN_f.pickle +++ b/js/NonLinear/MIN_f.pickle @@ -4,8 +4,10 @@ p0 ((lp1 S'x' p2 -atp3 -Rp4 +aS'model' +p3 +atp4 +Rp5 .(dp0 S'model.sim' p1 diff --git a/js/NonLinear/POWBLK_f.js b/js/NonLinear/POWBLK_f.js index f2b1c07c..2725027e 100644 --- a/js/NonLinear/POWBLK_f.js +++ b/js/NonLinear/POWBLK_f.js @@ -3,16 +3,16 @@ function POWBLK_f() { POWBLK_f.prototype.define = function POWBLK_f() { in1 = 1; this.a = 1.5; - model = scicos_model(); - model.sim = "powblk"; - model.in1 = -1; - model.out = -1; - model.rpar = this.a; - model.blocktype = "c"; - model.dep_ut = [true,false]; + this.model = scicos_model(); + this.model.sim = new ScilabString("powblk"); + this.model.in1 = new ScilabDouble(-1); + this.model.out = new ScilabDouble(-1); + this.model.rpar = new ScilabDouble(this.a); + this.model.blocktype = new ScilabString("c"); + this.model.dep_ut = [true,false]; exprs = string(this.a); gr_i = []; - this.x = standard_define([2,2],model,exprs,gr_i); + this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } POWBLK_f.prototype.details = function POWBLK_f() { @@ -28,7 +28,7 @@ function POWBLK_f() { this.x = arg1; graphics = arg1.graphics; exprs = graphics.exprs; - model = arg1.model; + this.model = arg1.model; if (size(exprs,"*")==2) { exprs = exprs[2-1]; } @@ -39,15 +39,15 @@ function POWBLK_f() { } graphics.exprs = exprs; if (this.a==int(this.a)) { - model.ipar = this.a; - model.rpar = []; + this.model.ipar = new ScilabDouble(this.a); + this.model.rpar = []; } else { - model.rpar = this.a; - model.ipar = []; + this.model.rpar = new ScilabDouble(this.a); + this.model.ipar = []; } - model.firing = []; + this.model.firing = []; this.x.graphics = graphics; - this.x.model = model; + this.x.model = this.model; break; } return new BasicBlock(this.x); diff --git a/js/NonLinear/POWBLK_f.pickle b/js/NonLinear/POWBLK_f.pickle index 68f9f010..a9f0ac38 100644 --- a/js/NonLinear/POWBLK_f.pickle +++ b/js/NonLinear/POWBLK_f.pickle @@ -6,8 +6,10 @@ S'a' p2 aS'x' p3 -atp4 -Rp5 +aS'model' +p4 +atp5 +Rp6 .(dp0 S'a' p1 diff --git a/js/NonLinear/PRODUCT.js b/js/NonLinear/PRODUCT.js index d7587964..8e3f9a39 100644 --- a/js/NonLinear/PRODUCT.js +++ b/js/NonLinear/PRODUCT.js @@ -2,16 +2,16 @@ function PRODUCT() { PRODUCT.prototype.define = function PRODUCT() { this.sgn = [[1],[-1]]; - model = scicos_model(); - model.sim = list("product",4); - model.in1 = [[-1],[-1]]; - model.out = -1; - model.ipar = this.sgn; - model.blocktype = "c"; - model.dep_ut = [true,false]; + this.model = scicos_model(); + this.model.sim = list("product",4); + this.model.in1 = [[-1],[-1]]; + this.model.out = new ScilabDouble(-1); + this.model.ipar = this.sgn; + this.model.blocktype = new ScilabString("c"); + this.model.dep_ut = [true,false]; exprs = sci2exp(this.sgn); gr_i = []; - this.x = standard_define([2,3],model,exprs,gr_i); + this.x = standard_define([2,3],this.model,exprs,gr_i); return new Product(this.x); } PRODUCT.prototype.details = function PRODUCT() { @@ -26,7 +26,7 @@ function PRODUCT() { this.sgn = inverse(arguments[0]["sgn"]) this.x = arg1; graphics = arg1.graphics; - model = arg1.model; + this.model = arg1.model; exprs = graphics.exprs; while (true) { [ok,this.sgn,exprs] = scicos_getvalue([[" Set multiplication block parameters"],["(multiplication is set with + 1, division with -1)"],[""]],"Number of inputs or sign vector",list("vec",-1),exprs); @@ -57,13 +57,13 @@ function PRODUCT() { } } if (ok) { - [model,graphics,ok] = check_io(model,graphics,in1,nout,[],[]); + [model,graphics,ok] = check_io(this.model,graphics,in1,nout,[],[]); } if (ok) { - model.ipar = this.sgn; + this.model.ipar = new ScilabDouble(this.sgn); graphics.exprs = exprs; this.x.graphics = graphics; - this.x.model = model; + this.x.model = this.model; break; } } diff --git a/js/NonLinear/PRODUCT.pickle b/js/NonLinear/PRODUCT.pickle index 7b79339b..b4766cb8 100644 --- a/js/NonLinear/PRODUCT.pickle +++ b/js/NonLinear/PRODUCT.pickle @@ -4,10 +4,12 @@ p0 ((lp1 S'x' p2 -aS'sgn' +aS'model' p3 -atp4 -Rp5 +aS'sgn' +p4 +atp5 +Rp6 .(dp0 S'arg1' p1 diff --git a/js/NonLinear/PROD_f.js b/js/NonLinear/PROD_f.js index 157d61bc..cf325e3e 100644 --- a/js/NonLinear/PROD_f.js +++ b/js/NonLinear/PROD_f.js @@ -1,13 +1,13 @@ /* autogenerated from "macros/NonLinear/PROD_f.sci" */ function PROD_f() { PROD_f.prototype.define = function PROD_f() { - model = scicos_model(); - model.sim = list("prod",2); - model.in1 = [[-1],[-1]]; - model.out = -1; - model.blocktype = "c"; - model.dep_ut = [true,false]; - this.x = standard_define([1,1],model,[],[]); + this.model = scicos_model(); + this.model.sim = list("prod",2); + this.model.in1 = [[-1],[-1]]; + this.model.out = new ScilabDouble(-1); + this.model.blocktype = new ScilabString("c"); + this.model.dep_ut = [true,false]; + this.x = standard_define([1,1],this.model,[],[]); return new BasicBlock(this.x); } PROD_f.prototype.details = function PROD_f() { diff --git a/js/NonLinear/PROD_f.pickle b/js/NonLinear/PROD_f.pickle index 4bea59b8..d5ae4cb3 100644 --- a/js/NonLinear/PROD_f.pickle +++ b/js/NonLinear/PROD_f.pickle @@ -4,8 +4,10 @@ p0 ((lp1 S'x' p2 -atp3 -Rp4 +aS'model' +p3 +atp4 +Rp5 .(dp0 S'model.sim' p1 diff --git a/js/NonLinear/QUANT_f.js b/js/NonLinear/QUANT_f.js index bace34cc..0b55fd58 100644 --- a/js/NonLinear/QUANT_f.js +++ b/js/NonLinear/QUANT_f.js @@ -3,17 +3,17 @@ function QUANT_f() { QUANT_f.prototype.define = function QUANT_f() { this.pas = 0.1; this.meth = 1; - model = scicos_model(); - model.sim = "qzrnd"; - model.in1 = -1; - model.out = -1; - model.rpar = this.pas; - model.ipar = this.meth; - model.blocktype = "c"; - model.dep_ut = [true,false]; + this.model = scicos_model(); + this.model.sim = new ScilabString("qzrnd"); + this.model.in1 = new ScilabDouble(-1); + this.model.out = new ScilabDouble(-1); + this.model.rpar = new ScilabDouble(this.pas); + this.model.ipar = new ScilabDouble(this.meth); + this.model.blocktype = new ScilabString("c"); + this.model.dep_ut = [true,false]; exprs = [[string(this.pas)],[string(this.meth)]]; gr_i = []; - this.x = standard_define([2,2],model,exprs,gr_i); + this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } QUANT_f.prototype.details = function QUANT_f() { @@ -32,7 +32,7 @@ function QUANT_f() { this.x = arg1; graphics = arg1.graphics; exprs = graphics.exprs; - model = arg1.model; + this.model = arg1.model; while (true) { [ok,this.pas,this.meth,exprs] = scicos_getvalue("Set parameters",["Step","Quantization Type (1-4)"],list("vec",1,"vec",1),exprs); if (!ok) { @@ -42,21 +42,21 @@ function QUANT_f() { message("Quantization Type must be from 1 to 4"); } else { rpar = this.pas; - model.rpar = rpar; - model.ipar = this.meth; + this.model.rpar = new ScilabDouble(rpar); + this.model.ipar = new ScilabDouble(this.meth); switch (this.meth) { case 1: - model.sim = "qzrnd"; + this.model.sim = new ScilabString("qzrnd"); case 2: - model.sim = "qztrn"; + this.model.sim = new ScilabString("qztrn"); case 3: - model.sim = "qzflr"; + this.model.sim = new ScilabString("qzflr"); case 4: - model.sim = "qzcel"; + this.model.sim = new ScilabString("qzcel"); } graphics.exprs = exprs; this.x.graphics = graphics; - this.x.model = model; + this.x.model = this.model; break; } } diff --git a/js/NonLinear/QUANT_f.pickle b/js/NonLinear/QUANT_f.pickle index b4faee1b..aac3fdf6 100644 --- a/js/NonLinear/QUANT_f.pickle +++ b/js/NonLinear/QUANT_f.pickle @@ -4,12 +4,14 @@ p0 ((lp1 S'x' p2 -aS'meth' +aS'model' p3 aS'pas' p4 -atp5 -Rp6 +aS'meth' +p5 +atp6 +Rp7 .(dp0 S'model.sim' p1 diff --git a/js/NonLinear/SATURATION.js b/js/NonLinear/SATURATION.js index 2eb79d27..a6f2ac2b 100644 --- a/js/NonLinear/SATURATION.js +++ b/js/NonLinear/SATURATION.js @@ -4,18 +4,18 @@ function SATURATION() { this.minp = -1; this.maxp = 1; rpar = [[this.maxp],[this.minp]]; - model = scicos_model(); - model.sim = list("satur",4); - model.in1 = 1; - model.nzcross = 2; - model.nmode = 1; - model.out = 1; - model.rpar = rpar; - model.blocktype = "c"; - model.dep_ut = [true,false]; - exprs = [[string(this.maxp)],[string(this.minp)],[string(model.nmode)]]; + this.model = scicos_model(); + this.model.sim = list("satur",4); + this.model.in1 = new ScilabDouble(1); + this.model.nzcross = new ScilabDouble(2); + this.model.nmode = new ScilabDouble(1); + this.model.out = new ScilabDouble(1); + this.model.rpar = rpar; + this.model.blocktype = new ScilabString("c"); + this.model.dep_ut = [true,false]; + exprs = [[string(this.maxp)],[string(this.minp)],[string(this.model.nmode)]]; gr_i = []; - this.x = standard_define([2,2],model,exprs,gr_i); + this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } SATURATION.prototype.details = function SATURATION() { @@ -36,7 +36,7 @@ function SATURATION() { this.x = arg1; graphics = arg1.graphics; exprs = graphics.exprs; - model = arg1.model; + this.model = arg1.model; while (true) { [ok,this.maxp,this.minp,this.zeroc,exprs] = scicos_getvalue("Set Saturation parameters",["Upper limit","Lower limit","zero crossing (0:no, 1:yes)"],list("vec",1,"vec",1,"vec",1),exprs); if (!ok) { @@ -46,17 +46,17 @@ function SATURATION() { message("Upper limit must be > Lower limit"); } else { rpar = [[this.maxp],[this.minp]]; - model.rpar = rpar; + this.model.rpar = rpar; if (this.zeroc!=0) { - model.nzcross = 2; - model.nmode = 1; + this.model.nzcross = new ScilabDouble(2); + this.model.nmode = new ScilabDouble(1); } else { - model.nzcross = 0; - model.nmode = 0; + this.model.nzcross = new ScilabDouble(0); + this.model.nmode = new ScilabDouble(0); } graphics.exprs = exprs; this.x.graphics = graphics; - this.x.model = model; + this.x.model = this.model; break; } } diff --git a/js/NonLinear/SATURATION.pickle b/js/NonLinear/SATURATION.pickle index 4597f082..496fcd93 100644 --- a/js/NonLinear/SATURATION.pickle +++ b/js/NonLinear/SATURATION.pickle @@ -6,12 +6,14 @@ S'minp' p2 aS'x' p3 -aS'maxp' +aS'model' p4 aS'zeroc' p5 -atp6 -Rp7 +aS'maxp' +p6 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/NonLinear/SAT_f.js b/js/NonLinear/SAT_f.js index 72812ed6..f0122f8a 100644 --- a/js/NonLinear/SAT_f.js +++ b/js/NonLinear/SAT_f.js @@ -5,17 +5,17 @@ function SAT_f() { this.maxp = 1; slope = 1; rpar = [[this.minp],[this.maxp],[slope]]; - model = scicos_model(); - model.sim = list("lusat",1); - model.in1 = 1; - model.nzcross = 2; - model.out = 1; - model.rpar = [[this.minp],[this.maxp],[slope]]; - model.blocktype = "c"; - model.dep_ut = [true,false]; + this.model = scicos_model(); + this.model.sim = list("lusat",1); + this.model.in1 = new ScilabDouble(1); + this.model.nzcross = new ScilabDouble(2); + this.model.out = new ScilabDouble(1); + this.model.rpar = [[this.minp],[this.maxp],[slope]]; + this.model.blocktype = new ScilabString("c"); + this.model.dep_ut = [true,false]; exprs = [[string(this.minp)],[string(this.maxp)],[string(slope)]]; gr_i = []; - this.x = standard_define([2,2],model,exprs,gr_i); + this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } SAT_f.prototype.details = function SAT_f() { @@ -36,7 +36,7 @@ function SAT_f() { this.x = arg1; graphics = arg1.graphics; exprs = graphics.exprs; - model = arg1.model; + this.model = arg1.model; while (true) { [ok,this.minp,this.maxp,this.pente,exprs] = scicos_getvalue("Set Saturation parameters",["Min","Max","Slope"],list("vec",1,"vec",1,"vec",1),exprs); if (!ok) { @@ -48,11 +48,11 @@ function SAT_f() { message("Slope must be strictly positive"); } else { rpar = [[this.minp/this.pente],[this.maxp/this.pente],[this.pente]]; - model.rpar = rpar; - model.firing = []; + this.model.rpar = rpar; + this.model.firing = []; graphics.exprs = exprs; this.x.graphics = graphics; - this.x.model = model; + this.x.model = this.model; break; } } diff --git a/js/NonLinear/SAT_f.pickle b/js/NonLinear/SAT_f.pickle index bfdf1e21..5ba17f00 100644 --- a/js/NonLinear/SAT_f.pickle +++ b/js/NonLinear/SAT_f.pickle @@ -6,12 +6,14 @@ S'minp' p2 aS'x' p3 -aS'maxp' +aS'model' p4 -aS'pente' +aS'maxp' p5 -atp6 -Rp7 +aS'pente' +p6 +atp7 +Rp8 .(dp0 S'slope' p1 diff --git a/js/NonLinear/SIGNUM.js b/js/NonLinear/SIGNUM.js index f52c4715..274537ab 100644 --- a/js/NonLinear/SIGNUM.js +++ b/js/NonLinear/SIGNUM.js @@ -2,17 +2,17 @@ function SIGNUM() { SIGNUM.prototype.define = function SIGNUM() { nu = -1; - model = scicos_model(); - model.sim = list("signum",4); - model.in1 = nu; - model.out = nu; - model.nzcross = nu; - model.nmode = nu; - model.blocktype = "c"; - model.dep_ut = [true,false]; + this.model = scicos_model(); + this.model.sim = list("signum",4); + this.model.in1 = new ScilabDouble(nu); + this.model.out = new ScilabDouble(nu); + this.model.nzcross = new ScilabDouble(nu); + this.model.nmode = new ScilabDouble(nu); + this.model.blocktype = new ScilabString("c"); + this.model.dep_ut = [true,false]; exprs = [string([1])]; gr_i = []; - this.x = standard_define([2,2],model,exprs,gr_i); + this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } SIGNUM.prototype.details = function SIGNUM() { @@ -29,7 +29,7 @@ function SIGNUM() { this.x = arg1; graphics = arg1.graphics; exprs = graphics.exprs; - model = arg1.model; + this.model = arg1.model; while (true) { [ok,this.zcr,exprs] = scicos_getvalue("Set block parameters",["use zero_crossing (1: yes) (0:no)"],list("vec",1),exprs); if (!ok) { @@ -38,14 +38,14 @@ function SIGNUM() { graphics.exprs = exprs; if (ok) { if (this.zcr!=0) { - model.nmode = -1; - model.nzcross = -1; + this.model.nmode = new ScilabDouble(-1); + this.model.nzcross = new ScilabDouble(-1); } else { - model.nmode = 0; - model.nzcross = 0; + this.model.nmode = new ScilabDouble(0); + this.model.nzcross = new ScilabDouble(0); } this.x.graphics = graphics; - this.x.model = model; + this.x.model = this.model; break; } } diff --git a/js/NonLinear/SIGNUM.pickle b/js/NonLinear/SIGNUM.pickle index 835aded5..083f7a74 100644 --- a/js/NonLinear/SIGNUM.pickle +++ b/js/NonLinear/SIGNUM.pickle @@ -4,10 +4,12 @@ p0 ((lp1 S'x' p2 -aS'zcr' +aS'model' p3 -atp4 -Rp5 +aS'zcr' +p4 +atp5 +Rp6 .(dp0 S'model.sim' p1 diff --git a/js/NonLinear/SINBLK_f.js b/js/NonLinear/SINBLK_f.js index 94069384..be034737 100644 --- a/js/NonLinear/SINBLK_f.js +++ b/js/NonLinear/SINBLK_f.js @@ -1,15 +1,15 @@ /* autogenerated from "macros/NonLinear/SINBLK_f.sci" */ function SINBLK_f() { SINBLK_f.prototype.define = function SINBLK_f() { - model = scicos_model(); - model.sim = "sinblk"; - model.in1 = -1; - model.out = -1; - model.blocktype = "c"; - model.dep_ut = [true,false]; + this.model = scicos_model(); + this.model.sim = new ScilabString("sinblk"); + this.model.in1 = new ScilabDouble(-1); + this.model.out = new ScilabDouble(-1); + this.model.blocktype = new ScilabString("c"); + this.model.dep_ut = [true,false]; exprs = " "; gr_i = []; - this.x = standard_define([2,2],model,exprs,gr_i); + this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } SINBLK_f.prototype.details = function SINBLK_f() { diff --git a/js/NonLinear/SINBLK_f.pickle b/js/NonLinear/SINBLK_f.pickle index a1899b57..a48dbb00 100644 --- a/js/NonLinear/SINBLK_f.pickle +++ b/js/NonLinear/SINBLK_f.pickle @@ -4,8 +4,10 @@ p0 ((lp1 S'x' p2 -atp3 -Rp4 +aS'model' +p3 +atp4 +Rp5 .(dp0 S'model.sim' p1 diff --git a/js/NonLinear/TANBLK_f.js b/js/NonLinear/TANBLK_f.js index 66fef89f..c422297a 100644 --- a/js/NonLinear/TANBLK_f.js +++ b/js/NonLinear/TANBLK_f.js @@ -2,15 +2,15 @@ function TANBLK_f() { TANBLK_f.prototype.define = function TANBLK_f() { in1 = -1; - model = scicos_model(); - model.sim = "tanblk"; - model.in1 = in1; - model.out = in1; - model.blocktype = "c"; - model.dep_ut = [true,false]; + this.model = scicos_model(); + this.model.sim = new ScilabString("tanblk"); + this.model.in1 = new ScilabDouble(in1); + this.model.out = new ScilabDouble(in1); + this.model.blocktype = new ScilabString("c"); + this.model.dep_ut = [true,false]; exprs = sci2exp(in1); gr_i = []; - this.x = standard_define([2,2],model,exprs,gr_i); + this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } TANBLK_f.prototype.details = function TANBLK_f() { diff --git a/js/NonLinear/TANBLK_f.pickle b/js/NonLinear/TANBLK_f.pickle index b1fe08f9..1758e0ab 100644 --- a/js/NonLinear/TANBLK_f.pickle +++ b/js/NonLinear/TANBLK_f.pickle @@ -4,8 +4,10 @@ p0 ((lp1 S'x' p2 -atp3 -Rp4 +aS'model' +p3 +atp4 +Rp5 .(dp0 S'model.sim' p1 diff --git a/js/NonLinear/TrigFun.js b/js/NonLinear/TrigFun.js index e0392284..5459db52 100644 --- a/js/NonLinear/TrigFun.js +++ b/js/NonLinear/TrigFun.js @@ -1,15 +1,15 @@ /* autogenerated from "macros/NonLinear/TrigFun.sci" */ function TrigFun() { TrigFun.prototype.define = function TrigFun() { - model = scicos_model(); - model.sim = list("sin_blk",4); - model.in1 = -1; - model.out = -1; - model.blocktype = "c"; - model.dep_ut = [true,false]; + this.model = scicos_model(); + this.model.sim = list("sin_blk",4); + this.model.in1 = new ScilabDouble(-1); + this.model.out = new ScilabDouble(-1); + this.model.blocktype = new ScilabString("c"); + this.model.dep_ut = [true,false]; exprs = "sin"; gr_i = []; - this.x = standard_define([4,2],model,exprs,gr_i); + this.x = standard_define([4,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } TrigFun.prototype.details = function TrigFun() { @@ -25,7 +25,7 @@ function TrigFun() { this.x = arg1; graphics = arg1.graphics; exprs = graphics.exprs; - model = arg1.model; + this.model = arg1.model; PREVAR_FF = [["sin"],["cos"],["tan"],["asin"],["acos"],["atan"],["sinh"],["cosh"],["tanh"],["asinh"],["acosh"],["atanh"]]; PREVAR_GG = [["Choose among "+strcat(PREVAR_FF.slice(1-1,4),", ")],[strcat(PREVAR_FF.slice(5-1,$),", ")]]; while (true) { @@ -39,7 +39,7 @@ function TrigFun() { graphics.exprs = exprs; execstr("model.sim=list(\'"+this.fun+"_blk\',4)"); this.x.graphics = graphics; - this.x.model = model; + this.x.model = this.model; break; } } diff --git a/js/NonLinear/TrigFun.pickle b/js/NonLinear/TrigFun.pickle index b9dda0a5..59115b66 100644 --- a/js/NonLinear/TrigFun.pickle +++ b/js/NonLinear/TrigFun.pickle @@ -6,8 +6,10 @@ S'fun' p2 aS'x' p3 -atp4 -Rp5 +aS'model' +p4 +atp5 +Rp6 .(dp0 S'model.sim' p1 |