diff options
Diffstat (limited to 'js/MatrixOp')
52 files changed, 753 insertions, 701 deletions
diff --git a/js/MatrixOp/CUMSUM.js b/js/MatrixOp/CUMSUM.js index 5e4fcdc4..fab59e4e 100644 --- a/js/MatrixOp/CUMSUM.js +++ b/js/MatrixOp/CUMSUM.js @@ -1,28 +1,28 @@ /* autogenerated from "macros/MatrixOp/CUMSUM.sci" */ function CUMSUM() { CUMSUM.prototype.define = function CUMSUM() { - model = scicos_model(); + this.model = scicos_model(); function_name = "cumsum_m"; funtyp = 4; - model.sim = list(function_name,funtyp); - model.in1 = -1; - model.in2 = -2; - model.intyp = 1; - model.out = -1; - model.out2 = -2; - model.outtyp = 1; - model.evtin = []; - model.evtout = []; - model.state = []; - model.dstate = []; - model.rpar = []; - model.ipar = []; - model.blocktype = "c"; - model.firing = []; - model.dep_ut = [true,false]; + this.model.sim = list(function_name,funtyp); + this.model.in1 = new ScilabDouble(-1); + this.model.in2 = new ScilabDouble(-2); + this.model.intyp = new ScilabDouble(1); + this.model.out = new ScilabDouble(-1); + this.model.out2 = new ScilabDouble(-2); + this.model.outtyp = new ScilabDouble(1); + this.model.evtin = []; + this.model.evtout = []; + this.model.state = []; + this.model.dstate = []; + this.model.rpar = []; + this.model.ipar = []; + this.model.blocktype = new ScilabString("c"); + this.model.firing = []; + this.model.dep_ut = [true,false]; label = [[sci2exp(1)],[sci2exp(0)]]; gr_i = []; - this.x = standard_define([3,2],model,label,gr_i); + this.x = standard_define([3,2],this.model,label,gr_i); return new BasicBlock(this.x); } CUMSUM.prototype.details = function CUMSUM() { @@ -40,7 +40,7 @@ function CUMSUM() { this.decomptyp = arguments[0]["decomptyp"] this.lab = arguments[0]["lab"] this.x = arg1; - model = arg1.model; + this.model = arg1.model; graphics = arg1.graphics; label = graphics.exprs; if (size(label,"*")==14) { @@ -85,15 +85,15 @@ function CUMSUM() { message("Datatype is not supported"); ok = false; } - in1 = [model.in1,model.in2]; - out = [model.out,model.out2]; + in1 = [this.model.in1,this.model.in2]; + out = [this.model.out,this.model.out2]; funtyp = 4; if (ok) { - [model,graphics,ok] = set_io(model,graphics,list(in1,it),list(out,ot),[],[]); + [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); } if (ok) { - model.sim = list(function_name,funtyp); - arg1.model = model; + this.model.sim = list(function_name,funtyp); + arg1.model = this.model; graphics.exprs = label; arg1.graphics = graphics; this.x = arg1; diff --git a/js/MatrixOp/CUMSUM.pickle b/js/MatrixOp/CUMSUM.pickle index 6646e7f5..1702aadf 100644 --- a/js/MatrixOp/CUMSUM.pickle +++ b/js/MatrixOp/CUMSUM.pickle @@ -4,14 +4,16 @@ p0 ((lp1 S'x' p2 -aS'typ' +aS'model' p3 -aS'lab' +aS'typ' p4 -aS'decomptyp' +aS'lab' p5 -atp6 -Rp7 +aS'decomptyp' +p6 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/EXTRACT.js b/js/MatrixOp/EXTRACT.js index 1678b4c7..0ddee0c2 100644 --- a/js/MatrixOp/EXTRACT.js +++ b/js/MatrixOp/EXTRACT.js @@ -1,28 +1,28 @@ /* autogenerated from "macros/MatrixOp/EXTRACT.sci" */ function EXTRACT() { EXTRACT.prototype.define = function EXTRACT() { - model = scicos_model(); + this.model = scicos_model(); function_name = "extract"; funtyp = 4; - model.sim = list(function_name,funtyp); - model.in1 = -1; - model.in2 = -2; - model.intyp = 1; - model.out = 1; - model.out2 = 1; - model.outtyp = 1; - model.evtin = []; - model.evtout = []; - model.state = []; - model.dstate = []; - model.rpar = []; - model.ipar = [1,1,1,1]; - model.blocktype = "c"; - model.firing = []; - model.dep_ut = [true,false]; + this.model.sim = list(function_name,funtyp); + this.model.in1 = new ScilabDouble(-1); + this.model.in2 = new ScilabDouble(-2); + this.model.intyp = new ScilabDouble(1); + this.model.out = new ScilabDouble(1); + this.model.out2 = new ScilabDouble(1); + this.model.outtyp = new ScilabDouble(1); + this.model.evtin = []; + this.model.evtout = []; + this.model.state = []; + this.model.dstate = []; + this.model.rpar = []; + this.model.ipar = [1,1,1,1]; + this.model.blocktype = new ScilabString("c"); + this.model.firing = []; + this.model.dep_ut = [true,false]; label = [[sci2exp(1)],[sci2exp([1])],[sci2exp([1])]]; gr_i = []; - this.x = standard_define([3,2],model,label,gr_i); + this.x = standard_define([3,2],this.model,label,gr_i); return new BasicBlock(this.x); } EXTRACT.prototype.details = function EXTRACT() { @@ -43,7 +43,7 @@ function EXTRACT() { this.x = arg1; graphics = arg1.graphics; label = graphics.exprs; - model = arg1.model; + this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; } @@ -84,17 +84,17 @@ function EXTRACT() { ok = false; } } - model.ipar = [[this.a],[this.b],[ma],[mb]]; - in1 = [model.in1,model.in2]; + this.model.ipar = [[this.a],[this.b],[ma],[mb]]; + in1 = [this.model.in1,this.model.in2]; out = [ma,mb]; funtyp = 4; if (ok) { label = exprs; - [model,graphics,ok] = set_io(model,graphics,list(in1,it),list(out,ot),[],[]); - model.sim = list(function_name,funtyp); + [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); + this.model.sim = list(function_name,funtyp); graphics.exprs = label; arg1.graphics = graphics; - arg1.model = model; + arg1.model = this.model; this.x = arg1; break; } diff --git a/js/MatrixOp/EXTRACT.pickle b/js/MatrixOp/EXTRACT.pickle index 632d3a55..07d79ca8 100644 --- a/js/MatrixOp/EXTRACT.pickle +++ b/js/MatrixOp/EXTRACT.pickle @@ -6,12 +6,14 @@ S'a' p2 aS'x' p3 -aS'b' +aS'model' p4 -aS'typ' +aS'b' p5 -atp6 -Rp7 +aS'typ' +p6 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/EXTTRI.js b/js/MatrixOp/EXTTRI.js index 575b6398..e2591656 100644 --- a/js/MatrixOp/EXTTRI.js +++ b/js/MatrixOp/EXTTRI.js @@ -1,28 +1,28 @@ /* autogenerated from "macros/MatrixOp/EXTTRI.sci" */ function EXTTRI() { EXTTRI.prototype.define = function EXTTRI() { - model = scicos_model(); + this.model = scicos_model(); function_name = "extrilz"; funtyp = 4; - model.sim = list(function_name,funtyp); - model.in1 = -1; - model.in2 = -2; - model.intyp = 1; - model.out = -1; - model.out2 = -2; - model.outtyp = 1; - model.evtin = []; - model.evtout = []; - model.state = []; - model.dstate = []; - model.rpar = []; - model.ipar = []; - model.blocktype = "c"; - model.firing = []; - model.dep_ut = [true,false]; + this.model.sim = list(function_name,funtyp); + this.model.in1 = new ScilabDouble(-1); + this.model.in2 = new ScilabDouble(-2); + this.model.intyp = new ScilabDouble(1); + this.model.out = new ScilabDouble(-1); + this.model.out2 = new ScilabDouble(-2); + this.model.outtyp = new ScilabDouble(1); + this.model.evtin = []; + this.model.evtout = []; + this.model.state = []; + this.model.dstate = []; + this.model.rpar = []; + this.model.ipar = []; + this.model.blocktype = new ScilabString("c"); + this.model.firing = []; + this.model.dep_ut = [true,false]; label = [[sci2exp(1)],[sci2exp(1)]]; gr_i = []; - this.x = standard_define([3,2],model,label,gr_i); + this.x = standard_define([3,2],this.model,label,gr_i); return new BasicBlock(this.x); } EXTTRI.prototype.details = function EXTTRI() { @@ -40,7 +40,7 @@ function EXTTRI() { this.decomptyp = arguments[0]["decomptyp"] this.lab = arguments[0]["lab"] this.x = arg1; - model = arg1.model; + this.model = arg1.model; graphics = arg1.graphics; label = graphics.exprs; if (size(label,"*")==14) { @@ -82,15 +82,15 @@ function EXTTRI() { message("Datatype is not supported"); ok = false; } - in1 = [model.in1,model.in2]; - out = [model.out,model.out2]; + in1 = [this.model.in1,this.model.in2]; + out = [this.model.out,this.model.out2]; funtyp = 4; if (ok) { - [model,graphics,ok] = set_io(model,graphics,list(in1,it),list(out,ot),[],[]); + [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); } if (ok) { - model.sim = list(function_name,funtyp); - arg1.model = model; + this.model.sim = list(function_name,funtyp); + arg1.model = this.model; graphics.exprs = label; arg1.graphics = graphics; this.x = arg1; diff --git a/js/MatrixOp/EXTTRI.pickle b/js/MatrixOp/EXTTRI.pickle index 6646e7f5..1702aadf 100644 --- a/js/MatrixOp/EXTTRI.pickle +++ b/js/MatrixOp/EXTTRI.pickle @@ -4,14 +4,16 @@ p0 ((lp1 S'x' p2 -aS'typ' +aS'model' p3 -aS'lab' +aS'typ' p4 -aS'decomptyp' +aS'lab' p5 -atp6 -Rp7 +aS'decomptyp' +p6 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATBKSL.js b/js/MatrixOp/MATBKSL.js index c5af6daa..48a7dd6b 100644 --- a/js/MatrixOp/MATBKSL.js +++ b/js/MatrixOp/MATBKSL.js @@ -1,28 +1,28 @@ /* autogenerated from "macros/MatrixOp/MATBKSL.sci" */ function MATBKSL() { MATBKSL.prototype.define = function MATBKSL() { - model = scicos_model(); + this.model = scicos_model(); function_name = "mat_bksl"; funtyp = 4; - model.sim = list(function_name,funtyp); - model.in1 = [[-1],[-1]]; - model.in2 = [[-2],[-3]]; - model.intyp = [1,1]; - model.out = -2; - model.out2 = -3; - model.outtyp = 1; - model.evtin = []; - model.evtout = []; - model.state = []; - model.dstate = []; - model.rpar = []; - model.ipar = []; - model.blocktype = "c"; - model.firing = []; - model.dep_ut = [true,false]; + this.model.sim = list(function_name,funtyp); + this.model.in1 = [[-1],[-1]]; + this.model.in2 = [[-2],[-3]]; + this.model.intyp = [1,1]; + this.model.out = new ScilabDouble(-2); + this.model.out2 = new ScilabDouble(-3); + this.model.outtyp = new ScilabDouble(1); + this.model.evtin = []; + this.model.evtout = []; + this.model.state = []; + this.model.dstate = []; + this.model.rpar = []; + this.model.ipar = []; + this.model.blocktype = new ScilabString("c"); + this.model.firing = []; + this.model.dep_ut = [true,false]; label = [sci2exp(1)]; gr_i = []; - this.x = standard_define([2,2],model,label,gr_i); + this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } MATBKSL.prototype.details = function MATBKSL() { @@ -39,7 +39,7 @@ function MATBKSL() { this.x = arg1; graphics = arg1.graphics; label = graphics.exprs; - model = arg1.model; + this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; } @@ -60,16 +60,16 @@ function MATBKSL() { message("Datatype is not supported"); ok = false; } - in1 = [model.in1,model.in2]; - out = [model.out,model.out2]; + in1 = [this.model.in1,this.model.in2]; + out = [this.model.out,this.model.out2]; funtyp = 4; if (ok) { label = exprs; - [model,graphics,ok] = set_io(model,graphics,list(in1,it),list(out,ot),[],[]); - model.sim = list(function_name,funtyp); + [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); + this.model.sim = list(function_name,funtyp); graphics.exprs = label; arg1.graphics = graphics; - arg1.model = model; + arg1.model = this.model; this.x = arg1; break; } diff --git a/js/MatrixOp/MATBKSL.pickle b/js/MatrixOp/MATBKSL.pickle index e72e5ed5..de46d12f 100644 --- a/js/MatrixOp/MATBKSL.pickle +++ b/js/MatrixOp/MATBKSL.pickle @@ -4,10 +4,12 @@ p0 ((lp1 S'x' p2 -aS'typ' +aS'model' p3 -atp4 -Rp5 +aS'typ' +p4 +atp5 +Rp6 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATCATH.js b/js/MatrixOp/MATCATH.js index 193c14eb..31889bf1 100644 --- a/js/MatrixOp/MATCATH.js +++ b/js/MatrixOp/MATCATH.js @@ -1,28 +1,28 @@ /* autogenerated from "macros/MatrixOp/MATCATH.sci" */ function MATCATH() { MATCATH.prototype.define = function MATCATH() { - model = scicos_model(); + this.model = scicos_model(); function_name = "mat_cath"; funtyp = 4; - model.sim = list(function_name,funtyp); - model.in1 = [[-1],[-1]]; - model.in2 = [[-2],[-3]]; - model.intyp = [1,1]; - model.out = -1; - model.out2 = 0; - model.outtyp = -1; - model.evtin = []; - model.evtout = []; - model.state = []; - model.dstate = []; - model.rpar = []; - model.ipar = []; - model.blocktype = "c"; - model.firing = []; - model.dep_ut = [true,false]; + this.model.sim = list(function_name,funtyp); + this.model.in1 = [[-1],[-1]]; + this.model.in2 = [[-2],[-3]]; + this.model.intyp = [1,1]; + this.model.out = new ScilabDouble(-1); + this.model.out2 = new ScilabDouble(0); + this.model.outtyp = new ScilabDouble(-1); + this.model.evtin = []; + this.model.evtout = []; + this.model.state = []; + this.model.dstate = []; + this.model.rpar = []; + this.model.ipar = []; + this.model.blocktype = new ScilabString("c"); + this.model.firing = []; + this.model.dep_ut = [true,false]; label = [sci2exp(2)]; gr_i = []; - this.x = standard_define([2,3],model,label,gr_i); + this.x = standard_define([2,3],this.model,label,gr_i); return new BasicBlock(this.x); } MATCATH.prototype.details = function MATCATH() { @@ -38,7 +38,7 @@ function MATCATH() { this.nin = arguments[0]["nin"] this.lab = arguments[0]["lab"] this.x = arg1; - model = arg1.model; + this.model = arg1.model; graphics = arg1.graphics; label = graphics.exprs; if (size(label,"*")>1) { @@ -54,13 +54,13 @@ function MATCATH() { out = [-1,0]; it = -1*(ones(this.nin,1)); ot = -1; - [model,graphics,ok] = set_io(model,graphics,list(in1,it),list(out,ot),[],[]); + [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); if (ok) { funtyp = 4; - model.sim = list("mat_cath",funtyp); + this.model.sim = list("mat_cath",funtyp); graphics.exprs = label; arg1.graphics = graphics; - arg1.model = model; + arg1.model = this.model; this.x = arg1; break; } diff --git a/js/MatrixOp/MATCATH.pickle b/js/MatrixOp/MATCATH.pickle index f646b261..b8059c1d 100644 --- a/js/MatrixOp/MATCATH.pickle +++ b/js/MatrixOp/MATCATH.pickle @@ -4,12 +4,14 @@ p0 ((lp1 S'x' p2 -aS'nin' +aS'model' p3 -aS'lab' +aS'nin' p4 -atp5 -Rp6 +aS'lab' +p5 +atp6 +Rp7 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATCATV.js b/js/MatrixOp/MATCATV.js index 68f2ca62..41205c93 100644 --- a/js/MatrixOp/MATCATV.js +++ b/js/MatrixOp/MATCATV.js @@ -2,28 +2,28 @@ function MATCATV() { MATCATV.prototype.define = function MATCATV() { l1 = [[2],[2]]; - model = scicos_model(); + this.model = scicos_model(); function_name = "mat_catv"; funtyp = 4; - model.sim = list(function_name,funtyp); - model.in2 = [[-1],[-1]]; - model.in1 = [[-2],[-3]]; - model.intyp = [-1,-1]; - model.out = 0; - model.out2 = -1; - model.outtyp = -1; - model.evtin = []; - model.evtout = []; - model.state = []; - model.dstate = []; - model.rpar = []; - model.ipar = []; - model.blocktype = "c"; - model.firing = []; - model.dep_ut = [true,false]; + this.model.sim = list(function_name,funtyp); + this.model.in2 = [[-1],[-1]]; + this.model.in1 = [[-2],[-3]]; + this.model.intyp = [-1,-1]; + this.model.out = new ScilabDouble(0); + this.model.out2 = new ScilabDouble(-1); + this.model.outtyp = new ScilabDouble(-1); + this.model.evtin = []; + this.model.evtout = []; + this.model.state = []; + this.model.dstate = []; + this.model.rpar = []; + this.model.ipar = []; + this.model.blocktype = new ScilabString("c"); + this.model.firing = []; + this.model.dep_ut = [true,false]; label = [sci2exp(2)]; gr_i = []; - this.x = standard_define([2,3],model,label,gr_i); + this.x = standard_define([2,3],this.model,label,gr_i); return new BasicBlock(this.x); } MATCATV.prototype.details = function MATCATV() { @@ -39,7 +39,7 @@ function MATCATV() { this.nin = arguments[0]["nin"] this.lab = arguments[0]["lab"] this.x = arg1; - model = arg1.model; + this.model = arg1.model; graphics = arg1.graphics; label = graphics.exprs; if (size(label,"*")>1) { @@ -55,13 +55,13 @@ function MATCATV() { it = -ones(this.nin,1); ot = -1; out = [0,-1]; - [model,graphics,ok] = set_io(model,graphics,list(in1,it),list(out,ot),[],[]); + [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); if (ok) { funtyp = 4; - model.sim = list("mat_catv",funtyp); + this.model.sim = list("mat_catv",funtyp); graphics.exprs = label; arg1.graphics = graphics; - arg1.model = model; + arg1.model = this.model; this.x = arg1; break; } diff --git a/js/MatrixOp/MATCATV.pickle b/js/MatrixOp/MATCATV.pickle index dfc3dbb8..2db43f63 100644 --- a/js/MatrixOp/MATCATV.pickle +++ b/js/MatrixOp/MATCATV.pickle @@ -4,12 +4,14 @@ p0 ((lp1 S'x' p2 -aS'nin' +aS'model' p3 -aS'lab' +aS'nin' p4 -atp5 -Rp6 +aS'lab' +p5 +atp6 +Rp7 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATDET.js b/js/MatrixOp/MATDET.js index 3f9d3c79..d06fcb58 100644 --- a/js/MatrixOp/MATDET.js +++ b/js/MatrixOp/MATDET.js @@ -1,28 +1,28 @@ /* autogenerated from "macros/MatrixOp/MATDET.sci" */ function MATDET() { MATDET.prototype.define = function MATDET() { - model = scicos_model(); + this.model = scicos_model(); function_name = "mat_det"; funtyp = 4; - model.sim = list(function_name,funtyp); - model.in1 = -1; - model.in2 = -1; - model.intyp = 1; - model.out = 1; - model.out2 = 1; - model.outtyp = 1; - model.evtin = []; - model.evtout = []; - model.state = []; - model.dstate = []; - model.rpar = []; - model.ipar = []; - model.blocktype = "c"; - model.firing = []; - model.dep_ut = [true,false]; + this.model.sim = list(function_name,funtyp); + this.model.in1 = new ScilabDouble(-1); + this.model.in2 = new ScilabDouble(-1); + this.model.intyp = new ScilabDouble(1); + this.model.out = new ScilabDouble(1); + this.model.out2 = new ScilabDouble(1); + this.model.outtyp = new ScilabDouble(1); + this.model.evtin = []; + this.model.evtout = []; + this.model.state = []; + this.model.dstate = []; + this.model.rpar = []; + this.model.ipar = []; + this.model.blocktype = new ScilabString("c"); + this.model.firing = []; + this.model.dep_ut = [true,false]; label = [sci2exp(1)]; gr_i = []; - this.x = standard_define([2,2],model,label,gr_i); + this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } MATDET.prototype.details = function MATDET() { @@ -39,7 +39,7 @@ function MATDET() { this.x = arg1; graphics = arg1.graphics; label = graphics.exprs; - model = arg1.model; + this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; } @@ -60,16 +60,16 @@ function MATDET() { message("Datatype is not supported"); ok = false; } - in1 = [model.in1,model.in2]; - out = [model.out,model.out2]; + in1 = [this.model.in1,this.model.in2]; + out = [this.model.out,this.model.out2]; funtyp = 4; if (ok) { label = exprs; - [model,graphics,ok] = set_io(model,graphics,list(in1,it),list(out,ot),[],[]); - model.sim = list(function_name,funtyp); + [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); + this.model.sim = list(function_name,funtyp); graphics.exprs = label; arg1.graphics = graphics; - arg1.model = model; + arg1.model = this.model; this.x = arg1; break; } diff --git a/js/MatrixOp/MATDET.pickle b/js/MatrixOp/MATDET.pickle index bd912c03..15536b33 100644 --- a/js/MatrixOp/MATDET.pickle +++ b/js/MatrixOp/MATDET.pickle @@ -4,10 +4,12 @@ p0 ((lp1 S'x' p2 -aS'typ' +aS'model' p3 -atp4 -Rp5 +aS'typ' +p4 +atp5 +Rp6 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATDIAG.js b/js/MatrixOp/MATDIAG.js index 701c7a7c..41cac0d7 100644 --- a/js/MatrixOp/MATDIAG.js +++ b/js/MatrixOp/MATDIAG.js @@ -1,28 +1,28 @@ /* autogenerated from "macros/MatrixOp/MATDIAG.sci" */ function MATDIAG() { MATDIAG.prototype.define = function MATDIAG() { - model = scicos_model(); + this.model = scicos_model(); function_name = "mat_diag"; funtyp = 4; - model.sim = list(function_name,funtyp); - model.in1 = -1; - model.in2 = 1; - model.intyp = 1; - model.out = -1; - model.out2 = -1; - model.outtyp = 1; - model.evtin = []; - model.evtout = []; - model.state = []; - model.dstate = []; - model.rpar = []; - model.ipar = []; - model.blocktype = "c"; - model.firing = []; - model.dep_ut = [true,false]; + this.model.sim = list(function_name,funtyp); + this.model.in1 = new ScilabDouble(-1); + this.model.in2 = new ScilabDouble(1); + this.model.intyp = new ScilabDouble(1); + this.model.out = new ScilabDouble(-1); + this.model.out2 = new ScilabDouble(-1); + this.model.outtyp = new ScilabDouble(1); + this.model.evtin = []; + this.model.evtout = []; + this.model.state = []; + this.model.dstate = []; + this.model.rpar = []; + this.model.ipar = []; + this.model.blocktype = new ScilabString("c"); + this.model.firing = []; + this.model.dep_ut = [true,false]; label = [sci2exp(1)]; gr_i = []; - this.x = standard_define([2,2],model,label,gr_i); + this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } MATDIAG.prototype.details = function MATDIAG() { @@ -39,7 +39,7 @@ function MATDIAG() { this.x = arg1; graphics = arg1.graphics; label = graphics.exprs; - model = arg1.model; + this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; } @@ -60,16 +60,16 @@ function MATDIAG() { message("Datatype is not supported"); ok = false; } - in1 = [model.in1,model.in2]; - out = [model.out,model.out2]; + in1 = [this.model.in1,this.model.in2]; + out = [this.model.out,this.model.out2]; funtyp = 4; if (ok) { label = exprs; - [model,graphics,ok] = set_io(model,graphics,list(in1,it),list(out,ot),[],[]); - model.sim = list(function_name,funtyp); + [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); + this.model.sim = list(function_name,funtyp); graphics.exprs = label; arg1.graphics = graphics; - arg1.model = model; + arg1.model = this.model; this.x = arg1; break; } diff --git a/js/MatrixOp/MATDIAG.pickle b/js/MatrixOp/MATDIAG.pickle index bd912c03..15536b33 100644 --- a/js/MatrixOp/MATDIAG.pickle +++ b/js/MatrixOp/MATDIAG.pickle @@ -4,10 +4,12 @@ p0 ((lp1 S'x' p2 -aS'typ' +aS'model' p3 -atp4 -Rp5 +aS'typ' +p4 +atp5 +Rp6 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATDIV.js b/js/MatrixOp/MATDIV.js index 49d03f43..91442543 100644 --- a/js/MatrixOp/MATDIV.js +++ b/js/MatrixOp/MATDIV.js @@ -1,28 +1,28 @@ /* autogenerated from "macros/MatrixOp/MATDIV.sci" */ function MATDIV() { MATDIV.prototype.define = function MATDIV() { - model = scicos_model(); + this.model = scicos_model(); function_name = "mat_div"; funtyp = 4; - model.sim = list(function_name,funtyp); - model.in1 = [[-1],[-2]]; - model.in2 = [[-3],[-3]]; - model.intyp = [1,1]; - model.out = -1; - model.out2 = -2; - model.outtyp = 1; - model.evtin = []; - model.evtout = []; - model.state = []; - model.dstate = []; - model.rpar = []; - model.ipar = []; - model.blocktype = "c"; - model.firing = []; - model.dep_ut = [true,false]; + this.model.sim = list(function_name,funtyp); + this.model.in1 = [[-1],[-2]]; + this.model.in2 = [[-3],[-3]]; + this.model.intyp = [1,1]; + this.model.out = new ScilabDouble(-1); + this.model.out2 = new ScilabDouble(-2); + this.model.outtyp = new ScilabDouble(1); + this.model.evtin = []; + this.model.evtout = []; + this.model.state = []; + this.model.dstate = []; + this.model.rpar = []; + this.model.ipar = []; + this.model.blocktype = new ScilabString("c"); + this.model.firing = []; + this.model.dep_ut = [true,false]; label = [sci2exp(1)]; gr_i = []; - this.x = standard_define([2,2],model,label,gr_i); + this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } MATDIV.prototype.details = function MATDIV() { @@ -39,7 +39,7 @@ function MATDIV() { this.x = arg1; graphics = arg1.graphics; label = graphics.exprs; - model = arg1.model; + this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; } @@ -60,16 +60,16 @@ function MATDIV() { message("Datatype is not supported"); ok = false; } - in1 = [model.in1,model.in2]; - out = [model.out,model.out2]; + in1 = [this.model.in1,this.model.in2]; + out = [this.model.out,this.model.out2]; funtyp = 4; if (ok) { label = exprs; - [model,graphics,ok] = set_io(model,graphics,list(in1,it),list(out,ot),[],[]); - model.sim = list(function_name,funtyp); + [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); + this.model.sim = list(function_name,funtyp); graphics.exprs = label; arg1.graphics = graphics; - arg1.model = model; + arg1.model = this.model; this.x = arg1; break; } diff --git a/js/MatrixOp/MATDIV.pickle b/js/MatrixOp/MATDIV.pickle index e72e5ed5..de46d12f 100644 --- a/js/MatrixOp/MATDIV.pickle +++ b/js/MatrixOp/MATDIV.pickle @@ -4,10 +4,12 @@ p0 ((lp1 S'x' p2 -aS'typ' +aS'model' p3 -atp4 -Rp5 +aS'typ' +p4 +atp5 +Rp6 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATEIG.js b/js/MatrixOp/MATEIG.js index c44828fb..2b8e6b7f 100644 --- a/js/MatrixOp/MATEIG.js +++ b/js/MatrixOp/MATEIG.js @@ -1,28 +1,28 @@ /* autogenerated from "macros/MatrixOp/MATEIG.sci" */ function MATEIG() { MATEIG.prototype.define = function MATEIG() { - model = scicos_model(); + this.model = scicos_model(); function_name = "mat_vps"; funtyp = 4; - model.sim = list(function_name,funtyp); - model.in1 = -1; - model.in2 = -1; - model.intyp = 1; - model.out = -1; - model.out2 = 1; - model.outtyp = 2; - model.evtin = []; - model.evtout = []; - model.state = []; - model.dstate = []; - model.rpar = []; - model.ipar = []; - model.blocktype = "c"; - model.firing = []; - model.dep_ut = [true,false]; + this.model.sim = list(function_name,funtyp); + this.model.in1 = new ScilabDouble(-1); + this.model.in2 = new ScilabDouble(-1); + this.model.intyp = new ScilabDouble(1); + this.model.out = new ScilabDouble(-1); + this.model.out2 = new ScilabDouble(1); + this.model.outtyp = new ScilabDouble(2); + this.model.evtin = []; + this.model.evtout = []; + this.model.state = []; + this.model.dstate = []; + this.model.rpar = []; + this.model.ipar = []; + this.model.blocktype = new ScilabString("c"); + this.model.firing = []; + this.model.dep_ut = [true,false]; label = [[sci2exp(1)],[sci2exp(1)]]; gr_i = []; - this.x = standard_define([2,2],model,label,gr_i); + this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } MATEIG.prototype.details = function MATEIG() { @@ -40,7 +40,7 @@ function MATEIG() { this.decomptyp = arguments[0]["decomptyp"] this.lab = arguments[0]["lab"] this.x = arg1; - model = arg1.model; + this.model = arg1.model; graphics = arg1.graphics; label = graphics.exprs; if (size(label,"*")==14) { @@ -87,11 +87,11 @@ function MATEIG() { in1 = [-1,-1]; funtyp = 4; if (ok) { - [model,graphics,ok] = set_io(model,graphics,list(in1,it),list(out,ot),[],[]); + [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); } if (ok) { - model.sim = list(function_name,funtyp); - arg1.model = model; + this.model.sim = list(function_name,funtyp); + arg1.model = this.model; graphics.exprs = label; arg1.graphics = graphics; this.x = arg1; diff --git a/js/MatrixOp/MATEIG.pickle b/js/MatrixOp/MATEIG.pickle index 1f8a0e90..3f91bc29 100644 --- a/js/MatrixOp/MATEIG.pickle +++ b/js/MatrixOp/MATEIG.pickle @@ -4,14 +4,16 @@ p0 ((lp1 S'x' p2 -aS'typ' +aS'model' p3 -aS'lab' +aS'typ' p4 -aS'decomptyp' +aS'lab' p5 -atp6 -Rp7 +aS'decomptyp' +p6 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATEXPM.js b/js/MatrixOp/MATEXPM.js index 175fd28a..e9aa1f53 100644 --- a/js/MatrixOp/MATEXPM.js +++ b/js/MatrixOp/MATEXPM.js @@ -1,28 +1,28 @@ /* autogenerated from "macros/MatrixOp/MATEXPM.sci" */ function MATEXPM() { MATEXPM.prototype.define = function MATEXPM() { - model = scicos_model(); + this.model = scicos_model(); function_name = "mat_expm"; funtyp = 4; - model.sim = list(function_name,funtyp); - model.in1 = -1; - model.in2 = -1; - model.intyp = 1; - model.out = -1; - model.out2 = -1; - model.outtyp = 1; - model.evtin = []; - model.evtout = []; - model.state = []; - model.dstate = []; - model.rpar = []; - model.ipar = []; - model.blocktype = "c"; - model.firing = []; - model.dep_ut = [true,false]; + this.model.sim = list(function_name,funtyp); + this.model.in1 = new ScilabDouble(-1); + this.model.in2 = new ScilabDouble(-1); + this.model.intyp = new ScilabDouble(1); + this.model.out = new ScilabDouble(-1); + this.model.out2 = new ScilabDouble(-1); + this.model.outtyp = new ScilabDouble(1); + this.model.evtin = []; + this.model.evtout = []; + this.model.state = []; + this.model.dstate = []; + this.model.rpar = []; + this.model.ipar = []; + this.model.blocktype = new ScilabString("c"); + this.model.firing = []; + this.model.dep_ut = [true,false]; label = [sci2exp(1)]; gr_i = []; - this.x = standard_define([2,2],model,label,gr_i); + this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } MATEXPM.prototype.details = function MATEXPM() { @@ -39,7 +39,7 @@ function MATEXPM() { this.x = arg1; graphics = arg1.graphics; label = graphics.exprs; - model = arg1.model; + this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; } @@ -60,16 +60,16 @@ function MATEXPM() { message("Datatype is not supported"); ok = false; } - in1 = [model.in1,model.in2]; - out = [model.out,model.out2]; + in1 = [this.model.in1,this.model.in2]; + out = [this.model.out,this.model.out2]; funtyp = 4; if (ok) { label = exprs; - [model,graphics,ok] = set_io(model,graphics,list(in1,it),list(out,ot),[],[]); - model.sim = list(function_name,funtyp); + [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); + this.model.sim = list(function_name,funtyp); graphics.exprs = label; arg1.graphics = graphics; - arg1.model = model; + arg1.model = this.model; this.x = arg1; break; } diff --git a/js/MatrixOp/MATEXPM.pickle b/js/MatrixOp/MATEXPM.pickle index bd912c03..15536b33 100644 --- a/js/MatrixOp/MATEXPM.pickle +++ b/js/MatrixOp/MATEXPM.pickle @@ -4,10 +4,12 @@ p0 ((lp1 S'x' p2 -aS'typ' +aS'model' p3 -atp4 -Rp5 +aS'typ' +p4 +atp5 +Rp6 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATINV.js b/js/MatrixOp/MATINV.js index 16316559..40d54de2 100644 --- a/js/MatrixOp/MATINV.js +++ b/js/MatrixOp/MATINV.js @@ -1,28 +1,28 @@ /* autogenerated from "macros/MatrixOp/MATINV.sci" */ function MATINV() { MATINV.prototype.define = function MATINV() { - model = scicos_model(); + this.model = scicos_model(); function_name = "mat_inv"; funtyp = 4; - model.sim = list(function_name,funtyp); - model.in1 = -1; - model.in2 = -1; - model.intyp = 1; - model.out = -1; - model.out2 = -1; - model.outtyp = 1; - model.evtin = []; - model.evtout = []; - model.state = []; - model.dstate = []; - model.rpar = []; - model.ipar = []; - model.blocktype = "c"; - model.firing = []; - model.dep_ut = [true,false]; + this.model.sim = list(function_name,funtyp); + this.model.in1 = new ScilabDouble(-1); + this.model.in2 = new ScilabDouble(-1); + this.model.intyp = new ScilabDouble(1); + this.model.out = new ScilabDouble(-1); + this.model.out2 = new ScilabDouble(-1); + this.model.outtyp = new ScilabDouble(1); + this.model.evtin = []; + this.model.evtout = []; + this.model.state = []; + this.model.dstate = []; + this.model.rpar = []; + this.model.ipar = []; + this.model.blocktype = new ScilabString("c"); + this.model.firing = []; + this.model.dep_ut = [true,false]; label = [sci2exp(1)]; gr_i = []; - this.x = standard_define([2,2],model,label,gr_i); + this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } MATINV.prototype.details = function MATINV() { @@ -39,7 +39,7 @@ function MATINV() { this.x = arg1; graphics = arg1.graphics; label = graphics.exprs; - model = arg1.model; + this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; } @@ -60,16 +60,16 @@ function MATINV() { message("Datatype is not supported"); ok = false; } - in1 = [model.in1,model.in2]; - out = [model.out,model.out2]; + in1 = [this.model.in1,this.model.in2]; + out = [this.model.out,this.model.out2]; funtyp = 4; if (ok) { label = exprs; - [model,graphics,ok] = set_io(model,graphics,list(in1,it),list(out,ot),[],[]); - model.sim = list(function_name,funtyp); + [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); + this.model.sim = list(function_name,funtyp); graphics.exprs = label; arg1.graphics = graphics; - arg1.model = model; + arg1.model = this.model; this.x = arg1; break; } diff --git a/js/MatrixOp/MATINV.pickle b/js/MatrixOp/MATINV.pickle index bd912c03..15536b33 100644 --- a/js/MatrixOp/MATINV.pickle +++ b/js/MatrixOp/MATINV.pickle @@ -4,10 +4,12 @@ p0 ((lp1 S'x' p2 -aS'typ' +aS'model' p3 -atp4 -Rp5 +aS'typ' +p4 +atp5 +Rp6 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATLU.js b/js/MatrixOp/MATLU.js index 09cce1c8..41a6989a 100644 --- a/js/MatrixOp/MATLU.js +++ b/js/MatrixOp/MATLU.js @@ -1,28 +1,28 @@ /* autogenerated from "macros/MatrixOp/MATLU.sci" */ function MATLU() { MATLU.prototype.define = function MATLU() { - model = scicos_model(); + this.model = scicos_model(); function_name = "mat_lu"; funtyp = 4; - model.sim = list(function_name,funtyp); - model.in1 = -1; - model.in2 = -1; - model.intyp = 1; - model.out = [[-1],[-1]]; - model.out2 = [[-1],[-1]]; - model.outtyp = [1,1]; - model.evtin = []; - model.evtout = []; - model.state = []; - model.dstate = []; - model.rpar = []; - model.ipar = []; - model.blocktype = "c"; - model.firing = []; - model.dep_ut = [true,false]; + this.model.sim = list(function_name,funtyp); + this.model.in1 = new ScilabDouble(-1); + this.model.in2 = new ScilabDouble(-1); + this.model.intyp = new ScilabDouble(1); + this.model.out = [[-1],[-1]]; + this.model.out2 = [[-1],[-1]]; + this.model.outtyp = [1,1]; + this.model.evtin = []; + this.model.evtout = []; + this.model.state = []; + this.model.dstate = []; + this.model.rpar = []; + this.model.ipar = []; + this.model.blocktype = new ScilabString("c"); + this.model.firing = []; + this.model.dep_ut = [true,false]; label = sci2exp(1); gr_i = []; - this.x = standard_define([2,2],model,label,gr_i); + this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } MATLU.prototype.details = function MATLU() { @@ -38,7 +38,7 @@ function MATLU() { this.typ = inverse(arguments[0]["typ"]) this.lab = arguments[0]["lab"] this.x = arg1; - model = arg1.model; + this.model = arg1.model; graphics = arg1.graphics; label = graphics.exprs; if (size(label,"*")==14) { @@ -62,14 +62,14 @@ function MATLU() { ok = false; } if (ok) { - [model,graphics,ok] = set_io(model,graphics,list([model.in1,model.in2],it),list([model.out,model.out2],ot),[],[]); + [model,graphics,ok] = set_io(this.model,graphics,list([this.model.in1,this.model.in2],it),list([this.model.out,this.model.out2],ot),[],[]); } if (ok) { funtyp = 4; - model.sim = list(function_name,funtyp); + this.model.sim = list(function_name,funtyp); graphics.exprs = this.lab; this.x.graphics = graphics; - this.x.model = model; + this.x.model = this.model; break; } } diff --git a/js/MatrixOp/MATLU.pickle b/js/MatrixOp/MATLU.pickle index fb806027..b3f171b9 100644 --- a/js/MatrixOp/MATLU.pickle +++ b/js/MatrixOp/MATLU.pickle @@ -4,12 +4,14 @@ p0 ((lp1 S'x' p2 -aS'typ' +aS'model' p3 -aS'lab' +aS'typ' p4 -atp5 -Rp6 +aS'lab' +p5 +atp6 +Rp7 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATMAGPHI.js b/js/MatrixOp/MATMAGPHI.js index db99a27b..85bdcd7c 100644 --- a/js/MatrixOp/MATMAGPHI.js +++ b/js/MatrixOp/MATMAGPHI.js @@ -1,28 +1,28 @@ /* autogenerated from "macros/MatrixOp/MATMAGPHI.sci" */ function MATMAGPHI() { MATMAGPHI.prototype.define = function MATMAGPHI() { - model = scicos_model(); + this.model = scicos_model(); function_name = "matz_abs"; funtyp = 4; - model.sim = list(function_name,funtyp); - model.in1 = -1; - model.in2 = -2; - model.intyp = 2; - model.out = [[-1],[-1]]; - model.out2 = [[-2],[-2]]; - model.outtyp = [1,1]; - model.evtin = []; - model.evtout = []; - model.state = []; - model.dstate = []; - model.rpar = []; - model.ipar = []; - model.blocktype = "c"; - model.firing = []; - model.dep_ut = [true,false]; + this.model.sim = list(function_name,funtyp); + this.model.in1 = new ScilabDouble(-1); + this.model.in2 = new ScilabDouble(-2); + this.model.intyp = new ScilabDouble(2); + this.model.out = [[-1],[-1]]; + this.model.out2 = [[-2],[-2]]; + this.model.outtyp = [1,1]; + this.model.evtin = []; + this.model.evtout = []; + this.model.state = []; + this.model.dstate = []; + this.model.rpar = []; + this.model.ipar = []; + this.model.blocktype = new ScilabString("c"); + this.model.firing = []; + this.model.dep_ut = [true,false]; label = [sci2exp(1)]; gr_i = []; - this.x = standard_define([3,2],model,label,gr_i); + this.x = standard_define([3,2],this.model,label,gr_i); return new BasicBlock(this.x); } MATMAGPHI.prototype.details = function MATMAGPHI() { @@ -38,7 +38,7 @@ function MATMAGPHI() { this.decomptyp = arguments[0]["decomptyp"] this.lab = arguments[0]["lab"] this.x = arg1; - model = arg1.model; + this.model = arg1.model; graphics = arg1.graphics; label = graphics.exprs; if (size(label,"*")==14) { @@ -68,11 +68,11 @@ function MATMAGPHI() { } funtyp = 4; if (ok) { - [model,graphics,ok] = set_io(model,graphics,list(in1,it),list(out,ot),[],[]); + [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); } if (ok) { - model.sim = list(function_name,funtyp); - arg1.model = model; + this.model.sim = list(function_name,funtyp); + arg1.model = this.model; graphics.exprs = label; arg1.graphics = graphics; this.x = arg1; diff --git a/js/MatrixOp/MATMAGPHI.pickle b/js/MatrixOp/MATMAGPHI.pickle index 88eb46d5..afcc7aea 100644 --- a/js/MatrixOp/MATMAGPHI.pickle +++ b/js/MatrixOp/MATMAGPHI.pickle @@ -4,12 +4,14 @@ p0 ((lp1 S'x' p2 -aS'lab' +aS'model' p3 -aS'decomptyp' +aS'lab' p4 -atp5 -Rp6 +aS'decomptyp' +p5 +atp6 +Rp7 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATMUL.js b/js/MatrixOp/MATMUL.js index 2c2cc096..955f4d7a 100644 --- a/js/MatrixOp/MATMUL.js +++ b/js/MatrixOp/MATMUL.js @@ -1,17 +1,17 @@ /* autogenerated from "macros/MatrixOp/MATMUL.sci" */ function MATMUL() { MATMUL.prototype.define = function MATMUL() { - model = scicos_model(); - model.sim = list("matmul_m",4); - model.in1 = [[-1],[-2]]; - model.in2 = [[-2],[-3]]; - model.out = -1; - model.out2 = -3; - model.dep_ut = [true,false]; - model.ipar = 1; - label = [sci2exp(model.ipar)]; + this.model = scicos_model(); + this.model.sim = list("matmul_m",4); + this.model.in1 = [[-1],[-2]]; + this.model.in2 = [[-2],[-3]]; + this.model.out = new ScilabDouble(-1); + 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 = []; - this.x = standard_define([3,2],model,label,gr_i); + this.x = standard_define([3,2],this.model,label,gr_i); return new BasicBlock(this.x); } MATMUL.prototype.details = function MATMUL() { @@ -32,9 +32,9 @@ function MATMUL() { this.x = arg1; graphics = this.x.graphics; label = graphics.exprs; - model = this.x.model; - if (model.ipar==[]) { - model.ipar = 1; + this.model = this.x.model; + if (this.model.ipar==[]) { + this.model.ipar = new ScilabDouble(1); } if (size(label,"*")==1) { label[2-1] = sci2exp(1); @@ -63,72 +63,72 @@ function MATMUL() { 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) { - model.sim = list("matmul2_m",4); + this.model.sim = list("matmul2_m",4); } else if (this.np==1) { - model.sim = list("matmul2_s",4); + this.model.sim = list("matmul2_s",4); } else { - model.sim = list("matmul2_e",4); + this.model.sim = list("matmul2_e",4); } } else if (this.rule==3) { if (this.np==0) { - model.sim = list("matbyscal",4); + this.model.sim = list("matbyscal",4); } else if (this.np==1) { - model.sim = list("matbyscal_s",4); + this.model.sim = list("matbyscal_s",4); } else { - model.sim = list("matbyscal_e",4); + this.model.sim = list("matbyscal_e",4); } } else { if ((this.dtype==1)) { - model.sim = list("matmul_m",4); + this.model.sim = list("matmul_m",4); } else if ((this.dtype==2)) { - model.sim = list("matzmul_m",4); + this.model.sim = list("matzmul_m",4); } else if (this.dtype==3) { if (this.np==0) { - model.sim = list("matmul_i32n",4); + this.model.sim = list("matmul_i32n",4); } else if (this.np==1) { - model.sim = list("matmul_i32s",4); + this.model.sim = list("matmul_i32s",4); } else { - model.sim = list("matmul_i32e",4); + this.model.sim = list("matmul_i32e",4); } } else if (this.dtype==4) { if (this.np==0) { - model.sim = list("matmul_i16n",4); + this.model.sim = list("matmul_i16n",4); } else if (this.np==1) { - model.sim = list("matmul_i16s",4); + this.model.sim = list("matmul_i16s",4); } else { - model.sim = list("matmul_i16e",4); + this.model.sim = list("matmul_i16e",4); } } else if (this.dtype==5) { if (this.np==0) { - model.sim = list("matmul_i8n",4); + this.model.sim = list("matmul_i8n",4); } else if (this.np==1) { - model.sim = list("matmul_i8s",4); + this.model.sim = list("matmul_i8s",4); } else { - model.sim = list("matmul_i8e",4); + this.model.sim = list("matmul_i8e",4); } } else if (this.dtype==6) { if (this.np==0) { - model.sim = list("matmul_ui32n",4); + this.model.sim = list("matmul_ui32n",4); } else if (this.np==1) { - model.sim = list("matmul_ui32s",4); + this.model.sim = list("matmul_ui32s",4); } else { - model.sim = list("matmul_ui32e",4); + this.model.sim = list("matmul_ui32e",4); } } else if (this.dtype==7) { if (this.np==0) { - model.sim = list("matmul_ui16n",4); + this.model.sim = list("matmul_ui16n",4); } else if (this.np==1) { - model.sim = list("matmul_ui16s",4); + this.model.sim = list("matmul_ui16s",4); } else { - model.sim = list("matmul_ui16e",4); + this.model.sim = list("matmul_ui16e",4); } } else if (this.dtype==8) { if (this.np==0) { - model.sim = list("matmul_ui8n",4); + this.model.sim = list("matmul_ui8n",4); } else if (this.np==1) { - model.sim = list("matmul_ui8s",4); + this.model.sim = list("matmul_ui8s",4); } else { - model.sim = list("matmul_ui8e",4); + this.model.sim = list("matmul_ui8e",4); } } } @@ -146,14 +146,14 @@ function MATMUL() { in1 = [[-1,-2],[1,1]]; out = [-1,-2]; } - [model,graphics,ok] = set_io(model,graphics,list(in1,it),list(out,ot),[],[]); + [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); if (ok) { label = exprs; - model.ipar = this.rule; - model.rpar = [[kmin],[kmax]]; + this.model.ipar = new ScilabDouble(this.rule); + this.model.rpar = [[kmin],[kmax]]; graphics.exprs = label; this.x.graphics = graphics; - this.x.model = model; + this.x.model = this.model; arg1 = this.x; break; } diff --git a/js/MatrixOp/MATMUL.pickle b/js/MatrixOp/MATMUL.pickle index ca58fcfb..0b53f77c 100644 --- a/js/MatrixOp/MATMUL.pickle +++ b/js/MatrixOp/MATMUL.pickle @@ -6,12 +6,14 @@ S'np' p2 aS'x' p3 -aS'rule' +aS'model' p4 -aS'dtype' +aS'rule' p5 -atp6 -Rp7 +aS'dtype' +p6 +atp7 +Rp8 .(dp0 S'arg1' p1 diff --git a/js/MatrixOp/MATPINV.js b/js/MatrixOp/MATPINV.js index e10268f5..f77d1db0 100644 --- a/js/MatrixOp/MATPINV.js +++ b/js/MatrixOp/MATPINV.js @@ -1,28 +1,28 @@ /* autogenerated from "macros/MatrixOp/MATPINV.sci" */ function MATPINV() { MATPINV.prototype.define = function MATPINV() { - model = scicos_model(); + this.model = scicos_model(); function_name = "mat_pinv"; funtyp = 4; - model.sim = list(function_name,funtyp); - model.in1 = -1; - model.in2 = -2; - model.intyp = 1; - model.out = -2; - model.out2 = -1; - model.outtyp = 1; - model.evtin = []; - model.evtout = []; - model.state = []; - model.dstate = []; - model.rpar = []; - model.ipar = []; - model.blocktype = "c"; - model.firing = []; - model.dep_ut = [true,false]; + this.model.sim = list(function_name,funtyp); + this.model.in1 = new ScilabDouble(-1); + this.model.in2 = new ScilabDouble(-2); + this.model.intyp = new ScilabDouble(1); + this.model.out = new ScilabDouble(-2); + this.model.out2 = new ScilabDouble(-1); + this.model.outtyp = new ScilabDouble(1); + this.model.evtin = []; + this.model.evtout = []; + this.model.state = []; + this.model.dstate = []; + this.model.rpar = []; + this.model.ipar = []; + this.model.blocktype = new ScilabString("c"); + this.model.firing = []; + this.model.dep_ut = [true,false]; label = [sci2exp(1)]; gr_i = []; - this.x = standard_define([2,2],model,label,gr_i); + this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } MATPINV.prototype.details = function MATPINV() { @@ -39,7 +39,7 @@ function MATPINV() { this.x = arg1; graphics = arg1.graphics; label = graphics.exprs; - model = arg1.model; + this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; } @@ -60,16 +60,16 @@ function MATPINV() { message("Datatype is not supported"); ok = false; } - in1 = [model.in1,model.in2]; - out = [model.out,model.out2]; + in1 = [this.model.in1,this.model.in2]; + out = [this.model.out,this.model.out2]; funtyp = 4; if (ok) { label = exprs; - [model,graphics,ok] = set_io(model,graphics,list(in1,it),list(out,ot),[],[]); - model.sim = list(function_name,funtyp); + [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); + this.model.sim = list(function_name,funtyp); graphics.exprs = label; arg1.graphics = graphics; - arg1.model = model; + arg1.model = this.model; this.x = arg1; break; } diff --git a/js/MatrixOp/MATPINV.pickle b/js/MatrixOp/MATPINV.pickle index bd912c03..15536b33 100644 --- a/js/MatrixOp/MATPINV.pickle +++ b/js/MatrixOp/MATPINV.pickle @@ -4,10 +4,12 @@ p0 ((lp1 S'x' p2 -aS'typ' +aS'model' p3 -atp4 -Rp5 +aS'typ' +p4 +atp5 +Rp6 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATRESH.js b/js/MatrixOp/MATRESH.js index de34ba14..ff814632 100644 --- a/js/MatrixOp/MATRESH.js +++ b/js/MatrixOp/MATRESH.js @@ -1,28 +1,28 @@ /* autogenerated from "macros/MatrixOp/MATRESH.sci" */ function MATRESH() { MATRESH.prototype.define = function MATRESH() { - model = scicos_model(); + this.model = scicos_model(); function_name = "mat_reshape"; funtyp = 4; - model.sim = list(function_name,funtyp); - model.in1 = -1; - model.in2 = -2; - model.intyp = 1; - model.out = -1; - model.out2 = -2; - model.outtyp = 1; - model.evtin = []; - model.evtout = []; - model.state = []; - model.dstate = []; - model.rpar = []; - model.ipar = []; - model.blocktype = "c"; - model.firing = []; - model.dep_ut = [true,false]; + this.model.sim = list(function_name,funtyp); + this.model.in1 = new ScilabDouble(-1); + this.model.in2 = new ScilabDouble(-2); + this.model.intyp = new ScilabDouble(1); + this.model.out = new ScilabDouble(-1); + this.model.out2 = new ScilabDouble(-2); + this.model.outtyp = new ScilabDouble(1); + this.model.evtin = []; + this.model.evtout = []; + this.model.state = []; + this.model.dstate = []; + this.model.rpar = []; + this.model.ipar = []; + 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 = []; - this.x = standard_define([3,2],model,label,gr_i); + this.x = standard_define([3,2],this.model,label,gr_i); return new BasicBlock(this.x); } MATRESH.prototype.details = function MATRESH() { @@ -42,7 +42,7 @@ function MATRESH() { this.out = arguments[0]["out"] this.lab = arguments[0]["lab"] this.x = arg1; - model = arg1.model; + this.model = arg1.model; graphics = arg1.graphics; label = graphics.exprs; if (size(label,"*")==14) { @@ -91,14 +91,14 @@ function MATRESH() { } if (ok) { label = this.lab; - [model,graphics,ok] = set_io(model,graphics,list(this.l1,it),list(this.out,ot),[],[]); + [model,graphics,ok] = set_io(this.model,graphics,list(this.l1,it),list(this.out,ot),[],[]); } if (ok) { funtyp = 4; - model.sim = list(function_name,funtyp); + this.model.sim = list(function_name,funtyp); graphics.exprs = label; arg1.graphics = graphics; - arg1.model = model; + arg1.model = this.model; this.x = arg1; break; } diff --git a/js/MatrixOp/MATRESH.pickle b/js/MatrixOp/MATRESH.pickle index 02b5b27a..c6cc8e26 100644 --- a/js/MatrixOp/MATRESH.pickle +++ b/js/MatrixOp/MATRESH.pickle @@ -2,18 +2,20 @@ c__builtin__ set p0 ((lp1 -S'x' +S'lab' p2 -aS'out' +aS'l1' p3 -aS'typ' +aS'x' p4 -aS'lab' +aS'model' p5 -aS'l1' +aS'typ' p6 -atp7 -Rp8 +aS'out' +p7 +atp8 +Rp9 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATSING.js b/js/MatrixOp/MATSING.js index 7cd36526..00867c61 100644 --- a/js/MatrixOp/MATSING.js +++ b/js/MatrixOp/MATSING.js @@ -1,28 +1,28 @@ /* autogenerated from "macros/MatrixOp/MATSING.sci" */ function MATSING() { MATSING.prototype.define = function MATSING() { - model = scicos_model(); + this.model = scicos_model(); function_name = "mat_sing"; funtyp = 4; - model.sim = list(function_name,funtyp); - model.in1 = -1; - model.in2 = -2; - model.intyp = 1; - model.out = -1; - model.out2 = 1; - model.outtyp = 1; - model.evtin = []; - model.evtout = []; - model.state = []; - model.dstate = []; - model.rpar = []; - model.ipar = []; - model.blocktype = "c"; - model.firing = []; - model.dep_ut = [true,false]; + this.model.sim = list(function_name,funtyp); + this.model.in1 = new ScilabDouble(-1); + this.model.in2 = new ScilabDouble(-2); + this.model.intyp = new ScilabDouble(1); + this.model.out = new ScilabDouble(-1); + this.model.out2 = new ScilabDouble(1); + this.model.outtyp = new ScilabDouble(1); + this.model.evtin = []; + this.model.evtout = []; + this.model.state = []; + this.model.dstate = []; + this.model.rpar = []; + this.model.ipar = []; + this.model.blocktype = new ScilabString("c"); + this.model.firing = []; + this.model.dep_ut = [true,false]; label = [[sci2exp(1)],[sci2exp(1)]]; gr_i = []; - this.x = standard_define([2,2],model,label,gr_i); + this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } MATSING.prototype.details = function MATSING() { @@ -40,7 +40,7 @@ function MATSING() { this.decomptyp = arguments[0]["decomptyp"] this.lab = arguments[0]["lab"] this.x = arg1; - model = arg1.model; + this.model = arg1.model; graphics = arg1.graphics; label = graphics.exprs; if (size(label,"*")==14) { @@ -90,11 +90,11 @@ function MATSING() { } funtyp = 4; if (ok) { - [model,graphics,ok] = set_io(model,graphics,list(in1,it),list(out,ot),[],[]); + [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); } if (ok) { - model.sim = list(function_name,funtyp); - arg1.model = model; + this.model.sim = list(function_name,funtyp); + arg1.model = this.model; graphics.exprs = label; arg1.graphics = graphics; this.x = arg1; diff --git a/js/MatrixOp/MATSING.pickle b/js/MatrixOp/MATSING.pickle index 1f8a0e90..3f91bc29 100644 --- a/js/MatrixOp/MATSING.pickle +++ b/js/MatrixOp/MATSING.pickle @@ -4,14 +4,16 @@ p0 ((lp1 S'x' p2 -aS'typ' +aS'model' p3 -aS'lab' +aS'typ' p4 -aS'decomptyp' +aS'lab' p5 -atp6 -Rp7 +aS'decomptyp' +p6 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATSUM.js b/js/MatrixOp/MATSUM.js index 92d22248..fda1ba97 100644 --- a/js/MatrixOp/MATSUM.js +++ b/js/MatrixOp/MATSUM.js @@ -1,28 +1,28 @@ /* autogenerated from "macros/MatrixOp/MATSUM.sci" */ function MATSUM() { MATSUM.prototype.define = function MATSUM() { - model = scicos_model(); + this.model = scicos_model(); function_name = "mat_sum"; funtyp = 4; - model.sim = list(function_name,funtyp); - model.in1 = -1; - model.in2 = -2; - model.intyp = 1; - model.out = 1; - model.out2 = 1; - model.outtyp = 1; - model.evtin = []; - model.evtout = []; - model.state = []; - model.dstate = []; - model.rpar = []; - model.ipar = []; - model.blocktype = "c"; - model.firing = []; - model.dep_ut = [true,false]; + this.model.sim = list(function_name,funtyp); + this.model.in1 = new ScilabDouble(-1); + this.model.in2 = new ScilabDouble(-2); + this.model.intyp = new ScilabDouble(1); + this.model.out = new ScilabDouble(1); + this.model.out2 = new ScilabDouble(1); + this.model.outtyp = new ScilabDouble(1); + this.model.evtin = []; + this.model.evtout = []; + this.model.state = []; + this.model.dstate = []; + this.model.rpar = []; + this.model.ipar = []; + this.model.blocktype = new ScilabString("c"); + this.model.firing = []; + this.model.dep_ut = [true,false]; label = [[sci2exp(1)],[sci2exp(0)]]; gr_i = []; - this.x = standard_define([3,2],model,label,gr_i); + this.x = standard_define([3,2],this.model,label,gr_i); return new BasicBlock(this.x); } MATSUM.prototype.details = function MATSUM() { @@ -40,7 +40,7 @@ function MATSUM() { this.decomptyp = arguments[0]["decomptyp"] this.lab = arguments[0]["lab"] this.x = arg1; - model = arg1.model; + this.model = arg1.model; graphics = arg1.graphics; label = graphics.exprs; if (size(label,"*")==14) { @@ -88,14 +88,14 @@ function MATSUM() { message("Datatype is not supported"); ok = false; } - in1 = [model.in1,model.in2]; + in1 = [this.model.in1,this.model.in2]; funtyp = 4; if (ok) { - [model,graphics,ok] = set_io(model,graphics,list(in1,it),list(out,ot),[],[]); + [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); } if (ok) { - model.sim = list(function_name,funtyp); - arg1.model = model; + this.model.sim = list(function_name,funtyp); + arg1.model = this.model; graphics.exprs = label; arg1.graphics = graphics; this.x = arg1; diff --git a/js/MatrixOp/MATSUM.pickle b/js/MatrixOp/MATSUM.pickle index 6646e7f5..1702aadf 100644 --- a/js/MatrixOp/MATSUM.pickle +++ b/js/MatrixOp/MATSUM.pickle @@ -4,14 +4,16 @@ p0 ((lp1 S'x' p2 -aS'typ' +aS'model' p3 -aS'lab' +aS'typ' p4 -aS'decomptyp' +aS'lab' p5 -atp6 -Rp7 +aS'decomptyp' +p6 +atp7 +Rp8 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATTRAN.js b/js/MatrixOp/MATTRAN.js index 7f798932..26aaeca5 100644 --- a/js/MatrixOp/MATTRAN.js +++ b/js/MatrixOp/MATTRAN.js @@ -1,16 +1,16 @@ /* autogenerated from "macros/MatrixOp/MATTRAN.sci" */ function MATTRAN() { MATTRAN.prototype.define = function MATTRAN() { - model = scicos_model(); - model.sim = list("mattran_m",4); - model.in1 = -1; - model.in2 = -2; - model.out = -2; - model.out2 = -1; - model.dep_ut = [true,false]; + this.model = scicos_model(); + this.model.sim = list("mattran_m",4); + this.model.in1 = new ScilabDouble(-1); + this.model.in2 = new ScilabDouble(-2); + this.model.out = new ScilabDouble(-2); + this.model.out2 = new ScilabDouble(-1); + this.model.dep_ut = [true,false]; label = [sci2exp(1)]; gr_i = []; - this.x = standard_define([3,2],model,label,gr_i); + this.x = standard_define([3,2],this.model,label,gr_i); return new BasicBlock(this.x); } MATTRAN.prototype.details = function MATTRAN() { @@ -29,7 +29,7 @@ function MATTRAN() { this.x = arg1; graphics = arg1.graphics; label = graphics.exprs; - model = arg1.model; + this.model = arg1.model; if (size(label,"*")==1) { label[2-1] = sci2exp(1); } @@ -54,16 +54,16 @@ function MATTRAN() { message("Datatype is not supported"); ok = false; } - in1 = [model.in1,model.in2]; - out = [model.out,model.out2]; + in1 = [this.model.in1,this.model.in2]; + out = [this.model.out,this.model.out2]; funtyp = 4; if (ok) { label = exprs; - [model,graphics,ok] = set_io(model,graphics,list(in1,it),list(out,ot),[],[]); - model.sim = list(function_name,funtyp); + [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); + this.model.sim = list(function_name,funtyp); graphics.exprs = label; arg1.graphics = graphics; - arg1.model = model; + arg1.model = this.model; this.x = arg1; break; } diff --git a/js/MatrixOp/MATTRAN.pickle b/js/MatrixOp/MATTRAN.pickle index 59d34284..8fcd032a 100644 --- a/js/MatrixOp/MATTRAN.pickle +++ b/js/MatrixOp/MATTRAN.pickle @@ -4,12 +4,14 @@ p0 ((lp1 S'x' p2 -aS'typ' +aS'model' p3 -aS'rule' +aS'typ' p4 -atp5 -Rp6 +aS'rule' +p5 +atp6 +Rp7 .(dp0 S'arg1' p1 diff --git a/js/MatrixOp/MATZCONJ.js b/js/MatrixOp/MATZCONJ.js index f2a49d4d..fb995ca6 100644 --- a/js/MatrixOp/MATZCONJ.js +++ b/js/MatrixOp/MATZCONJ.js @@ -1,28 +1,28 @@ /* autogenerated from "macros/MatrixOp/MATZCONJ.sci" */ function MATZCONJ() { MATZCONJ.prototype.define = function MATZCONJ() { - model = scicos_model(); + this.model = scicos_model(); function_name = "matz_conj"; funtyp = 4; - model.sim = list(function_name,funtyp); - model.in1 = -1; - model.in2 = -2; - model.intyp = 2; - model.out = -1; - model.out2 = -2; - model.outtyp = 2; - model.evtin = []; - model.evtout = []; - model.state = []; - model.dstate = []; - model.rpar = []; - model.ipar = []; - model.blocktype = "c"; - model.firing = []; - model.dep_ut = [true,false]; + this.model.sim = list(function_name,funtyp); + this.model.in1 = new ScilabDouble(-1); + this.model.in2 = new ScilabDouble(-2); + this.model.intyp = new ScilabDouble(2); + this.model.out = new ScilabDouble(-1); + this.model.out2 = new ScilabDouble(-2); + this.model.outtyp = new ScilabDouble(2); + this.model.evtin = []; + this.model.evtout = []; + this.model.state = []; + this.model.dstate = []; + this.model.rpar = []; + this.model.ipar = []; + this.model.blocktype = new ScilabString("c"); + this.model.firing = []; + this.model.dep_ut = [true,false]; label = []; gr_i = []; - this.x = standard_define([2,2],model,label,gr_i); + this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } MATZCONJ.prototype.details = function MATZCONJ() { diff --git a/js/MatrixOp/MATZCONJ.pickle b/js/MatrixOp/MATZCONJ.pickle index 7f173bfa..1ad63449 100644 --- a/js/MatrixOp/MATZCONJ.pickle +++ b/js/MatrixOp/MATZCONJ.pickle @@ -4,8 +4,10 @@ p0 ((lp1 S'x' p2 -atp3 -Rp4 +aS'model' +p3 +atp4 +Rp5 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/MATZREIM.js b/js/MatrixOp/MATZREIM.js index 5fa97e04..4b42c962 100644 --- a/js/MatrixOp/MATZREIM.js +++ b/js/MatrixOp/MATZREIM.js @@ -1,28 +1,28 @@ /* autogenerated from "macros/MatrixOp/MATZREIM.sci" */ function MATZREIM() { MATZREIM.prototype.define = function MATZREIM() { - model = scicos_model(); + this.model = scicos_model(); function_name = "matz_reim"; funtyp = 4; - model.sim = list(function_name,funtyp); - model.in1 = -1; - model.in2 = -2; - model.intyp = 2; - model.out = [[-1],[-1]]; - model.out2 = [[-2],[-2]]; - model.outtyp = [1,1]; - model.evtin = []; - model.evtout = []; - model.state = []; - model.dstate = []; - model.rpar = []; - model.ipar = []; - model.blocktype = "c"; - model.firing = []; - model.dep_ut = [true,false]; + this.model.sim = list(function_name,funtyp); + this.model.in1 = new ScilabDouble(-1); + this.model.in2 = new ScilabDouble(-2); + this.model.intyp = new ScilabDouble(2); + this.model.out = [[-1],[-1]]; + this.model.out2 = [[-2],[-2]]; + this.model.outtyp = [1,1]; + this.model.evtin = []; + this.model.evtout = []; + this.model.state = []; + this.model.dstate = []; + this.model.rpar = []; + this.model.ipar = []; + this.model.blocktype = new ScilabString("c"); + this.model.firing = []; + this.model.dep_ut = [true,false]; label = sci2exp(1); gr_i = []; - this.x = standard_define([3,2],model,label,gr_i); + this.x = standard_define([3,2],this.model,label,gr_i); return new BasicBlock(this.x); } MATZREIM.prototype.details = function MATZREIM() { @@ -38,7 +38,7 @@ function MATZREIM() { this.decomptyp = arguments[0]["decomptyp"] this.lab = arguments[0]["lab"] this.x = arg1; - model = arg1.model; + this.model = arg1.model; graphics = arg1.graphics; label = graphics.exprs; if (size(label,"*")==14) { @@ -68,11 +68,11 @@ function MATZREIM() { } funtyp = 4; if (ok) { - [model,graphics,ok] = set_io(model,graphics,list(in1,it),list(out,ot),[],[]); + [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); } if (ok) { - model.sim = list(function_name,funtyp); - arg1.model = model; + this.model.sim = list(function_name,funtyp); + arg1.model = this.model; graphics.exprs = label; arg1.graphics = graphics; this.x = arg1; diff --git a/js/MatrixOp/MATZREIM.pickle b/js/MatrixOp/MATZREIM.pickle index 7d5c8ddc..44cf122c 100644 --- a/js/MatrixOp/MATZREIM.pickle +++ b/js/MatrixOp/MATZREIM.pickle @@ -4,12 +4,14 @@ p0 ((lp1 S'x' p2 -aS'lab' +aS'model' p3 -aS'decomptyp' +aS'lab' p4 -atp5 -Rp6 +aS'decomptyp' +p5 +atp6 +Rp7 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/RICC.js b/js/MatrixOp/RICC.js index 6f73ee6c..9a96442c 100644 --- a/js/MatrixOp/RICC.js +++ b/js/MatrixOp/RICC.js @@ -1,28 +1,28 @@ /* autogenerated from "macros/MatrixOp/RICC.sci" */ function RICC() { RICC.prototype.define = function RICC() { - model = scicos_model(); + this.model = scicos_model(); function_name = "ricc_m"; funtyp = 4; - model.sim = list(function_name,funtyp); - model.in1 = [[-1],[-1],[-1]]; - model.in2 = [[-1],[-1],[-1]]; - model.intyp = [1,1,1]; - model.out = -1; - model.out2 = -1; - model.outtyp = 1; - model.evtin = []; - model.evtout = []; - model.state = []; - model.dstate = []; - model.rpar = []; - model.ipar = [[1],[1]]; - model.blocktype = "c"; - model.firing = []; - model.dep_ut = [true,false]; + this.model.sim = list(function_name,funtyp); + this.model.in1 = [[-1],[-1],[-1]]; + this.model.in2 = [[-1],[-1],[-1]]; + this.model.intyp = [1,1,1]; + this.model.out = new ScilabDouble(-1); + this.model.out2 = new ScilabDouble(-1); + this.model.outtyp = new ScilabDouble(1); + this.model.evtin = []; + this.model.evtout = []; + this.model.state = []; + this.model.dstate = []; + this.model.rpar = []; + this.model.ipar = [[1],[1]]; + this.model.blocktype = new ScilabString("c"); + this.model.firing = []; + this.model.dep_ut = [true,false]; label = [[sci2exp(1)],[sci2exp(1)]]; gr_i = []; - this.x = standard_define([2,2],model,label,gr_i); + this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } RICC.prototype.details = function RICC() { @@ -41,7 +41,7 @@ function RICC() { this.x = arg1; graphics = arg1.graphics; label = graphics.exprs; - model = arg1.model; + this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; } @@ -50,17 +50,17 @@ function RICC() { if (!ok) { break; } - in1 = [model.in1,model.in2]; - out = [model.out,model.out2]; + in1 = [this.model.in1,this.model.in2]; + out = [this.model.out,this.model.out2]; it = [1,1,1]; ot = 1; label = exprs; - [model,graphics,ok] = set_io(model,graphics,list(in1,it),list(out,ot),[],[]); + [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); if (ok) { - model.ipar = [[this.tpe],[this.mod]]; + this.model.ipar = [[this.tpe],[this.mod]]; graphics.exprs = label; arg1.graphics = graphics; - arg1.model = model; + arg1.model = this.model; this.x = arg1; break; } diff --git a/js/MatrixOp/RICC.pickle b/js/MatrixOp/RICC.pickle index 3ab8d419..9f9ca752 100644 --- a/js/MatrixOp/RICC.pickle +++ b/js/MatrixOp/RICC.pickle @@ -4,12 +4,14 @@ p0 ((lp1 S'x' p2 -aS'tpe' +aS'model' p3 -aS'mod' +aS'tpe' p4 -atp5 -Rp6 +aS'mod' +p5 +atp6 +Rp7 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/ROOTCOEF.js b/js/MatrixOp/ROOTCOEF.js index 08d5e3f9..94e09951 100644 --- a/js/MatrixOp/ROOTCOEF.js +++ b/js/MatrixOp/ROOTCOEF.js @@ -1,28 +1,28 @@ /* autogenerated from "macros/MatrixOp/ROOTCOEF.sci" */ function ROOTCOEF() { ROOTCOEF.prototype.define = function ROOTCOEF() { - model = scicos_model(); + this.model = scicos_model(); function_name = "root_coef"; funtyp = 4; - model.sim = list(function_name,funtyp); - model.in1 = -1; - model.in2 = 1; - model.intyp = 1; - model.out = -2; - model.out2 = 1; - model.outtyp = 1; - model.evtin = []; - model.evtout = []; - model.state = []; - model.dstate = []; - model.rpar = []; - model.ipar = []; - model.blocktype = "c"; - model.firing = []; - model.dep_ut = [true,false]; + this.model.sim = list(function_name,funtyp); + this.model.in1 = new ScilabDouble(-1); + this.model.in2 = new ScilabDouble(1); + this.model.intyp = new ScilabDouble(1); + this.model.out = new ScilabDouble(-2); + this.model.out2 = new ScilabDouble(1); + this.model.outtyp = new ScilabDouble(1); + this.model.evtin = []; + this.model.evtout = []; + this.model.state = []; + this.model.dstate = []; + this.model.rpar = []; + this.model.ipar = []; + this.model.blocktype = new ScilabString("c"); + this.model.firing = []; + this.model.dep_ut = [true,false]; label = [[sci2exp(1)],[sci2exp(1)]]; gr_i = []; - this.x = standard_define([3,2],model,label,gr_i); + this.x = standard_define([3,2],this.model,label,gr_i); return new BasicBlock(this.x); } ROOTCOEF.prototype.details = function ROOTCOEF() { @@ -41,7 +41,7 @@ function ROOTCOEF() { this.x = arg1; graphics = arg1.graphics; label = graphics.exprs; - model = arg1.model; + this.model = arg1.model; if (size(label,"*")==14) { label[9-1] = []; } @@ -62,16 +62,16 @@ function ROOTCOEF() { message("Datatype is not supported"); ok = false; } - in1 = [this.inp,model.in2]; - out = [this.inp+1,model.out2]; + in1 = [this.inp,this.model.in2]; + out = [this.inp+1,this.model.out2]; funtyp = 4; if (ok) { label = exprs; - [model,graphics,ok] = set_io(model,graphics,list(in1,it),list(out,ot),[],[]); - model.sim = list(function_name,funtyp); + [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); + this.model.sim = list(function_name,funtyp); graphics.exprs = label; arg1.graphics = graphics; - arg1.model = model; + arg1.model = this.model; this.x = arg1; break; } diff --git a/js/MatrixOp/ROOTCOEF.pickle b/js/MatrixOp/ROOTCOEF.pickle index 49151f65..acb596f2 100644 --- a/js/MatrixOp/ROOTCOEF.pickle +++ b/js/MatrixOp/ROOTCOEF.pickle @@ -4,12 +4,14 @@ p0 ((lp1 S'x' p2 -aS'inp' +aS'model' p3 aS'typ' p4 -atp5 -Rp6 +aS'inp' +p5 +atp6 +Rp7 .(dp0 S'model.dstate' p1 diff --git a/js/MatrixOp/SQRT.js b/js/MatrixOp/SQRT.js index 32b04337..cddf98f2 100644 --- a/js/MatrixOp/SQRT.js +++ b/js/MatrixOp/SQRT.js @@ -1,18 +1,18 @@ /* autogenerated from "macros/MatrixOp/SQRT.sci" */ function SQRT() { SQRT.prototype.define = function SQRT() { - model = scicos_model(); - model.sim = list("mat_sqrt",4); - model.in1 = -1; - model.in2 = -2; - model.intyp = 1; - model.outtyp = 1; - model.out = -1; - model.out2 = -2; - model.dep_ut = [true,false]; + this.model = scicos_model(); + this.model.sim = list("mat_sqrt",4); + this.model.in1 = new ScilabDouble(-1); + this.model.in2 = new ScilabDouble(-2); + this.model.intyp = new ScilabDouble(1); + this.model.outtyp = new ScilabDouble(1); + this.model.out = new ScilabDouble(-1); + this.model.out2 = new ScilabDouble(-2); + this.model.dep_ut = [true,false]; label = [sci2exp(1)]; gr_i = []; - this.x = standard_define([2,2],model,label,gr_i); + this.x = standard_define([2,2],this.model,label,gr_i); return new BasicBlock(this.x); } SQRT.prototype.details = function SQRT() { @@ -29,7 +29,7 @@ function SQRT() { this.x = arg1; graphics = arg1.graphics; label = graphics.exprs; - model = arg1.model; + 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); if (!ok) { @@ -45,16 +45,16 @@ function SQRT() { } it = this.typ; ot = this.typ; - in1 = [model.in1,model.in2]; - out = [model.out,model.out2]; + in1 = [this.model.in1,this.model.in2]; + out = [this.model.out,this.model.out2]; funtyp = 4; if (ok) { label = exprs; - [model,graphics,ok] = set_io(model,graphics,list(in1,it),list(out,ot),[],[]); - model.sim = list(function_name,funtyp); + [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); + this.model.sim = list(function_name,funtyp); graphics.exprs = label; arg1.graphics = graphics; - arg1.model = model; + arg1.model = this.model; this.x = arg1; break; } diff --git a/js/MatrixOp/SQRT.pickle b/js/MatrixOp/SQRT.pickle index 887aa198..9030e62d 100644 --- a/js/MatrixOp/SQRT.pickle +++ b/js/MatrixOp/SQRT.pickle @@ -4,10 +4,12 @@ p0 ((lp1 S'x' p2 -aS'typ' +aS'model' p3 -atp4 -Rp5 +aS'typ' +p4 +atp5 +Rp6 .(dp0 S'arg1' p1 diff --git a/js/MatrixOp/SUBMAT.js b/js/MatrixOp/SUBMAT.js index 18382fdf..5db415ed 100644 --- a/js/MatrixOp/SUBMAT.js +++ b/js/MatrixOp/SUBMAT.js @@ -1,28 +1,28 @@ /* autogenerated from "macros/MatrixOp/SUBMAT.sci" */ function SUBMAT() { SUBMAT.prototype.define = function SUBMAT() { - model = scicos_model(); + this.model = scicos_model(); function_name = "submat"; funtyp = 4; - model.sim = list(function_name,funtyp); - model.in1 = -1; - model.in2 = -2; - model.intyp = 1; - model.out = -1; - model.out2 = -2; - model.outtyp = 1; - model.evtin = []; - model.evtout = []; - model.state = []; - model.dstate = []; - model.rpar = []; - model.ipar = [[1],[1],[1],[1]]; - model.blocktype = "c"; - model.firing = []; - model.dep_ut = [true,false]; + this.model.sim = list(function_name,funtyp); + this.model.in1 = new ScilabDouble(-1); + this.model.in2 = new ScilabDouble(-2); + this.model.intyp = new ScilabDouble(1); + this.model.out = new ScilabDouble(-1); + this.model.out2 = new ScilabDouble(-2); + this.model.outtyp = new ScilabDouble(1); + this.model.evtin = []; + this.model.evtout = []; + this.model.state = []; + this.model.dstate = []; + this.model.rpar = []; + this.model.ipar = [[1],[1],[1],[1]]; + 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 = []; - this.x = standard_define([2.5,2],model,label,gr_i); + this.x = standard_define([2.5,2],this.model,label,gr_i); return new BasicBlock(this.x); } SUBMAT.prototype.details = function SUBMAT() { @@ -49,7 +49,7 @@ function SUBMAT() { this.x = arg1; graphics = arg1.graphics; label = graphics.exprs; - model = arg1.model; + this.model = arg1.model; if (size(label,"*")==5) { label[6-1] = sci2exp([1,1]); } @@ -90,17 +90,17 @@ function SUBMAT() { message("index of ending column is out of range"); ok = false; } - model.ipar = [[this.a],[this.b],[this.c],[this.d]]; + this.model.ipar = [[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; if (ok) { - [model,graphics,ok] = set_io(model,graphics,list(in1,it),list(out,ot),[],[]); - model.sim = list(function_name,funtyp); + [model,graphics,ok] = set_io(this.model,graphics,list(in1,it),list(out,ot),[],[]); + this.model.sim = list(function_name,funtyp); graphics.exprs = label; arg1.graphics = graphics; - arg1.model = model; + arg1.model = this.model; this.x = arg1; break; } diff --git a/js/MatrixOp/SUBMAT.pickle b/js/MatrixOp/SUBMAT.pickle index 8af6ffcd..7a5a7843 100644 --- a/js/MatrixOp/SUBMAT.pickle +++ b/js/MatrixOp/SUBMAT.pickle @@ -14,10 +14,12 @@ aS'inp' p6 aS'x' p7 -aS'typ' +aS'model' p8 -atp9 -Rp10 +aS'typ' +p9 +atp10 +Rp11 .(dp0 S'model.dstate' p1 |