diff options
Diffstat (limited to 'js/Linear')
71 files changed, 598 insertions, 707 deletions
diff --git a/js/Linear/BIGSOM_f.js b/js/Linear/BIGSOM_f.js index 2305b2bc..e2890f53 100644 --- a/js/Linear/BIGSOM_f.js +++ b/js/Linear/BIGSOM_f.js @@ -4,7 +4,7 @@ function BIGSOM_f() { this.sgn = [[1],[1]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["sum"]), new ScilabDouble([2])); - this.model.in1 = new ScilabDouble([-1],[-1]); + this.model.in = new ScilabDouble([-1],[-1]); this.model.out = new ScilabDouble([-1]); this.model.rpar = new ScilabDouble(this.sgn); this.model.blocktype = new ScilabString(["c"]); @@ -25,9 +25,6 @@ function BIGSOM_f() { BIGSOM_f.prototype.set = function BIGSOM_f() { this.sgn = inverse(arguments[0]["sgn"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; while (true) { [ok,this.sgn,this.exprs] = scicos_getvalue("Set sum block parameters","Inputs ports signs/gain",list("vec",-1),this.exprs); diff --git a/js/Linear/BIGSOM_f.pickle b/js/Linear/BIGSOM_f.pickle index 8b298173..d56a56dd 100644 --- a/js/Linear/BIGSOM_f.pickle +++ b/js/Linear/BIGSOM_f.pickle @@ -25,32 +25,32 @@ sS'model.sim' p3 S'list' p4 -sS'model.in1' +sS'model.out' p5 -g2 -sS'model.blocktype' +S'double' p6 -S'string' +sS'model.blocktype' p7 -sS'x.graphics' +S'string' p8 -S'object' +sS'x.graphics' p9 -sS'arg1' +S'object' p10 -g9 -sS'graphics.exprs' +sS'arg1' p11 -NsS'in1' +g10 +sS'graphics.exprs' p12 -S'double' +NsS'in1' p13 +g6 sS'model.rpar' p14 g2 sS'exprs' p15 -g7 +g8 sS'x.model' p16 NsS'gr_i' @@ -60,22 +60,22 @@ p18 sS'model.dep_ut' p19 g18 -sS'graphics' +sS'model.in' p20 -g9 -sS'y' +g2 +sS'graphics' p21 +g10 +sS'y' +p22 g18 sS'x' -p22 -g13 -sS'model' p23 -g9 -sS'typ' +g6 +sS'model' p24 -g18 -sS'model.out' +g10 +sS'typ' p25 -g13 +g18 s.
\ No newline at end of file diff --git a/js/Linear/CLINDUMMY_f.js b/js/Linear/CLINDUMMY_f.js index ff8a9769..13a9fb3a 100644 --- a/js/Linear/CLINDUMMY_f.js +++ b/js/Linear/CLINDUMMY_f.js @@ -21,7 +21,6 @@ function CLINDUMMY_f() { return options; } CLINDUMMY_f.prototype.set = function CLINDUMMY_f() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/Linear/CLR.js b/js/Linear/CLR.js index 0ae65202..90b97f0c 100644 --- a/js/Linear/CLR.js +++ b/js/Linear/CLR.js @@ -9,7 +9,7 @@ function CLR() { this.exprs = [["1"],["1+s"]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["csslti4"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.state = new ScilabDouble([x0]); this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); @@ -33,10 +33,7 @@ function CLR() { this.num = arguments[0]["num"] this.den = arguments[0]["den"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var x0 = this.model.state; var rpar = this.model.rpar; var ns = prod(size(x0)); diff --git a/js/Linear/CLR.pickle b/js/Linear/CLR.pickle index b567f246..be2d6092 100644 --- a/js/Linear/CLR.pickle +++ b/js/Linear/CLR.pickle @@ -43,45 +43,45 @@ g8 sS'x0[ns1-1][1-1]' p10 g8 -sS'model.in1' -p11 -g8 sS'x.graphics' -p12 +p11 g2 sS'ns' -p13 +p12 g8 sS'A' -p14 +p13 g8 sS'model.sim' -p15 +p14 S'list' -p16 +p15 sS'C' -p17 +p16 g8 sS'PREVAR_scicos_context.s' -p18 +p17 g8 sS'nin' -p19 +p18 g8 sS'D' -p20 +p19 g8 sS'H' -p21 +p20 g8 sS'model.rpar' -p22 +p21 g5 sS'mmm' -p23 +p22 S'vector' -p24 +p23 sS'model.state' +p24 +g8 +sS'model.in' p25 g8 sS'graphics.exprs' @@ -91,7 +91,7 @@ p27 g8 sS'typ' p28 -g24 +g23 sS'ok' p29 S'boolean' @@ -102,18 +102,18 @@ S'string' p32 sS'model.dep_ut' p33 -g24 +g23 sS'exprs' p34 g5 sS'gr_i' p35 -g24 +g23 sS'PREVAR_scicos_context' p36 NsS'y' p37 -g24 +g23 sS'x' p38 g8 diff --git a/js/Linear/CLR_f.js b/js/Linear/CLR_f.js index b18af850..c534851c 100644 --- a/js/Linear/CLR_f.js +++ b/js/Linear/CLR_f.js @@ -9,7 +9,7 @@ function CLR_f() { this.exprs = [["1"],["1+s"]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["csslti"]), new ScilabDouble([1])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.state = new ScilabDouble([x0]); this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); @@ -33,10 +33,7 @@ function CLR_f() { this.num = arguments[0]["num"] this.den = arguments[0]["den"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var x0 = this.model.state; var rpar = this.model.rpar; var ns = prod(size(x0)); diff --git a/js/Linear/CLR_f.pickle b/js/Linear/CLR_f.pickle index b567f246..be2d6092 100644 --- a/js/Linear/CLR_f.pickle +++ b/js/Linear/CLR_f.pickle @@ -43,45 +43,45 @@ g8 sS'x0[ns1-1][1-1]' p10 g8 -sS'model.in1' -p11 -g8 sS'x.graphics' -p12 +p11 g2 sS'ns' -p13 +p12 g8 sS'A' -p14 +p13 g8 sS'model.sim' -p15 +p14 S'list' -p16 +p15 sS'C' -p17 +p16 g8 sS'PREVAR_scicos_context.s' -p18 +p17 g8 sS'nin' -p19 +p18 g8 sS'D' -p20 +p19 g8 sS'H' -p21 +p20 g8 sS'model.rpar' -p22 +p21 g5 sS'mmm' -p23 +p22 S'vector' -p24 +p23 sS'model.state' +p24 +g8 +sS'model.in' p25 g8 sS'graphics.exprs' @@ -91,7 +91,7 @@ p27 g8 sS'typ' p28 -g24 +g23 sS'ok' p29 S'boolean' @@ -102,18 +102,18 @@ S'string' p32 sS'model.dep_ut' p33 -g24 +g23 sS'exprs' p34 g5 sS'gr_i' p35 -g24 +g23 sS'PREVAR_scicos_context' p36 NsS'y' p37 -g24 +g23 sS'x' p38 g8 diff --git a/js/Linear/CLSS.js b/js/Linear/CLSS.js index c3aa0444..1d4e5cef 100644 --- a/js/Linear/CLSS.js +++ b/js/Linear/CLSS.js @@ -10,7 +10,7 @@ function CLSS() { var out = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["csslti4"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([out]); this.model.state = new ScilabDouble([this.x0]); this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); @@ -41,13 +41,10 @@ function CLSS() { this.D = parseFloat(arguments[0]["D"]) this.x0 = parseFloat(arguments[0]["x0"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; if (size(this.exprs,"*")==7) { this.exprs = this.exprs[[1:4,7]-1]; } - this.model = arg1.model; while (true) { [ok,this.A,this.B,this.C,this.D,this.x0,this.exprs] = scicos_getvalue("Set continuous linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),this.exprs); if (!ok) { diff --git a/js/Linear/CLSS.pickle b/js/Linear/CLSS.pickle index 67df1cc8..ed38f3cd 100644 --- a/js/Linear/CLSS.pickle +++ b/js/Linear/CLSS.pickle @@ -46,39 +46,39 @@ p8 sS'out' p9 g8 -sS'model.in1' -p10 -g8 sS'x.graphics' -p11 +p10 g2 sS'A' -p12 +p11 g8 sS'model.sim' -p13 +p12 S'list' -p14 +p13 sS'C' -p15 +p14 g8 sS'B' -p16 +p15 g8 sS'D' -p17 +p16 g8 sS'in1' -p18 +p17 g8 sS'model.rpar' -p19 +p18 g5 sS'mmm' -p20 +p19 S'vector' -p21 +p20 sS'model.state' +p21 +g8 +sS'model.in' p22 g8 sS'graphics.exprs' @@ -89,27 +89,27 @@ p24 g8 sS'typ' p25 -g21 +g20 sS'model.blocktype' p26 S'string' p27 sS'model.dep_ut' p28 -g21 +g20 sS'exprs' p29 g5 sS'gr_i' p30 -g21 +g20 sS'okD' p31 S'boolean' p32 sS'y' p33 -g21 +g20 sS'x' p34 g8 diff --git a/js/Linear/CLSS_f.js b/js/Linear/CLSS_f.js index f1fd411b..3780d2b7 100644 --- a/js/Linear/CLSS_f.js +++ b/js/Linear/CLSS_f.js @@ -10,7 +10,7 @@ function CLSS_f() { var out = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["csslti"]), new ScilabDouble([1])); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([out]); this.model.state = new ScilabDouble([this.x0]); this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); @@ -41,13 +41,10 @@ function CLSS_f() { this.D = parseFloat(arguments[0]["D"]) this.x0 = parseFloat(arguments[0]["x0"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; if (size(this.exprs,"*")==7) { this.exprs = this.exprs[[1:4,7]-1]; } - this.model = arg1.model; while (true) { [ok,this.A,this.B,this.C,this.D,this.x0,this.exprs] = scicos_getvalue("Set continuous linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),this.exprs); if (!ok) { diff --git a/js/Linear/CLSS_f.pickle b/js/Linear/CLSS_f.pickle index 5888cbdb..b01fd687 100644 --- a/js/Linear/CLSS_f.pickle +++ b/js/Linear/CLSS_f.pickle @@ -46,39 +46,39 @@ p8 sS'out' p9 g8 -sS'model.in1' -p10 -g8 sS'x.graphics' -p11 +p10 g2 sS'A' -p12 +p11 g8 sS'model.sim' -p13 +p12 S'list' -p14 +p13 sS'C' -p15 +p14 g8 sS'B' -p16 +p15 g8 sS'D' -p17 +p16 g8 sS'in1' -p18 +p17 g8 sS'model.rpar' -p19 +p18 g5 sS'mmm' -p20 +p19 S'vector' -p21 +p20 sS'model.state' +p21 +g8 +sS'model.in' p22 g8 sS'graphics.exprs' @@ -89,23 +89,23 @@ p24 g8 sS'typ' p25 -g21 +g20 sS'model.blocktype' p26 S'string' p27 sS'model.dep_ut' p28 -g21 +g20 sS'exprs' p29 g5 sS'gr_i' p30 -g21 +g20 sS'y' p31 -g21 +g20 sS'x' p32 g8 diff --git a/js/Linear/DELAYV_f.js b/js/Linear/DELAYV_f.js index 4aaadbfd..84764dd7 100644 --- a/js/Linear/DELAYV_f.js +++ b/js/Linear/DELAYV_f.js @@ -7,7 +7,7 @@ function DELAYV_f() { this.T = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["delayv"]), new ScilabDouble([1])); - this.model.in1 = new ScilabDouble([this.nin],[1]); + this.model.in = new ScilabDouble([this.nin],[1]); this.model.out = new ScilabDouble([this.nin]); this.model.evtin = new ScilabDouble([1]); this.model.evtout = new ScilabDouble([1],[1]); @@ -37,11 +37,8 @@ function DELAYV_f() { this.zz0 = inverse(arguments[0]["zz0"]) this.T = parseFloat(arguments[0]["T"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; - this.nin = this.model.in1[1-1]; + this.nin = this.model.in[1-1]; var z0 = this.model.dstate; this.zz0 = z0.slice(1-1,$-1); var told = z0[$-1]; diff --git a/js/Linear/DELAYV_f.pickle b/js/Linear/DELAYV_f.pickle index ab2cd3e7..9230a94e 100644 --- a/js/Linear/DELAYV_f.pickle +++ b/js/Linear/DELAYV_f.pickle @@ -42,41 +42,41 @@ g4 sS'model.out' p9 g2 -sS'model.in1' -p10 -S'matrix' -p11 sS'x.graphics' -p12 +p10 g4 sS'typ' -p13 +p11 g7 sS'model.evtin' -p14 +p12 g2 sS'model.firing' -p15 +p13 g7 sS'told' -p16 +p14 g2 sS'model.sim' -p17 +p15 S'list' -p18 +p16 sS'model.evtout' -p19 -g11 +p17 +S'matrix' +p18 sS'nin' -p20 +p19 g2 sS'model.rpar' -p21 +p20 g2 sS'T' -p22 +p21 g2 +sS'model.in' +p22 +g18 sS'graphics.exprs' p23 NsS'z0' @@ -95,7 +95,7 @@ p29 g7 sS'exprs' p30 -g11 +g18 sS'gr_i' p31 g7 diff --git a/js/Linear/DELAY_f.js b/js/Linear/DELAY_f.js index c80050dc..32549d82 100644 --- a/js/Linear/DELAY_f.js +++ b/js/Linear/DELAY_f.js @@ -54,7 +54,7 @@ function DELAY_f() { this.x.graphics.pin = 0; this.x.graphics.pout = 0; this.x.model.sim = "csuper"; - this.x.model.in1 = 1; + this.x.model.in = 1; this.x.model.out = 1; this.x.model.blocktype = "h"; this.x.model.dep_ut = [false,false]; @@ -80,8 +80,6 @@ function DELAY_f() { this.z0 = arguments[0]["z0"] this.exprs = inverse(arguments[0]["exprs"]) var ppath = list(0,0); - for (i=1;i<=length(arg1.model.rpar.objs);i+=1) { - var o = arg1.model.rpar.objs[i-1]; if (typeof(o)=="Block"&&o.gui=="REGISTER_f") { ppath[1-1] = i; } @@ -92,7 +90,6 @@ function DELAY_f() { break; } } - this.x = arg1; var newpar = list(); var register = this.x.model.rpar.objs[ppath[1-1]-1]; var evtdly = this.x.model.rpar.objs[ppath[2-1]-1]; diff --git a/js/Linear/DELAY_f.pickle b/js/Linear/DELAY_f.pickle index ecc140bb..4eebe89b 100644 --- a/js/Linear/DELAY_f.pickle +++ b/js/Linear/DELAY_f.pickle @@ -115,44 +115,44 @@ g2 sS'arg1' p37 g2 -sS'x.model.in1' -p38 -g4 sS'evtdly.graphics.sz' -p39 +p38 g15 sS'register.graphics.sz' -p40 +p39 g15 sS'x.graphics.in_style' -p41 +p40 g6 sS'output_port.model.ipar' -p42 +p41 g4 sS'evtdly_exprs' -p43 +p42 NsS'input_port.graphics.sz' -p44 +p43 g15 sS'register.model' -p45 +p44 g2 sS'diagram.objs[2-1]' -p46 +p45 g2 sS'diagram.objs[4-1]' -p47 +p46 g2 sS'diagram.objs[10-1]' -p48 +p47 g4 sS'evtdly.graphics.exprs' -p49 +p48 g8 sS'ok' -p50 +p49 g19 +sS'x.model.in' +p50 +g4 sS'input_port' p51 g2 diff --git a/js/Linear/DERIV.js b/js/Linear/DERIV.js index afac05d0..0f028358 100644 --- a/js/Linear/DERIV.js +++ b/js/Linear/DERIV.js @@ -3,7 +3,7 @@ function DERIV() { DERIV.prototype.define = function DERIV() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["deriv"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["x"]); this.model.dep_ut = new ScilabDouble([true,false]); @@ -21,7 +21,6 @@ function DERIV() { return options; } DERIV.prototype.set = function DERIV() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/Linear/DERIV.pickle b/js/Linear/DERIV.pickle index 53cb8de0..b0d27eb1 100644 --- a/js/Linear/DERIV.pickle +++ b/js/Linear/DERIV.pickle @@ -19,38 +19,38 @@ S'model.sim' p1 S'list' p2 -sS'model.in1' +sS'model.blocktype' p3 -S'double' +S'string' p4 -sS'model.blocktype' +sS'exprs' p5 -S'string' +S'vector' p6 -sS'exprs' +sS'model.dep_ut' p7 -S'vector' +g6 +sS'model.out' p8 -sS'model.dep_ut' +S'double' p9 -g8 -sS'model.out' -p10 -g4 sS'gr_i' +p10 +g6 +sS'model.in' p11 -g8 +g9 sS'y' p12 -g8 +g6 sS'x' p13 -g4 +g9 sS'model' p14 S'object' p15 sS'typ' p16 -g8 +g6 s.
\ No newline at end of file diff --git a/js/Linear/DIFF_c.js b/js/Linear/DIFF_c.js index 10147a4d..9ac329a7 100644 --- a/js/Linear/DIFF_c.js +++ b/js/Linear/DIFF_c.js @@ -4,7 +4,7 @@ function DIFF_c() { this.x0 = [[0],[0]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["diffblk_c"]), new ScilabDouble([10004])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.state = new ScilabDouble(this.x0); this.model.blocktype = new ScilabString(["c"]); @@ -28,10 +28,7 @@ function DIFF_c() { this.x0 = inverse(arguments[0]["x0"]) this.xd0 = inverse(arguments[0]["xd0"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { var ask_again = false; [ok,this.x0,this.xd0,this.exprs] = scicos_getvalue("Set continuous linear system parameters",["Initial state","Initial Derivative"],list("vec",-1,"vec",-1),this.exprs); @@ -54,7 +51,7 @@ function DIFF_c() { this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.state = new ScilabDouble([this.x0],[this.xd0]); this.model.out = new ScilabDouble([N]); - this.model.in1 = new ScilabDouble([N]); + this.model.in = new ScilabDouble([N]); this.x.graphics = this.graphics; this.x.model = this.model; break; diff --git a/js/Linear/DIFF_c.pickle b/js/Linear/DIFF_c.pickle index 74c91b8e..1fa364cb 100644 --- a/js/Linear/DIFF_c.pickle +++ b/js/Linear/DIFF_c.pickle @@ -36,34 +36,34 @@ sS'model.out' p7 S'double' p8 -sS'model.in1' -p9 -g8 sS'x.model.firing' -p10 +p9 g6 sS'x.graphics' -p11 +p10 g2 sS'model.sim' -p12 +p11 S'list' -p13 +p12 sS'N' -p14 +p13 g8 sS'Nxd' -p15 +p14 g8 sS'model.state' -p16 +p15 S'matrix' +p16 +sS'model.in' p17 +g8 sS'graphics.exprs' p18 NsS'x0' p19 -g17 +g16 sS'typ' p20 g6 @@ -76,7 +76,7 @@ p23 g6 sS'exprs' p24 -g17 +g16 sS'gr_i' p25 g6 diff --git a/js/Linear/DLR.js b/js/Linear/DLR.js index cc77c067..f2dc4ece 100644 --- a/js/Linear/DLR.js +++ b/js/Linear/DLR.js @@ -9,7 +9,7 @@ function DLR() { this.exprs = [["1"],["1+z"]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["dsslti4"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble(x0.slice()); @@ -34,10 +34,7 @@ function DLR() { this.num = arguments[0]["num"] this.den = arguments[0]["den"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var x0 = this.model.dstate; var ns = prod(size(x0)); var PREVAR_scicos_context = PREVAR_scicos_context; diff --git a/js/Linear/DLR.pickle b/js/Linear/DLR.pickle index 486f8c81..bbf917d6 100644 --- a/js/Linear/DLR.pickle +++ b/js/Linear/DLR.pickle @@ -44,49 +44,49 @@ p10 sS'x0[ns1-1][1-1]' p11 g10 -sS'model.in1' -p12 -g10 sS'x.model.firing' -p13 +p12 g2 sS'x.graphics' -p14 +p13 g4 sS'model.evtin' -p15 +p14 g10 sS'ns' -p16 +p15 g10 sS'A' -p17 +p16 g10 sS'model.sim' -p18 +p17 S'list' -p19 +p18 sS'C' -p20 +p19 g10 sS'B' -p21 +p20 g10 sS'D' -p22 +p21 g10 sS'H' -p23 +p22 g10 sS'PREVAR_scicos_context.z' -p24 +p23 g10 sS'model.rpar' -p25 +p24 g7 sS'mmm' -p26 +p25 g2 +sS'model.in' +p26 +g10 sS'graphics.exprs' p27 NsS'x0' diff --git a/js/Linear/DLR_f.js b/js/Linear/DLR_f.js index 6cfe981b..4cb0a9b1 100644 --- a/js/Linear/DLR_f.js +++ b/js/Linear/DLR_f.js @@ -9,7 +9,7 @@ function DLR_f() { this.exprs = [["1"],["1+z"]]; this.model = scicos_model(); this.model.sim = new ScilabString(["dsslti"]); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble(x0.slice()); @@ -34,10 +34,7 @@ function DLR_f() { this.num = arguments[0]["num"] this.den = arguments[0]["den"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; var x0 = this.model.dstate; var ns = prod(size(x0)); var PREVAR_scicos_context = PREVAR_scicos_context; diff --git a/js/Linear/DLR_f.pickle b/js/Linear/DLR_f.pickle index 77ebf7e1..e3dc7d2e 100644 --- a/js/Linear/DLR_f.pickle +++ b/js/Linear/DLR_f.pickle @@ -44,49 +44,49 @@ p10 sS'x0[ns1-1][1-1]' p11 g10 -sS'model.in1' -p12 -g10 sS'x.model.firing' -p13 +p12 g2 sS'x.graphics' -p14 +p13 g4 sS'model.evtin' -p15 +p14 g10 sS'ns' -p16 +p15 g10 sS'A' -p17 +p16 g10 sS'model.sim' -p18 +p17 S'string' -p19 +p18 sS'C' -p20 +p19 g10 sS'B' -p21 +p20 g10 sS'D' -p22 +p21 g10 sS'H' -p23 +p22 g10 sS'PREVAR_scicos_context.z' -p24 +p23 g10 sS'model.rpar' -p25 +p24 g7 sS'mmm' -p26 +p25 g2 +sS'model.in' +p26 +g10 sS'graphics.exprs' p27 NsS'x0' @@ -101,7 +101,7 @@ S'boolean' p31 sS'model.blocktype' p32 -g19 +g18 sS'model.dep_ut' p33 g2 diff --git a/js/Linear/DLSS.js b/js/Linear/DLSS.js index da2bcd88..3a0f5694 100644 --- a/js/Linear/DLSS.js +++ b/js/Linear/DLSS.js @@ -8,7 +8,7 @@ function DLSS() { this.D = 0; this.model = scicos_model(); this.model.sim = list(new ScilabString(["dsslti4"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble(this.x0.slice()); @@ -40,13 +40,10 @@ function DLSS() { this.D = parseFloat(arguments[0]["D"]) this.x0 = parseFloat(arguments[0]["x0"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; if (size(this.exprs,"*")==7) { this.exprs = this.exprs[[1:4,7]-1]; } - this.model = arg1.model; while (true) { [ok,this.A,this.B,this.C,this.D,this.x0,this.exprs] = scicos_getvalue("Set discrete linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),this.exprs); if (!ok) { diff --git a/js/Linear/DLSS.pickle b/js/Linear/DLSS.pickle index eb7fb836..3ec224c7 100644 --- a/js/Linear/DLSS.pickle +++ b/js/Linear/DLSS.pickle @@ -50,40 +50,40 @@ p10 sS'out' p11 g2 -sS'model.in1' -p12 -g10 sS'x.graphics' -p13 +p12 g4 sS'model.evtin' -p14 +p13 g10 sS'A' -p15 +p14 g10 sS'model.sim' -p16 +p15 S'list' -p17 +p16 sS'C' -p18 +p17 g10 sS'B' -p19 +p18 g10 sS'D' -p20 +p19 g10 sS'in1' -p21 +p20 g2 sS'model.rpar' -p22 +p21 g7 sS'mmm' -p23 +p22 g2 +sS'model.in' +p23 +g10 sS'graphics.exprs' p24 g10 diff --git a/js/Linear/DLSS_f.js b/js/Linear/DLSS_f.js index 1d9f045e..6d89f7ad 100644 --- a/js/Linear/DLSS_f.js +++ b/js/Linear/DLSS_f.js @@ -8,7 +8,7 @@ function DLSS_f() { this.D = 0; this.model = scicos_model(); this.model.sim = list(new ScilabString(["dsslti"]), new ScilabDouble([1])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble(this.x0.slice()); @@ -40,13 +40,10 @@ function DLSS_f() { this.D = parseFloat(arguments[0]["D"]) this.x0 = parseFloat(arguments[0]["x0"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; if (size(this.exprs,"*")==7) { this.exprs = this.exprs[[1:4,7]-1]; } - this.model = arg1.model; while (true) { [ok,this.A,this.B,this.C,this.D,this.x0,this.exprs] = scicos_getvalue("Set discrete linear system parameters",["A matrix","B matrix","C matrix","D matrix","Initial state"],list("mat",[-1,-1],"mat",["size(%1,2)","-1"],"mat",["-1","size(%1,2)"],"mat",[-1,-1],"vec","size(%1,2)"),this.exprs); if (!ok) { diff --git a/js/Linear/DLSS_f.pickle b/js/Linear/DLSS_f.pickle index d909374f..48238692 100644 --- a/js/Linear/DLSS_f.pickle +++ b/js/Linear/DLSS_f.pickle @@ -50,40 +50,40 @@ p10 sS'out' p11 g2 -sS'model.in1' -p12 -g10 sS'x.graphics' -p13 +p12 g4 sS'model.evtin' -p14 +p13 g10 sS'A' -p15 +p14 g10 sS'model.sim' -p16 +p15 S'list' -p17 +p16 sS'C' -p18 +p17 g10 sS'B' -p19 +p18 g10 sS'D' -p20 +p19 g10 sS'in1' -p21 +p20 g2 sS'model.rpar' -p22 +p21 g7 sS'mmm' -p23 +p22 g2 +sS'model.in' +p23 +g10 sS'graphics.exprs' p24 g10 diff --git a/js/Linear/DOLLAR.js b/js/Linear/DOLLAR.js index a67e959d..af9b793c 100644 --- a/js/Linear/DOLLAR.js +++ b/js/Linear/DOLLAR.js @@ -7,7 +7,7 @@ function DOLLAR() { this.exprs = string([[z],[this.inh]]); this.model = scicos_model(); this.model.sim = list(new ScilabString(["dollar4"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([in1]); this.model.evtin = new ScilabDouble([1-this.inh]); this.model.dstate = new ScilabDouble([z]); @@ -31,10 +31,7 @@ function DOLLAR() { this.a = arguments[0]["a"] this.inh = parseFloat(arguments[0]["inh"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")<2) { this.exprs[2-1] = "0"; } diff --git a/js/Linear/DOLLAR.pickle b/js/Linear/DOLLAR.pickle index 70bb77cf..711e00ae 100644 --- a/js/Linear/DOLLAR.pickle +++ b/js/Linear/DOLLAR.pickle @@ -51,23 +51,23 @@ sS'out' p12 S'vector' p13 -sS'model.in1' -p14 -g4 sS'x.graphics' -p15 +p14 g6 sS'model.evtin' -p16 +p15 g4 sS'exprs[2-1]' -p17 +p16 S'string' -p18 +p17 sS'model.sim' -p19 +p18 g2 sS'in1' +p19 +g4 +sS'model.in' p20 g4 sS'graphics.exprs' @@ -84,13 +84,13 @@ S'boolean' p25 sS'model.blocktype' p26 -g18 +g17 sS'model.dep_ut' p27 g13 sS'exprs' p28 -g18 +g17 sS'gr_i' p29 g13 diff --git a/js/Linear/DOLLAR_f.js b/js/Linear/DOLLAR_f.js index ec558ae4..8ebdf0ae 100644 --- a/js/Linear/DOLLAR_f.js +++ b/js/Linear/DOLLAR_f.js @@ -7,7 +7,7 @@ function DOLLAR_f() { this.exprs = string([[z],[this.inh]]); this.model = scicos_model(); this.model.sim = new ScilabString(["dollar"]); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([in1]); this.model.evtin = new ScilabDouble([1-this.inh]); this.model.dstate = new ScilabDouble([z]); @@ -31,10 +31,7 @@ function DOLLAR_f() { this.a = arguments[0]["a"] this.inh = parseFloat(arguments[0]["inh"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")<2) { this.exprs[2-1] = "0"; } @@ -57,7 +54,7 @@ function DOLLAR_f() { if (ok) { this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.dstate = new ScilabDouble([this.a]); - this.model.in1 = new ScilabDouble(in1); + this.model.in = new ScilabDouble(in1); this.model.out = new ScilabDouble(out); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Linear/DOLLAR_f.pickle b/js/Linear/DOLLAR_f.pickle index ab8ea4a7..08fd26e2 100644 --- a/js/Linear/DOLLAR_f.pickle +++ b/js/Linear/DOLLAR_f.pickle @@ -42,23 +42,23 @@ sS'out' p9 S'vector' p10 -sS'model.in1' -p11 -g2 sS'x.graphics' -p12 +p11 g4 sS'model.evtin' -p13 +p12 g2 sS'exprs[2-1]' -p14 +p13 S'string' -p15 +p14 sS'model.sim' -p16 -g15 +p15 +g14 sS'in1' +p16 +g2 +sS'model.in' p17 g2 sS'graphics.exprs' @@ -68,13 +68,13 @@ p19 g10 sS'model.blocktype' p20 -g15 +g14 sS'model.dep_ut' p21 g10 sS'exprs' p22 -g15 +g14 sS'gr_i' p23 g10 diff --git a/js/Linear/DOLLAR_m.js b/js/Linear/DOLLAR_m.js index 2c0c4398..e3926dd6 100644 --- a/js/Linear/DOLLAR_m.js +++ b/js/Linear/DOLLAR_m.js @@ -7,7 +7,7 @@ function DOLLAR_m() { this.exprs = string([[z],[this.inh]]); this.model = scicos_model(); this.model.sim = list(new ScilabString(["dollar4"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([in1]); this.model.evtin = new ScilabDouble([1-this.inh]); this.model.dstate = new ScilabDouble([z]); @@ -31,10 +31,7 @@ function DOLLAR_m() { this.a = arguments[0]["a"] this.inh = parseFloat(arguments[0]["inh"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")<2) { this.exprs[2-1] = "0"; } diff --git a/js/Linear/DOLLAR_m.pickle b/js/Linear/DOLLAR_m.pickle index 70bb77cf..711e00ae 100644 --- a/js/Linear/DOLLAR_m.pickle +++ b/js/Linear/DOLLAR_m.pickle @@ -51,23 +51,23 @@ sS'out' p12 S'vector' p13 -sS'model.in1' -p14 -g4 sS'x.graphics' -p15 +p14 g6 sS'model.evtin' -p16 +p15 g4 sS'exprs[2-1]' -p17 +p16 S'string' -p18 +p17 sS'model.sim' -p19 +p18 g2 sS'in1' +p19 +g4 +sS'model.in' p20 g4 sS'graphics.exprs' @@ -84,13 +84,13 @@ S'boolean' p25 sS'model.blocktype' p26 -g18 +g17 sS'model.dep_ut' p27 g13 sS'exprs' p28 -g18 +g17 sS'gr_i' p29 g13 diff --git a/js/Linear/GAINBLK.js b/js/Linear/GAINBLK.js index a74d673f..d5b40e1e 100644 --- a/js/Linear/GAINBLK.js +++ b/js/Linear/GAINBLK.js @@ -8,7 +8,7 @@ function GAINBLK() { var out2 = -2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["gainblk"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([out]); this.model.in2 = new ScilabDouble([in2]); this.model.out2 = new ScilabDouble([out2]); @@ -34,10 +34,7 @@ function GAINBLK() { this.gain = parseFloat(arguments[0]["gain"]) this.over = arguments[0]["over"] this.exprs = inverse(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")==1) { this.exprs = [[this.exprs],[sci2exp(0)]]; } diff --git a/js/Linear/GAINBLK.pickle b/js/Linear/GAINBLK.pickle index b7258a6b..605c804c 100644 --- a/js/Linear/GAINBLK.pickle +++ b/js/Linear/GAINBLK.pickle @@ -41,26 +41,26 @@ g5 sS'model.in2' p9 g5 -sS'model.in1' -p10 -g5 sS'x.graphics' -p11 +p10 g2 sS'model.sim' -p12 +p11 S'list' -p13 +p12 sS'model.out2' -p14 +p13 g5 sS'in1' -p15 +p14 g5 sS'in2' -p16 +p15 g5 sS'model.rpar' +p16 +g5 +sS'model.in' p17 g5 sS'graphics.exprs' @@ -73,7 +73,7 @@ S'vector' p21 sS'model.opar' p22 -g13 +g12 sS'out2' p23 g5 diff --git a/js/Linear/GAINBLK_f.js b/js/Linear/GAINBLK_f.js index bf0f3b7e..20248e22 100644 --- a/js/Linear/GAINBLK_f.js +++ b/js/Linear/GAINBLK_f.js @@ -6,7 +6,7 @@ function GAINBLK_f() { var out = 1; this.model = scicos_model(); this.model.sim = new ScilabString(["gain"]); - this.model.in1 = new ScilabDouble([in1]); + this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([out]); this.model.rpar = new ScilabDouble([this.gain]); this.model.blocktype = new ScilabString(["c"]); @@ -28,10 +28,7 @@ function GAINBLK_f() { GAINBLK_f.prototype.set = function GAINBLK_f() { this.gain = parseFloat(arguments[0]["gain"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.gain,this.exprs] = scicos_getvalue("Set gain block parameters",["Gain"],list("mat",[-1,-1]),this.exprs[1-1]); if (!ok) { diff --git a/js/Linear/GAINBLK_f.pickle b/js/Linear/GAINBLK_f.pickle index 9be62223..189e881e 100644 --- a/js/Linear/GAINBLK_f.pickle +++ b/js/Linear/GAINBLK_f.pickle @@ -21,7 +21,7 @@ S'model.sim' p1 S'string' p2 -sS'model.in1' +sS'model.out' p3 S'double' p4 @@ -58,21 +58,21 @@ g9 sS'gain' p17 g4 -sS'graphics' +sS'model.in' p18 +g4 +sS'graphics' +p19 g7 sS'y' -p19 +p20 g9 sS'x' -p20 +p21 g4 sS'model' -p21 -g7 -sS'model.out' p22 -g4 +g7 sS'typ' p23 g9 diff --git a/js/Linear/GAIN_f.js b/js/Linear/GAIN_f.js index 73dcfdba..0a58b8ee 100644 --- a/js/Linear/GAIN_f.js +++ b/js/Linear/GAIN_f.js @@ -6,7 +6,7 @@ function GAIN_f() { var out = 1; this.model = scicos_model(); this.model.sim = new ScilabString(["gain"]); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.gain]); this.model.blocktype = new ScilabString(["c"]); @@ -28,10 +28,7 @@ function GAIN_f() { GAIN_f.prototype.set = function GAIN_f() { this.gain = parseFloat(arguments[0]["gain"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.gain,this.exprs] = scicos_getvalue("Set gain block parameters",["Gain"],list("mat",[-1,-1]),this.exprs[1-1]); if (!ok) { diff --git a/js/Linear/GAIN_f.pickle b/js/Linear/GAIN_f.pickle index b56e466c..3ad06e12 100644 --- a/js/Linear/GAIN_f.pickle +++ b/js/Linear/GAIN_f.pickle @@ -21,7 +21,7 @@ S'model.sim' p1 S'string' p2 -sS'model.in1' +sS'model.out' p3 S'double' p4 @@ -59,21 +59,21 @@ g9 sS'gain' p18 g4 -sS'graphics' +sS'model.in' p19 +g4 +sS'graphics' +p20 g7 sS'y' -p20 +p21 g9 sS'x' -p21 +p22 g4 sS'model' -p22 -g7 -sS'model.out' p23 -g4 +g7 sS'typ' p24 g9 diff --git a/js/Linear/INTEGRAL.js b/js/Linear/INTEGRAL.js index 7128c3bb..b3adbece 100644 --- a/js/Linear/INTEGRAL.js +++ b/js/Linear/INTEGRAL.js @@ -7,7 +7,7 @@ function INTEGRAL() { this.model = scicos_model(); this.model.state = new ScilabDouble([0]); this.model.sim = list(new ScilabString(["integral_func"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); @@ -38,10 +38,7 @@ function INTEGRAL() { this.maxp = parseFloat(arguments[0]["maxp"]) this.lowp = arguments[0]["lowp"] this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.x0,this.reinit,this.satur,this.maxp,this.lowp,this.exprs] = scicos_getvalue("Set Integral block parameters",["Initial Condition","With re-intialization (1:yes, 0:no)","With saturation (1:yes, 0:no)","Upper limit","Lower limit"],list("vec",-1,"vec",1,"vec",1,"vec",-1,"vec",-1),this.exprs); if (!ok) { diff --git a/js/Linear/INTEGRAL.pickle b/js/Linear/INTEGRAL.pickle index 2c6a4954..3fa2cfa6 100644 --- a/js/Linear/INTEGRAL.pickle +++ b/js/Linear/INTEGRAL.pickle @@ -25,57 +25,57 @@ p11 atp12 Rp13 .(dp0 -S'arg1' +S'model.in' p1 -S'object' +S'double' p2 -sS'reinit' +sS'arg1' p3 -S'double' +S'object' p4 -sS'rpar' +sS'reinit' p5 -S'vector' +g2 +sS'rpar' p6 -sS'model.out' +S'vector' p7 -g4 -sS'x.model' +sS'model.out' p8 -NsS'minp' +g2 +sS'x.model' p9 -g4 -sS'graphics' +NsS'minp' p10 g2 -sS'x.graphics' +sS'graphics' p11 -g2 -sS'typ' +g4 +sS'x.graphics' p12 -g6 -sS'maxp' -p13 g4 -sS'model.sim' +sS'typ' +p13 +g7 +sS'maxp' p14 -S'list' +g2 +sS'model.sim' p15 -sS'model.nmode' +S'list' p16 -g4 -sS'model.rpar' +sS'model.nmode' p17 -g6 -sS'model.in1' +g2 +sS'model.rpar' p18 -g4 +g7 sS'satur' p19 -g4 +g2 sS'model.state' p20 -g4 +g2 sS'lowp' p21 S'string' @@ -84,10 +84,10 @@ sS'graphics.exprs' p23 NsS'x0' p24 -g6 +g7 sS'model.nzcross' p25 -g4 +g2 sS'x.graphics.id' p26 g22 @@ -100,20 +100,20 @@ p29 g22 sS'model.dep_ut' p30 -g6 +g7 sS'exprs' p31 g22 sS'gr_i' p32 -g6 +g7 sS'y' p33 -g6 +g7 sS'x' p34 -g4 +g2 sS'model' p35 -g2 +g4 s.
\ No newline at end of file diff --git a/js/Linear/INTEGRAL_f.js b/js/Linear/INTEGRAL_f.js index 36995956..7b027f9d 100644 --- a/js/Linear/INTEGRAL_f.js +++ b/js/Linear/INTEGRAL_f.js @@ -4,7 +4,7 @@ function INTEGRAL_f() { this.x0 = 0; this.model = scicos_model(); this.model.sim = new ScilabString(["integr"]); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.state = new ScilabDouble([this.x0]); this.model.blocktype = new ScilabString(["c"]); @@ -25,10 +25,7 @@ function INTEGRAL_f() { INTEGRAL_f.prototype.set = function INTEGRAL_f() { this.x0 = parseFloat(arguments[0]["x0"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.x0,this.exprs] = scicos_getvalue("Set continuous linear system parameters","Initial state",list("vec",1),this.exprs); if (!ok) { diff --git a/js/Linear/INTEGRAL_f.pickle b/js/Linear/INTEGRAL_f.pickle index 0fd0a5a0..30ddf90c 100644 --- a/js/Linear/INTEGRAL_f.pickle +++ b/js/Linear/INTEGRAL_f.pickle @@ -21,7 +21,7 @@ S'model.sim' p1 S'string' p2 -sS'model.in1' +sS'model.out' p3 S'double' p4 @@ -44,18 +44,18 @@ p11 NsS'model.dep_ut' p12 g7 -sS'model.out' -p13 -g4 sS'exprs' -p14 +p13 g4 sS'x.model' -p15 +p14 NsS'gr_i' -p16 +p15 g7 sS'model.state' +p16 +g4 +sS'model.in' p17 g4 sS'graphics' diff --git a/js/Linear/INTEGRAL_m.js b/js/Linear/INTEGRAL_m.js index 07d5480e..e202045f 100644 --- a/js/Linear/INTEGRAL_m.js +++ b/js/Linear/INTEGRAL_m.js @@ -7,7 +7,7 @@ function INTEGRAL_m() { this.model = scicos_model(); this.model.state = new ScilabDouble([0]); this.model.sim = list(new ScilabString(["integral_func"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.in2 = new ScilabDouble([1]); this.model.out2 = new ScilabDouble([1]); @@ -39,10 +39,7 @@ function INTEGRAL_m() { this.maxp = parseFloat(arguments[0]["maxp"]) this.lowp = parseFloat(arguments[0]["lowp"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.x0,this.reinit,this.satur,this.maxp,this.lowp,this.exprs] = scicos_getvalue("Set Integral block parameters",["Initial Condition","With re-intialization (1:yes, 0:no)","With saturation (1:yes, 0:no)","Upper limit","Lower limit"],list("mat",[-1,-1],"vec",1,"vec",1,"mat",[-1,-1],"mat",[-1,-1]),this.exprs); if (!ok) { diff --git a/js/Linear/INTEGRAL_m.pickle b/js/Linear/INTEGRAL_m.pickle index 21951779..972d2db9 100644 --- a/js/Linear/INTEGRAL_m.pickle +++ b/js/Linear/INTEGRAL_m.pickle @@ -25,82 +25,82 @@ p11 atp12 Rp13 .(dp0 -S'arg1' +S'model.in' p1 -S'object' +S'double' p2 -sS'reinit' +sS'arg1' p3 -S'double' +S'object' p4 -sS'it' +sS'reinit' p5 -S'matrix' +g2 +sS'it' p6 -sS'rpar' +S'matrix' p7 -S'vector' +sS'rpar' p8 -sS'model.out' +S'vector' p9 -g4 -sS'x.model' +sS'model.out' p10 -NsS'minp' +g2 +sS'x.model' p11 -g4 -sS'out' +NsS'minp' p12 -g4 -sS'model.in2' +g2 +sS'out' p13 -g4 -sS'model.in1' +g2 +sS'model.in2' p14 -g4 +g2 sS'x.graphics' p15 -g2 +g4 sS'typ' p16 -g8 +g9 sS'maxp' p17 -g4 +g2 sS'model.sim' p18 S'list' p19 sS'Datatype' p20 -g4 +g2 sS'model.out2' p21 -g4 +g2 sS'in1' p22 -g8 +g9 sS'model.rpar' p23 -g8 +g9 sS'model.nmode' p24 -g4 +g2 sS'satur' p25 -g4 +g2 sS'model.state' p26 -g4 +g2 sS'lowp' p27 -g4 +g2 sS'graphics' p28 -g2 +g4 sS'model.nzcross' p29 -g4 +g2 sS'ok' p30 S'boolean' @@ -111,25 +111,25 @@ S'string' p33 sS'model.dep_ut' p34 -g8 +g9 sS'exprs' p35 g33 sS'gr_i' p36 -g8 +g9 sS'graphics.exprs' p37 NsS'y' p38 -g8 +g9 sS'x' p39 -g4 +g2 sS'model' p40 -g2 +g4 sS'ot' p41 -g4 +g2 s.
\ No newline at end of file diff --git a/js/Linear/PID.js b/js/Linear/PID.js index 439f4907..bca0affb 100644 --- a/js/Linear/PID.js +++ b/js/Linear/PID.js @@ -25,7 +25,7 @@ function PID() { scs_m.objs[21-1] = scicos_link(xx=[[213.97067],[233.97067]],yy=[[203.11733],[203.11733]],id="drawlink",thick=[0,0],ct=[1,1],from=[20,1,0],to=[15,1,1]); this.model = scicos_model(); this.model.sim = new ScilabString(["csuper"]); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.out = new ScilabDouble([-1]); this.model.out2 = new ScilabDouble([-2]); @@ -56,11 +56,7 @@ function PID() { this.d = arguments[0]["d"] this.exprs0 = arguments[0]["exprs0"] var ppath = list(0,0,0); - for (i=1;i<=length(arg1.model.rpar.objs);i+=1) { - var o = arg1.model.rpar.objs[this.i-1]; if (typeof(o)=="Link") { - var from = arg1.model.rpar.objs[o.from[1-1]-1]; - var to = arg1.model.rpar.objs[o.to[1-1]-1]; if (from.gui=="GAINBLK") { switch (to.gui) { case "SUMMATION": @@ -86,13 +82,10 @@ function PID() { } } var newpar = list(); - var xx1 = arg1.model.rpar.objs[ppath[1-1]-1]; this.exprs[1-1] = xx1.graphics.exprs[1-1]; var p_old = xx1.model.rpar; - var xx2 = arg1.model.rpar.objs[ppath[2-1]-1]; this.exprs[2-1] = xx2.graphics.exprs[1-1]; var i_old = xx2.model.rpar; - var xx3 = arg1.model.rpar.objs[ppath[3-1]-1]; this.exprs[3-1] = xx3.graphics.exprs[1-1]; var d_old = xx3.model.rpar; var y = 0; @@ -108,9 +101,6 @@ function PID() { xx2.model.rpar = this.i; xx3.graphics.exprs = this.exprs0[3-1]; xx3.model.rpar = this.d; - arg1.model.rpar.objs[ppath[1-1]-1] = xx1; - arg1.model.rpar.objs[ppath[2-1]-1] = xx2; - arg1.model.rpar.objs[ppath[3-1]-1] = xx3; break; } } @@ -121,7 +111,6 @@ function PID() { newpar[size(newpar)+1-1] = ppath[3-1]; var needcompile = 2; } - this.x = arg1; var y = max(y,needcompile); var typ = newpar; return new BasicBlock(this.x); diff --git a/js/Linear/PID.pickle b/js/Linear/PID.pickle index f2b15d1a..392781a3 100644 --- a/js/Linear/PID.pickle +++ b/js/Linear/PID.pickle @@ -84,7 +84,7 @@ p23 g4 sS'xx3.model.rpar' p24 -NsS'model.in1' +NsS'model.intyp' p25 g4 sS'scs_m.objs[19-1]' @@ -149,27 +149,27 @@ g4 sS'xx2.graphics' p46 g2 -sS'model.intyp' -p47 -g4 sS'i_old' -p48 +p47 NsS'scs_m.objs[3-1]' -p49 +p48 g4 sS'arg1.model.rpar.objs[ppath[3-1]-1]' -p50 +p49 g2 sS'ppath[1-1]' -p51 +p50 g4 sS'exprs[3-1]' -p52 +p51 g4 sS'scs_m.objs[14-1]' -p53 +p52 g4 sS'scs_m.objs[17-1]' +p53 +g4 +sS'model.in' p54 g4 sS'scs_m.objs[4-1]' diff --git a/js/Linear/REGISTER.js b/js/Linear/REGISTER.js index 7d0077d3..92437384 100644 --- a/js/Linear/REGISTER.js +++ b/js/Linear/REGISTER.js @@ -4,7 +4,7 @@ function REGISTER() { this.z0 = zeros(10,1); this.model = scicos_model(); this.model.sim = list(new ScilabString(["delay4"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([this.z0]); @@ -29,10 +29,7 @@ function REGISTER() { this.z0 = parseFloat(arguments[0]["z0"]) this.it = arguments[0]["it"] this.exprs = inverse(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,1)==1) { this.exprs = [[this.exprs],[sci2exp(1)]]; } diff --git a/js/Linear/REGISTER.pickle b/js/Linear/REGISTER.pickle index 8dd4c7e1..a1ee7aa7 100644 --- a/js/Linear/REGISTER.pickle +++ b/js/Linear/REGISTER.pickle @@ -39,25 +39,25 @@ p8 NsS'model.out' p9 g4 -sS'model.in1' -p10 -g4 sS'x.graphics' -p11 +p10 g6 sS'typ' -p12 +p11 S'vector' -p13 +p12 sS'model.evtin' -p14 +p13 g4 sS'model.sim' -p15 +p14 g2 sS'in1' +p15 +g12 +sS'model.in' p16 -g13 +g4 sS'graphics.exprs' p17 S'matrix' @@ -75,16 +75,16 @@ S'string' p23 sS'model.dep_ut' p24 -g13 +g12 sS'exprs' p25 g4 sS'gr_i' p26 -g13 +g12 sS'y' p27 -g13 +g12 sS'x' p28 g4 diff --git a/js/Linear/REGISTER_f.js b/js/Linear/REGISTER_f.js index 478fe1e2..329bdc09 100644 --- a/js/Linear/REGISTER_f.js +++ b/js/Linear/REGISTER_f.js @@ -4,7 +4,7 @@ function REGISTER_f() { this.z0 = zeros(10,1); this.model = scicos_model(); this.model.sim = new ScilabString(["delay"]); - this.model.in1 = new ScilabDouble([1]); + this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([this.z0]); @@ -26,10 +26,7 @@ function REGISTER_f() { REGISTER_f.prototype.set = function REGISTER_f() { this.z0 = parseFloat(arguments[0]["z0"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.z0,this.exprs] = scicos_getvalue("Set delay parameters","Register initial condition",list("vec",-1),this.exprs); if (!ok) { diff --git a/js/Linear/REGISTER_f.pickle b/js/Linear/REGISTER_f.pickle index 0fb58e59..862af688 100644 --- a/js/Linear/REGISTER_f.pickle +++ b/js/Linear/REGISTER_f.pickle @@ -21,7 +21,7 @@ S'model.sim' p1 S'string' p2 -sS'model.in1' +sS'model.out' p3 S'double' p4 @@ -44,30 +44,30 @@ p11 NsS'model.dstate' p12 g4 -sS'model.blocktype' -p13 -g2 sS'exprs' -p14 +p13 g4 sS'x.model' -p15 +p14 NsS'gr_i' -p16 +p15 S'vector' -p17 +p16 sS'z0' -p18 +p17 g4 sS'model.dep_ut' +p18 +g16 +sS'model.in' p19 -g17 +g4 sS'graphics' p20 g9 sS'y' p21 -g17 +g16 sS'x' p22 g4 @@ -76,8 +76,8 @@ p23 g9 sS'typ' p24 -g17 -sS'model.out' +g16 +sS'model.blocktype' p25 -g4 +g2 s.
\ No newline at end of file diff --git a/js/Linear/SAMPHOLD.js b/js/Linear/SAMPHOLD.js index 3664af57..3332a6a8 100644 --- a/js/Linear/SAMPHOLD.js +++ b/js/Linear/SAMPHOLD.js @@ -4,7 +4,7 @@ function SAMPHOLD() { var in1 = -1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["samphold4"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); @@ -22,7 +22,6 @@ function SAMPHOLD() { return options; } SAMPHOLD.prototype.set = function SAMPHOLD() { - this.x = arg1; this.x.model.firing = []; return new BasicBlock(this.x); } diff --git a/js/Linear/SAMPHOLD.pickle b/js/Linear/SAMPHOLD.pickle index 32879b77..59f3bcea 100644 --- a/js/Linear/SAMPHOLD.pickle +++ b/js/Linear/SAMPHOLD.pickle @@ -19,44 +19,44 @@ S'model.sim' p1 S'list' p2 -sS'model.in1' +sS'model.blocktype' p3 -S'double' +S'string' p4 -sS'model.blocktype' +sS'x.model.firing' p5 -S'string' +S'vector' p6 -sS'x.model.firing' +sS'model.evtin' p7 -S'vector' +S'double' p8 -sS'model.evtin' -p9 -g4 sS'in1' -p10 -g4 +p9 +g8 sS'model.dep_ut' +p10 +g6 +sS'model.out' p11 g8 -sS'model.out' -p12 -g4 sS'gr_i' +p12 +g6 +sS'model.in' p13 g8 sS'y' p14 -g8 +g6 sS'x' p15 -g4 +g8 sS'model' p16 S'object' p17 sS'typ' p18 -g8 +g6 s.
\ No newline at end of file diff --git a/js/Linear/SAMPHOLD_m.js b/js/Linear/SAMPHOLD_m.js index 07015edf..c9b51b93 100644 --- a/js/Linear/SAMPHOLD_m.js +++ b/js/Linear/SAMPHOLD_m.js @@ -3,7 +3,7 @@ function SAMPHOLD_m() { SAMPHOLD_m.prototype.define = function SAMPHOLD_m() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["samphold4_m"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); this.model.intyp = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); @@ -29,11 +29,8 @@ function SAMPHOLD_m() { SAMPHOLD_m.prototype.set = function SAMPHOLD_m() { this.it = arguments[0]["it"] this.exprs = arguments[0]["exprs"] - this.x = arg1; this.x.model.firing = []; - this.graphics = arg1.graphics; var label = this.graphics.exprs; - this.model = arg1.model; while (true) { [ok,this.it,this.exprs] = scicos_getvalue("Set parameters Block",["Datatype(1=real double 2=Complex 3=int32 ...)"],list("vec",1),label); if (!ok) { @@ -44,16 +41,13 @@ function SAMPHOLD_m() { var ok = false; } if (ok) { - var in1 = [this.model.in1,this.model.in2]; + var in1 = [this.model.in,this.model.in2]; var tmpvar0 = set_io(this.model,this.graphics,list(in1,this.it),list(in1,this.it),1,[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { this.graphics.exprs = new ScilabDouble([this.exprs]); - arg1.graphics = this.graphics; - arg1.model = this.model; - this.x = arg1; break; } } diff --git a/js/Linear/SAMPHOLD_m.pickle b/js/Linear/SAMPHOLD_m.pickle index 9bae4649..c99a685d 100644 --- a/js/Linear/SAMPHOLD_m.pickle +++ b/js/Linear/SAMPHOLD_m.pickle @@ -57,10 +57,10 @@ g5 sS'in1' p16 g9 -sS'model.in1' +sS'model.outtyp' p17 g5 -sS'model.outtyp' +sS'model.in' p18 g5 sS'graphics.exprs' diff --git a/js/Linear/SAMPLEHOLD_f.js b/js/Linear/SAMPLEHOLD_f.js index 8489ab24..f44c2f5d 100644 --- a/js/Linear/SAMPLEHOLD_f.js +++ b/js/Linear/SAMPLEHOLD_f.js @@ -4,7 +4,7 @@ function SAMPLEHOLD_f() { var in1 = -1; this.model = scicos_model(); this.model.sim = new ScilabString(["samphold"]); - this.model.in1 = new ScilabDouble([-1]); + this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); @@ -22,7 +22,6 @@ function SAMPLEHOLD_f() { return options; } SAMPLEHOLD_f.prototype.set = function SAMPLEHOLD_f() { - this.x = arg1; this.x.model.firing = []; return new BasicBlock(this.x); } diff --git a/js/Linear/SAMPLEHOLD_f.pickle b/js/Linear/SAMPLEHOLD_f.pickle index 8e96cab8..3ae36d40 100644 --- a/js/Linear/SAMPLEHOLD_f.pickle +++ b/js/Linear/SAMPLEHOLD_f.pickle @@ -19,43 +19,43 @@ S'model.sim' p1 S'string' p2 -sS'model.in1' -p3 -S'double' -p4 sS'model.blocktype' -p5 +p3 g2 sS'x.model.firing' -p6 +p4 S'vector' -p7 +p5 sS'model.evtin' -p8 -g4 +p6 +S'double' +p7 sS'in1' -p9 -g4 +p8 +g7 sS'model.dep_ut' +p9 +g5 +sS'model.out' p10 g7 -sS'model.out' -p11 -g4 sS'gr_i' +p11 +g5 +sS'model.in' p12 g7 sS'y' p13 -g7 +g5 sS'x' p14 -g4 +g7 sS'model' p15 S'object' p16 sS'typ' p17 -g7 +g5 s.
\ No newline at end of file diff --git a/js/Linear/SOM_f.js b/js/Linear/SOM_f.js index 06f1177f..bbbf8327 100644 --- a/js/Linear/SOM_f.js +++ b/js/Linear/SOM_f.js @@ -4,7 +4,7 @@ function SOM_f() { var sgn = [[1],[1],[1]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["sum"]), new ScilabDouble([2])); - this.model.in1 = new ScilabDouble([-1],[-1],[-1]); + this.model.in = new ScilabDouble([-1],[-1],[-1]); this.model.out = new ScilabDouble([-1]); this.model.rpar = new ScilabDouble(sgn); this.model.blocktype = new ScilabString(["c"]); @@ -23,9 +23,6 @@ function SOM_f() { return options; } SOM_f.prototype.set = function SOM_f() { - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; if (size(this.exprs,"*")==2) { this.exprs = this.exprs[2-1]; diff --git a/js/Linear/SOM_f.pickle b/js/Linear/SOM_f.pickle index 89465842..3ae0ff70 100644 --- a/js/Linear/SOM_f.pickle +++ b/js/Linear/SOM_f.pickle @@ -19,60 +19,60 @@ S'model.sim' p1 S'list' p2 -sS'model.in1' +sS'model.out' p3 -S'matrix' +S'double' p4 -sS'model.blocktype' +sS'model.in' p5 -S'string' +S'matrix' p6 sS'exprs' p7 -g4 +g6 sS'arg1' p8 S'object' p9 sS'sgn' p10 -g4 -sS'model.dep_ut' +g6 +sS'model.rpar' p11 -S'vector' +g6 +sS'labs' p12 -sS'model.out' +S'vector' p13 -S'double' +sS'p' p14 -sS'labs' +g4 +sS'gr_i' p15 -g12 -sS'p' +g13 +sS'model.dep_ut' p16 -g14 -sS'gr_i' -p17 -g12 -sS'model.rpar' -p18 -g4 +g13 sS'str' -p19 -g4 +p17 +g6 sS'graphics' -p20 +p18 g9 sS'y' -p21 -g12 +p19 +g13 sS'x' -p22 -g14 +p20 +g4 sS'model' -p23 +p21 g9 sS'typ' +p22 +g13 +sS'model.blocktype' +p23 +S'string' p24 -g12 s.
\ No newline at end of file diff --git a/js/Linear/SUMMATION.js b/js/Linear/SUMMATION.js index afad8077..9967727b 100644 --- a/js/Linear/SUMMATION.js +++ b/js/Linear/SUMMATION.js @@ -4,7 +4,7 @@ function SUMMATION() { this.sgn = [[1],[-1]]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["summation"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([-1],[-1]); + this.model.in = new ScilabDouble([-1],[-1]); this.model.out = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2],[-2]); this.model.out2 = new ScilabDouble([-2]); @@ -32,9 +32,6 @@ function SUMMATION() { this.sgn = inverse(arguments[0]["sgn"]) this.satur = arguments[0]["satur"] this.exprs = inverse(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; - this.model = arg1.model; this.exprs = this.graphics.exprs; if (size(this.exprs,1)==1) { this.exprs = [[sci2exp(1)],[this.exprs],[sci2exp(0)]]; diff --git a/js/Linear/SUMMATION.pickle b/js/Linear/SUMMATION.pickle index 8539744e..710ffd4f 100644 --- a/js/Linear/SUMMATION.pickle +++ b/js/Linear/SUMMATION.pickle @@ -45,28 +45,28 @@ p10 sS'model.in2' p11 g8 -sS'model.in1' -p12 -g8 sS'x.graphics' -p13 +p12 g2 sS'model.sim' -p14 +p13 S'list' -p15 +p14 sS'model.out2' -p16 +p15 g10 sS'in1' -p17 +p16 g10 sS'in2' -p18 +p17 g10 sS'model.rpar' +p18 +NsS'model.in' p19 -NsS'graphics.exprs' +g8 +sS'graphics.exprs' p20 g8 sS'nout2' diff --git a/js/Linear/SUM_f.js b/js/Linear/SUM_f.js index 0c134618..c56ea5a0 100644 --- a/js/Linear/SUM_f.js +++ b/js/Linear/SUM_f.js @@ -3,7 +3,7 @@ function SUM_f() { SUM_f.prototype.define = function SUM_f() { this.model = scicos_model(); this.model.sim = list(new ScilabString(["plusblk"]), new ScilabDouble([2])); - this.model.in1 = new ScilabDouble([-1],[-1],[-1]); + this.model.in = new ScilabDouble([-1],[-1],[-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabDouble([true,false]); @@ -21,7 +21,6 @@ function SUM_f() { return options; } SUM_f.prototype.set = function SUM_f() { - this.x = arg1; return new BasicBlock(this.x); } } diff --git a/js/Linear/SUM_f.pickle b/js/Linear/SUM_f.pickle index 96074d47..515d7f3c 100644 --- a/js/Linear/SUM_f.pickle +++ b/js/Linear/SUM_f.pickle @@ -19,9 +19,9 @@ S'model.sim' p1 S'list' p2 -sS'model.in1' +sS'model.out' p3 -S'matrix' +S'double' p4 sS'model.blocktype' p5 @@ -31,25 +31,25 @@ sS'exprs' p7 S'vector' p8 -sS'model.out' +sS'model.dep_ut' p9 -S'double' -p10 +g8 sS'p' -p11 -g10 +p10 +g4 sS'gr_i' -p12 +p11 g8 -sS'model.dep_ut' +sS'model.in' +p12 +S'matrix' p13 -g8 sS'y' p14 g8 sS'x' p15 -g10 +g4 sS'model' p16 S'object' diff --git a/js/Linear/TCLSS.js b/js/Linear/TCLSS.js index d65a0170..8bbaca6a 100644 --- a/js/Linear/TCLSS.js +++ b/js/Linear/TCLSS.js @@ -11,7 +11,7 @@ function TCLSS() { var out = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["tcslti4"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([in1],[nx]); + this.model.in = new ScilabDouble([in1],[nx]); this.model.out = new ScilabDouble([out]); this.model.evtin = new ScilabDouble([1]); this.model.state = new ScilabDouble([this.x0]); @@ -43,10 +43,7 @@ function TCLSS() { this.D = parseFloat(arguments[0]["D"]) this.x0 = parseFloat(arguments[0]["x0"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")==7) { this.exprs = this.exprs[[1:4,7]-1]; } diff --git a/js/Linear/TCLSS.pickle b/js/Linear/TCLSS.pickle index 79765239..23368990 100644 --- a/js/Linear/TCLSS.pickle +++ b/js/Linear/TCLSS.pickle @@ -46,47 +46,47 @@ p8 sS'out' p9 g8 -sS'model.in1' -p10 -g5 sS'x.graphics' -p11 +p10 g2 sS'nx' -p12 +p11 g8 sS'model.evtin' -p13 +p12 g8 sS'A' -p14 +p13 g8 sS'model.sim' -p15 +p14 S'list' -p16 +p15 sS'C' -p17 +p16 g8 sS'B' -p18 +p17 g8 sS'D' -p19 +p18 g8 sS'in1' -p20 +p19 g8 sS'model.rpar' -p21 +p20 g5 sS'mmm' -p22 +p21 S'vector' -p23 +p22 sS'model.state' -p24 +p23 g8 +sS'model.in' +p24 +g5 sS'graphics.exprs' p25 g8 @@ -95,23 +95,23 @@ p26 g8 sS'typ' p27 -g23 +g22 sS'model.blocktype' p28 S'string' p29 sS'model.dep_ut' p30 -g23 +g22 sS'exprs' p31 g5 sS'gr_i' p32 -g23 +g22 sS'y' p33 -g23 +g22 sS'x' p34 g8 diff --git a/js/Linear/TCLSS_f.js b/js/Linear/TCLSS_f.js index c1b6a82f..bc5216cf 100644 --- a/js/Linear/TCLSS_f.js +++ b/js/Linear/TCLSS_f.js @@ -11,7 +11,7 @@ function TCLSS_f() { var out = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["tcslti"]), new ScilabDouble([1])); - this.model.in1 = new ScilabDouble([in1],[nx]); + this.model.in = new ScilabDouble([in1],[nx]); this.model.out = new ScilabDouble([out]); this.model.evtin = new ScilabDouble([1]); this.model.state = new ScilabDouble([this.x0]); @@ -43,10 +43,7 @@ function TCLSS_f() { this.D = parseFloat(arguments[0]["D"]) this.x0 = parseFloat(arguments[0]["x0"]) this.exprs = parseFloat(arguments[0]["exprs"]) - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; if (size(this.exprs,"*")==7) { this.exprs = this.exprs[[1:4,7]-1]; } diff --git a/js/Linear/TCLSS_f.pickle b/js/Linear/TCLSS_f.pickle index 79765239..23368990 100644 --- a/js/Linear/TCLSS_f.pickle +++ b/js/Linear/TCLSS_f.pickle @@ -46,47 +46,47 @@ p8 sS'out' p9 g8 -sS'model.in1' -p10 -g5 sS'x.graphics' -p11 +p10 g2 sS'nx' -p12 +p11 g8 sS'model.evtin' -p13 +p12 g8 sS'A' -p14 +p13 g8 sS'model.sim' -p15 +p14 S'list' -p16 +p15 sS'C' -p17 +p16 g8 sS'B' -p18 +p17 g8 sS'D' -p19 +p18 g8 sS'in1' -p20 +p19 g8 sS'model.rpar' -p21 +p20 g5 sS'mmm' -p22 +p21 S'vector' -p23 +p22 sS'model.state' -p24 +p23 g8 +sS'model.in' +p24 +g5 sS'graphics.exprs' p25 g8 @@ -95,23 +95,23 @@ p26 g8 sS'typ' p27 -g23 +g22 sS'model.blocktype' p28 S'string' p29 sS'model.dep_ut' p30 -g23 +g22 sS'exprs' p31 g5 sS'gr_i' p32 -g23 +g22 sS'y' p33 -g23 +g22 sS'x' p34 g8 diff --git a/js/Linear/TIME_DELAY.js b/js/Linear/TIME_DELAY.js index 8401943f..f3bc0687 100644 --- a/js/Linear/TIME_DELAY.js +++ b/js/Linear/TIME_DELAY.js @@ -7,7 +7,7 @@ function TIME_DELAY() { this.N = 1024; this.model = scicos_model(); this.model.sim = list(new ScilabString(["time_delay"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([nin]); + this.model.in = new ScilabDouble([nin]); this.model.out = new ScilabDouble([nin]); this.model.rpar = new ScilabDouble([this.T,this.init]); this.model.ipar = new ScilabDouble([this.N]); @@ -34,11 +34,8 @@ function TIME_DELAY() { this.init = parseFloat(arguments[0]["init"]) this.N = parseFloat(arguments[0]["N"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; - var nin = this.model.in1[1-1]; + var nin = this.model.in[1-1]; while (true) { [ok,this.T,this.init,this.N,this.exprs] = scicos_getvalue("Set delay parameters",["Delay","initial input","Buffer size"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Linear/TIME_DELAY.pickle b/js/Linear/TIME_DELAY.pickle index 50fbebef..abce5a99 100644 --- a/js/Linear/TIME_DELAY.pickle +++ b/js/Linear/TIME_DELAY.pickle @@ -35,32 +35,32 @@ sS'model.out' p5 S'double' p6 -sS'model.in1' -p7 -S'vector' -p8 sS'x.graphics' -p9 +p7 g2 sS'init' -p10 +p8 g6 sS'model.sim' -p11 +p9 S'list' -p12 +p10 sS'nin' -p13 +p11 g6 sS'model.rpar' -p14 -g8 +p12 +S'vector' +p13 sS'N' -p15 +p14 g6 sS'T' -p16 +p15 g6 +sS'model.in' +p16 +g13 sS'graphics.exprs' p17 NsS'model.ipar' @@ -68,7 +68,7 @@ p18 g6 sS'typ' p19 -g8 +g13 sS'ok' p20 S'boolean' @@ -79,17 +79,17 @@ S'string' p23 sS'model.dep_ut' p24 -g8 +g13 sS'exprs' p25 S'matrix' p26 sS'gr_i' p27 -g8 +g13 sS'y' p28 -g8 +g13 sS'x' p29 g6 diff --git a/js/Linear/VARIABLE_DELAY.js b/js/Linear/VARIABLE_DELAY.js index 09352e17..d3032318 100644 --- a/js/Linear/VARIABLE_DELAY.js +++ b/js/Linear/VARIABLE_DELAY.js @@ -7,7 +7,7 @@ function VARIABLE_DELAY() { this.N = 1024; this.model = scicos_model(); this.model.sim = list(new ScilabString(["variable_delay"]), new ScilabDouble([4])); - this.model.in1 = new ScilabDouble([nin],[1]); + this.model.in = new ScilabDouble([nin],[1]); this.model.out = new ScilabDouble([nin]); this.model.rpar = new ScilabDouble([this.T,this.init]); this.model.ipar = new ScilabDouble([this.N]); @@ -34,11 +34,8 @@ function VARIABLE_DELAY() { this.init = parseFloat(arguments[0]["init"]) this.N = parseFloat(arguments[0]["N"]) this.exprs = arguments[0]["exprs"] - this.x = arg1; - this.graphics = arg1.graphics; this.exprs = this.graphics.exprs; - this.model = arg1.model; - var nin = this.model.in1[1-1]; + var nin = this.model.in[1-1]; while (true) { [ok,this.T,this.init,this.N,this.exprs] = scicos_getvalue("Set delay parameters",["Max delay","initial input","Buffer size"],list("vec",1,"vec",1,"vec",1),this.exprs); if (!ok) { diff --git a/js/Linear/VARIABLE_DELAY.pickle b/js/Linear/VARIABLE_DELAY.pickle index 175985ac..6aad7d01 100644 --- a/js/Linear/VARIABLE_DELAY.pickle +++ b/js/Linear/VARIABLE_DELAY.pickle @@ -35,33 +35,33 @@ sS'model.out' p5 S'double' p6 -sS'model.in1' -p7 -S'matrix' -p8 sS'x.graphics' -p9 +p7 g2 sS'init' -p10 +p8 g6 sS'model.sim' -p11 +p9 S'list' -p12 +p10 sS'nin' -p13 +p11 g6 sS'model.rpar' -p14 +p12 S'vector' -p15 +p13 sS'N' -p16 +p14 g6 sS'T' -p17 +p15 g6 +sS'model.in' +p16 +S'matrix' +p17 sS'graphics.exprs' p18 NsS'model.ipar' @@ -69,7 +69,7 @@ p19 g6 sS'typ' p20 -g15 +g13 sS'ok' p21 S'boolean' @@ -80,16 +80,16 @@ S'string' p24 sS'model.dep_ut' p25 -g15 +g13 sS'exprs' p26 -g8 +g17 sS'gr_i' p27 -g15 +g13 sS'y' p28 -g15 +g13 sS'x' p29 g6 |