diff options
Diffstat (limited to 'js/Threshold/GENERAL_f.js')
| -rw-r--r-- | js/Threshold/GENERAL_f.js | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/js/Threshold/GENERAL_f.js b/js/Threshold/GENERAL_f.js index ef70faba..a63700e8 100644 --- a/js/Threshold/GENERAL_f.js +++ b/js/Threshold/GENERAL_f.js @@ -2,18 +2,18 @@ function GENERAL_f() { GENERAL_f.prototype.define = function GENERAL_f() { var rpar = [[0],[0],[0],[0]]; - this.in1 = 1; + this.in = 1; this.out = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["zcross"]), new ScilabDouble([1])); - this.model.nzcross = new ScilabDouble([this.in1]); - this.model.in = new ScilabDouble([this.in1]); + this.model.nzcross = new ScilabDouble([this.in]); + this.model.in = new ScilabDouble([this.in]); this.model.evtout = new ScilabDouble([ones(this.out,1)]); this.model.rpar = new ScilabDouble([0],[0],[0],[0]); this.model.blocktype = new ScilabString(["z"]); this.model.firing = new ScilabDouble([-ones(this.out,1)]); this.model.dep_ut = new ScilabBoolean([true,false]); - var exprs = [[strcat(sci2exp(this.in1))],[strcat(sci2exp(this.out))]]; + var exprs = [[strcat(sci2exp(this.in))],[strcat(sci2exp(this.out))]]; var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GENERAL_f\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); @@ -24,13 +24,13 @@ function GENERAL_f() { GENERAL_f.prototype.get = function GENERAL_f() { var exprs = this.graphics.exprs; var rpar = this.model.rpar; - this.in1 = this.model.in; + this.in = this.model.in; this.out = this.model.evtout; - var nin = sum(this.in1); + var nin = sum(this.in); var nout = sum(this.out); this.set_param_popup_title = "Set General Zero-Crossing parameters"; var options = { - in1:["Input size",this.in1], + in:["Input size",this.in], out:["Number of event output",this.out], } return options; @@ -38,22 +38,22 @@ function GENERAL_f() { GENERAL_f.prototype.set = function GENERAL_f() { var exprs = this.graphics.exprs; var rpar = this.model.rpar; - this.in1 = this.model.in; + this.in = this.model.in; this.out = this.model.evtout; - var nin = sum(this.in1); + var nin = sum(this.in); var nout = sum(this.out); var ok = true; - this.in1 = parseFloat(arguments[0]["in1"]); + this.in = arguments[0]["in"]; this.out = parseFloat(arguments[0]["out"]); - var exprs = [arguments[0]["in1"], arguments[0]["out"]]; + var exprs = [arguments[0]["in"], arguments[0]["out"]]; if (ok) { - var tmpvar0 = check_io(this.model,this.graphics,this.in1,[],[],ones(this.out,1)); + var tmpvar0 = check_io(this.model,this.graphics,this.in,[],[],ones(this.out,1)); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; if (ok) { var nout1 = this.out; - var nin1 = this.in1; + var nin1 = this.in; if (nout==nout1&&nin==nin1) { var rp = matrix(rpar,nout,2^(2*nin)); } else { @@ -63,7 +63,7 @@ function GENERAL_f() { var result = x_mdialog("routing matrix",string(1,nout1),string(1,2^(2*nin1)),string(rp.slice().slice())); if (result.length!=0) { rp.slice(1-1,nout1).slice(1-1,2*n) = evstr(result); - this.model.nzcross = new ScilabDouble([this.in1]); + this.model.nzcross = new ScilabDouble([this.in]); this.model.rpar = new ScilabDouble(rp.slice()); this.model.firing = new ScilabDouble([-ones(this.out,1)]); this.graphics.exprs = new ScilabDouble([exprs]); @@ -80,7 +80,7 @@ function GENERAL_f() { GENERAL_f.prototype.importset = function GENERAL_f() { var graphics = this.x.graphics; var ary = getData(graphics.exprs); - this.in1 = ary[0]; + this.in = ary[0]; this.out = ary[1]; } GENERAL_f.prototype.getContainer = function GENERAL_f() { return new BasicBlock(this.x); } |