diff options
Diffstat (limited to 'js/NonLinear')
33 files changed, 682 insertions, 744 deletions
diff --git a/js/NonLinear/ABSBLK_f.js b/js/NonLinear/ABSBLK_f.js index 2204f7fa..dccca3e7 100644 --- a/js/NonLinear/ABSBLK_f.js +++ b/js/NonLinear/ABSBLK_f.js @@ -7,7 +7,7 @@ function ABSBLK_f() { this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [true,false]; - gr_i = []; + var gr_i = []; this.x = standard_define([2,2],this.model,[],gr_i); return new BasicBlock(this.x); } diff --git a/js/NonLinear/ABS_VALUE.js b/js/NonLinear/ABS_VALUE.js index 116d1ad1..d1440877 100644 --- a/js/NonLinear/ABS_VALUE.js +++ b/js/NonLinear/ABS_VALUE.js @@ -1,7 +1,7 @@ /* autogenerated from "macros/NonLinear/ABS_VALUE.sci" */ function ABS_VALUE() { ABS_VALUE.prototype.define = function ABS_VALUE() { - nu = -1; + var nu = -1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["absolute_value"]), new ScilabDouble([4])); this.model.in1 = new ScilabDouble([nu]); @@ -10,8 +10,8 @@ function ABS_VALUE() { this.model.nmode = new ScilabDouble([nu]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [true,false]; - exprs = [string([1])]; - gr_i = []; + var exprs = [string([1])]; + var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -27,8 +27,8 @@ function ABS_VALUE() { ABS_VALUE.prototype.set = function ABS_VALUE() { this.zcr = arguments[0]["zcr"] this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = graphics.exprs; 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); diff --git a/js/NonLinear/COSBLK_f.js b/js/NonLinear/COSBLK_f.js index 9ac5c564..5fc89b30 100644 --- a/js/NonLinear/COSBLK_f.js +++ b/js/NonLinear/COSBLK_f.js @@ -1,14 +1,14 @@ /* autogenerated from "macros/NonLinear/COSBLK_f.sci" */ function COSBLK_f() { COSBLK_f.prototype.define = function COSBLK_f() { - in1 = 1; + var in1 = 1; 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 = []; + var gr_i = []; this.x = standard_define([2,2],this.model,[],gr_i); return new BasicBlock(this.x); } diff --git a/js/NonLinear/DLRADAPT_f.js b/js/NonLinear/DLRADAPT_f.js index f1d5e69d..bbbcc0b1 100644 --- a/js/NonLinear/DLRADAPT_f.js +++ b/js/NonLinear/DLRADAPT_f.js @@ -18,8 +18,8 @@ function DLRADAPT_f() { 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 = []; + var exprs = [[sci2exp(this.p)],[sci2exp(this.rn)],[sci2exp(this.rd,0)],[sci2exp(this.g)],[sci2exp(this.last_u)],[sci2exp(this.last_y)]]; + var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -45,23 +45,25 @@ function DLRADAPT_f() { this.last_u = inverse(arguments[0]["last_u"]) this.last_y = inverse(arguments[0]["last_y"]) this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = graphics.exprs; 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) { break; } - m = size(this.rn,2); - [npt,n] = size(this.rd); + var m = size(this.rn,2); + var tmpvar0 = size(this.rd) + var npt = tmpvar0[0] + var n = tmpvar0[1]; if (m>=n) { message("Transfer must be strictly proper"); } else if (size(this.rn,1)!=0&&size(this.rn,1)!=size(this.p,"*")) { message("Numerator roots matrix row size\'s is incorrect"); } 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]]; + var rpar = [[this.p.slice()],[real(this.rn.slice())],[imag(this.rn.slice())],[real(this.rd.slice())],[imag(this.rd.slice())],[this.g.slice()]]; + var ipar = [[m],[n],[npt]]; this.model.dstate = new ScilabDouble([this.last_u.slice()],[this.last_y.slice()]); this.model.rpar = new ScilabDouble(rpar); this.model.ipar = new ScilabDouble(ipar); diff --git a/js/NonLinear/DLRADAPT_f.pickle b/js/NonLinear/DLRADAPT_f.pickle index 42c4b32e..4e1549e0 100644 --- a/js/NonLinear/DLRADAPT_f.pickle +++ b/js/NonLinear/DLRADAPT_f.pickle @@ -90,31 +90,28 @@ g18 sS'g' p27 g2 -sS'[npt,n]' -p28 -g9 sS'm' -p29 +p28 g9 sS'model.dep_ut' -p30 +p29 g15 sS'p' -p31 +p30 g2 sS'gr_i' -p32 +p31 g15 sS'ipar' -p33 +p32 g2 sS'y' -p34 +p33 g15 sS'x' -p35 +p34 g9 sS'model' -p36 +p35 g4 s.
\ No newline at end of file diff --git a/js/NonLinear/EXPBLK_f.js b/js/NonLinear/EXPBLK_f.js index 2847bcc3..a1ec6e7f 100644 --- a/js/NonLinear/EXPBLK_f.js +++ b/js/NonLinear/EXPBLK_f.js @@ -1,7 +1,7 @@ /* autogenerated from "macros/NonLinear/EXPBLK_f.sci" */ function EXPBLK_f() { EXPBLK_f.prototype.define = function EXPBLK_f() { - in1 = 1; + var in1 = 1; this.a = math.E; this.model = scicos_model(); this.model.sim = new ScilabString(["expblk"]); @@ -10,8 +10,8 @@ function EXPBLK_f() { this.model.rpar = new ScilabDouble([this.a]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [true,false]; - exprs = ["%e"]; - gr_i = []; + var exprs = ["%e"]; + var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -26,11 +26,11 @@ function EXPBLK_f() { EXPBLK_f.prototype.set = function EXPBLK_f() { this.a = parseFloat(arguments[0]["a"]) this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = graphics.exprs; this.model = arg1.model; if (size(exprs,"*")==2) { - exprs = exprs[2-1]; + var exprs = exprs[2-1]; } while (true) { [ok,this.a,exprs] = scicos_getvalue("Set a^u block parameters","a (>0)",list("vec",1),exprs); diff --git a/js/NonLinear/EXPBLK_m.js b/js/NonLinear/EXPBLK_m.js index e2cfa846..61ae91d7 100644 --- a/js/NonLinear/EXPBLK_m.js +++ b/js/NonLinear/EXPBLK_m.js @@ -1,7 +1,7 @@ /* autogenerated from "macros/NonLinear/EXPBLK_m.sci" */ function EXPBLK_m() { EXPBLK_m.prototype.define = function EXPBLK_m() { - in1 = 1; + var in1 = 1; this.a = math.E; this.model = scicos_model(); this.model.sim = list(new ScilabString(["expblk_m"]), new ScilabDouble([4])); @@ -14,8 +14,8 @@ function EXPBLK_m() { this.model.rpar = new ScilabDouble([this.a]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [true,false]; - exprs = ["%e"]; - gr_i = []; + var exprs = ["%e"]; + var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -30,11 +30,11 @@ function EXPBLK_m() { EXPBLK_m.prototype.set = function EXPBLK_m() { this.a = parseFloat(arguments[0]["a"]) this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = graphics.exprs; this.model = arg1.model; if (size(exprs,"*")==2) { - exprs = exprs[2-1]; + var exprs = exprs[2-1]; } while (true) { [ok,this.a,exprs] = scicos_getvalue("Set a^u block parameters","a (>0)",list("vec",1),exprs); diff --git a/js/NonLinear/FSV_f.js b/js/NonLinear/FSV_f.js index faf8b470..37dc3224 100644 --- a/js/NonLinear/FSV_f.js +++ b/js/NonLinear/FSV_f.js @@ -1,15 +1,15 @@ /* autogenerated from "macros/NonLinear/FSV_f.sci" */ function FSV_f() { FSV_f.prototype.define = function FSV_f() { - in1 = 1; + var in1 = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["fsv"]), new ScilabDouble([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 = []; + var exprs = " "; + var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/NonLinear/INTRP2BLK_f.js b/js/NonLinear/INTRP2BLK_f.js index ca146ae9..db41305d 100644 --- a/js/NonLinear/INTRP2BLK_f.js +++ b/js/NonLinear/INTRP2BLK_f.js @@ -12,8 +12,8 @@ function INTRP2BLK_f() { this.model.ipar = new ScilabDouble([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 = []; + var exprs = [[strcat(sci2exp(this.a))],[strcat(sci2exp(this.b))],[strcat(sci2exp(this.c,0))]]; + var gr_i = []; this.x = standard_define([3,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -33,8 +33,8 @@ function INTRP2BLK_f() { this.b = inverse(arguments[0]["b"]) this.c = inverse(arguments[0]["c"]) this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = graphics.exprs; 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); diff --git a/js/NonLinear/INTRPLBLK_f.js b/js/NonLinear/INTRPLBLK_f.js index fd4e720d..d2cdf8fa 100644 --- a/js/NonLinear/INTRPLBLK_f.js +++ b/js/NonLinear/INTRPLBLK_f.js @@ -10,8 +10,8 @@ function INTRPLBLK_f() { this.model.rpar = new ScilabDouble([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 = []; + var exprs = [[strcat(sci2exp(this.a))],[strcat(sci2exp(this.b))]]; + var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -29,8 +29,8 @@ function INTRPLBLK_f() { this.a = inverse(arguments[0]["a"]) this.b = inverse(arguments[0]["b"]) this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = graphics.exprs; 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); diff --git a/js/NonLinear/INVBLK.js b/js/NonLinear/INVBLK.js index 74b5a1b1..4d9721cd 100644 --- a/js/NonLinear/INVBLK.js +++ b/js/NonLinear/INVBLK.js @@ -1,15 +1,15 @@ /* autogenerated from "macros/NonLinear/INVBLK.sci" */ function INVBLK() { INVBLK.prototype.define = function INVBLK() { - in1 = -1; + var in1 = -1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["invblk4"]), new ScilabDouble([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 = []; + var exprs = " "; + var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/NonLinear/INVBLK_f.js b/js/NonLinear/INVBLK_f.js index c49a8de8..219dc37b 100644 --- a/js/NonLinear/INVBLK_f.js +++ b/js/NonLinear/INVBLK_f.js @@ -1,15 +1,15 @@ /* autogenerated from "macros/NonLinear/INVBLK_f.sci" */ function INVBLK_f() { INVBLK_f.prototype.define = function INVBLK_f() { - in1 = -1; + var in1 = -1; 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 = []; + var exprs = " "; + var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/NonLinear/LOGBLK_f.js b/js/NonLinear/LOGBLK_f.js index 95afdc77..5b725fea 100644 --- a/js/NonLinear/LOGBLK_f.js +++ b/js/NonLinear/LOGBLK_f.js @@ -1,7 +1,7 @@ /* autogenerated from "macros/NonLinear/LOGBLK_f.sci" */ function LOGBLK_f() { LOGBLK_f.prototype.define = function LOGBLK_f() { - in1 = 1; + var in1 = 1; this.a = math.E; this.model = scicos_model(); this.model.sim = new ScilabString(["logblk"]); @@ -10,8 +10,8 @@ function LOGBLK_f() { this.model.rpar = new ScilabDouble([this.a]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [true,false]; - exprs = "%e"; - gr_i = []; + var exprs = "%e"; + var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -26,11 +26,11 @@ function LOGBLK_f() { LOGBLK_f.prototype.set = function LOGBLK_f() { this.a = parseFloat(arguments[0]["a"]) this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = graphics.exprs; this.model = arg1.model; if (size(exprs,"*")==2) { - exprs = exprs[2-1]; + var exprs = exprs[2-1]; } while (true) { [ok,this.a,exprs] = scicos_getvalue("Set log block parameters","Basis (>1)",list("vec",1),exprs); diff --git a/js/NonLinear/LOOKUP2D.js b/js/NonLinear/LOOKUP2D.js index 8c50face..1e615526 100644 --- a/js/NonLinear/LOOKUP2D.js +++ b/js/NonLinear/LOOKUP2D.js @@ -6,9 +6,9 @@ function LOOKUP2D() { this.yy = [1:3]; this.zz = [[4,5,6],[16,19,20],[10,18,23],[6,3,-1]]; this.Method = 1; - Graf = "n"; - Nx = length(this.xx); - Ny = length(this.yy); + var Graf = "n"; + var Nx = length(this.xx); + var Ny = length(this.yy); this.model.sim = list(new ScilabString(["lookup2d"]), new ScilabDouble([4])); this.model.in1 = new ScilabDouble([1],[1]); this.model.out = new ScilabDouble([1]); @@ -16,8 +16,8 @@ function LOOKUP2D() { this.model.ipar = new ScilabDouble([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 = []; + var exprs = list(strcat(sci2exp(this.xx)),strcat(sci2exp(this.yy)),strcat(sci2exp(this.zz)),sci2exp(this.Method),Graf); + var gr_i = []; this.x = standard_define([2.5,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -42,63 +42,71 @@ function LOOKUP2D() { this.graf = arguments[0]["graf"] this.x = arg1; this.model = arg1.model; - graphics = arg1.graphics; - exprs = graphics.exprs; - ok = false; - SaveExit = false; + var graphics = arg1.graphics; + var exprs = graphics.exprs; + var ok = false; + var SaveExit = false; while (true) { - Ask_again = false; + var Ask_again = false; [ok,this.xx,this.yy,this.zz,this.Method,this.graf,exprs] = scicos_getvalue("2D Lookup table parameters",["Row index input values","Column index input values","Table data","Lookup method(1..5)","Launch graphic window(y/n)?"],list("vec",-1,"vec",-1,"mat",[-1,-1],"vec",1,"str",1),exprs); if (!ok) { break; } - mtd = int(this.Method); + var mtd = int(this.Method); if (mtd<1) { - mtd = 1; + var mtd = 1; } if (mtd>6) { - mtd = 6; + var mtd = 6; } if (this.graf!="y"&&this.graf!="Y") { this.graf = "n"; } exprs[5-1] = "n"; exprs[4-1] = sci2exp(mtd); - METHOD = getmethod(mtd); + var METHOD = getmethod(mtd); if (!Ask_again) { this.xx = this.xx.slice(); this.yy = this.yy.slice(); - [nx,mx] = size(this.xx); - [ny,my] = size(this.yy); - [nz,mz] = size(this.zz); + var tmpvar0 = size(this.xx) + var nx = tmpvar0[0] + var mx = tmpvar0[1]; + var tmpvar1 = size(this.yy) + var ny = tmpvar1[0] + var my = tmpvar1[1]; + var tmpvar2 = size(this.zz) + var nz = tmpvar2[0] + var mz = tmpvar2[1]; if (((nx<=1)||(ny<=1))) { x_message("input row/column data size should be greater than one"); - Ask_again = true; + var Ask_again = true; } if (!((nx==nz)&&(ny==mz))) { x_message("incompatible size of x and y"); - Ask_again = true; + var Ask_again = true; } - [ok] = test_increasing(this.xx); + var tmpvar3 = test_increasing(this.xx) + var ok = tmpvar3[0]; if ((!ok)) { x_message("Row input values must be monotonically increasing"); - Ask_again = true; + var Ask_again = true; } - [ok] = test_increasing(this.yy); + var tmpvar4 = test_increasing(this.yy) + var ok = tmpvar4[0]; if ((!ok)) { x_message("Column input values must be monotonically increasing"); - Ask_again = true; + var Ask_again = true; } } if (!Ask_again) { if ((this.graf=="Y"||this.graf=="y")) { - gh = gcf(); - curwin = gh.figure_id; - save_curwin = curwin; - gh2 = scf(); - curwin = max(winsid())+1; + var gh = gcf(); + var curwin = gh.figure_id; + var save_curwin = curwin; + var gh2 = scf(); + var curwin = max(winsid())+1; plot3d(this.xx,this.yy,this.zz,35,45,"X@Y@Z",[5,2,4]); - curwin = save_curwin; + var curwin = save_curwin; gh.figure_id = curwin; } this.model.rpar = new ScilabDouble([this.xx.slice()],[this.yy.slice()],[this.zz.slice()]); diff --git a/js/NonLinear/LOOKUP2D.pickle b/js/NonLinear/LOOKUP2D.pickle index 2938eeb7..9caba996 100644 --- a/js/NonLinear/LOOKUP2D.pickle +++ b/js/NonLinear/LOOKUP2D.pickle @@ -21,27 +21,25 @@ p9 atp10 Rp11 .(dp0 -S'[ny,my]' +S'exprs[4-1]' p1 -S'double' +S'string' p2 -sS'[nx,mx]' -p3 -g2 sS'arg1' -p4 +p3 S'object' -p5 +p4 sS'SaveExit' -p6 +p5 S'boolean' -p7 +p6 sS'Nx' +p7 +S'double' p8 -g2 sS'Ny' p9 -g2 +g8 sS'xx' p10 S'vector' @@ -52,101 +50,91 @@ S'matrix' p13 sS'Ask_again' p14 -g7 +g6 sS'model.out' p15 -g2 +g8 sS'curwin' p16 NsS'Method' p17 -g2 +g8 sS'gh' p18 -g5 -sS'[nz,mz]' +g4 +sS'model.in1' p19 -g2 -sS'exprs[4-1]' +g13 +sS'gh2' p20 -S'string' +g8 +sS'gh.figure_id' p21 -sS'gh2' +NsS'METHOD' p22 g2 -sS'gh.figure_id' -p23 -NsS'METHOD' -p24 -g21 sS'model.sim' -p25 +p23 S'list' -p26 -sS'model.in1' -p27 -g13 +p24 sS'model.rpar' -p28 +p25 g13 sS'yy' -p29 +p26 g11 sS'exprs[5-1]' -p30 -g21 +p27 +g2 sS'graphics' -p31 -g5 +p28 +g4 sS'model.ipar' -p32 +p29 g13 sS'typ' -p33 +p30 g11 sS'Graf' -p34 -g21 +p31 +g2 sS'model.blocktype' -p35 -g21 +p32 +g2 sS'ok' -p36 -g7 +p33 +g6 sS'save_curwin' -p37 -NsS'[ok]' -p38 -g2 -sS'x.graphics' -p39 -g5 +p34 +NsS'x.graphics' +p35 +g4 sS'x.model' -p40 +p36 NsS'model.dep_ut' -p41 +p37 g11 sS'exprs' -p42 -g26 +p38 +g24 sS'gr_i' -p43 +p39 g11 sS'mtd' -p44 -g2 +p40 +g8 sS'graphics.exprs' -p45 +p41 NsS'y' -p46 +p42 g11 sS'x' -p47 -g2 +p43 +g8 sS'model' -p48 -g5 +p44 +g4 sS'graf' -p49 -g21 +p45 +g2 s.
\ No newline at end of file diff --git a/js/NonLinear/LOOKUP_c.js b/js/NonLinear/LOOKUP_c.js index 51ce5f2c..29655d2e 100644 --- a/js/NonLinear/LOOKUP_c.js +++ b/js/NonLinear/LOOKUP_c.js @@ -4,9 +4,9 @@ function LOOKUP_c() { this.model = scicos_model(); this.xx = [[-1],[0.5],[1],[1.5],[2.5]]; this.yy = [[-6],[-1],[-3],[3],[-4]]; - N = length(this.xx); + var N = length(this.xx); this.Method = 1; - Graf = "n"; + var Graf = "n"; this.model.sim = list(new ScilabString(["lookup_c"]), new ScilabDouble([4])); this.model.in1 = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); @@ -21,8 +21,8 @@ function LOOKUP_c() { this.model.evtin = []; this.model.evtout = []; this.model.firing = new ScilabDouble([0]); - exprs = [[sci2exp(this.Method)],[sci2exp(this.xx)],[sci2exp(this.yy)],[sci2exp(0)],[Graf]]; - gr_i = []; + var exprs = [[sci2exp(this.Method)],[sci2exp(this.xx)],[sci2exp(this.yy)],[sci2exp(0)],[Graf]]; + var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -47,30 +47,30 @@ function LOOKUP_c() { this.graf = arguments[0]["graf"] this.x = arg1; this.model = arg1.model; - graphics = arg1.graphics; - exprs = graphics.exprs; - ok = false; - SaveExit = false; + var graphics = arg1.graphics; + var exprs = graphics.exprs; + var ok = false; + var SaveExit = false; while (true) { - Ask_again = false; + var Ask_again = false; [ok,this.Method,this.xx,this.yy,this.extrapo,this.graf,exprs] = scicos_getvalue("Lookup table parameters",["Spline Interpolation method (0..9)","x","y","Extrapolate method (0,1)","Launch graphic window(y/n)?"],list("vec",1,"vec",-1,"vec",-1,"vec",1,"str",1),exprs); if (!ok) { break; } - PeriodicOption = "n"; + var PeriodicOption = "n"; if (PeriodicOption=="y"||PeriodicOption=="Y") { - PO = 1; + var PO = 1; } else { - PO = 0; + var PO = 0; } - mtd = int(this.Method); + var mtd = int(this.Method); if (mtd<0) { - mtd = 0; + var mtd = 0; } if (mtd>9) { - mtd = 9; + var mtd = 9; } - METHOD = getmethod(mtd); + var METHOD = getmethod(mtd); this.extrapo = int(this.extrapo); if (this.extrapo<0) { this.extrapo = 0; @@ -81,45 +81,53 @@ function LOOKUP_c() { if (!Ask_again) { this.xx = this.xx.slice(); this.yy = this.yy.slice(); - [nx,mx] = size(this.xx); - [ny,my] = size(this.yy); + var tmpvar0 = size(this.xx) + var nx = tmpvar0[0] + var mx = tmpvar0[1]; + var tmpvar1 = size(this.yy) + var ny = tmpvar1[0] + var my = tmpvar1[1]; if (!((nx==ny)&&(mx==my))) { x_message("incompatible size of x and y"); - Ask_again = true; + var Ask_again = true; } } if (!Ask_again) { this.xy = [this.xx,this.yy]; - [this.xy] = cleandata(this.xy); - N = size(this.xy,"r"); + var tmpvar2 = cleandata(this.xy) + this.xy = tmpvar2[0]; + var N = size(this.xy,"r"); exprs[5-1] = "n"; if (this.graf=="y"||this.graf=="Y") { - ipar = [[N],[mtd],[PO],[this.extrapo]]; - rpar = []; + var ipar = [[N],[mtd],[PO],[this.extrapo]]; + var rpar = []; if (!exists("curwin")) { - gh = gcf(); + var gh = gcf(); this.curwin = gh.figure_id; } - save_curwin = this.curwin; + var save_curwin = this.curwin; this.curwin = max(winsid())+1; - [orpar,oipar,ok] = poke_point(this.xy,ipar,rpar); + var tmpvar3 = poke_point(this.xy,ipar,rpar) + var orpar = tmpvar3[0] + var oipar = tmpvar3[1] + var ok = tmpvar3[2]; this.curwin = save_curwin; if (!ok) { break; } - N2 = oipar[1-1]; - xy2 = [orpar.slice(1-1,N2),orpar.slice(N2+1-1,2*N2)]; - New_methhod = oipar[2-1]; - DChange = false; - METHOD = getmethod(New_methhod); + var N2 = oipar[1-1]; + var xy2 = [orpar.slice(1-1,N2),orpar.slice(N2+1-1,2*N2)]; + var New_methhod = oipar[2-1]; + var DChange = false; + var METHOD = getmethod(New_methhod); if (or(this.xy.slice()[1-1]!=xy2.slice()[1-1])) { - DChange = true; + var DChange = true; } if (or(this.xy.slice(1-1,N-1)[2-1]!=xy2.slice(1-1,N2-1)[2-1])) { - DChange = true; + var DChange = true; } if ((this.xy[N-1][2-1]!=xy2[N2-1][2-1]&&(METHOD!="periodic"))) { - DChange = true; + var DChange = true; } if (DChange) { exprs[2-1] = strcat(sci2exp(xy2.slice()[1-1])); @@ -128,30 +136,33 @@ function LOOKUP_c() { exprs[1-1] = sci2exp(New_methhod); exprs[4-1] = sci2exp(oipar[4-1]); if (oipar[3-1]==1) { - perop = "y"; + var perop = "y"; } else { - perop = "n"; + var perop = "n"; } - SaveExit = true; + var SaveExit = true; } else { - [Xdummy,Ydummy,orpar] = Do_Spline(N,mtd,this.xy.slice()[1-1],this.xy.slice()[2-1],this.xy[$-1][1-1],this.xy[1-1][1-1],0); + var tmpvar4 = Do_Spline(N,mtd,this.xy.slice()[1-1],this.xy.slice()[2-1],this.xy[$-1][1-1],this.xy[1-1][1-1],0) + var Xdummy = tmpvar4[0] + var Ydummy = tmpvar4[1] + var orpar = tmpvar4[2]; if ((METHOD=="periodic")) { this.xy[N-1][2-1] = this.xy[1-1][2-1]; } if ((METHOD=="order 2"||METHOD=="not_a_knot"||METHOD=="periodic"||METHOD=="monotone"||METHOD=="fast"||METHOD=="clamped")) { - orpar = [[this.xy.slice()[1-1]],[this.xy.slice()[2-1]],[orpar]]; + var orpar = [[this.xy.slice()[1-1]],[this.xy.slice()[2-1]],[orpar]]; } else { if ((METHOD=="zero order-below"||METHOD=="linear"||METHOD=="zero order-above"||METHOD=="zero order-nearest")) { - orpar = [[this.xy.slice()[1-1]],[this.xy.slice()[2-1]]]; + var orpar = [[this.xy.slice()[1-1]],[this.xy.slice()[2-1]]]; } } exprs[1-1] = sci2exp(mtd); - oipar = [[N],[mtd],[PO],[this.extrapo]]; - SaveExit = true; + var oipar = [[N],[mtd],[PO],[this.extrapo]]; + var SaveExit = true; } } if ((SaveExit)) { - xp = find(orpar.slice(1-1,oipar[1-1])>=0); + var xp = find(orpar.slice(1-1,oipar[1-1])>=0); if ((xp!=[])) { this.model.firing = new ScilabDouble([orpar[xp[1-1]-1]]); } else { diff --git a/js/NonLinear/LOOKUP_c.pickle b/js/NonLinear/LOOKUP_c.pickle index d4d742be..1d90ff33 100644 --- a/js/NonLinear/LOOKUP_c.pickle +++ b/js/NonLinear/LOOKUP_c.pickle @@ -155,788 +155,716 @@ S'string' p4 sS'Sin_exprs' p5 -NsS'ya' +NsS'xenR' p6 S'double' p7 -sS'xenR' +sS'x2' p8 -g7 -sS'[orpar,oipar]' -p9 -g7 +g4 sS'Y[j-1]' -p10 -g7 -sS'NC' -p11 +p9 g7 sS'Ask_again' -p12 +p10 S'boolean' -p13 +p11 sS'y1' -p14 +p12 g4 sS'Amp3' -p15 +p13 g2 sS'curwin' -p16 +p14 NsS'Standm' -p17 +p15 g4 sS'xenC' -p18 +p16 g4 sS'yenR' -p19 +p17 g7 sS'gh' -p20 +p18 S'object' -p21 +p19 sS'a.title.text' -p22 +p20 g2 sS'xmn' -p23 +p21 g7 sS'x1' -p24 +p22 g4 -sS'y2p' -p25 -g7 sS'lx21' -p26 +p23 g7 sS'xstC' -p27 +p24 g4 sS'ymx' -p28 +p25 g7 sS'Zt' -p29 +p26 S'matrix' -p30 -sS'[this.xy,rpar,ipar]' -p31 -g7 -sS'[xtt,k2]' -p32 -g7 +p27 sS'Bt' -p33 -g30 +p28 +g27 sS'a.title.font_size' -p34 +p29 g7 sS'xmx' -p35 +p30 g7 sS'x1p' -p36 +p31 g7 sS'random_n_exprs' -p37 +p32 S'list' -p38 +p33 sS'a.axes_visible' -p39 +p34 g4 sS'METHOD' -p40 +p35 g7 sS'PeriodicOption' -p41 +p36 g4 sS'ymn' -p42 +p37 g7 sS'NOrder' -p43 +p38 g7 sS'var4' -p44 +p39 g2 sS'xa' -p45 +p40 g7 sS'yo' -p46 +p41 g7 sS'y22' -p47 +p42 g4 -sS'[sok]' -p48 +sS'ya' +p43 g7 sS'YMX' -p49 +p44 g7 sS'yc' -p50 +p45 g7 sS'a.title.foreground' -p51 +p46 g7 sS'model.rpar' -p52 -g30 +p47 +g27 sS'yy' -p53 -g30 +p48 +g27 sS'sok' -p54 -g13 +p49 +g11 sS'Pulse_exprs' -p55 +p50 NsS'dx' -p56 +p51 g7 sS'dy' -p57 +p52 g7 sS'random_n_exprs2' -p58 -g38 +p53 +g33 sS'a.clip_state' -p59 +p54 g4 sS'yt' -p60 +p55 g7 sS'model.blocktype' -p61 -g4 -sS'x21' -p62 +p56 g4 sS'save_curwin' -p63 +p57 NsS'oipar' -p64 +p58 NsS'MENU' -p65 +p59 g2 sS't4' -p66 +p60 g4 sS't5' -p67 +p61 g4 sS't2' -p68 +p62 g4 sS'x.model' -p69 +p63 NsS'model.dep_ut' -p70 +p64 g2 sS'menu_s' -p71 +p65 g2 sS'Sawt1_exprs' -p72 +p66 NsS'sample4' -p73 +p67 g2 sS'sTp2' -p74 +p68 g2 sS'x' -p75 +p69 g7 sS'x12' -p76 +p70 g4 -sS'[ny,my]' -p77 -g7 sS'exprs[1-1]' -p78 +p71 g4 sS'points.data' -p79 +p72 g2 sS'j' -p80 +p73 g4 -sS'[nx,mx]' -p81 -g7 sS'x11' -p82 +p74 g4 sS'arg1' -p83 -g21 +p75 +g19 sS'Pd3' -p84 +p76 g2 sS't3' -p85 +p77 g4 sS'ey' -p86 +p78 g7 sS'ex' -p87 +p79 g7 sS'xmn1' -p88 +p80 g7 sS'sAmp' -p89 +p81 g2 sS'a.children[2-1]' -p90 -g21 +p82 +g19 sS'sample5' -p91 +p83 g2 sS'a.title.font_style' -p92 +p84 g7 sS'y2' -p93 +p85 g4 sS'orpar' -p94 +p86 g2 sS'x.graphics' -p95 -g21 -sS'A[j+2-1][i+N+1-1]' -p96 -g7 +p87 +g19 sS'menu_d' -p97 +p88 g2 sS'menu_e' -p98 +p89 g2 sS'A[j+1-1][i+N-1]' -p99 +p90 g7 sS'a.children[1-1]' -p100 -g21 +p91 +g19 sS'y1p' -p101 +p92 g7 sS'r' -p102 +p93 g4 sS'seed4' -p103 +p94 g2 sS'seed5' -p104 +p95 g2 sS'B[j+1-1]' -p105 +p96 g7 sS'model.evtin' -p106 +p97 g2 sS'y21' -p107 +p98 g4 sS'menu_t' -p108 +p99 g2 sS'menu_r' -p109 +p100 g2 sS'PO' -p110 +p101 g7 sS'x22' -p111 +p102 g4 sS'C' -p112 +p103 g2 sS'DChange' -p113 -g13 +p104 +g11 sS'Cformat' -p114 +p105 g4 -sS'[Xdummy,Ydummy,orpar]' -p115 +sS'Q[i+N-1][i-1]' +p106 g7 sS'rep' -p116 +p107 g7 sS'model.out2' -p117 +p108 g7 sS'xy[N-1][2-1]' -p118 +p109 g7 sS'sTp' -p119 +p110 g2 sS'wp' -p120 +p111 g2 -sS'ystC' -p121 -g4 sS'New_methhod' -p122 +p112 g7 sS'PeridicOption' -p123 +p113 g7 sS'Graf' -p124 +p114 g4 sS'Q' -p125 +p115 g7 sS'ok' -p126 -g13 +p116 +g11 sS'ly11' -p127 +p117 g7 sS'xy[k-1].slice()' -p128 +p118 g2 sS'Z' -p129 +p119 g2 sS'Cmenu' -p130 +p120 g4 -sS'[xo,k2]' -p131 -g7 sS'periodicoption' -p132 +p121 g7 sS'w' -p133 +p122 g4 sS'random_u_exprs2' -p134 -g38 +p123 +g33 sS'model.outtyp' -p135 +p124 g7 sS'A[j+1-1][i+2*N-1]' -p136 +p125 g7 sS'YMN' -p137 +p126 g7 sS'Q[i-1][i+N-1]' -p138 +p127 g7 sS'y11' -p139 +p128 g4 sS'x2p' -p140 +p129 g7 sS'y12' -p141 +p130 g4 -sS'Lx' -p142 -g7 -sS'py' -p143 +sS'NC' +p131 g7 sS'xyt' -p144 +p132 g2 sS'xo' -p145 -g30 +p133 +g27 sS'ipar[2-1]' -p146 -g7 -sS'[mv,nv]' -p147 +p134 g7 sS'xc' -p148 +p135 g7 sS'extrapo' -p149 +p136 g7 sS'offset' -p150 +p137 g2 sS'splines.data' -p151 +p138 g2 sS'perop' -p152 +p139 g4 sS'xe' -p153 +p140 g7 sS'Y' -p154 -g30 +p141 +g27 sS'xx' -p155 -g30 +p142 +g27 sS'xy' -p156 +p143 g2 sS'btn' -p157 +p144 g7 sS'xye' -p158 +p145 g2 sS'SaveExit' -p159 -g13 +p146 +g11 sS'xp' -p160 +p147 g7 sS'Method' -p161 +p148 g7 sS'xt' -p162 -g30 +p149 +g27 sS'xyo' -p163 +p150 g2 sS'Q[i-1][i-1]' -p164 +p151 g7 sS'ystR' -p165 +p152 g7 sS'A[j-1][i+2*N-1]' -p166 +p153 g7 sS'ipar[4-1]' -p167 +p154 g7 sS'px' -p168 +p155 g7 -sS'[orpar,oipar,ok]' -p169 +sS'py' +p156 g7 sS'splines' -p170 +p157 NsS'tok' -p171 -g13 +p158 +g11 sS'ixy' -p172 +p159 g2 sS'rect' -p173 -g30 +p160 +g27 sS'NP' -p174 +p161 g7 sS'Amp' -p175 +p162 g2 -sS'x2' -p176 -g4 sS'exprs[2-1]' -p177 +p163 g7 sS'model.firing' -p178 +p164 g7 sS'xy2' -p179 +p165 g2 sS'B' -p180 +p166 g7 sS'A' -p181 -g7 -sS'[Value,TextInd]' -p182 +p167 g7 sS'yenC' -p183 +p168 g4 sS'N' -p184 -g7 -sS'[this.xye]' -p185 +p169 g7 sS'random_u_exprs' -p186 -g38 +p170 +g33 sS'Sawt2_exprs' -p187 -NsS'[btn,xc,yc,win,Cmenu]' -p188 +p171 +NsS'XMX' +p172 g7 sS'a.x_ticks' -p189 -g21 +p173 +g19 sS'graphics' -p190 -g21 +p174 +g19 sS'Exitm' -p191 +p175 g4 sS'N2' -p192 +p176 g7 sS'model.ipar' -p193 -g30 -sS'[xyo]' -p194 -g7 +p177 +g27 sS'Pw3' -p195 +p178 g2 sS'f' -p196 +p179 g7 sS'a.grid' -p197 +p180 g2 sS'y[N-1]' -p198 -g7 -sS'[dca,k]' -p199 -g7 -sS'[this.xt,k2]' -p200 -g7 -sS'[this.xy]' -p201 +p181 g7 sS'gr_i' -p202 +p182 g2 sS'ipar' -p203 +p183 g2 -sS'[rpar,ipar]' -p204 -g7 +sS'ystC' +p184 +g4 sS'mtd' -p205 +p185 g7 sS'PERIODIC' -p206 +p186 g4 sS'xmx1' -p207 +p187 g7 sS'scam' -p208 +p188 g4 sS'exprs[4-1]' -p209 +p189 g4 sS'ans0' -p210 +p190 g4 sS'ymn1' -p211 +p191 g7 sS't1' -p212 +p192 g4 sS'model.evtout' -p213 +p193 g2 sS'rpar' -p214 +p194 g2 sS'lx11' -p215 +p195 g7 sS'np5' -p216 +p196 g2 sS'Bias3' -p217 +p197 g2 sS'Tp3' -p218 +p198 g2 sS'model.out' -p219 +p199 g7 sS'np4' -p220 +p200 g2 sS'rectx' -p221 +p201 g7 sS'np1' -p222 -g7 -sS'[X,Y,orpar]' -p223 +p202 g7 -sS'[xy]' -p224 +sS'Lx' +p203 g7 +sS'x21' +p204 +g4 sS'model.in2' -p225 +p205 g7 sS'model.in1' -p226 +p206 g7 sS'x[k-1]' -p227 +p207 g2 sS'HIT' -p228 -g13 +p208 +g11 sS'xstR' -p229 +p209 g7 sS'ymx1' -p230 +p210 g7 sS'A[j+1-1][i-1]' -p231 +p211 g7 sS'sAmp2' -p232 +p212 g2 sS'TN' -p233 +p213 g2 sS'menus' -p234 -g38 +p214 +g33 sS'sdelay' -p235 +p215 g2 sS'points' -p236 -NsS'[lhs,rhs]' -p237 -g7 -sS'Q[i+N-1][i+N-1]' -p238 +p216 +NsS'Q[i+N-1][i+N-1]' +p217 g7 sS'TA' -p239 -g30 +p218 +g27 sS'Datam' -p240 +p219 g4 sS'model.sim' -p241 -g38 +p220 +g33 sS'XMN' -p242 +p221 g7 -sS'[tok,xytt]' -p243 +sS'A[j+2-1][i+N+1-1]' +p222 g7 sS'a.data_bounds' -p244 +p223 g7 sS'menu_o' -p245 +p224 g2 sS'd' -p246 +p225 g7 sS'ye' -p247 +p226 g7 sS'X' -p248 -g30 -sS'[fd,SST,Sheetnames,Sheetpos]' -p249 +p227 +g27 +sS'y2p' +p228 g7 sS'fd' -p250 +p229 g7 sS'exprs[5-1]' -p251 +p230 g4 sS'graphics.exprs' -p252 +p231 NsS'phase' -p253 +p232 g7 sS'typ' -p254 +p233 g2 sS'min5' -p255 +p234 g2 -sS'[nD,mD]' -p256 -g7 sS'a' -p257 -g21 +p235 +g19 sS'mok' -p258 -g13 +p236 +g11 sS'Orderm' -p259 +p237 g4 sS'A[j+2-1][i+N-1]' -p260 +p238 g7 sS'B[j-1]' -p261 +p239 g7 sS'ly21' -p262 +p240 g7 sS'A[j+2-1][i-1]' -p263 +p241 g7 sS'max5' -p264 +p242 g2 sS'exprs' -p265 -g30 +p243 +g27 sS'exprs[3-1]' -p266 +p244 g7 sS'y[k-1]' -p267 +p245 g2 sS'At' -p268 -g30 +p246 +g27 sS'y' -p269 -g7 -sS'XMX' -p270 +p247 g7 sS'model' -p271 -g21 +p248 +g19 sS'order' -p272 -g7 -sS'Q[i+N-1][i-1]' -p273 +p249 g7 s.
\ No newline at end of file diff --git a/js/NonLinear/LOOKUP_f.js b/js/NonLinear/LOOKUP_f.js index cb9d3d7d..9724bd70 100644 --- a/js/NonLinear/LOOKUP_f.js +++ b/js/NonLinear/LOOKUP_f.js @@ -8,7 +8,7 @@ function LOOKUP_f() { this.model.rpar = new ScilabDouble([-2],[-1],[1],[2],[-1],[1],[-1],[1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [true,false]; - gr_i = []; + var gr_i = []; this.x = standard_define([2,2],this.model,[],gr_i); return new BasicBlock(this.x); } @@ -22,27 +22,31 @@ function LOOKUP_f() { } LOOKUP_f.prototype.set = function LOOKUP_f() { this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = graphics.exprs; 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); + var rpar = this.model.rpar; + var n = size(rpar,"*")/2; + var xx = rpar.slice(1-1,n); + var yy = rpar.slice(n+1-1,2*n); while (true) { [ln,fun]=where() if (!or(fun=="do_eval")) { - [xx,yy,ok,gc] = edit_curv(xx,yy,"axy"); + var tmpvar0 = edit_curv(xx,yy,"axy") + var xx = tmpvar0[0] + var yy = tmpvar0[1] + var ok = tmpvar0[2] + var gc = tmpvar0[3]; } else { - ok = true; + var ok = true; } if (!ok) { break; } - n = size(xx,"*"); + var n = size(xx,"*"); if (or(xx.slice(2-1,n)-xx.slice(1-1,n-1)<=0)) { message("You have not defined a function"); - ok = false; + var ok = false; } if (ok) { this.model.rpar = new ScilabDouble([xx.slice()],[yy.slice()]); diff --git a/js/NonLinear/LOOKUP_f.pickle b/js/NonLinear/LOOKUP_f.pickle index 51951b20..0a9d52d0 100644 --- a/js/NonLinear/LOOKUP_f.pickle +++ b/js/NonLinear/LOOKUP_f.pickle @@ -9,74 +9,71 @@ p3 atp4 Rp5 .(dp0 -S'arg1' +S'model.sim' p1 -S'object' +S'string' p2 -sS'rpar' +sS'model.in1' p3 -NsS'x.model' +S'double' p4 -g2 -sS'model.out' +sS'ok' p5 -S'double' +S'boolean' p6 -sS'model.in1' +sS'model.blocktype' p7 -g6 +g2 sS'x.graphics' p8 -g2 -sS'model.sim' +S'object' p9 -S'string' +sS'arg1' p10 -sS'model.rpar' +g9 +sS'x.model' p11 -S'matrix' +g9 +sS'model.rpar' p12 -sS'yy' +S'matrix' p13 -S'vector' +sS'rpar' p14 -sS'graphics' +NsS'yy' p15 -g2 -sS'typ' +S'vector' p16 -g14 -sS'[xx,yy,ok,gc]' +sS'exprs' p17 -g6 -sS'ok' +NsS'xx' p18 -S'boolean' +g16 +sS'gr_i' p19 -sS'model.blocktype' +g16 +sS'model.dep_ut' p20 -g10 -sS'xx' +g16 +sS'graphics' p21 -g14 -sS'model.dep_ut' +g9 +sS'y' p22 -g14 -sS'n' +g16 +sS'x' p23 -g6 -sS'exprs' +g4 +sS'model' p24 -NsS'gr_i' +g9 +sS'n' p25 -g14 -sS'y' +g4 +sS'typ' p26 -g14 -sS'x' +g16 +sS'model.out' p27 -g6 -sS'model' -p28 -g2 +g4 s.
\ No newline at end of file diff --git a/js/NonLinear/MAXMIN.js b/js/NonLinear/MAXMIN.js index 44dd32f3..c973c2c3 100644 --- a/js/NonLinear/MAXMIN.js +++ b/js/NonLinear/MAXMIN.js @@ -8,8 +8,8 @@ function MAXMIN() { 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 = []; + var exprs = [string(transpose([2,1,1]))]; + var 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); @@ -30,8 +30,8 @@ function MAXMIN() { this.nin = arguments[0]["nin"] this.zcr = parseFloat(arguments[0]["zcr"]) this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = graphics.exprs; 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); @@ -46,13 +46,19 @@ function MAXMIN() { } if (this.nin!=1&&this.nin!=2) { message("Wrong number of inputs, only 1 and 2 allowed"); - ok = false; + var ok = false; } if (ok) { if (this.nin==1) { - [this.model,graphics,ok] = check_io(this.model,graphics,-1,1,[],[]); + var tmpvar0 = check_io(this.model,graphics,-1,1,[],[]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; } else { - [this.model,graphics,ok] = check_io(this.model,graphics,[-1,-1],-1,[],[]); + var tmpvar1 = check_io(this.model,graphics,[-1,-1],-1,[],[]) + this.model = tmpvar1[0] + var graphics = tmpvar1[1] + var ok = tmpvar1[2]; } } if (ok) { @@ -64,9 +70,9 @@ function MAXMIN() { } this.model.ipar = new ScilabDouble([this.mm]); if (this.mm==1) { - label = "MIN"; + var label = "MIN"; } else { - label = "MAX"; + var label = "MAX"; } graphics.style = "MAXMIN;displayedLabel="+label; graphics.exprs = exprs; diff --git a/js/NonLinear/MAXMIN.pickle b/js/NonLinear/MAXMIN.pickle index 9d62f4c2..71538e9d 100644 --- a/js/NonLinear/MAXMIN.pickle +++ b/js/NonLinear/MAXMIN.pickle @@ -52,49 +52,46 @@ sS'model.sim' p15 S'list' p16 -sS'[this.model,graphics,ok]' -p17 -g16 sS'model.nmode' -p18 +p17 g6 sS'graphics.exprs' -p19 +p18 NsS'x.graphics.style' -p20 +p19 g9 sS'model.ipar' -p21 +p20 g6 sS'model.nzcross' -p22 +p21 g6 sS'ok' -p23 +p22 S'boolean' -p24 +p23 sS'model.blocktype' -p25 +p24 g9 sS'mm' -p26 +p25 g6 sS'model.dep_ut' -p27 +p26 g13 sS'exprs' -p28 +p27 g13 sS'gr_i' -p29 +p28 g13 sS'y' -p30 +p29 g13 sS'x' -p31 +p30 g6 sS'model' -p32 +p31 g2 s.
\ No newline at end of file diff --git a/js/NonLinear/MAX_f.js b/js/NonLinear/MAX_f.js index 9a8719df..7bbbd11b 100644 --- a/js/NonLinear/MAX_f.js +++ b/js/NonLinear/MAX_f.js @@ -1,7 +1,7 @@ /* autogenerated from "macros/NonLinear/MAX_f.sci" */ function MAX_f() { MAX_f.prototype.define = function MAX_f() { - in1 = -1; + var in1 = -1; this.model = scicos_model(); this.model.sim = new ScilabString(["maxblk"]); this.model.in1 = new ScilabDouble([in1]); @@ -9,8 +9,8 @@ function MAX_f() { this.model.dstate = new ScilabDouble([0],[0]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [true,false]; - exprs = " "; - gr_i = []; + var exprs = " "; + var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/NonLinear/MIN_f.js b/js/NonLinear/MIN_f.js index 7c4a9e88..ff7b5cc0 100644 --- a/js/NonLinear/MIN_f.js +++ b/js/NonLinear/MIN_f.js @@ -1,7 +1,7 @@ /* autogenerated from "macros/NonLinear/MIN_f.sci" */ function MIN_f() { MIN_f.prototype.define = function MIN_f() { - in1 = -1; + var in1 = -1; this.model = scicos_model(); this.model.sim = new ScilabString(["minblk"]); this.model.in1 = new ScilabDouble([in1]); @@ -9,8 +9,8 @@ function MIN_f() { this.model.dstate = new ScilabDouble([0],[0]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [true,false]; - exprs = sci2exp(in1); - gr_i = []; + var exprs = sci2exp(in1); + var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/NonLinear/POWBLK_f.js b/js/NonLinear/POWBLK_f.js index b094c25a..aa5793da 100644 --- a/js/NonLinear/POWBLK_f.js +++ b/js/NonLinear/POWBLK_f.js @@ -1,7 +1,7 @@ /* autogenerated from "macros/NonLinear/POWBLK_f.sci" */ function POWBLK_f() { POWBLK_f.prototype.define = function POWBLK_f() { - in1 = 1; + var in1 = 1; this.a = 1.5; this.model = scicos_model(); this.model.sim = new ScilabString(["powblk"]); @@ -10,8 +10,8 @@ function POWBLK_f() { 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 = []; + var exprs = string(this.a); + var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -26,11 +26,11 @@ function POWBLK_f() { POWBLK_f.prototype.set = function POWBLK_f() { this.a = parseFloat(arguments[0]["a"]) this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = graphics.exprs; this.model = arg1.model; if (size(exprs,"*")==2) { - exprs = exprs[2-1]; + var exprs = exprs[2-1]; } while (true) { [ok,this.a,exprs] = scicos_getvalue("Set u^a block parameters","to the power of",list("vec",1),exprs); diff --git a/js/NonLinear/PRODUCT.js b/js/NonLinear/PRODUCT.js index e8f0287f..4ff4f86f 100644 --- a/js/NonLinear/PRODUCT.js +++ b/js/NonLinear/PRODUCT.js @@ -9,8 +9,8 @@ function PRODUCT() { this.model.ipar = new ScilabDouble(this.sgn); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [true,false]; - exprs = sci2exp(this.sgn); - gr_i = []; + var exprs = sci2exp(this.sgn); + var gr_i = []; this.x = standard_define([2,3],this.model,exprs,gr_i); return new Product(this.x); } @@ -25,9 +25,9 @@ function PRODUCT() { PRODUCT.prototype.set = function PRODUCT() { this.sgn = inverse(arguments[0]["sgn"]) this.x = arg1; - graphics = arg1.graphics; + var graphics = arg1.graphics; this.model = arg1.model; - exprs = graphics.exprs; + var 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); if (!ok) { @@ -37,27 +37,30 @@ function PRODUCT() { if (size(this.sgn,1)==1) { if (this.sgn<1) { message("Number of inputs must be > 0"); - ok = false; + var ok = false; } else if (this.sgn==1) { - in1 = -1; + var in1 = -1; this.sgn = []; - nout = 1; + var nout = 1; } else { - in1 = -ones(this.sgn,1); + var in1 = -ones(this.sgn,1); this.sgn = ones(this.sgn,1); - nout = -1; + var nout = -1; } } else { if (!and(abs(this.sgn)==1)) { message("Signs can only be +1 or -1"); - ok = false; + var ok = false; } else { - in1 = -ones(size(this.sgn,1),1); - nout = -1; + var in1 = -ones(size(this.sgn,1),1); + var nout = -1; } } if (ok) { - [this.model,graphics,ok] = check_io(this.model,graphics,in1,nout,[],[]); + var tmpvar0 = check_io(this.model,graphics,in1,nout,[],[]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; } if (ok) { this.model.ipar = new ScilabDouble([this.sgn]); diff --git a/js/NonLinear/PRODUCT.pickle b/js/NonLinear/PRODUCT.pickle index 9367a9b3..53adad8f 100644 --- a/js/NonLinear/PRODUCT.pickle +++ b/js/NonLinear/PRODUCT.pickle @@ -11,75 +11,72 @@ p4 atp5 Rp6 .(dp0 -S'arg1' +S'model.sim' p1 -S'object' +S'list' p2 -sS'graphics' +sS'model.in1' p3 -g2 -sS'x.model' +S'matrix' p4 -NsS'sgn' +sS'ok' p5 -S'matrix' +S'boolean' p6 -sS'model.out' +sS'model.blocktype' p7 -S'double' +S'string' p8 -sS'model.in1' -p9 -g6 sS'x.graphics' +p9 +S'object' p10 -g2 -sS'model.sim' +sS'arg1' p11 -S'list' +g10 +sS'sgn' p12 -sS'[this.model,graphics,ok]' -p13 -g12 +g4 sS'in1' +p13 +S'double' p14 -g8 -sS'graphics.exprs' +sS'model.out' p15 -NsS'model.ipar' +g14 +sS'exprs' p16 -g6 -sS'typ' +g8 +sS'x.model' p17 -S'vector' +NsS'gr_i' p18 -sS'ok' +S'vector' p19 -S'boolean' +sS'model.dep_ut' p20 -sS'model.blocktype' +g19 +sS'graphics.exprs' p21 -S'string' +NsS'graphics' p22 -sS'model.dep_ut' +g10 +sS'y' p23 -g18 -sS'exprs' +g19 +sS'x' p24 -g22 -sS'gr_i' +g14 +sS'model' p25 -g18 -sS'y' +g10 +sS'model.ipar' p26 -g18 -sS'x' +g4 +sS'typ' p27 -g8 -sS'model' -p28 -g2 +g19 sS'nout' -p29 -g8 +p28 +g14 s.
\ No newline at end of file diff --git a/js/NonLinear/QUANT_f.js b/js/NonLinear/QUANT_f.js index cc2cc43c..083c1e22 100644 --- a/js/NonLinear/QUANT_f.js +++ b/js/NonLinear/QUANT_f.js @@ -11,8 +11,8 @@ function QUANT_f() { 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 = []; + var exprs = [[string(this.pas)],[string(this.meth)]]; + var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -30,8 +30,8 @@ function QUANT_f() { this.pas = parseFloat(arguments[0]["pas"]) this.meth = parseFloat(arguments[0]["meth"]) this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = graphics.exprs; 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); @@ -41,7 +41,7 @@ function QUANT_f() { if (this.meth<1||this.meth>4) { message("Quantization Type must be from 1 to 4"); } else { - rpar = this.pas; + var rpar = this.pas; this.model.rpar = new ScilabDouble([rpar]); this.model.ipar = new ScilabDouble([this.meth]); switch (this.meth) { diff --git a/js/NonLinear/SATURATION.js b/js/NonLinear/SATURATION.js index 28ddbc8f..76577e72 100644 --- a/js/NonLinear/SATURATION.js +++ b/js/NonLinear/SATURATION.js @@ -3,7 +3,7 @@ function SATURATION() { SATURATION.prototype.define = function SATURATION() { this.minp = -1; this.maxp = 1; - rpar = [[this.maxp],[this.minp]]; + var rpar = [[this.maxp],[this.minp]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["satur"]), new ScilabDouble([4])); this.model.in1 = new ScilabDouble([1]); @@ -13,8 +13,8 @@ function SATURATION() { this.model.rpar = new ScilabDouble(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 = []; + var exprs = [[string(this.maxp)],[string(this.minp)],[string(this.model.nmode)]]; + var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -34,8 +34,8 @@ function SATURATION() { this.minp = parseFloat(arguments[0]["minp"]) this.zeroc = arguments[0]["zeroc"] this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = graphics.exprs; 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); @@ -45,7 +45,7 @@ function SATURATION() { if (this.maxp<=this.minp) { message("Upper limit must be > Lower limit"); } else { - rpar = [[this.maxp],[this.minp]]; + var rpar = [[this.maxp],[this.minp]]; this.model.rpar = new ScilabDouble(rpar); if (this.zeroc!=0) { this.model.nzcross = new ScilabDouble([2]); diff --git a/js/NonLinear/SAT_f.js b/js/NonLinear/SAT_f.js index 30dc8d49..b3c1cb21 100644 --- a/js/NonLinear/SAT_f.js +++ b/js/NonLinear/SAT_f.js @@ -3,8 +3,8 @@ function SAT_f() { SAT_f.prototype.define = function SAT_f() { this.minp = -1; this.maxp = 1; - slope = 1; - rpar = [[this.minp],[this.maxp],[slope]]; + var slope = 1; + var rpar = [[this.minp],[this.maxp],[slope]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["lusat"]), new ScilabDouble([1])); this.model.in1 = new ScilabDouble([1]); @@ -13,8 +13,8 @@ function SAT_f() { this.model.rpar = new ScilabDouble([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 = []; + var exprs = [[string(this.minp)],[string(this.maxp)],[string(slope)]]; + var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -34,8 +34,8 @@ function SAT_f() { this.maxp = parseFloat(arguments[0]["maxp"]) this.pente = arguments[0]["pente"] this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = graphics.exprs; 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); @@ -47,7 +47,7 @@ function SAT_f() { } else if (this.pente<=0) { message("Slope must be strictly positive"); } else { - rpar = [[this.minp/this.pente],[this.maxp/this.pente],[this.pente]]; + var rpar = [[this.minp/this.pente],[this.maxp/this.pente],[this.pente]]; this.model.rpar = new ScilabDouble(rpar); this.model.firing = []; graphics.exprs = exprs; diff --git a/js/NonLinear/SIGNUM.js b/js/NonLinear/SIGNUM.js index fcef07ab..e62644ab 100644 --- a/js/NonLinear/SIGNUM.js +++ b/js/NonLinear/SIGNUM.js @@ -1,7 +1,7 @@ /* autogenerated from "macros/NonLinear/SIGNUM.sci" */ function SIGNUM() { SIGNUM.prototype.define = function SIGNUM() { - nu = -1; + var nu = -1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["signum"]), new ScilabDouble([4])); this.model.in1 = new ScilabDouble([nu]); @@ -10,8 +10,8 @@ function SIGNUM() { this.model.nmode = new ScilabDouble([nu]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [true,false]; - exprs = [string([1])]; - gr_i = []; + var exprs = [string([1])]; + var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -27,8 +27,8 @@ function SIGNUM() { SIGNUM.prototype.set = function SIGNUM() { this.zcr = arguments[0]["zcr"] this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = graphics.exprs; 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); diff --git a/js/NonLinear/SINBLK_f.js b/js/NonLinear/SINBLK_f.js index 4235da70..0484cf15 100644 --- a/js/NonLinear/SINBLK_f.js +++ b/js/NonLinear/SINBLK_f.js @@ -7,8 +7,8 @@ function SINBLK_f() { this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [true,false]; - exprs = " "; - gr_i = []; + var exprs = " "; + var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/NonLinear/TANBLK_f.js b/js/NonLinear/TANBLK_f.js index 80e107cb..1650e8f0 100644 --- a/js/NonLinear/TANBLK_f.js +++ b/js/NonLinear/TANBLK_f.js @@ -1,15 +1,15 @@ /* autogenerated from "macros/NonLinear/TANBLK_f.sci" */ function TANBLK_f() { TANBLK_f.prototype.define = function TANBLK_f() { - in1 = -1; + var in1 = -1; 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 = []; + var exprs = sci2exp(in1); + var gr_i = []; this.x = standard_define([2,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } diff --git a/js/NonLinear/TrigFun.js b/js/NonLinear/TrigFun.js index 2e9e3965..d7168800 100644 --- a/js/NonLinear/TrigFun.js +++ b/js/NonLinear/TrigFun.js @@ -7,8 +7,8 @@ function TrigFun() { this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = [true,false]; - exprs = "sin"; - gr_i = []; + var exprs = "sin"; + var gr_i = []; this.x = standard_define([4,2],this.model,exprs,gr_i); return new BasicBlock(this.x); } @@ -23,11 +23,11 @@ function TrigFun() { TrigFun.prototype.set = function TrigFun() { this.fun = arguments[0]["fun"] this.x = arg1; - graphics = arg1.graphics; - exprs = graphics.exprs; + var graphics = arg1.graphics; + var exprs = graphics.exprs; 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,$),", ")]]; + var PREVAR_FF = [["sin"],["cos"],["tan"],["asin"],["acos"],["atan"],["sinh"],["cosh"],["tanh"],["asinh"],["acosh"],["atanh"]]; + var PREVAR_GG = [["Choose among "+strcat(PREVAR_FF.slice(1-1,4),", ")],[strcat(PREVAR_FF.slice(5-1,$),", ")]]; while (true) { [ok,this.fun,exprs] = scicos_getvalue(PREVAR_GG,"Function",list("str",1),exprs); if (!ok) { |