diff options
Diffstat (limited to 'js/MatrixOp')
51 files changed, 1208 insertions, 1208 deletions
diff --git a/js/MatrixOp/CUMSUM.js b/js/MatrixOp/CUMSUM.js index 3283e992..04df6b00 100644 --- a/js/MatrixOp/CUMSUM.js +++ b/js/MatrixOp/CUMSUM.js @@ -2,8 +2,8 @@ function CUMSUM() { CUMSUM.prototype.define = function CUMSUM() { this.model = scicos_model(); - function_name = "cumsum_m"; - funtyp = 4; + var function_name = "cumsum_m"; + var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.model.in1 = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); @@ -20,8 +20,8 @@ function CUMSUM() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = []; this.model.dep_ut = [true,false]; - label = [[sci2exp(1)],[sci2exp(0)]]; - gr_i = []; + var label = [[sci2exp(1)],[sci2exp(0)]]; + var gr_i = []; this.x = standard_define([3,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -41,8 +41,8 @@ function CUMSUM() { this.lab = arguments[0]["lab"] this.x = arg1; this.model = arg1.model; - graphics = arg1.graphics; - label = graphics.exprs; + var graphics = arg1.graphics; + var label = graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; } @@ -51,45 +51,48 @@ function CUMSUM() { if (!ok) { break; } - label = this.lab; + var label = this.lab; if ((this.typ==1)) { if ((this.decomptyp==0)) { - function_name = "cumsum_m"; - out = [-1,-2]; + var function_name = "cumsum_m"; + var out = [-1,-2]; } else if ((this.decomptyp==1)) { - function_name = "cumsum_r"; - out = [-1,1]; + var function_name = "cumsum_r"; + var out = [-1,1]; } else if ((this.decomptyp==2)) { - function_name = "cumsum_c"; - out = [1,-2]; + var function_name = "cumsum_c"; + var out = [1,-2]; } else { message("decomposition type is not supported"); - ok = false; + var ok = false; } - it = 1; - ot = 1; + var it = 1; + var ot = 1; } else if ((this.typ==2)) { if ((this.decomptyp==0)) { - function_name = "cumsumz_m"; + var function_name = "cumsumz_m"; } else if ((this.decomptyp==1)) { - function_name = "cumsumz_r"; + var function_name = "cumsumz_r"; } else if ((this.decomptyp==2)) { - function_name = "cumsumz_c"; + var function_name = "cumsumz_c"; } else { message("decomposition type is not supported"); - ok = false; + var ok = false; } - it = 2; - ot = 2; + var it = 2; + var ot = 2; } else { message("Datatype is not supported"); - ok = false; + var ok = false; } - in1 = [this.model.in1,this.model.in2]; - out = [this.model.out,this.model.out2]; - funtyp = 4; + var in1 = [this.model.in1,this.model.in2]; + var out = [this.model.out,this.model.out2]; + var funtyp = 4; if (ok) { - [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); + var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; } if (ok) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); diff --git a/js/MatrixOp/CUMSUM.pickle b/js/MatrixOp/CUMSUM.pickle index a299c038..071f5cfc 100644 --- a/js/MatrixOp/CUMSUM.pickle +++ b/js/MatrixOp/CUMSUM.pickle @@ -30,103 +30,100 @@ sS'it' p6 S'double' p7 -sS'model.intyp' -p8 -g7 sS'funtyp' -p9 +p8 g7 sS'model.out' -p10 +p9 g7 sS'out' -p11 +p10 g2 sS'model.in2' -p12 +p11 g7 -sS'model.in1' -p13 +sS'model.intyp' +p12 g7 sS'label' -p14 +p13 S'matrix' -p15 +p14 sS'model.evtin' -p16 +p15 g2 sS'model.firing' -p17 +p16 g2 sS'function_name' -p18 +p17 S'string' -p19 +p18 sS'model.sim' -p20 +p19 S'list' -p21 +p20 sS'model.evtout' -p22 +p21 g2 sS'arg1.graphics' -p23 +p22 g4 -sS'[this.model,graphics,ok]' -p24 -g7 sS'model.out2' -p25 +p23 g7 sS'in1' -p26 +p24 g2 sS'model.rpar' -p27 +p25 g2 +sS'model.in1' +p26 +g7 sS'model.outtyp' -p28 +p27 g7 sS'model.state' -p29 +p28 g2 sS'graphics.exprs' -p30 +p29 NsS'model.ipar' -p31 +p30 g2 sS'typ' -p32 +p31 g2 sS'arg1.model' -p33 +p32 g4 sS'label[9-1]' -p34 +p33 g2 sS'ok' -p35 +p34 S'boolean' -p36 +p35 sS'model.blocktype' -p37 -g19 +p36 +g18 sS'model.dep_ut' -p38 +p37 g2 sS'gr_i' -p39 +p38 g2 sS'y' -p40 +p39 g2 sS'x' -p41 +p40 g7 sS'model' -p42 +p41 g4 sS'ot' -p43 +p42 g7 s.
\ No newline at end of file diff --git a/js/MatrixOp/EXTRACT.js b/js/MatrixOp/EXTRACT.js index 5120789f..ad64ec4c 100644 --- a/js/MatrixOp/EXTRACT.js +++ b/js/MatrixOp/EXTRACT.js @@ -2,8 +2,8 @@ function EXTRACT() { EXTRACT.prototype.define = function EXTRACT() { this.model = scicos_model(); - function_name = "extract"; - funtyp = 4; + var function_name = "extract"; + var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.model.in1 = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); @@ -20,8 +20,8 @@ function EXTRACT() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = []; this.model.dep_ut = [true,false]; - label = [[sci2exp(1)],[sci2exp([1])],[sci2exp([1])]]; - gr_i = []; + var label = [[sci2exp(1)],[sci2exp([1])],[sci2exp([1])]]; + var gr_i = []; this.x = standard_define([3,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -41,8 +41,8 @@ function EXTRACT() { this.a = inverse(arguments[0]["a"]) this.b = inverse(arguments[0]["b"]) this.x = arg1; - graphics = arg1.graphics; - label = graphics.exprs; + var graphics = arg1.graphics; + var label = graphics.exprs; this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; @@ -55,42 +55,45 @@ function EXTRACT() { break; } if ((this.typ==1)) { - function_name = "extract"; - ot = 1; - it = 1; + var function_name = "extract"; + var ot = 1; + var it = 1; } else if ((this.typ==2)) { - function_name = "extractz"; - ot = 2; - it = 2; + var function_name = "extractz"; + var ot = 2; + var it = 2; } else { message("Datatype is not supported"); - ok = false; + var ok = false; } - ma = size(this.a,1); - mb = size(this.b,1); + var ma = size(this.a,1); + var mb = size(this.b,1); if ((ma==0||mb==0)) { message("empty field"); - ok = false; + var ok = false; } for (i=1;i<=ma;i+=1) { if ((this.a[i-1]<=0)) { message("invalid index"); - ok = false; + var ok = false; } } for (j=1;j<=mb;j+=1) { if ((this.b[j-1]<=0)) { message("invalid index"); - ok = false; + var ok = false; } } this.model.ipar = new ScilabDouble([this.a],[this.b],[ma],[mb]); - in1 = [this.model.in1,this.model.in2]; - out = [ma,mb]; - funtyp = 4; + var in1 = [this.model.in1,this.model.in2]; + var out = [ma,mb]; + var funtyp = 4; if (ok) { - label = exprs; - [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); + var label = exprs; + var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/MatrixOp/EXTRACT.pickle b/js/MatrixOp/EXTRACT.pickle index d65c7d90..3ab6adf0 100644 --- a/js/MatrixOp/EXTRACT.pickle +++ b/js/MatrixOp/EXTRACT.pickle @@ -23,9 +23,10 @@ sS'arg1' p3 S'object' p4 -sS'graphics.exprs' +sS'graphics' p5 -NsS'it' +g4 +sS'it' p6 S'double' p7 @@ -71,74 +72,70 @@ g2 sS'arg1.graphics' p23 g4 -sS'[this.model,graphics,ok]' -p24 -g7 sS'model.out2' -p25 +p24 g7 sS'in1' -p26 +p25 g2 sS'model.rpar' -p27 +p26 g2 sS'model.outtyp' -p28 +p27 g7 sS'b' -p29 +p28 g2 sS'model.state' -p30 +p29 g2 -sS'graphics' +sS'graphics.exprs' +p30 +NsS'ma' p31 -g4 -sS'ma' -p32 g7 sS'model.ipar' -p33 +p32 g2 sS'typ' -p34 +p33 g2 sS'a' -p35 +p34 g2 sS'arg1.model' -p36 +p35 g4 sS'label[9-1]' -p37 +p36 g2 sS'ok' -p38 +p37 S'boolean' -p39 +p38 sS'model.blocktype' -p40 +p39 g19 sS'mb' -p41 +p40 g7 sS'model.dep_ut' -p42 +p41 g2 sS'gr_i' -p43 +p42 g2 sS'y' -p44 +p43 g2 sS'x' -p45 +p44 g7 sS'model' -p46 +p45 g4 sS'ot' -p47 +p46 g7 s.
\ No newline at end of file diff --git a/js/MatrixOp/EXTTRI.js b/js/MatrixOp/EXTTRI.js index 071ee74f..07bd5b9c 100644 --- a/js/MatrixOp/EXTTRI.js +++ b/js/MatrixOp/EXTTRI.js @@ -2,8 +2,8 @@ function EXTTRI() { EXTTRI.prototype.define = function EXTTRI() { this.model = scicos_model(); - function_name = "extrilz"; - funtyp = 4; + var function_name = "extrilz"; + var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.model.in1 = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); @@ -20,8 +20,8 @@ function EXTTRI() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = []; this.model.dep_ut = [true,false]; - label = [[sci2exp(1)],[sci2exp(1)]]; - gr_i = []; + var label = [[sci2exp(1)],[sci2exp(1)]]; + var gr_i = []; this.x = standard_define([3,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -41,8 +41,8 @@ function EXTTRI() { this.lab = arguments[0]["lab"] this.x = arg1; this.model = arg1.model; - graphics = arg1.graphics; - label = graphics.exprs; + var graphics = arg1.graphics; + var label = graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; } @@ -51,42 +51,45 @@ function EXTTRI() { if (!ok) { break; } - label = this.lab; + var label = this.lab; if ((this.typ==1)) { if ((this.decomptyp==1)) { - function_name = "exttril"; + var function_name = "exttril"; } else if ((this.decomptyp==2)) { - function_name = "exttriu"; + var function_name = "exttriu"; } else if ((this.decomptyp==3)) { - function_name = "extdiag"; + var function_name = "extdiag"; } else { message("decomposition type is not supported"); - ok = false; + var ok = false; } - it = 1; - ot = 1; + var it = 1; + var ot = 1; } else if ((this.typ==2)) { if ((this.decomptyp==1)) { - function_name = "exttrilz"; + var function_name = "exttrilz"; } else if ((this.decomptyp==2)) { - function_name = "exttriuz"; + var function_name = "exttriuz"; } else if ((this.decomptyp==3)) { - function_name = "extdiagz"; + var function_name = "extdiagz"; } else { message("decomposition type is not supported"); - ok = false; + var ok = false; } - it = 2; - ot = 2; + var it = 2; + var ot = 2; } else { message("Datatype is not supported"); - ok = false; + var ok = false; } - in1 = [this.model.in1,this.model.in2]; - out = [this.model.out,this.model.out2]; - funtyp = 4; + var in1 = [this.model.in1,this.model.in2]; + var out = [this.model.out,this.model.out2]; + var funtyp = 4; if (ok) { - [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); + var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; } if (ok) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); diff --git a/js/MatrixOp/EXTTRI.pickle b/js/MatrixOp/EXTTRI.pickle index a299c038..2c5c8a8f 100644 --- a/js/MatrixOp/EXTTRI.pickle +++ b/js/MatrixOp/EXTTRI.pickle @@ -72,61 +72,58 @@ g2 sS'arg1.graphics' p23 g4 -sS'[this.model,graphics,ok]' -p24 -g7 sS'model.out2' -p25 +p24 g7 sS'in1' -p26 +p25 g2 sS'model.rpar' -p27 +p26 g2 sS'model.outtyp' -p28 +p27 g7 sS'model.state' -p29 +p28 g2 sS'graphics.exprs' -p30 +p29 NsS'model.ipar' -p31 +p30 g2 sS'typ' -p32 +p31 g2 sS'arg1.model' -p33 +p32 g4 sS'label[9-1]' -p34 +p33 g2 sS'ok' -p35 +p34 S'boolean' -p36 +p35 sS'model.blocktype' -p37 +p36 g19 sS'model.dep_ut' -p38 +p37 g2 sS'gr_i' -p39 +p38 g2 sS'y' -p40 +p39 g2 sS'x' -p41 +p40 g7 sS'model' -p42 +p41 g4 sS'ot' -p43 +p42 g7 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATBKSL.js b/js/MatrixOp/MATBKSL.js index f66c8398..2039befb 100644 --- a/js/MatrixOp/MATBKSL.js +++ b/js/MatrixOp/MATBKSL.js @@ -2,8 +2,8 @@ function MATBKSL() { MATBKSL.prototype.define = function MATBKSL() { this.model = scicos_model(); - function_name = "mat_bksl"; - funtyp = 4; + var function_name = "mat_bksl"; + var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.model.in1 = new ScilabDouble([-1],[-1]); this.model.in2 = new ScilabDouble([-2],[-3]); @@ -20,8 +20,8 @@ function MATBKSL() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = []; this.model.dep_ut = [true,false]; - label = [sci2exp(1)]; - gr_i = []; + var label = [sci2exp(1)]; + var gr_i = []; this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -37,8 +37,8 @@ function MATBKSL() { MATBKSL.prototype.set = function MATBKSL() { this.typ = inverse(arguments[0]["typ"]) this.x = arg1; - graphics = arg1.graphics; - label = graphics.exprs; + var graphics = arg1.graphics; + var label = graphics.exprs; this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; @@ -49,23 +49,26 @@ function MATBKSL() { break; } if ((this.typ==1)) { - function_name = "mat_bksl"; - ot = 1; - it = [1,1]; + var function_name = "mat_bksl"; + var ot = 1; + var it = [1,1]; } else if ((this.typ==2)) { - function_name = "matz_bksl"; - ot = 2; - it = [2,2]; + var function_name = "matz_bksl"; + var ot = 2; + var it = [2,2]; } else { message("Datatype is not supported"); - ok = false; + var ok = false; } - in1 = [this.model.in1,this.model.in2]; - out = [this.model.out,this.model.out2]; - funtyp = 4; + var in1 = [this.model.in1,this.model.in2]; + var out = [this.model.out,this.model.out2]; + var funtyp = 4; if (ok) { - label = exprs; - [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); + var label = exprs; + var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/MatrixOp/MATBKSL.pickle b/js/MatrixOp/MATBKSL.pickle index 32187fe9..d6584a86 100644 --- a/js/MatrixOp/MATBKSL.pickle +++ b/js/MatrixOp/MATBKSL.pickle @@ -68,61 +68,58 @@ g2 sS'arg1.graphics' p23 g4 -sS'[this.model,graphics,ok]' -p24 -g9 sS'model.out2' -p25 +p24 g9 sS'in1' -p26 +p25 g2 sS'model.rpar' -p27 +p26 g2 sS'model.outtyp' -p28 +p27 g9 sS'model.state' -p29 +p28 g2 sS'graphics.exprs' -p30 +p29 NsS'model.ipar' -p31 +p30 g2 sS'typ' -p32 +p31 g2 sS'arg1.model' -p33 +p32 g4 sS'label[9-1]' -p34 +p33 g2 sS'ok' -p35 +p34 S'boolean' -p36 +p35 sS'model.blocktype' -p37 +p36 g19 sS'model.dep_ut' -p38 +p37 g2 sS'gr_i' -p39 +p38 g2 sS'y' -p40 +p39 g2 sS'x' -p41 +p40 g9 sS'model' -p42 +p41 g4 sS'ot' -p43 +p42 g9 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATCATH.js b/js/MatrixOp/MATCATH.js index dc1558d0..d0ba82c1 100644 --- a/js/MatrixOp/MATCATH.js +++ b/js/MatrixOp/MATCATH.js @@ -2,8 +2,8 @@ function MATCATH() { MATCATH.prototype.define = function MATCATH() { this.model = scicos_model(); - function_name = "mat_cath"; - funtyp = 4; + var function_name = "mat_cath"; + var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.model.in1 = new ScilabDouble([-1],[-1]); this.model.in2 = new ScilabDouble([-2],[-3]); @@ -20,8 +20,8 @@ function MATCATH() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = []; this.model.dep_ut = [true,false]; - label = [sci2exp(2)]; - gr_i = []; + var label = [sci2exp(2)]; + var gr_i = []; this.x = standard_define([2,3],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -39,24 +39,27 @@ function MATCATH() { this.lab = arguments[0]["lab"] this.x = arg1; this.model = arg1.model; - graphics = arg1.graphics; - label = graphics.exprs; + var graphics = arg1.graphics; + var label = graphics.exprs; if (size(label,"*")>1) { - label = "size(evstr("+label[2-1]+"),\'*\')"; + var label = "size(evstr("+label[2-1]+"),\'*\')"; } while (true) { [ok,this.nin,this.lab] = scicos_getvalue("Set MATCATH block parameters",["Number of input"],list("vec",1),label); if (!ok) { break; } - label = this.lab; - in1 = [-1*(ones(this.nin,1)),-(transpose([2:this.nin+1]))]; - out = [-1,0]; - it = -1*(ones(this.nin,1)); - ot = -1; - [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); + var label = this.lab; + var in1 = [-1*(ones(this.nin,1)),-(transpose([2:this.nin+1]))]; + var out = [-1,0]; + var it = -1*(ones(this.nin,1)); + var ot = -1; + var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; if (ok) { - funtyp = 4; + var funtyp = 4; this.model.sim = list(new ScilabString(["mat_cath"]), new ScilabDouble([funtyp])); graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/MatrixOp/MATCATH.pickle b/js/MatrixOp/MATCATH.pickle index 6f396cfb..47afdfa1 100644 --- a/js/MatrixOp/MATCATH.pickle +++ b/js/MatrixOp/MATCATH.pickle @@ -67,56 +67,53 @@ g2 sS'arg1.graphics' p22 g4 -sS'[this.model,graphics,ok]' -p23 -g7 sS'model.out2' -p24 +p23 g7 sS'in1' -p25 +p24 g2 sS'model.rpar' -p26 +p25 g2 sS'model.in1' -p27 +p26 g12 sS'model.outtyp' -p28 +p27 g7 sS'model.state' -p29 +p28 g2 sS'graphics.exprs' -p30 +p29 NsS'model.ipar' -p31 +p30 g2 sS'typ' -p32 +p31 g2 sS'arg1.model' -p33 +p32 NsS'model.blocktype' -p34 +p33 g18 sS'model.dep_ut' -p35 +p34 g2 sS'gr_i' -p36 +p35 g2 sS'y' -p37 +p36 g2 sS'x' -p38 +p37 g7 sS'model' -p39 +p38 g4 sS'ot' -p40 +p39 g7 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATCATV.js b/js/MatrixOp/MATCATV.js index c6a998f3..a54a2a05 100644 --- a/js/MatrixOp/MATCATV.js +++ b/js/MatrixOp/MATCATV.js @@ -1,10 +1,10 @@ /* autogenerated from "macros/MatrixOp/MATCATV.sci" */ function MATCATV() { MATCATV.prototype.define = function MATCATV() { - l1 = [[2],[2]]; + var l1 = [[2],[2]]; this.model = scicos_model(); - function_name = "mat_catv"; - funtyp = 4; + var function_name = "mat_catv"; + var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.model.in2 = new ScilabDouble([-1],[-1]); this.model.in1 = new ScilabDouble([-2],[-3]); @@ -21,8 +21,8 @@ function MATCATV() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = []; this.model.dep_ut = [true,false]; - label = [sci2exp(2)]; - gr_i = []; + var label = [sci2exp(2)]; + var gr_i = []; this.x = standard_define([2,3],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -40,24 +40,27 @@ function MATCATV() { this.lab = arguments[0]["lab"] this.x = arg1; this.model = arg1.model; - graphics = arg1.graphics; - label = graphics.exprs; + var graphics = arg1.graphics; + var label = graphics.exprs; if (size(label,"*")>1) { - label = "size(evstr("+label[2-1]+"),\'*\')"; + var label = "size(evstr("+label[2-1]+"),\'*\')"; } while (true) { [ok,this.nin,this.lab] = scicos_getvalue("Set MATCATV block parameters",["Number od inputs"],list("vec",1),label); if (!ok) { break; } - label = this.lab; - in1 = [-(transpose([2:this.nin+1])),-ones(this.nin,1)]; - it = -ones(this.nin,1); - ot = -1; - out = [0,-1]; - [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); + var label = this.lab; + var in1 = [-(transpose([2:this.nin+1])),-ones(this.nin,1)]; + var it = -ones(this.nin,1); + var ot = -1; + var out = [0,-1]; + var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; if (ok) { - funtyp = 4; + var funtyp = 4; this.model.sim = list(new ScilabString(["mat_catv"]), new ScilabDouble([funtyp])); graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/MatrixOp/MATCATV.pickle b/js/MatrixOp/MATCATV.pickle index d29515a3..ead836c3 100644 --- a/js/MatrixOp/MATCATV.pickle +++ b/js/MatrixOp/MATCATV.pickle @@ -67,59 +67,56 @@ g2 sS'arg1.graphics' p22 g4 -sS'[this.model,graphics,ok]' -p23 -g7 sS'model.out2' -p24 +p23 g7 sS'in1' -p25 +p24 g2 sS'model.rpar' -p26 +p25 g2 sS'model.in1' -p27 +p26 g12 sS'model.outtyp' -p28 +p27 g7 sS'model.state' -p29 +p28 g2 sS'graphics.exprs' -p30 +p29 NsS'model.ipar' -p31 +p30 g2 sS'typ' -p32 +p31 g2 sS'arg1.model' -p33 +p32 NsS'model.blocktype' -p34 +p33 g18 sS'model.dep_ut' -p35 +p34 g2 sS'gr_i' -p36 +p35 g2 sS'l1' -p37 +p36 g12 sS'y' -p38 +p37 g2 sS'x' -p39 +p38 g7 sS'model' -p40 +p39 g4 sS'ot' -p41 +p40 g7 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATDET.js b/js/MatrixOp/MATDET.js index e9760077..ea37a5d3 100644 --- a/js/MatrixOp/MATDET.js +++ b/js/MatrixOp/MATDET.js @@ -2,8 +2,8 @@ function MATDET() { MATDET.prototype.define = function MATDET() { this.model = scicos_model(); - function_name = "mat_det"; - funtyp = 4; + var function_name = "mat_det"; + var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.model.in1 = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-1]); @@ -20,8 +20,8 @@ function MATDET() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = []; this.model.dep_ut = [true,false]; - label = [sci2exp(1)]; - gr_i = []; + var label = [sci2exp(1)]; + var gr_i = []; this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -37,8 +37,8 @@ function MATDET() { MATDET.prototype.set = function MATDET() { this.typ = inverse(arguments[0]["typ"]) this.x = arg1; - graphics = arg1.graphics; - label = graphics.exprs; + var graphics = arg1.graphics; + var label = graphics.exprs; this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; @@ -49,23 +49,26 @@ function MATDET() { break; } if ((this.typ==1)) { - function_name = "mat_det"; - ot = 1; - it = 1; + var function_name = "mat_det"; + var ot = 1; + var it = 1; } else if ((this.typ==2)) { - function_name = "matz_det"; - ot = 2; - it = 2; + var function_name = "matz_det"; + var ot = 2; + var it = 2; } else { message("Datatype is not supported"); - ok = false; + var ok = false; } - in1 = [this.model.in1,this.model.in2]; - out = [this.model.out,this.model.out2]; - funtyp = 4; + var in1 = [this.model.in1,this.model.in2]; + var out = [this.model.out,this.model.out2]; + var funtyp = 4; if (ok) { - label = exprs; - [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); + var label = exprs; + var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/MatrixOp/MATDET.pickle b/js/MatrixOp/MATDET.pickle index f8728324..42a969d6 100644 --- a/js/MatrixOp/MATDET.pickle +++ b/js/MatrixOp/MATDET.pickle @@ -67,61 +67,58 @@ g2 sS'arg1.graphics' p22 g4 -sS'[this.model,graphics,ok]' -p23 -g7 sS'model.out2' -p24 +p23 g7 sS'in1' -p25 +p24 g2 sS'model.rpar' -p26 +p25 g2 sS'model.outtyp' -p27 +p26 g7 sS'model.state' -p28 +p27 g2 sS'graphics.exprs' -p29 +p28 NsS'model.ipar' -p30 +p29 g2 sS'typ' -p31 +p30 g2 sS'arg1.model' -p32 +p31 g4 sS'label[9-1]' -p33 +p32 g2 sS'ok' -p34 +p33 S'boolean' -p35 +p34 sS'model.blocktype' -p36 +p35 g18 sS'model.dep_ut' -p37 +p36 g2 sS'gr_i' -p38 +p37 g2 sS'y' -p39 +p38 g2 sS'x' -p40 +p39 g7 sS'model' -p41 +p40 g4 sS'ot' -p42 +p41 g7 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATDIAG.js b/js/MatrixOp/MATDIAG.js index f3cd3976..1871efa6 100644 --- a/js/MatrixOp/MATDIAG.js +++ b/js/MatrixOp/MATDIAG.js @@ -2,8 +2,8 @@ function MATDIAG() { MATDIAG.prototype.define = function MATDIAG() { this.model = scicos_model(); - function_name = "mat_diag"; - funtyp = 4; + var function_name = "mat_diag"; + var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.model.in1 = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([1]); @@ -20,8 +20,8 @@ function MATDIAG() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = []; this.model.dep_ut = [true,false]; - label = [sci2exp(1)]; - gr_i = []; + var label = [sci2exp(1)]; + var gr_i = []; this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -37,8 +37,8 @@ function MATDIAG() { MATDIAG.prototype.set = function MATDIAG() { this.typ = inverse(arguments[0]["typ"]) this.x = arg1; - graphics = arg1.graphics; - label = graphics.exprs; + var graphics = arg1.graphics; + var label = graphics.exprs; this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; @@ -49,23 +49,26 @@ function MATDIAG() { break; } if ((this.typ==1)) { - function_name = "mat_diag"; - ot = 1; - it = 1; + var function_name = "mat_diag"; + var ot = 1; + var it = 1; } else if ((this.typ==2)) { - function_name = "matz_diag"; - ot = 2; - it = 2; + var function_name = "matz_diag"; + var ot = 2; + var it = 2; } else { message("Datatype is not supported"); - ok = false; + var ok = false; } - in1 = [this.model.in1,this.model.in2]; - out = [this.model.out,this.model.out2]; - funtyp = 4; + var in1 = [this.model.in1,this.model.in2]; + var out = [this.model.out,this.model.out2]; + var funtyp = 4; if (ok) { - label = exprs; - [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); + var label = exprs; + var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/MatrixOp/MATDIAG.pickle b/js/MatrixOp/MATDIAG.pickle index f8728324..42a969d6 100644 --- a/js/MatrixOp/MATDIAG.pickle +++ b/js/MatrixOp/MATDIAG.pickle @@ -67,61 +67,58 @@ g2 sS'arg1.graphics' p22 g4 -sS'[this.model,graphics,ok]' -p23 -g7 sS'model.out2' -p24 +p23 g7 sS'in1' -p25 +p24 g2 sS'model.rpar' -p26 +p25 g2 sS'model.outtyp' -p27 +p26 g7 sS'model.state' -p28 +p27 g2 sS'graphics.exprs' -p29 +p28 NsS'model.ipar' -p30 +p29 g2 sS'typ' -p31 +p30 g2 sS'arg1.model' -p32 +p31 g4 sS'label[9-1]' -p33 +p32 g2 sS'ok' -p34 +p33 S'boolean' -p35 +p34 sS'model.blocktype' -p36 +p35 g18 sS'model.dep_ut' -p37 +p36 g2 sS'gr_i' -p38 +p37 g2 sS'y' -p39 +p38 g2 sS'x' -p40 +p39 g7 sS'model' -p41 +p40 g4 sS'ot' -p42 +p41 g7 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATDIV.js b/js/MatrixOp/MATDIV.js index dbe451df..d295365d 100644 --- a/js/MatrixOp/MATDIV.js +++ b/js/MatrixOp/MATDIV.js @@ -2,8 +2,8 @@ function MATDIV() { MATDIV.prototype.define = function MATDIV() { this.model = scicos_model(); - function_name = "mat_div"; - funtyp = 4; + var function_name = "mat_div"; + var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.model.in1 = new ScilabDouble([-1],[-2]); this.model.in2 = new ScilabDouble([-3],[-3]); @@ -20,8 +20,8 @@ function MATDIV() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = []; this.model.dep_ut = [true,false]; - label = [sci2exp(1)]; - gr_i = []; + var label = [sci2exp(1)]; + var gr_i = []; this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -37,8 +37,8 @@ function MATDIV() { MATDIV.prototype.set = function MATDIV() { this.typ = inverse(arguments[0]["typ"]) this.x = arg1; - graphics = arg1.graphics; - label = graphics.exprs; + var graphics = arg1.graphics; + var label = graphics.exprs; this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; @@ -49,23 +49,26 @@ function MATDIV() { break; } if ((this.typ==1)) { - function_name = "mat_div"; - ot = 1; - it = [1,1]; + var function_name = "mat_div"; + var ot = 1; + var it = [1,1]; } else if ((this.typ==2)) { - function_name = "matz_div"; - ot = 2; - it = [2,2]; + var function_name = "matz_div"; + var ot = 2; + var it = [2,2]; } else { message("Datatype is not supported"); - ok = false; + var ok = false; } - in1 = [this.model.in1,this.model.in2]; - out = [this.model.out,this.model.out2]; - funtyp = 4; + var in1 = [this.model.in1,this.model.in2]; + var out = [this.model.out,this.model.out2]; + var funtyp = 4; if (ok) { - label = exprs; - [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); + var label = exprs; + var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/MatrixOp/MATDIV.pickle b/js/MatrixOp/MATDIV.pickle index 32187fe9..d6584a86 100644 --- a/js/MatrixOp/MATDIV.pickle +++ b/js/MatrixOp/MATDIV.pickle @@ -68,61 +68,58 @@ g2 sS'arg1.graphics' p23 g4 -sS'[this.model,graphics,ok]' -p24 -g9 sS'model.out2' -p25 +p24 g9 sS'in1' -p26 +p25 g2 sS'model.rpar' -p27 +p26 g2 sS'model.outtyp' -p28 +p27 g9 sS'model.state' -p29 +p28 g2 sS'graphics.exprs' -p30 +p29 NsS'model.ipar' -p31 +p30 g2 sS'typ' -p32 +p31 g2 sS'arg1.model' -p33 +p32 g4 sS'label[9-1]' -p34 +p33 g2 sS'ok' -p35 +p34 S'boolean' -p36 +p35 sS'model.blocktype' -p37 +p36 g19 sS'model.dep_ut' -p38 +p37 g2 sS'gr_i' -p39 +p38 g2 sS'y' -p40 +p39 g2 sS'x' -p41 +p40 g9 sS'model' -p42 +p41 g4 sS'ot' -p43 +p42 g9 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATEIG.js b/js/MatrixOp/MATEIG.js index bd8d9a1c..53c4e86d 100644 --- a/js/MatrixOp/MATEIG.js +++ b/js/MatrixOp/MATEIG.js @@ -2,8 +2,8 @@ function MATEIG() { MATEIG.prototype.define = function MATEIG() { this.model = scicos_model(); - function_name = "mat_vps"; - funtyp = 4; + var function_name = "mat_vps"; + var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.model.in1 = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-1]); @@ -20,8 +20,8 @@ function MATEIG() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = []; this.model.dep_ut = [true,false]; - label = [[sci2exp(1)],[sci2exp(1)]]; - gr_i = []; + var label = [[sci2exp(1)],[sci2exp(1)]]; + var gr_i = []; this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -41,8 +41,8 @@ function MATEIG() { this.lab = arguments[0]["lab"] this.x = arg1; this.model = arg1.model; - graphics = arg1.graphics; - label = graphics.exprs; + var graphics = arg1.graphics; + var label = graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; } @@ -51,43 +51,46 @@ function MATEIG() { if (!ok) { break; } - label = this.lab; + var label = this.lab; if ((this.typ==1)) { if ((this.decomptyp==1)) { - function_name = "mat_vps"; - out = [-1,1]; - ot = 2; + var function_name = "mat_vps"; + var out = [-1,1]; + var ot = 2; } else if ((this.decomptyp==2)) { - function_name = "mat_vpv"; - out = [[-1,-1],[-1,-1]]; - ot = [2,2]; + var function_name = "mat_vpv"; + var out = [[-1,-1],[-1,-1]]; + var ot = [2,2]; } else { message("decomposition type is not supported"); - ok = false; + var ok = false; } - it = 1; + var it = 1; } else if ((this.typ==2)) { if ((this.decomptyp==1)) { - function_name = "matz_vps"; - out = [-1,1]; - ot = 2; + var function_name = "matz_vps"; + var out = [-1,1]; + var ot = 2; } else if ((this.decomptyp==2)) { - function_name = "matz_vpv"; - out = [[-1,-1],[-1,-1]]; - ot = [2,2]; + var function_name = "matz_vpv"; + var out = [[-1,-1],[-1,-1]]; + var ot = [2,2]; } else { message("decomposition type is not supported"); - ok = false; + var ok = false; } - it = 2; + var it = 2; } else { message("Datatype is not supported"); - ok = false; + var ok = false; } - in1 = [-1,-1]; - funtyp = 4; + var in1 = [-1,-1]; + var funtyp = 4; if (ok) { - [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); + var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; } if (ok) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); diff --git a/js/MatrixOp/MATEIG.pickle b/js/MatrixOp/MATEIG.pickle index dced0534..fa38deab 100644 --- a/js/MatrixOp/MATEIG.pickle +++ b/js/MatrixOp/MATEIG.pickle @@ -30,102 +30,99 @@ sS'it' p6 S'double' p7 -sS'model.intyp' -p8 -g7 sS'funtyp' -p9 +p8 g7 sS'model.out' -p10 +p9 g7 sS'out' -p11 +p10 S'matrix' -p12 +p11 sS'model.in2' -p13 +p12 g7 -sS'model.in1' -p14 +sS'model.intyp' +p13 g7 sS'label' -p15 -g12 +p14 +g11 sS'model.evtin' -p16 +p15 g2 sS'model.firing' -p17 +p16 g2 sS'function_name' -p18 +p17 S'string' -p19 +p18 sS'model.sim' -p20 +p19 S'list' -p21 +p20 sS'model.evtout' -p22 +p21 g2 sS'arg1.graphics' -p23 +p22 g4 -sS'[this.model,graphics,ok]' -p24 -g7 sS'model.out2' -p25 +p23 g7 sS'in1' -p26 +p24 g2 sS'model.rpar' -p27 +p25 g2 +sS'model.in1' +p26 +g7 sS'model.outtyp' -p28 +p27 g7 sS'model.state' -p29 +p28 g2 sS'graphics.exprs' -p30 +p29 NsS'model.ipar' -p31 +p30 g2 sS'typ' -p32 +p31 g2 sS'arg1.model' -p33 +p32 NsS'label[9-1]' -p34 +p33 g2 sS'ok' -p35 +p34 S'boolean' -p36 +p35 sS'model.blocktype' -p37 -g19 +p36 +g18 sS'model.dep_ut' -p38 +p37 g2 sS'gr_i' -p39 +p38 g2 sS'y' -p40 +p39 g2 sS'x' -p41 +p40 g7 sS'model' -p42 +p41 g4 sS'ot' -p43 +p42 g2 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATEXPM.js b/js/MatrixOp/MATEXPM.js index d528759f..08d383ad 100644 --- a/js/MatrixOp/MATEXPM.js +++ b/js/MatrixOp/MATEXPM.js @@ -2,8 +2,8 @@ function MATEXPM() { MATEXPM.prototype.define = function MATEXPM() { this.model = scicos_model(); - function_name = "mat_expm"; - funtyp = 4; + var function_name = "mat_expm"; + var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.model.in1 = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-1]); @@ -20,8 +20,8 @@ function MATEXPM() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = []; this.model.dep_ut = [true,false]; - label = [sci2exp(1)]; - gr_i = []; + var label = [sci2exp(1)]; + var gr_i = []; this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -37,8 +37,8 @@ function MATEXPM() { MATEXPM.prototype.set = function MATEXPM() { this.typ = inverse(arguments[0]["typ"]) this.x = arg1; - graphics = arg1.graphics; - label = graphics.exprs; + var graphics = arg1.graphics; + var label = graphics.exprs; this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; @@ -49,23 +49,26 @@ function MATEXPM() { break; } if ((this.typ==1)) { - function_name = "mat_expm"; - ot = 1; - it = 1; + var function_name = "mat_expm"; + var ot = 1; + var it = 1; } else if ((this.typ==2)) { - function_name = "matz_expm"; - ot = 2; - it = 2; + var function_name = "matz_expm"; + var ot = 2; + var it = 2; } else { message("Datatype is not supported"); - ok = false; + var ok = false; } - in1 = [this.model.in1,this.model.in2]; - out = [this.model.out,this.model.out2]; - funtyp = 4; + var in1 = [this.model.in1,this.model.in2]; + var out = [this.model.out,this.model.out2]; + var funtyp = 4; if (ok) { - label = exprs; - [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); + var label = exprs; + var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/MatrixOp/MATEXPM.pickle b/js/MatrixOp/MATEXPM.pickle index f8728324..42a969d6 100644 --- a/js/MatrixOp/MATEXPM.pickle +++ b/js/MatrixOp/MATEXPM.pickle @@ -67,61 +67,58 @@ g2 sS'arg1.graphics' p22 g4 -sS'[this.model,graphics,ok]' -p23 -g7 sS'model.out2' -p24 +p23 g7 sS'in1' -p25 +p24 g2 sS'model.rpar' -p26 +p25 g2 sS'model.outtyp' -p27 +p26 g7 sS'model.state' -p28 +p27 g2 sS'graphics.exprs' -p29 +p28 NsS'model.ipar' -p30 +p29 g2 sS'typ' -p31 +p30 g2 sS'arg1.model' -p32 +p31 g4 sS'label[9-1]' -p33 +p32 g2 sS'ok' -p34 +p33 S'boolean' -p35 +p34 sS'model.blocktype' -p36 +p35 g18 sS'model.dep_ut' -p37 +p36 g2 sS'gr_i' -p38 +p37 g2 sS'y' -p39 +p38 g2 sS'x' -p40 +p39 g7 sS'model' -p41 +p40 g4 sS'ot' -p42 +p41 g7 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATINV.js b/js/MatrixOp/MATINV.js index d43ab5fd..9ad78085 100644 --- a/js/MatrixOp/MATINV.js +++ b/js/MatrixOp/MATINV.js @@ -2,8 +2,8 @@ function MATINV() { MATINV.prototype.define = function MATINV() { this.model = scicos_model(); - function_name = "mat_inv"; - funtyp = 4; + var function_name = "mat_inv"; + var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.model.in1 = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-1]); @@ -20,8 +20,8 @@ function MATINV() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = []; this.model.dep_ut = [true,false]; - label = [sci2exp(1)]; - gr_i = []; + var label = [sci2exp(1)]; + var gr_i = []; this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -37,8 +37,8 @@ function MATINV() { MATINV.prototype.set = function MATINV() { this.typ = inverse(arguments[0]["typ"]) this.x = arg1; - graphics = arg1.graphics; - label = graphics.exprs; + var graphics = arg1.graphics; + var label = graphics.exprs; this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; @@ -49,23 +49,26 @@ function MATINV() { break; } if ((this.typ==1)) { - function_name = "mat_inv"; - ot = 1; - it = 1; + var function_name = "mat_inv"; + var ot = 1; + var it = 1; } else if ((this.typ==2)) { - function_name = "matz_inv"; - ot = 2; - it = 2; + var function_name = "matz_inv"; + var ot = 2; + var it = 2; } else { message("Datatype is not supported"); - ok = false; + var ok = false; } - in1 = [this.model.in1,this.model.in2]; - out = [this.model.out,this.model.out2]; - funtyp = 4; + var in1 = [this.model.in1,this.model.in2]; + var out = [this.model.out,this.model.out2]; + var funtyp = 4; if (ok) { - label = exprs; - [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); + var label = exprs; + var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/MatrixOp/MATINV.pickle b/js/MatrixOp/MATINV.pickle index f8728324..42a969d6 100644 --- a/js/MatrixOp/MATINV.pickle +++ b/js/MatrixOp/MATINV.pickle @@ -67,61 +67,58 @@ g2 sS'arg1.graphics' p22 g4 -sS'[this.model,graphics,ok]' -p23 -g7 sS'model.out2' -p24 +p23 g7 sS'in1' -p25 +p24 g2 sS'model.rpar' -p26 +p25 g2 sS'model.outtyp' -p27 +p26 g7 sS'model.state' -p28 +p27 g2 sS'graphics.exprs' -p29 +p28 NsS'model.ipar' -p30 +p29 g2 sS'typ' -p31 +p30 g2 sS'arg1.model' -p32 +p31 g4 sS'label[9-1]' -p33 +p32 g2 sS'ok' -p34 +p33 S'boolean' -p35 +p34 sS'model.blocktype' -p36 +p35 g18 sS'model.dep_ut' -p37 +p36 g2 sS'gr_i' -p38 +p37 g2 sS'y' -p39 +p38 g2 sS'x' -p40 +p39 g7 sS'model' -p41 +p40 g4 sS'ot' -p42 +p41 g7 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATLU.js b/js/MatrixOp/MATLU.js index 90e16908..c1c29c69 100644 --- a/js/MatrixOp/MATLU.js +++ b/js/MatrixOp/MATLU.js @@ -2,8 +2,8 @@ function MATLU() { MATLU.prototype.define = function MATLU() { this.model = scicos_model(); - function_name = "mat_lu"; - funtyp = 4; + var function_name = "mat_lu"; + var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.model.in1 = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-1]); @@ -20,8 +20,8 @@ function MATLU() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = []; this.model.dep_ut = [true,false]; - label = sci2exp(1); - gr_i = []; + var label = sci2exp(1); + var gr_i = []; this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -39,8 +39,8 @@ function MATLU() { this.lab = arguments[0]["lab"] this.x = arg1; this.model = arg1.model; - graphics = arg1.graphics; - label = graphics.exprs; + var graphics = arg1.graphics; + var label = graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; } @@ -50,22 +50,25 @@ function MATLU() { break; } if ((this.typ==1)) { - function_name = "mat_lu"; - ot = [1,1]; - it = 1; + var function_name = "mat_lu"; + var ot = [1,1]; + var it = 1; } else if ((this.typ==2)) { - function_name = "matz_lu"; - ot = [2,2]; - it = 2; + var function_name = "matz_lu"; + var ot = [2,2]; + var it = 2; } else { message("Datatype is not supported"); - ok = false; + var ok = false; } if (ok) { - [this.model,graphics,ok] = set_io(this.model,graphics,list([this.model.in1,this.model.in2],it),list([this.model.out,this.model.out2],ot),[],[]); + var tmpvar0 = set_io(this.model,graphics,list([this.model.in1,this.model.in2],it),list([this.model.out,this.model.out2],ot),[],[]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; } if (ok) { - funtyp = 4; + var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); graphics.exprs = this.lab; this.x.graphics = graphics; diff --git a/js/MatrixOp/MATLU.pickle b/js/MatrixOp/MATLU.pickle index 83b8081a..afb20bf7 100644 --- a/js/MatrixOp/MATLU.pickle +++ b/js/MatrixOp/MATLU.pickle @@ -67,58 +67,55 @@ p21 sS'model.evtout' p22 g2 -sS'[this.model,graphics,ok]' -p23 -g7 sS'model.out2' -p24 +p23 g11 sS'model.intyp' -p25 +p24 g7 sS'model.rpar' -p26 +p25 g2 sS'model.outtyp' -p27 +p26 g2 sS'model.state' -p28 +p27 g2 sS'graphics.exprs' -p29 +p28 NsS'model.ipar' -p30 +p29 g2 sS'typ' -p31 +p30 g2 sS'label[9-1]' -p32 +p31 g2 sS'ok' -p33 +p32 S'boolean' -p34 +p33 sS'model.blocktype' -p35 +p34 g16 sS'model.dep_ut' -p36 +p35 g2 sS'gr_i' -p37 +p36 g2 sS'y' -p38 +p37 g2 sS'x' -p39 +p38 g7 sS'model' -p40 +p39 g4 sS'ot' -p41 +p40 g2 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATMAGPHI.js b/js/MatrixOp/MATMAGPHI.js index b3760a0d..bbe2d7d9 100644 --- a/js/MatrixOp/MATMAGPHI.js +++ b/js/MatrixOp/MATMAGPHI.js @@ -2,8 +2,8 @@ function MATMAGPHI() { MATMAGPHI.prototype.define = function MATMAGPHI() { this.model = scicos_model(); - function_name = "matz_abs"; - funtyp = 4; + var function_name = "matz_abs"; + var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.model.in1 = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); @@ -20,8 +20,8 @@ function MATMAGPHI() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = []; this.model.dep_ut = [true,false]; - label = [sci2exp(1)]; - gr_i = []; + var label = [sci2exp(1)]; + var gr_i = []; this.x = standard_define([3,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -39,8 +39,8 @@ function MATMAGPHI() { this.lab = arguments[0]["lab"] this.x = arg1; this.model = arg1.model; - graphics = arg1.graphics; - label = graphics.exprs; + var graphics = arg1.graphics; + var label = graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; } @@ -49,26 +49,29 @@ function MATMAGPHI() { if (!ok) { break; } - label = this.lab; + var label = this.lab; if ((this.decomptyp==1)) { - function_name = "matz_abs"; - in1 = [-1,-2]; - it = 2; - out = [[-1,-2],[-1,-2]]; - ot = [1,1]; + var function_name = "matz_abs"; + var in1 = [-1,-2]; + var it = 2; + var out = [[-1,-2],[-1,-2]]; + var ot = [1,1]; } else if ((this.decomptyp==2)) { - function_name = "matz_absc"; - in1 = [[-1,-2],[-1,-2]]; - it = [1,1]; - out = [-1,-2]; - ot = 2; + var function_name = "matz_absc"; + var in1 = [[-1,-2],[-1,-2]]; + var it = [1,1]; + var out = [-1,-2]; + var ot = 2; } else { message("decomposition type is not supported"); - ok = false; + var ok = false; } - funtyp = 4; + var funtyp = 4; if (ok) { - [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); + var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; } if (ok) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); diff --git a/js/MatrixOp/MATMAGPHI.pickle b/js/MatrixOp/MATMAGPHI.pickle index 7457f5ff..689495ae 100644 --- a/js/MatrixOp/MATMAGPHI.pickle +++ b/js/MatrixOp/MATMAGPHI.pickle @@ -27,103 +27,100 @@ g4 sS'it' p6 g2 -sS'model.intyp' +sS'funtyp' p7 S'double' p8 -sS'funtyp' -p9 -g8 sS'model.out' -p10 +p9 S'matrix' -p11 +p10 sS'out' -p12 +p11 g2 sS'model.in2' -p13 +p12 g8 -sS'model.in1' -p14 +sS'model.intyp' +p13 g8 sS'label' -p15 +p14 g2 sS'model.evtin' -p16 +p15 g2 sS'model.firing' -p17 +p16 g2 sS'function_name' -p18 +p17 S'string' -p19 +p18 sS'model.sim' -p20 +p19 S'list' -p21 +p20 sS'model.evtout' -p22 +p21 g2 sS'arg1.graphics' -p23 +p22 g4 -sS'[this.model,graphics,ok]' -p24 -g8 sS'model.out2' -p25 -g11 +p23 +g10 sS'in1' -p26 -g11 +p24 +g10 sS'model.rpar' -p27 +p25 g2 +sS'model.in1' +p26 +g8 sS'model.outtyp' -p28 +p27 g2 sS'model.state' -p29 +p28 g2 sS'graphics.exprs' -p30 +p29 NsS'model.ipar' -p31 +p30 g2 sS'typ' -p32 +p31 g2 sS'arg1.model' -p33 +p32 NsS'label[9-1]' -p34 +p33 g2 sS'ok' -p35 +p34 S'boolean' -p36 +p35 sS'model.blocktype' -p37 -g19 +p36 +g18 sS'model.dep_ut' -p38 +p37 g2 sS'gr_i' -p39 +p38 g2 sS'y' -p40 +p39 g2 sS'x' -p41 +p40 g8 sS'model' -p42 +p41 g4 sS'ot' -p43 +p42 g8 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATMUL.js b/js/MatrixOp/MATMUL.js index 2ce11fb8..81217de2 100644 --- a/js/MatrixOp/MATMUL.js +++ b/js/MatrixOp/MATMUL.js @@ -9,8 +9,8 @@ function MATMUL() { this.model.out2 = new ScilabDouble([-3]); this.model.dep_ut = [true,false]; this.model.ipar = new ScilabDouble([1]); - label = [sci2exp(this.model.ipar)]; - gr_i = []; + var label = [sci2exp(this.model.ipar)]; + var gr_i = []; this.x = standard_define([3,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -30,8 +30,8 @@ function MATMUL() { this.rule = parseFloat(arguments[0]["rule"]) this.np = parseFloat(arguments[0]["np"]) this.x = arg1; - graphics = this.x.graphics; - label = graphics.exprs; + var graphics = this.x.graphics; + var label = graphics.exprs; this.model = this.x.model; if (this.model.ipar==[]) { this.model.ipar = new ScilabDouble([1]); @@ -50,17 +50,17 @@ function MATMUL() { this.rule = int(this.rule); if ((this.dtype<1||this.dtype>8)) { message("type is not supported"); - ok = false; + var ok = false; } if ((this.rule<1||this.rule>3)) { message("Multiplication rule must be only 1,2 or 3"); - ok = false; + var ok = false; } if ((this.dtype==1||this.dtype==2)) { this.np = 0; } - TABMIN = [[0],[0],[-(2^31)],[-(2^15)],[-(2^7)],[0],[0],[0]]; - TABMAX = [[0],[0],[(2^31)-1],[(2^15)-1],[(2^7)-1],[(2^32)-1],[(2^16)-1],[(2^8)-1]]; + var TABMIN = [[0],[0],[-(2^31)],[-(2^15)],[-(2^7)],[0],[0],[0]]; + var TABMAX = [[0],[0],[(2^31)-1],[(2^15)-1],[(2^7)-1],[(2^32)-1],[(2^16)-1],[(2^8)-1]]; if (this.rule==2) { if (this.np==0) { this.model.sim = list(new ScilabString(["matmul2_m"]), new ScilabDouble([4])); @@ -132,29 +132,32 @@ function MATMUL() { } } } - kmin = TABMIN[this.dtype-1]; - kmax = TABMAX[this.dtype-1]; - it = this.dtype*ones(1,2); - ot = this.dtype; + var kmin = TABMIN[this.dtype-1]; + var kmax = TABMAX[this.dtype-1]; + var it = this.dtype*ones(1,2); + var ot = this.dtype; if (this.rule==1) { - in1 = [[-1,-2],[-2,-3]]; - out = [-1,-3]; + var in1 = [[-1,-2],[-2,-3]]; + var out = [-1,-3]; } else if (this.rule==2) { - in1 = [[-1,-2],[-1,-2]]; - out = [-1,-2]; + var in1 = [[-1,-2],[-1,-2]]; + var out = [-1,-2]; } else { - in1 = [[-1,-2],[1,1]]; - out = [-1,-2]; + var in1 = [[-1,-2],[1,1]]; + var out = [-1,-2]; } - [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); + var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; if (ok) { - label = exprs; + var label = exprs; this.model.ipar = new ScilabDouble([this.rule]); this.model.rpar = new ScilabDouble([kmin],[kmax]); graphics.exprs = label; this.x.graphics = graphics; this.x.model = this.model; - arg1 = this.x; + var arg1 = this.x; break; } } diff --git a/js/MatrixOp/MATMUL.pickle b/js/MatrixOp/MATMUL.pickle index dcc42c69..31523949 100644 --- a/js/MatrixOp/MATMUL.pickle +++ b/js/MatrixOp/MATMUL.pickle @@ -61,62 +61,59 @@ g8 sS'np' p19 g10 -sS'[this.model,graphics,ok]' -p20 -g10 sS'model.sim' -p21 +p20 S'list' -p22 +p21 sS'label[2-1]' -p23 +p22 g5 sS'model.out2' -p24 +p23 g10 sS'in1' -p25 +p24 g14 sS'model.rpar' -p26 +p25 g14 sS'kmax' -p27 +p26 g10 sS'graphics' -p28 +p27 g2 sS'model.ipar' -p29 +p28 g10 sS'typ' -p30 +p29 g8 sS'ot' -p31 +p30 NsS'ok' -p32 +p31 S'boolean' -p33 +p32 sS'rule' -p34 +p33 g10 sS'gr_i' -p35 +p34 g8 sS'TABMIN' -p36 +p35 g14 sS'y' -p37 +p36 g8 sS'x' -p38 +p37 g10 sS'model' -p39 +p38 g2 sS'TABMAX' -p40 +p39 g14 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATPINV.js b/js/MatrixOp/MATPINV.js index c055a359..ca0b3185 100644 --- a/js/MatrixOp/MATPINV.js +++ b/js/MatrixOp/MATPINV.js @@ -2,8 +2,8 @@ function MATPINV() { MATPINV.prototype.define = function MATPINV() { this.model = scicos_model(); - function_name = "mat_pinv"; - funtyp = 4; + var function_name = "mat_pinv"; + var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.model.in1 = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); @@ -20,8 +20,8 @@ function MATPINV() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = []; this.model.dep_ut = [true,false]; - label = [sci2exp(1)]; - gr_i = []; + var label = [sci2exp(1)]; + var gr_i = []; this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -37,8 +37,8 @@ function MATPINV() { MATPINV.prototype.set = function MATPINV() { this.typ = inverse(arguments[0]["typ"]) this.x = arg1; - graphics = arg1.graphics; - label = graphics.exprs; + var graphics = arg1.graphics; + var label = graphics.exprs; this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; @@ -49,23 +49,26 @@ function MATPINV() { break; } if ((this.typ==1)) { - function_name = "mat_pinv"; - ot = 1; - it = 1; + var function_name = "mat_pinv"; + var ot = 1; + var it = 1; } else if ((this.typ==2)) { - function_name = "matz_pinv"; - ot = 2; - it = 2; + var function_name = "matz_pinv"; + var ot = 2; + var it = 2; } else { message("Datatype is not supported"); - ok = false; + var ok = false; } - in1 = [this.model.in1,this.model.in2]; - out = [this.model.out,this.model.out2]; - funtyp = 4; + var in1 = [this.model.in1,this.model.in2]; + var out = [this.model.out,this.model.out2]; + var funtyp = 4; if (ok) { - label = exprs; - [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); + var label = exprs; + var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/MatrixOp/MATPINV.pickle b/js/MatrixOp/MATPINV.pickle index f8728324..42a969d6 100644 --- a/js/MatrixOp/MATPINV.pickle +++ b/js/MatrixOp/MATPINV.pickle @@ -67,61 +67,58 @@ g2 sS'arg1.graphics' p22 g4 -sS'[this.model,graphics,ok]' -p23 -g7 sS'model.out2' -p24 +p23 g7 sS'in1' -p25 +p24 g2 sS'model.rpar' -p26 +p25 g2 sS'model.outtyp' -p27 +p26 g7 sS'model.state' -p28 +p27 g2 sS'graphics.exprs' -p29 +p28 NsS'model.ipar' -p30 +p29 g2 sS'typ' -p31 +p30 g2 sS'arg1.model' -p32 +p31 g4 sS'label[9-1]' -p33 +p32 g2 sS'ok' -p34 +p33 S'boolean' -p35 +p34 sS'model.blocktype' -p36 +p35 g18 sS'model.dep_ut' -p37 +p36 g2 sS'gr_i' -p38 +p37 g2 sS'y' -p39 +p38 g2 sS'x' -p40 +p39 g7 sS'model' -p41 +p40 g4 sS'ot' -p42 +p41 g7 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATRESH.js b/js/MatrixOp/MATRESH.js index 647cc3db..6de8b8bc 100644 --- a/js/MatrixOp/MATRESH.js +++ b/js/MatrixOp/MATRESH.js @@ -2,8 +2,8 @@ function MATRESH() { MATRESH.prototype.define = function MATRESH() { this.model = scicos_model(); - function_name = "mat_reshape"; - funtyp = 4; + var function_name = "mat_reshape"; + var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.model.in1 = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); @@ -20,8 +20,8 @@ function MATRESH() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = []; this.model.dep_ut = [true,false]; - label = [[sci2exp(1)],[sci2exp([1,1])],[sci2exp([1,1])]]; - gr_i = []; + var label = [[sci2exp(1)],[sci2exp([1,1])],[sci2exp([1,1])]]; + var gr_i = []; this.x = standard_define([3,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -43,8 +43,8 @@ function MATRESH() { this.lab = arguments[0]["lab"] this.x = arg1; this.model = arg1.model; - graphics = arg1.graphics; - label = graphics.exprs; + var graphics = arg1.graphics; + var label = graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; } @@ -53,48 +53,51 @@ function MATRESH() { if (!ok) { break; } - nout = size(this.out); - nin = size(this.l1); + var nout = size(this.out); + var nin = size(this.l1); if (nout==0) { message("output must have at least one element"); - ok = false; + var ok = false; } if (nin==0) { message("input must have at least one element"); - ok = false; + var ok = false; } if (ok) { if (((this.out[1-1]>(this.l1[1-1]*this.l1[2-1])))) { message("the first dimension of the output is too big"); - ok = false; + var ok = false; } if (((this.out[2-1]>(this.l1[1-1]*this.l1[2-1])))) { message("the second dimension of the output is too big"); - ok = false; + var ok = false; } if ((((this.out[2-1]*this.out[1-1])>(this.l1[1-1]*this.l1[2-1])))) { message("the dimensions of the output are too big"); - ok = false; + var ok = false; } } if ((this.typ==1)) { - function_name = "mat_reshape"; - ot = 1; - it = 1; + var function_name = "mat_reshape"; + var ot = 1; + var it = 1; } else if ((this.typ==2)) { - function_name = "matz_reshape"; - ot = 2; - it = 2; + var function_name = "matz_reshape"; + var ot = 2; + var it = 2; } else { message("Datatype is not supported"); - ok = false; + var ok = false; } if (ok) { - label = this.lab; - [this.model,graphics,ok] = set_io(this.model,graphics,list(this.l1,it),list(this.out,ot),[],[]); + var label = this.lab; + var tmpvar0 = set_io(this.model,graphics,list(this.l1,it),list(this.out,ot),[],[]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; } if (ok) { - funtyp = 4; + var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/MatrixOp/MATRESH.pickle b/js/MatrixOp/MATRESH.pickle index ca6a495b..f8f86478 100644 --- a/js/MatrixOp/MATRESH.pickle +++ b/js/MatrixOp/MATRESH.pickle @@ -41,7 +41,7 @@ g7 sS'model.in2' p10 g7 -sS'model.in1' +sS'model.intyp' p11 g7 sS'label' @@ -71,63 +71,60 @@ g7 sS'arg1.graphics' p22 g4 -sS'[this.model,graphics,ok]' +sS'model.out2' p23 g7 -sS'model.out2' +sS'model.in1' p24 g7 -sS'model.intyp' -p25 -g7 sS'model.rpar' -p26 +p25 g2 sS'model.outtyp' -p27 +p26 g7 sS'model.state' -p28 +p27 g2 sS'graphics.exprs' -p29 +p28 NsS'model.ipar' -p30 +p29 g2 sS'typ' -p31 +p30 g2 sS'arg1.model' -p32 +p31 NsS'label[9-1]' -p33 +p32 g2 sS'ok' -p34 +p33 S'boolean' -p35 +p34 sS'model.blocktype' -p36 +p35 g17 sS'model.dep_ut' -p37 +p36 g2 sS'gr_i' -p38 +p37 g2 sS'y' -p39 +p38 g2 sS'x' -p40 +p39 g7 sS'model' -p41 +p40 g4 sS'ot' -p42 +p41 g7 sS'nout' -p43 +p42 g7 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATSING.js b/js/MatrixOp/MATSING.js index 7f0bd2ec..66956d3f 100644 --- a/js/MatrixOp/MATSING.js +++ b/js/MatrixOp/MATSING.js @@ -2,8 +2,8 @@ function MATSING() { MATSING.prototype.define = function MATSING() { this.model = scicos_model(); - function_name = "mat_sing"; - funtyp = 4; + var function_name = "mat_sing"; + var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.model.in1 = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); @@ -20,8 +20,8 @@ function MATSING() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = []; this.model.dep_ut = [true,false]; - label = [[sci2exp(1)],[sci2exp(1)]]; - gr_i = []; + var label = [[sci2exp(1)],[sci2exp(1)]]; + var gr_i = []; this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -41,8 +41,8 @@ function MATSING() { this.lab = arguments[0]["lab"] this.x = arg1; this.model = arg1.model; - graphics = arg1.graphics; - label = graphics.exprs; + var graphics = arg1.graphics; + var label = graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; } @@ -51,46 +51,49 @@ function MATSING() { if (!ok) { break; } - label = this.lab; + var label = this.lab; if ((this.typ==1)) { if ((this.decomptyp==1)) { - function_name = "mat_sing"; - in1 = [-1,-2]; - out = [-1,1]; - ot = 1; + var function_name = "mat_sing"; + var in1 = [-1,-2]; + var out = [-1,1]; + var ot = 1; } else if ((this.decomptyp==2)) { - function_name = "mat_svd"; - in1 = [-1,-2]; - out = [[-1,-1],[-1,-2],[-2,-2]]; - ot = [1,1,1]; + var function_name = "mat_svd"; + var in1 = [-1,-2]; + var out = [[-1,-1],[-1,-2],[-2,-2]]; + var ot = [1,1,1]; } else { message("decomposition type is not supported"); - ok = false; + var ok = false; } - it = 1; + var it = 1; } else if ((this.typ==2)) { if ((this.decomptyp==1)) { - function_name = "matz_sing"; - in1 = [-1,-2]; - out = [-1,1]; - ot = 1; + var function_name = "matz_sing"; + var in1 = [-1,-2]; + var out = [-1,1]; + var ot = 1; } else if ((this.decomptyp==2)) { - function_name = "matz_svd"; - in1 = [-1,-2]; - out = [[-1,-1],[-1,-2],[-2,-2]]; - ot = [2,1,2]; + var function_name = "matz_svd"; + var in1 = [-1,-2]; + var out = [[-1,-1],[-1,-2],[-2,-2]]; + var ot = [2,1,2]; } else { message("decomposition type is not supported"); - ok = false; + var ok = false; } - it = 2; + var it = 2; } else { message("Datatype is not supported"); - ok = false; + var ok = false; } - funtyp = 4; + var funtyp = 4; if (ok) { - [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); + var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; } if (ok) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); diff --git a/js/MatrixOp/MATSING.pickle b/js/MatrixOp/MATSING.pickle index dced0534..fa38deab 100644 --- a/js/MatrixOp/MATSING.pickle +++ b/js/MatrixOp/MATSING.pickle @@ -30,102 +30,99 @@ sS'it' p6 S'double' p7 -sS'model.intyp' -p8 -g7 sS'funtyp' -p9 +p8 g7 sS'model.out' -p10 +p9 g7 sS'out' -p11 +p10 S'matrix' -p12 +p11 sS'model.in2' -p13 +p12 g7 -sS'model.in1' -p14 +sS'model.intyp' +p13 g7 sS'label' -p15 -g12 +p14 +g11 sS'model.evtin' -p16 +p15 g2 sS'model.firing' -p17 +p16 g2 sS'function_name' -p18 +p17 S'string' -p19 +p18 sS'model.sim' -p20 +p19 S'list' -p21 +p20 sS'model.evtout' -p22 +p21 g2 sS'arg1.graphics' -p23 +p22 g4 -sS'[this.model,graphics,ok]' -p24 -g7 sS'model.out2' -p25 +p23 g7 sS'in1' -p26 +p24 g2 sS'model.rpar' -p27 +p25 g2 +sS'model.in1' +p26 +g7 sS'model.outtyp' -p28 +p27 g7 sS'model.state' -p29 +p28 g2 sS'graphics.exprs' -p30 +p29 NsS'model.ipar' -p31 +p30 g2 sS'typ' -p32 +p31 g2 sS'arg1.model' -p33 +p32 NsS'label[9-1]' -p34 +p33 g2 sS'ok' -p35 +p34 S'boolean' -p36 +p35 sS'model.blocktype' -p37 -g19 +p36 +g18 sS'model.dep_ut' -p38 +p37 g2 sS'gr_i' -p39 +p38 g2 sS'y' -p40 +p39 g2 sS'x' -p41 +p40 g7 sS'model' -p42 +p41 g4 sS'ot' -p43 +p42 g2 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATSUM.js b/js/MatrixOp/MATSUM.js index d60e4191..f4348aa7 100644 --- a/js/MatrixOp/MATSUM.js +++ b/js/MatrixOp/MATSUM.js @@ -2,8 +2,8 @@ function MATSUM() { MATSUM.prototype.define = function MATSUM() { this.model = scicos_model(); - function_name = "mat_sum"; - funtyp = 4; + var function_name = "mat_sum"; + var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.model.in1 = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); @@ -20,8 +20,8 @@ function MATSUM() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = []; this.model.dep_ut = [true,false]; - label = [[sci2exp(1)],[sci2exp(0)]]; - gr_i = []; + var label = [[sci2exp(1)],[sci2exp(0)]]; + var gr_i = []; this.x = standard_define([3,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -41,8 +41,8 @@ function MATSUM() { this.lab = arguments[0]["lab"] this.x = arg1; this.model = arg1.model; - graphics = arg1.graphics; - label = graphics.exprs; + var graphics = arg1.graphics; + var label = graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; } @@ -51,47 +51,50 @@ function MATSUM() { if (!ok) { break; } - label = this.lab; + var label = this.lab; if ((this.typ==1)) { if ((this.decomptyp==0)) { - function_name = "mat_sum"; - out = [1,1]; + var function_name = "mat_sum"; + var out = [1,1]; } else if ((this.decomptyp==2)) { - function_name = "mat_suml"; - out = [-1,1]; + var function_name = "mat_suml"; + var out = [-1,1]; } else if ((this.decomptyp==1)) { - function_name = "mat_sumc"; - out = [1,-2]; + var function_name = "mat_sumc"; + var out = [1,-2]; } else { message("decomposition type is not supported"); - ok = false; + var ok = false; } - it = 1; - ot = 1; + var it = 1; + var ot = 1; } else if ((this.typ==2)) { if ((this.decomptyp==0)) { - function_name = "matz_sum"; - out = [1,1]; + var function_name = "matz_sum"; + var out = [1,1]; } else if ((this.decomptyp==2)) { - function_name = "matz_suml"; - out = [-1,1]; + var function_name = "matz_suml"; + var out = [-1,1]; } else if ((this.decomptyp==1)) { - function_name = "matz_sumc"; - out = [1,-2]; + var function_name = "matz_sumc"; + var out = [1,-2]; } else { message("decomposition type is not supported"); - ok = false; + var ok = false; } - it = 2; - ot = 2; + var it = 2; + var ot = 2; } else { message("Datatype is not supported"); - ok = false; + var ok = false; } - in1 = [this.model.in1,this.model.in2]; - funtyp = 4; + var in1 = [this.model.in1,this.model.in2]; + var funtyp = 4; if (ok) { - [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); + var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; } if (ok) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); diff --git a/js/MatrixOp/MATSUM.pickle b/js/MatrixOp/MATSUM.pickle index a299c038..071f5cfc 100644 --- a/js/MatrixOp/MATSUM.pickle +++ b/js/MatrixOp/MATSUM.pickle @@ -30,103 +30,100 @@ sS'it' p6 S'double' p7 -sS'model.intyp' -p8 -g7 sS'funtyp' -p9 +p8 g7 sS'model.out' -p10 +p9 g7 sS'out' -p11 +p10 g2 sS'model.in2' -p12 +p11 g7 -sS'model.in1' -p13 +sS'model.intyp' +p12 g7 sS'label' -p14 +p13 S'matrix' -p15 +p14 sS'model.evtin' -p16 +p15 g2 sS'model.firing' -p17 +p16 g2 sS'function_name' -p18 +p17 S'string' -p19 +p18 sS'model.sim' -p20 +p19 S'list' -p21 +p20 sS'model.evtout' -p22 +p21 g2 sS'arg1.graphics' -p23 +p22 g4 -sS'[this.model,graphics,ok]' -p24 -g7 sS'model.out2' -p25 +p23 g7 sS'in1' -p26 +p24 g2 sS'model.rpar' -p27 +p25 g2 +sS'model.in1' +p26 +g7 sS'model.outtyp' -p28 +p27 g7 sS'model.state' -p29 +p28 g2 sS'graphics.exprs' -p30 +p29 NsS'model.ipar' -p31 +p30 g2 sS'typ' -p32 +p31 g2 sS'arg1.model' -p33 +p32 g4 sS'label[9-1]' -p34 +p33 g2 sS'ok' -p35 +p34 S'boolean' -p36 +p35 sS'model.blocktype' -p37 -g19 +p36 +g18 sS'model.dep_ut' -p38 +p37 g2 sS'gr_i' -p39 +p38 g2 sS'y' -p40 +p39 g2 sS'x' -p41 +p40 g7 sS'model' -p42 +p41 g4 sS'ot' -p43 +p42 g7 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATTRAN.js b/js/MatrixOp/MATTRAN.js index 847402cb..5189898a 100644 --- a/js/MatrixOp/MATTRAN.js +++ b/js/MatrixOp/MATTRAN.js @@ -8,8 +8,8 @@ function MATTRAN() { this.model.out = new ScilabDouble([-2]); this.model.out2 = new ScilabDouble([-1]); this.model.dep_ut = [true,false]; - label = [sci2exp(1)]; - gr_i = []; + var label = [sci2exp(1)]; + var gr_i = []; this.x = standard_define([3,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -27,8 +27,8 @@ function MATTRAN() { this.typ = inverse(arguments[0]["typ"]) this.rule = arguments[0]["rule"] this.x = arg1; - graphics = arg1.graphics; - label = graphics.exprs; + var graphics = arg1.graphics; + var label = graphics.exprs; this.model = arg1.model; if (size(label,"*")==1) { label[2-1] = sci2exp(1); @@ -39,27 +39,30 @@ function MATTRAN() { break; } if ((this.typ==1)) { - function_name = "mattran_m"; - ot = 1; - it = 1; + var function_name = "mattran_m"; + var ot = 1; + var it = 1; } else if ((this.typ==2)) { if (this.rule==1) { - function_name = "matztran_m"; + var function_name = "matztran_m"; } else { - function_name = "mathermit_m"; + var function_name = "mathermit_m"; } - ot = 2; - it = 2; + var ot = 2; + var it = 2; } else { message("Datatype is not supported"); - ok = false; + var ok = false; } - in1 = [this.model.in1,this.model.in2]; - out = [this.model.out,this.model.out2]; - funtyp = 4; + var in1 = [this.model.in1,this.model.in2]; + var out = [this.model.out,this.model.out2]; + var funtyp = 4; if (ok) { - label = exprs; - [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); + var label = exprs; + var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/MatrixOp/MATTRAN.pickle b/js/MatrixOp/MATTRAN.pickle index d37f5da1..c78ddced 100644 --- a/js/MatrixOp/MATTRAN.pickle +++ b/js/MatrixOp/MATTRAN.pickle @@ -43,57 +43,54 @@ g5 sS'label' p12 g9 -sS'[this.model,graphics,ok]' -p13 -g5 sS'function_name' -p14 +p13 S'string' -p15 +p14 sS'model.sim' -p16 +p15 S'list' -p17 +p16 sS'arg1.graphics' -p18 +p17 g2 sS'label[2-1]' -p19 -g15 +p18 +g14 sS'model.out2' -p20 +p19 g5 sS'in1' -p21 +p20 g9 sS'graphics.exprs' -p22 +p21 NsS'typ' -p23 +p22 g9 sS'arg1.model' -p24 +p23 g2 sS'ok' -p25 +p24 S'boolean' -p26 +p25 sS'model.dep_ut' -p27 +p26 g9 sS'gr_i' -p28 +p27 g9 sS'y' -p29 +p28 g9 sS'x' -p30 +p29 g5 sS'model' -p31 +p30 g2 sS'ot' -p32 +p31 g5 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATZCONJ.js b/js/MatrixOp/MATZCONJ.js index d12db1a6..43dab206 100644 --- a/js/MatrixOp/MATZCONJ.js +++ b/js/MatrixOp/MATZCONJ.js @@ -2,8 +2,8 @@ function MATZCONJ() { MATZCONJ.prototype.define = function MATZCONJ() { this.model = scicos_model(); - function_name = "matz_conj"; - funtyp = 4; + var function_name = "matz_conj"; + var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.model.in1 = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); @@ -20,8 +20,8 @@ function MATZCONJ() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = []; this.model.dep_ut = [true,false]; - label = []; - gr_i = []; + var label = []; + var gr_i = []; this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } diff --git a/js/MatrixOp/MATZREIM.js b/js/MatrixOp/MATZREIM.js index 7e9eb000..b36f0466 100644 --- a/js/MatrixOp/MATZREIM.js +++ b/js/MatrixOp/MATZREIM.js @@ -2,8 +2,8 @@ function MATZREIM() { MATZREIM.prototype.define = function MATZREIM() { this.model = scicos_model(); - function_name = "matz_reim"; - funtyp = 4; + var function_name = "matz_reim"; + var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.model.in1 = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); @@ -20,8 +20,8 @@ function MATZREIM() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = []; this.model.dep_ut = [true,false]; - label = sci2exp(1); - gr_i = []; + var label = sci2exp(1); + var gr_i = []; this.x = standard_define([3,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -39,8 +39,8 @@ function MATZREIM() { this.lab = arguments[0]["lab"] this.x = arg1; this.model = arg1.model; - graphics = arg1.graphics; - label = graphics.exprs; + var graphics = arg1.graphics; + var label = graphics.exprs; if (size(label,"*")==14) { label[9-1] = []; } @@ -49,26 +49,29 @@ function MATZREIM() { if (!ok) { break; } - label = this.lab; + var label = this.lab; if ((this.decomptyp==1)) { - function_name = "matz_reim"; - in1 = [-1,-2]; - it = 2; - out = [[-1,-2],[-1,-2]]; - ot = [1,1]; + var function_name = "matz_reim"; + var in1 = [-1,-2]; + var it = 2; + var out = [[-1,-2],[-1,-2]]; + var ot = [1,1]; } else if ((this.decomptyp==2)) { - function_name = "matz_reimc"; - in1 = [[-1,-2],[-1,-2]]; - it = [1,1]; - out = [-1,-2]; - ot = 2; + var function_name = "matz_reimc"; + var in1 = [[-1,-2],[-1,-2]]; + var it = [1,1]; + var out = [-1,-2]; + var ot = 2; } else { message("decomposition type is not supported"); - ok = false; + var ok = false; } - funtyp = 4; + var funtyp = 4; if (ok) { - [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); + var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; } if (ok) { this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); diff --git a/js/MatrixOp/MATZREIM.pickle b/js/MatrixOp/MATZREIM.pickle index 7611abb3..9e408e2d 100644 --- a/js/MatrixOp/MATZREIM.pickle +++ b/js/MatrixOp/MATZREIM.pickle @@ -27,103 +27,100 @@ g4 sS'it' p6 g2 -sS'model.intyp' +sS'funtyp' p7 S'double' p8 -sS'funtyp' -p9 -g8 sS'model.out' -p10 +p9 S'matrix' -p11 +p10 sS'out' -p12 +p11 g2 sS'model.in2' -p13 +p12 g8 -sS'model.in1' -p14 +sS'model.intyp' +p13 g8 sS'label' -p15 +p14 S'string' -p16 +p15 sS'model.evtin' -p17 +p16 g2 sS'model.firing' -p18 +p17 g2 sS'function_name' -p19 -g16 +p18 +g15 sS'model.sim' -p20 +p19 S'list' -p21 +p20 sS'model.evtout' -p22 +p21 g2 sS'arg1.graphics' -p23 +p22 g4 -sS'[this.model,graphics,ok]' -p24 -g8 sS'model.out2' -p25 -g11 +p23 +g10 sS'in1' -p26 -g11 +p24 +g10 sS'model.rpar' -p27 +p25 g2 +sS'model.in1' +p26 +g8 sS'model.outtyp' -p28 +p27 g2 sS'model.state' -p29 +p28 g2 sS'graphics.exprs' -p30 +p29 NsS'model.ipar' -p31 +p30 g2 sS'typ' -p32 +p31 g2 sS'arg1.model' -p33 +p32 NsS'label[9-1]' -p34 +p33 g2 sS'ok' -p35 +p34 S'boolean' -p36 +p35 sS'model.blocktype' -p37 -g16 +p36 +g15 sS'model.dep_ut' -p38 +p37 g2 sS'gr_i' -p39 +p38 g2 sS'y' -p40 +p39 g2 sS'x' -p41 +p40 g8 sS'model' -p42 +p41 g4 sS'ot' -p43 +p42 g8 s.
\ No newline at end of file diff --git a/js/MatrixOp/RICC.js b/js/MatrixOp/RICC.js index 482dc0d3..6cdfff18 100644 --- a/js/MatrixOp/RICC.js +++ b/js/MatrixOp/RICC.js @@ -2,8 +2,8 @@ function RICC() { RICC.prototype.define = function RICC() { this.model = scicos_model(); - function_name = "ricc_m"; - funtyp = 4; + var function_name = "ricc_m"; + var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.model.in1 = new ScilabDouble([-1],[-1],[-1]); this.model.in2 = new ScilabDouble([-1],[-1],[-1]); @@ -20,8 +20,8 @@ function RICC() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = []; this.model.dep_ut = [true,false]; - label = [[sci2exp(1)],[sci2exp(1)]]; - gr_i = []; + var label = [[sci2exp(1)],[sci2exp(1)]]; + var gr_i = []; this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -39,8 +39,8 @@ function RICC() { this.tpe = arguments[0]["tpe"] this.mod = arguments[0]["mod"] this.x = arg1; - graphics = arg1.graphics; - label = graphics.exprs; + var graphics = arg1.graphics; + var label = graphics.exprs; this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; @@ -50,12 +50,15 @@ function RICC() { if (!ok) { break; } - in1 = [this.model.in1,this.model.in2]; - out = [this.model.out,this.model.out2]; - it = [1,1,1]; - ot = 1; - label = exprs; - [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); + var in1 = [this.model.in1,this.model.in2]; + var out = [this.model.out,this.model.out2]; + var it = [1,1,1]; + var ot = 1; + var label = exprs; + var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; if (ok) { this.model.ipar = new ScilabDouble([this.tpe],[this.mod]); graphics.exprs = label; diff --git a/js/MatrixOp/RICC.pickle b/js/MatrixOp/RICC.pickle index 5a4ca420..57262a2c 100644 --- a/js/MatrixOp/RICC.pickle +++ b/js/MatrixOp/RICC.pickle @@ -27,100 +27,97 @@ g4 sS'it' p6 g2 -sS'model.intyp' -p7 -g2 sS'funtyp' -p8 +p7 S'double' -p9 +p8 sS'model.out' -p10 -g9 +p9 +g8 sS'out' -p11 +p10 g2 sS'model.in2' -p12 +p11 S'matrix' +p12 +sS'model.intyp' p13 -sS'model.in1' -p14 -g13 +g2 sS'label' -p15 -g13 +p14 +g12 sS'model.evtin' -p16 +p15 g2 sS'model.firing' -p17 +p16 g2 sS'function_name' -p18 +p17 S'string' -p19 +p18 sS'model.sim' -p20 +p19 S'list' -p21 +p20 sS'model.evtout' -p22 +p21 g2 sS'arg1.graphics' -p23 +p22 g4 -sS'[this.model,graphics,ok]' -p24 -g9 sS'model.out2' -p25 -g9 +p23 +g8 sS'in1' -p26 +p24 g2 sS'model.rpar' -p27 +p25 g2 +sS'model.in1' +p26 +g12 sS'model.outtyp' -p28 -g9 +p27 +g8 sS'model.state' -p29 +p28 g2 sS'graphics.exprs' -p30 +p29 NsS'model.ipar' -p31 -g13 +p30 +g12 sS'typ' -p32 +p31 g2 sS'arg1.model' -p33 +p32 g4 sS'label[9-1]' -p34 +p33 g2 sS'model.blocktype' -p35 -g19 +p34 +g18 sS'model.dep_ut' -p36 +p35 g2 sS'gr_i' -p37 +p36 g2 sS'y' -p38 +p37 g2 sS'x' -p39 -g9 +p38 +g8 sS'model' -p40 +p39 g4 sS'ot' -p41 -g9 +p40 +g8 s.
\ No newline at end of file diff --git a/js/MatrixOp/ROOTCOEF.js b/js/MatrixOp/ROOTCOEF.js index b92ae12a..a468a2ba 100644 --- a/js/MatrixOp/ROOTCOEF.js +++ b/js/MatrixOp/ROOTCOEF.js @@ -2,8 +2,8 @@ function ROOTCOEF() { ROOTCOEF.prototype.define = function ROOTCOEF() { this.model = scicos_model(); - function_name = "root_coef"; - funtyp = 4; + var function_name = "root_coef"; + var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.model.in1 = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([1]); @@ -20,8 +20,8 @@ function ROOTCOEF() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = []; this.model.dep_ut = [true,false]; - label = [[sci2exp(1)],[sci2exp(1)]]; - gr_i = []; + var label = [[sci2exp(1)],[sci2exp(1)]]; + var gr_i = []; this.x = standard_define([3,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -39,8 +39,8 @@ function ROOTCOEF() { this.typ = inverse(arguments[0]["typ"]) this.inp = arguments[0]["inp"] this.x = arg1; - graphics = arg1.graphics; - label = graphics.exprs; + var graphics = arg1.graphics; + var label = graphics.exprs; this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; @@ -51,23 +51,26 @@ function ROOTCOEF() { break; } if ((this.typ==1)) { - function_name = "root_coef"; - ot = 1; - it = 1; + var function_name = "root_coef"; + var ot = 1; + var it = 1; } else if ((this.typ==2)) { - function_name = "rootz_coef"; - ot = 2; - it = 2; + var function_name = "rootz_coef"; + var ot = 2; + var it = 2; } else { message("Datatype is not supported"); - ok = false; + var ok = false; } - in1 = [this.inp,this.model.in2]; - out = [this.inp+1,this.model.out2]; - funtyp = 4; + var in1 = [this.inp,this.model.in2]; + var out = [this.inp+1,this.model.out2]; + var funtyp = 4; if (ok) { - label = exprs; - [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); + var label = exprs; + var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/MatrixOp/ROOTCOEF.pickle b/js/MatrixOp/ROOTCOEF.pickle index 38cb75d8..22aed3f5 100644 --- a/js/MatrixOp/ROOTCOEF.pickle +++ b/js/MatrixOp/ROOTCOEF.pickle @@ -70,61 +70,58 @@ g2 sS'arg1.graphics' p23 g4 -sS'[this.model,graphics,ok]' -p24 -g7 sS'model.out2' -p25 +p24 g7 sS'in1' -p26 +p25 g2 sS'model.rpar' -p27 +p26 g2 sS'model.outtyp' -p28 +p27 g7 sS'model.state' -p29 +p28 g2 sS'graphics.exprs' -p30 +p29 NsS'model.ipar' -p31 +p30 g2 sS'typ' -p32 +p31 g2 sS'arg1.model' -p33 +p32 g4 sS'label[9-1]' -p34 +p33 g2 sS'ok' -p35 +p34 S'boolean' -p36 +p35 sS'model.blocktype' -p37 +p36 g19 sS'model.dep_ut' -p38 +p37 g2 sS'gr_i' -p39 +p38 g2 sS'y' -p40 +p39 g2 sS'x' -p41 +p40 g7 sS'model' -p42 +p41 g4 sS'ot' -p43 +p42 g7 s.
\ No newline at end of file diff --git a/js/MatrixOp/SQRT.js b/js/MatrixOp/SQRT.js index f9eeb3f7..b109ab09 100644 --- a/js/MatrixOp/SQRT.js +++ b/js/MatrixOp/SQRT.js @@ -10,8 +10,8 @@ function SQRT() { this.model.out = new ScilabDouble([-1]); this.model.out2 = new ScilabDouble([-2]); this.model.dep_ut = [true,false]; - label = [sci2exp(1)]; - gr_i = []; + var label = [sci2exp(1)]; + var gr_i = []; this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -27,8 +27,8 @@ function SQRT() { SQRT.prototype.set = function SQRT() { this.typ = inverse(arguments[0]["typ"]) this.x = arg1; - graphics = arg1.graphics; - label = graphics.exprs; + var graphics = arg1.graphics; + var label = graphics.exprs; this.model = arg1.model; while (true) { [ok,this.typ,exprs] = scicos_getvalue("Set SQRT Block",["Datatype(1=real double 2=Complex)"],list("vec",1),label); @@ -36,21 +36,24 @@ function SQRT() { break; } if ((this.typ==1)) { - function_name = "mat_sqrt"; + var function_name = "mat_sqrt"; } else if ((this.typ==2)) { - function_name = "matz_sqrt"; + var function_name = "matz_sqrt"; } else { message("type is not supported"); - ok = false; + var ok = false; } - it = this.typ; - ot = this.typ; - in1 = [this.model.in1,this.model.in2]; - out = [this.model.out,this.model.out2]; - funtyp = 4; + var it = this.typ; + var ot = this.typ; + var in1 = [this.model.in1,this.model.in2]; + var out = [this.model.out,this.model.out2]; + var funtyp = 4; if (ok) { - label = exprs; - [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); + var label = exprs; + var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/MatrixOp/SQRT.pickle b/js/MatrixOp/SQRT.pickle index 633e0a08..9d3a8e10 100644 --- a/js/MatrixOp/SQRT.pickle +++ b/js/MatrixOp/SQRT.pickle @@ -55,46 +55,43 @@ p17 sS'arg1.graphics' p18 g2 -sS'[this.model,graphics,ok]' -p19 -g7 sS'model.out2' -p20 +p19 g7 sS'in1' -p21 +p20 g5 sS'model.outtyp' -p22 +p21 g7 sS'graphics.exprs' -p23 +p22 NsS'typ' -p24 +p23 g5 sS'arg1.model' -p25 +p24 g2 sS'ok' -p26 +p25 S'boolean' -p27 +p26 sS'model.dep_ut' -p28 +p27 g5 sS'gr_i' -p29 +p28 g5 sS'y' -p30 +p29 g5 sS'x' -p31 +p30 g7 sS'model' -p32 +p31 g2 sS'ot' -p33 +p32 g5 s.
\ No newline at end of file diff --git a/js/MatrixOp/SUBMAT.js b/js/MatrixOp/SUBMAT.js index a91c40c4..9e039c9b 100644 --- a/js/MatrixOp/SUBMAT.js +++ b/js/MatrixOp/SUBMAT.js @@ -2,8 +2,8 @@ function SUBMAT() { SUBMAT.prototype.define = function SUBMAT() { this.model = scicos_model(); - function_name = "submat"; - funtyp = 4; + var function_name = "submat"; + var funtyp = 4; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); this.model.in1 = new ScilabDouble([-1]); this.model.in2 = new ScilabDouble([-2]); @@ -20,8 +20,8 @@ function SUBMAT() { this.model.blocktype = new ScilabString(["c"]); this.model.firing = []; this.model.dep_ut = [true,false]; - label = [[sci2exp(1)],[sci2exp(1)],[sci2exp(1)],[sci2exp(1)],[sci2exp(1)]]; - gr_i = []; + var label = [[sci2exp(1)],[sci2exp(1)],[sci2exp(1)],[sci2exp(1)],[sci2exp(1)]]; + var gr_i = []; this.x = standard_define([2.5,2],this.model,label,gr_i); return new BasicBlock(this.x); } @@ -47,8 +47,8 @@ function SUBMAT() { this.d = arguments[0]["d"] this.inp = arguments[0]["inp"] this.x = arg1; - graphics = arg1.graphics; - label = graphics.exprs; + var graphics = arg1.graphics; + var label = graphics.exprs; this.model = arg1.model; if (size(label,"*")==5) { label[6-1] = sci2exp([1,1]); @@ -59,44 +59,47 @@ function SUBMAT() { break; } if ((this.typ==1)) { - function_name = "submat"; - ot = 1; - it = 1; + var function_name = "submat"; + var ot = 1; + var it = 1; } else if ((this.typ==2)) { - function_name = "submatz"; - ot = 2; - it = 2; + var function_name = "submatz"; + var ot = 2; + var it = 2; } else { message("Datatype is not supported"); - ok = false; + var ok = false; } if ((this.a<=0)||(this.b<=0)||(this.c<=0)||(this.d<=0)) { message("invalid index"); - ok = false; + var ok = false; } if (this.b<this.a) { message("ending row must be greater than starting row"); - ok = false; + var ok = false; } if (this.d<this.c) { message("ending column must be greater than starting column"); - ok = false; + var ok = false; } if (this.b>this.inp[1-1]) { message("index of ending row is out of range"); - ok = false; + var ok = false; } if (this.d>this.inp[2-1]) { message("index of ending column is out of range"); - ok = false; + var ok = false; } this.model.ipar = new ScilabDouble([this.a],[this.b],[this.c],[this.d]); - in1 = [this.inp[1-1],this.inp[2-1]]; - out = [(this.b-this.a)+1,(this.d-this.c)+1]; - funtyp = 4; - label = exprs; + var in1 = [this.inp[1-1],this.inp[2-1]]; + var out = [(this.b-this.a)+1,(this.d-this.c)+1]; + var funtyp = 4; + var label = exprs; if (ok) { - [this.model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); + var tmpvar0 = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]) + this.model = tmpvar0[0] + var graphics = tmpvar0[1] + var ok = tmpvar0[2]; this.model.sim = list(new ScilabString([function_name]), new ScilabDouble([funtyp])); graphics.exprs = label; arg1.graphics = graphics; diff --git a/js/MatrixOp/SUBMAT.pickle b/js/MatrixOp/SUBMAT.pickle index aba790d7..2889adb4 100644 --- a/js/MatrixOp/SUBMAT.pickle +++ b/js/MatrixOp/SUBMAT.pickle @@ -78,60 +78,57 @@ g2 sS'arg1.graphics' p23 g4 -sS'[this.model,graphics,ok]' -p24 -g7 sS'model.out2' -p25 +p24 g7 sS'in1' -p26 +p25 g2 sS'model.rpar' -p27 +p26 g2 sS'model.outtyp' -p28 +p27 g7 sS'model.state' -p29 +p28 g2 sS'graphics.exprs' -p30 +p29 NsS'model.ipar' -p31 +p30 g15 sS'typ' -p32 +p31 g2 sS'label[6-1]' -p33 +p32 g19 sS'arg1.model' -p34 +p33 NsS'ok' -p35 +p34 S'boolean' -p36 +p35 sS'model.blocktype' -p37 +p36 g19 sS'model.dep_ut' -p38 +p37 g2 sS'gr_i' -p39 +p38 g2 sS'y' -p40 +p39 g2 sS'x' -p41 +p40 g7 sS'model' -p42 +p41 g4 sS'ot' -p43 +p42 g7 s.
\ No newline at end of file |