diff options
Diffstat (limited to 'combined.js')
-rw-r--r-- | combined.js | 310 |
1 files changed, 155 insertions, 155 deletions
diff --git a/combined.js b/combined.js index e4cf7d80..86cf29df 100644 --- a/combined.js +++ b/combined.js @@ -1123,15 +1123,15 @@ function ISELECT_m() { /* autogenerated from "macros/Branching/MUX.sci" */ function MUX() { MUX.prototype.define = function MUX() { - this.in1 = 2; + this.in = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["multiplex"]), new ScilabDouble([4])); - this.model.in = new ScilabDouble(-transpose([1:this.in1])); + this.model.in = new ScilabDouble(-transpose([1:this.in])); this.model.out = new ScilabDouble([0]); - this.model.ipar = new ScilabDouble([this.in1]); + this.model.ipar = new ScilabDouble([this.in]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - var exprs = string(this.in1); + var exprs = string(this.in); var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MUX\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([.5,2]),this.model,new ScilabString([exprs]),gr_i); return new BasicBlock(this.x); @@ -1143,7 +1143,7 @@ function MUX() { var exprs = this.graphics.exprs; this.set_param_popup_title = "Set MUX block parameters"; var options = { - in1:["number of input ports or vector of sizes",this.in1], + in:["number of input ports or vector of sizes",this.in], } return options; } @@ -1151,45 +1151,45 @@ function MUX() { var exprs = this.graphics.exprs; while (true) { var ok = true; - this.in1 = parseFloat(arguments[0]["in1"]); - var exprs = [arguments[0]["in1"]]; + this.in = parseFloat(arguments[0]["in"]); + var exprs = [arguments[0]["in"]]; if (!ok) { break; } - if (size(this.in1,"*")==1) { - if (this.in1<2||this.in1>31) { + if (size(this.in,"*")==1) { + if (this.in<2||this.in>31) { message("Block must have at least two input ports and at most 31"); throw "user error"; var ok = false; } else { - var tmpvar0 = check_io(this.model,this.graphics,-transpose([1:this.in1]),0,[],[]); + var tmpvar0 = check_io(this.model,this.graphics,-transpose([1:this.in]),0,[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } } else { - if (size(this.in1,"*")<2||or(this.in1==0)||size(this.in1,"*")>31) { + if (size(this.in,"*")<2||or(this.in==0)||size(this.in,"*")>31) { message([["Block must have at least two input ports"],["and at most 31. Size 0 is not allowed. "]]); throw "user error"; var ok = false; } else { - if (min(this.in1)<0) { + if (min(this.in)<0) { var nout = 0; } else { - var nout = sum(this.in1); + var nout = sum(this.in); } - var tmpvar1 = check_io(this.model,this.graphics,this.in1.slice(),nout,[],[]); + var tmpvar1 = check_io(this.model,this.graphics,this.in.slice(),nout,[],[]); this.model = tmpvar1[0]; this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.in1 = size(this.in1,"*"); + this.in = size(this.in,"*"); } } } if (ok) { this.graphics.exprs = new ScilabDouble([exprs]); - this.model.ipar = new ScilabDouble([this.in1]); + this.model.ipar = new ScilabDouble([this.in]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -1203,22 +1203,22 @@ function MUX() { MUX.prototype.importset = function MUX() { var graphics = this.x.graphics; var ary = getData(graphics.exprs); - this.in1 = ary[0]; + this.in = ary[0]; } MUX.prototype.getContainer = function MUX() { return new BasicBlock(this.x); } } /* autogenerated from "macros/Branching/MUX_f.sci" */ function MUX_f() { MUX_f.prototype.define = function MUX_f() { - this.in1 = 2; + this.in = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["mux"]), new ScilabDouble([1])); - this.model.in = new ScilabDouble(-transpose([1:this.in1])); + this.model.in = new ScilabDouble(-transpose([1:this.in])); this.model.out = new ScilabDouble([0]); - this.model.ipar = new ScilabDouble([this.in1]); + this.model.ipar = new ScilabDouble([this.in]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - var exprs = string(this.in1); + var exprs = string(this.in); var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MUX_f\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([0.5,2]),this.model,new ScilabString([exprs]),gr_i); return new BasicBlock(this.x); @@ -1230,7 +1230,7 @@ function MUX_f() { var exprs = this.graphics.exprs; this.set_param_popup_title = "Set MUX block parameters"; var options = { - in1:["number of input ports or vector of sizes",this.in1], + in:["number of input ports or vector of sizes",this.in], } return options; } @@ -1238,45 +1238,45 @@ function MUX_f() { var exprs = this.graphics.exprs; while (true) { var ok = true; - this.in1 = parseFloat(arguments[0]["in1"]); - var exprs = [arguments[0]["in1"]]; + this.in = parseFloat(arguments[0]["in"]); + var exprs = [arguments[0]["in"]]; if (!ok) { break; } - if (size(this.in1,"*")==1) { - if (this.in1<2||this.in1>8) { + if (size(this.in,"*")==1) { + if (this.in<2||this.in>8) { message("Block must have at least two input ports and at most eight"); throw "user error"; var ok = false; } else { - var tmpvar0 = check_io(this.model,this.graphics,-transpose([1:this.in1]),0,[],[]); + var tmpvar0 = check_io(this.model,this.graphics,-transpose([1:this.in]),0,[],[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } } else { - if (size(this.in1,"*")<2||size(this.in1,"*")>8||or(this.in1==0)) { + if (size(this.in,"*")<2||size(this.in,"*")>8||or(this.in==0)) { message([["Block must have at least two input ports"],["and at most eight, and size 0 is not allowed. "]]); throw "user error"; var ok = false; } else { - if (min(this.in1)<0) { + if (min(this.in)<0) { var nout = 0; } else { - var nout = sum(this.in1); + var nout = sum(this.in); } - var tmpvar1 = check_io(this.model,this.graphics,this.in1.slice(),nout,[],[]); + var tmpvar1 = check_io(this.model,this.graphics,this.in.slice(),nout,[],[]); this.model = tmpvar1[0]; this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; if (ok) { - this.in1 = size(this.in1,"*"); + this.in = size(this.in,"*"); } } } if (ok) { this.graphics.exprs = new ScilabDouble([exprs]); - this.model.ipar = new ScilabDouble([this.in1]); + this.model.ipar = new ScilabDouble([this.in]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -1290,7 +1290,7 @@ function MUX_f() { MUX_f.prototype.importset = function MUX_f() { var graphics = this.x.graphics; var ary = getData(graphics.exprs); - this.in1 = ary[0]; + this.in = ary[0]; } MUX_f.prototype.getContainer = function MUX_f() { return new BasicBlock(this.x); } } @@ -13928,7 +13928,7 @@ function CBLOCK4() { var options = { function_name:["Simulation function",this.function_name], impli:["Is block implicit? (y,n)",this.impli], - in1:["Input ports sizes",this.in1], + in:["Input ports sizes",this.in], it:["Input ports type",this.it], out:["Output port sizes",this.out], ot:["Output ports type",this.ot], @@ -13954,7 +13954,7 @@ function CBLOCK4() { var ok = true; this.function_name = arguments[0]["function_name"]; this.impli = arguments[0]["impli"]; - this.in1 = arguments[0]["in1"]; + this.in = arguments[0]["in"]; this.it = arguments[0]["it"]; this.out = arguments[0]["out"]; this.ot = arguments[0]["ot"]; @@ -13971,7 +13971,7 @@ function CBLOCK4() { this.auto0 = arguments[0]["auto0"]; this.depu = parseBoolean(arguments[0]["depu"]); this.dept = parseBoolean(arguments[0]["dept"]); - var lab = [arguments[0]["function_name"], arguments[0]["impli"], arguments[0]["in1"], arguments[0]["it"], arguments[0]["out"], arguments[0]["ot"], arguments[0]["ci"], arguments[0]["co"], arguments[0]["xx"], arguments[0]["z"], arguments[0]["oz"], arguments[0]["rpar"], arguments[0]["ipar"], arguments[0]["opar"], arguments[0]["nmode"], arguments[0]["nzcr"], arguments[0]["auto0"], arguments[0]["depu"], arguments[0]["dept"]]; + var lab = [arguments[0]["function_name"], arguments[0]["impli"], arguments[0]["in"], arguments[0]["it"], arguments[0]["out"], arguments[0]["ot"], arguments[0]["ci"], arguments[0]["co"], arguments[0]["xx"], arguments[0]["z"], arguments[0]["oz"], arguments[0]["rpar"], arguments[0]["ipar"], arguments[0]["opar"], arguments[0]["nmode"], arguments[0]["nzcr"], arguments[0]["auto0"], arguments[0]["depu"], arguments[0]["dept"]]; if (!ok) { break; } @@ -14020,7 +14020,7 @@ function CBLOCK4() { var tt = []; } var tt = label[2-1]; - var tmpvar0 = set_io(this.model,this.graphics,list(this.in1,this.it),list(this.out,this.ot),this.ci,this.co); + var tmpvar0 = set_io(this.model,this.graphics,list(this.in,this.it),list(this.out,this.ot),this.ci,this.co); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; @@ -14069,7 +14069,7 @@ function CBLOCK4() { var ary = getData(graphics.exprs); this.function_name = ary[0]; this.impli = ary[1]; - this.in1 = ary[2]; + this.in = ary[2]; this.it = ary[3]; this.out = ary[4]; this.ot = ary[5]; @@ -15209,7 +15209,7 @@ function LOGICAL_OP() { /* autogenerated from "macros/Misc/MBLOCK.sci" */ function MBLOCK() { MBLOCK.prototype.define = function MBLOCK() { - this.in1 = ["u1"]; + this.in = ["u1"]; this.intype = ["I"]; this.out = [["y1"],["y2"]]; this.outtype = [["I"],["E"]]; @@ -15217,7 +15217,7 @@ function MBLOCK() { var paramv = list(0.1,.0001); this.pprop = [[0],[0]]; var nameF = "generic"; - var exprs = tlist(["MBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],sci2exp(this.in1.slice()),sci2exp(this.intype.slice()),sci2exp(this.out.slice()),sci2exp(this.outtype.slice()),sci2exp(param.slice()),list(string(0.1),string(.0001)),sci2exp(this.pprop.slice()),nameF,[]); + var exprs = tlist(["MBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],sci2exp(this.in.slice()),sci2exp(this.intype.slice()),sci2exp(this.out.slice()),sci2exp(this.outtype.slice()),sci2exp(param.slice()),list(string(0.1),string(.0001)),sci2exp(this.pprop.slice()),nameF,[]); this.model = scicos_model(); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); @@ -15229,7 +15229,7 @@ function MBLOCK() { mo.model = nameF; mo.parameters = list(param,paramv); this.model.sim = list(new ScilabString([mo.model]), new ScilabDouble([30004])); - mo.inputs = this.in1; + mo.inputs = this.in; mo.outputs = this.out; this.model.in = new ScilabDouble([ones(size(mo.inputs,"r"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"r"),1)]); @@ -15300,7 +15300,7 @@ function MBLOCK() { var ok = false; } if (ok) { - for (i=1;i<=size(this.in1,"*");i+=1) { + for (i=1;i<=size(this.in,"*");i+=1) { var r = false; var ierr = execstr("r=validvar(in(i))","errcatch"); if (!r) { @@ -15309,7 +15309,7 @@ function MBLOCK() { } } if (!ok) { - messagebox([["Invalid variable name for the input "+string(i)+"."],["\""+this.in1[i-1]+"\""],["Please choose another variable name."]],"modal","error"); + messagebox([["Invalid variable name for the input "+string(i)+"."],["\""+this.in[i-1]+"\""],["Please choose another variable name."]],"modal","error"); } } if (ok) { @@ -15358,7 +15358,7 @@ function MBLOCK() { } } if (ok) { - if (or(size(this.intype)!=size(this.in1))) { + if (or(size(this.intype)!=size(this.in))) { messagebox("Input variables are not well defined!","modal","error"); var ok = false; } @@ -15401,7 +15401,7 @@ function MBLOCK() { if (ok) { var intypex = find(this.intype=="I"); var outtypex = find(this.outtype=="I"); - var tmpvar1 = set_io(this.model,this.graphics,list([ones(this.in1),ones(this.in1)],ones(this.in1)),list([ones(this.out),ones(this.out)],ones(this.out)),[],[],intypex,outtypex); + var tmpvar1 = set_io(this.model,this.graphics,list([ones(this.in),ones(this.in)],ones(this.in)),list([ones(this.out),ones(this.out)],ones(this.out)),[],[],intypex,outtypex); this.model = tmpvar1[0]; this.graphics = tmpvar1[1]; var ok = tmpvar1[2]; @@ -15463,7 +15463,7 @@ function MBLOCK() { var tt = []; } } - var tmpvar2 = MODCOM(this.funam,tt,this.in1,this.out,param,paramv,this.pprop); + var tmpvar2 = MODCOM(this.funam,tt,this.in,this.out,param,paramv,this.pprop); var ok = tmpvar2[0]; var tt = tmpvar2[1]; if (!ok) { @@ -15473,7 +15473,7 @@ function MBLOCK() { if (ok) { var mo = modelica(); mo.model = nameF; - mo.inputs = this.in1; + mo.inputs = this.in; mo.outputs = this.out; if (max(this.pprop)>0) { mo.parameters = list(transpose(param),paramv,transpose(this.pprop)); @@ -15615,7 +15615,7 @@ function MEMORY_f() { /* autogenerated from "macros/Misc/MPBLOCK.sci" */ function MPBLOCK() { MPBLOCK.prototype.define = function MPBLOCK() { - this.in1 = ["u"]; + this.in = ["u"]; this.intype = ["I"]; this.out = [["y1"],["y2"]]; this.outtype = [["I"],["I"]]; @@ -15623,7 +15623,7 @@ function MPBLOCK() { var paramv = list(); var pprop = []; var nameF = "myModel"; - var exprs = tlist(["MPBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],sci2exp(this.in1.slice()),sci2exp(this.intype.slice()),sci2exp(this.out.slice()),sci2exp(this.outtype.slice()),sci2exp(param.slice()),list(string(0.1),string(.0001)),sci2exp(pprop.slice()),nameF,[]); + var exprs = tlist(["MPBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],sci2exp(this.in.slice()),sci2exp(this.intype.slice()),sci2exp(this.out.slice()),sci2exp(this.outtype.slice()),sci2exp(param.slice()),list(string(0.1),string(.0001)),sci2exp(pprop.slice()),nameF,[]); this.model = scicos_model(); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,true]); @@ -15635,7 +15635,7 @@ function MPBLOCK() { mo.model = nameF; mo.parameters = list(param,paramv); this.model.sim = list(new ScilabString([mo.model]), new ScilabDouble([10004])); - mo.inputs = this.in1; + mo.inputs = this.in; mo.outputs = this.out; this.model.in = new ScilabDouble([ones(size(mo.inputs,"r"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"r"),1)]); @@ -15685,7 +15685,7 @@ function MPBLOCK() { var ok = false; } if (ok) { - for (i=1;i<=size(this.in1,"*");i+=1) { + for (i=1;i<=size(this.in,"*");i+=1) { var r = false; var ierr = execstr("r=validvar(in(i))","errcatch"); if (!r) { @@ -15694,7 +15694,7 @@ function MPBLOCK() { } } if (!ok) { - x_message([["Invalid variable name for the input "+string(i)+"."],["\""+this.in1[i-1]+"\""],["Please choose another variable name."]]); + x_message([["Invalid variable name for the input "+string(i)+"."],["\""+this.in[i-1]+"\""],["Please choose another variable name."]]); } } if (ok) { @@ -15743,7 +15743,7 @@ function MPBLOCK() { } } if (ok) { - if (or(size(this.intype)!=size(this.in1))) { + if (or(size(this.intype)!=size(this.in))) { x_message("Input variables are not well defined!"); var ok = false; } @@ -15786,7 +15786,7 @@ function MPBLOCK() { if (ok) { var intypex = find(this.intype=="I"); var outtypex = find(this.outtype=="I"); - var tmpvar2 = set_io(this.model,this.graphics,list([ones(this.in1),ones(this.in1)],ones(this.in1)),list([ones(this.out),ones(this.out)],ones(this.out)),[],[],intypex,outtypex); + var tmpvar2 = set_io(this.model,this.graphics,list([ones(this.in),ones(this.in)],ones(this.in)),list([ones(this.out),ones(this.out)],ones(this.out)),[],[],intypex,outtypex); this.model = tmpvar2[0]; this.graphics = tmpvar2[1]; var ok = tmpvar2[2]; @@ -15846,7 +15846,7 @@ function MPBLOCK() { if (ok) { var mo = modelica(); mo.model = nameF; - mo.inputs = this.in1; + mo.inputs = this.in; mo.outputs = this.out; if (pprop.length!=0) { if (max(pprop)>0) { @@ -16977,7 +16977,7 @@ function generic_block3() { var options = { function_name:["Simulation function",this.function_name], funtyp:["Function type (0,1,2,..)",this.funtyp], - in1:["Input ports sizes",this.in1], + in:["Input ports sizes",this.in], it:["Input ports type",this.it], out:["Output port sizes",this.out], ot:["Output ports type",this.ot], @@ -17006,7 +17006,7 @@ function generic_block3() { var ok = true; this.function_name = arguments[0]["function_name"]; this.funtyp = parseFloat(arguments[0]["funtyp"]); - this.in1 = arguments[0]["in1"]; + this.in = arguments[0]["in"]; this.it = arguments[0]["it"]; this.out = arguments[0]["out"]; this.ot = arguments[0]["ot"]; @@ -17023,7 +17023,7 @@ function generic_block3() { this.auto0 = arguments[0]["auto0"]; this.depu = parseBoolean(arguments[0]["depu"]); this.dept = parseBoolean(arguments[0]["dept"]); - var lab = [arguments[0]["function_name"], arguments[0]["funtyp"], arguments[0]["in1"], arguments[0]["it"], arguments[0]["out"], arguments[0]["ot"], arguments[0]["ci"], arguments[0]["co"], arguments[0]["xx"], arguments[0]["z"], arguments[0]["oz"], arguments[0]["rpar"], arguments[0]["ipar"], arguments[0]["opar"], arguments[0]["nmode"], arguments[0]["nzcr"], arguments[0]["auto0"], arguments[0]["depu"], arguments[0]["dept"]]; + var lab = [arguments[0]["function_name"], arguments[0]["funtyp"], arguments[0]["in"], arguments[0]["it"], arguments[0]["out"], arguments[0]["ot"], arguments[0]["ci"], arguments[0]["co"], arguments[0]["xx"], arguments[0]["z"], arguments[0]["oz"], arguments[0]["rpar"], arguments[0]["ipar"], arguments[0]["opar"], arguments[0]["nmode"], arguments[0]["nzcr"], arguments[0]["auto0"], arguments[0]["depu"], arguments[0]["dept"]]; if (!ok) { break; } @@ -17072,7 +17072,7 @@ function generic_block3() { } var dep_ut = [this.depu,this.dept]; if (ok) { - var tmpvar0 = set_io(this.model,this.graphics,list(this.in1,this.it),list(this.out,this.ot),this.ci,this.co); + var tmpvar0 = set_io(this.model,this.graphics,list(this.in,this.it),list(this.out,this.ot),this.ci,this.co); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; @@ -17107,7 +17107,7 @@ function generic_block3() { var ary = getData(graphics.exprs); this.function_name = ary[0]; this.funtyp = ary[1]; - this.in1 = ary[2]; + this.in = ary[2]; this.it = ary[3]; this.out = ary[4]; this.ot = ary[5]; @@ -19430,14 +19430,14 @@ function AFFICH_m() { this.colr = 1; this.nt = 5; this.nd = 1; - this.in1 = [1,1]; + this.in = [1,1]; this.model = scicos_model(); this.model.sim = list(new ScilabString(["affich2"]), new ScilabDouble([4])); - this.model.in = new ScilabDouble([this.in1[1-1][1-1]]); - this.model.in2 = new ScilabDouble([this.in1[1-1][2-1]]); + this.model.in = new ScilabDouble([this.in[1-1][1-1]]); + this.model.in2 = new ScilabDouble([this.in[1-1][2-1]]); this.model.evtin = new ScilabDouble([1]); - this.model.dstate = new ScilabDouble([-1],[0],[0],[1],[1],[0],[zeros(this.in1[1-1][1-1]*this.in1[1-1][2-1],1)]); - this.model.ipar = new ScilabDouble([this.font],[this.fontsize],[this.colr],[1000],[this.nt],[this.nd],[this.in1[1-1][1-1]]); + this.model.dstate = new ScilabDouble([-1],[0],[0],[1],[1],[0],[zeros(this.in[1-1][1-1]*this.in[1-1][2-1],1)]); + this.model.ipar = new ScilabDouble([this.font],[this.fontsize],[this.colr],[1000],[this.nt],[this.nd],[this.in[1-1][1-1]]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([true,false]); @@ -19454,7 +19454,7 @@ function AFFICH_m() { var exprs = this.graphics.exprs; this.set_param_popup_title = "Set parameters"; var options = { - in1:["Input Size",this.in1], + in:["Input Size",this.in], font:["Font number",this.font], fontsize:["Font size",this.fontsize], colr:["Color",this.colr], @@ -19468,14 +19468,14 @@ function AFFICH_m() { var exprs = this.graphics.exprs; while (true) { var ok = true; - this.in1 = inverse(arguments[0]["in1"]); + this.in = inverse(arguments[0]["in"]); this.font = parseFloat(arguments[0]["font"]); this.fontsize = parseFloat(arguments[0]["fontsize"]); this.colr = parseFloat(arguments[0]["colr"]); this.nt = parseFloat(arguments[0]["nt"]); this.nd = parseFloat(arguments[0]["nd"]); this.herit = arguments[0]["herit"]; - var exprs = [arguments[0]["in1"], arguments[0]["font"], arguments[0]["fontsize"], arguments[0]["colr"], arguments[0]["nt"], arguments[0]["nd"], arguments[0]["herit"]]; + var exprs = [arguments[0]["in"], arguments[0]["font"], arguments[0]["fontsize"], arguments[0]["colr"], arguments[0]["nt"], arguments[0]["nd"], arguments[0]["herit"]]; if (!ok) { break; } @@ -19509,14 +19509,14 @@ function AFFICH_m() { throw "user error"; } if (ok) { - var tmpvar0 = set_io(this.model,this.graphics,list(this.in1,1),list(),ones(1-this.herit,1),[]); + var tmpvar0 = set_io(this.model,this.graphics,list(this.in,1),list(),ones(1-this.herit,1),[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; } if (ok) { - this.model.ipar = new ScilabDouble([this.font],[this.fontsize],[this.colr],[this.nt],[this.nd],[this.in1[1-1][1-1]]); - this.model.dstate = new ScilabDouble([-1],[0],[0],[1],[1],[0],[zeros(this.in1[1-1][1-1]*this.in1[1-1][2-1],1)]); + this.model.ipar = new ScilabDouble([this.font],[this.fontsize],[this.colr],[this.nt],[this.nd],[this.in[1-1][1-1]]); + this.model.dstate = new ScilabDouble([-1],[0],[0],[1],[1],[0],[zeros(this.in[1-1][1-1]*this.in[1-1][2-1],1)]); this.model.evtin = new ScilabDouble([ones(1-this.herit,1)]); this.graphics.exprs = new ScilabDouble([exprs]); this.x.graphics = this.graphics; @@ -19532,7 +19532,7 @@ function AFFICH_m() { AFFICH_m.prototype.importset = function AFFICH_m() { var graphics = this.x.graphics; var ary = getData(graphics.exprs); - this.in1 = ary[0]; + this.in = ary[0]; this.font = ary[1]; this.fontsize = ary[2]; this.colr = ary[3]; @@ -20582,7 +20582,7 @@ function CMATVIEW() { function CMSCOPE() { CMSCOPE.prototype.define = function CMSCOPE() { this.win = -1; - this.in1 = [[1],[1]]; + this.in = [[1],[1]]; this.wdim = [[-1],[-1]]; this.wpos = [[-1],[-1]]; this.clrs = [[1],[3],[5],[7],[9],[11],[13],[15]]; @@ -20594,15 +20594,15 @@ function CMSCOPE() { var period = transpose(this.per.slice()); this.model = scicos_model(); this.model.sim = list(new ScilabString(["cmscope"]), new ScilabDouble([4])); - this.model.in = new ScilabDouble(this.in1); + this.model.in = new ScilabDouble([this.in]); this.model.in2 = new ScilabDouble([1],[1]); this.model.intyp = new ScilabDouble([1],[1]); this.model.evtin = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([0],[period.slice()],[yy.slice()]); - this.model.ipar = new ScilabDouble([this.win],[size(this.in1,"*")],[this.N],[this.wpos.slice()],[this.wdim.slice()],[this.in1.slice()],[this.clrs.slice(1-1,sum(this.in1))]); + this.model.ipar = new ScilabDouble([this.win],[size(this.in,"*")],[this.N],[this.wpos.slice()],[this.wdim.slice()],[this.in.slice()],[this.clrs.slice(1-1,sum(this.in))]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - var exprs = [[strcat(string(this.in1)," ")],[strcat(string(this.clrs)," ")],[string(this.win)],[sci2exp([])],[sci2exp([])],[strcat(string(this.ymin)," ")],[strcat(string(this.ymax)," ")],[strcat(string(this.per)," ")],[string(this.N)],[string(0)],[emptystr()]]; + var exprs = [[strcat(string(this.in)," ")],[strcat(string(this.clrs)," ")],[string(this.win)],[sci2exp([])],[sci2exp([])],[strcat(string(this.ymin)," ")],[strcat(string(this.ymax)," ")],[strcat(string(this.per)," ")],[string(this.N)],[string(0)],[emptystr()]]; var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CMSCOPE\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); @@ -20614,7 +20614,7 @@ function CMSCOPE() { var exprs = this.graphics.exprs; this.set_param_popup_title = "Set Scope parameters"; var options = { - in1:["Input ports sizes",this.in1.toString().replace(/,/g," ")], + in:["Input ports sizes",this.in.toString().replace(/,/g," ")], clrs:["Drawing colors (>0) or mark (<0)",this.clrs.toString().replace(/,/g," ")], win:["Output window number (-1 for automatic)",this.win], wpos:["Output window position",this.wpos.toString().replace(/,/g," ")], @@ -20632,7 +20632,7 @@ function CMSCOPE() { var exprs = this.graphics.exprs; while (true) { var ok = true; - this.in1 = inverse(arguments[0]["in1"]); + this.in = inverse(arguments[0]["in"]); this.clrs = inverse(arguments[0]["clrs"]); this.win = parseFloat(arguments[0]["win"]); this.wpos = inverse(arguments[0]["wpos"]); @@ -20643,21 +20643,21 @@ function CMSCOPE() { this.N = parseFloat(arguments[0]["N"]); this.heritance = arguments[0]["heritance"]; this.nom = arguments[0]["nom"]; - var exprs = [arguments[0]["in1"], arguments[0]["clrs"], arguments[0]["win"], arguments[0]["wpos"], arguments[0]["wdim"], arguments[0]["ymin"], arguments[0]["ymax"], arguments[0]["per"], arguments[0]["N"], arguments[0]["heritance"], arguments[0]["nom"]]; + var exprs = [arguments[0]["in"], arguments[0]["clrs"], arguments[0]["win"], arguments[0]["wpos"], arguments[0]["wdim"], arguments[0]["ymin"], arguments[0]["ymax"], arguments[0]["per"], arguments[0]["N"], arguments[0]["heritance"], arguments[0]["nom"]]; if (!ok) { break; } var mess = []; - if (size(this.in1,"*")<=0) { + if (size(this.in,"*")<=0) { var mess = [[mess],["Block must have at least one input port"],[" "]]; var ok = false; } - if (min(this.in1)<=0) { + if (min(this.in)<=0) { var mess = [[mess],["Port sizes must be positive"],[" "]]; var ok = false; } - if (size(this.clrs,"*")<sum(this.in1)) { - var mess = [[mess],["Not enough colors defined (at least "+string(sum(this.in1))+")"],[" "]]; + if (size(this.clrs,"*")<sum(this.in)) { + var mess = [[mess],["Not enough colors defined (at least "+string(sum(this.in))+")"],[" "]]; var ok = false; } if (size(this.wpos,"*")!=0&&size(this.wpos,"*")!=2) { @@ -20699,10 +20699,10 @@ function CMSCOPE() { throw "user error"; } if (ok) { - this.in1 = this.in1.slice(); - var a = size(this.in1,1); + this.in = this.in.slice(); + var a = size(this.in,1); var in2 = ones(a,1); - var tmpvar0 = set_io(this.model,this.graphics,list([this.in1,in2],ones(a,1)),list(),ones(1-this.heritance,1),[]); + var tmpvar0 = set_io(this.model,this.graphics,list([this.in,in2],ones(a,1)),list(),ones(1-this.heritance,1),[]); this.model = tmpvar0[0]; this.graphics = tmpvar0[1]; var ok = tmpvar0[2]; @@ -20718,8 +20718,8 @@ function CMSCOPE() { var period = transpose(this.per.slice()); var yy = [[transpose(this.ymin.slice())],[transpose(this.ymax.slice())]]; var rpar = [[0],[period.slice()],[yy.slice()]]; - this.clrs = this.clrs.slice(1-1,sum(this.in1)); - var ipar = [[this.win],[size(this.in1,"*")],[this.N],[this.wpos.slice()],[this.wdim.slice()],[this.in1.slice()],[this.clrs.slice()],[this.heritance]]; + this.clrs = this.clrs.slice(1-1,sum(this.in)); + var ipar = [[this.win],[size(this.in,"*")],[this.N],[this.wpos.slice()],[this.wdim.slice()],[this.in.slice()],[this.clrs.slice()],[this.heritance]]; this.model.evtin = new ScilabDouble([ones(1-this.heritance,1)]); this.model.dstate = new ScilabDouble([]); this.model.rpar = new ScilabDouble(rpar); @@ -20741,7 +20741,7 @@ function CMSCOPE() { CMSCOPE.prototype.importset = function CMSCOPE() { var graphics = this.x.graphics; var ary = getData(graphics.exprs); - this.in1 = ary[0]; + this.in = ary[0]; this.clrs = ary[1]; this.win = ary[2]; this.wpos = ary[3]; @@ -21479,21 +21479,21 @@ function TRASH_f() { /* autogenerated from "macros/Sinks/WFILE_f.sci" */ function WFILE_f() { WFILE_f.prototype.define = function WFILE_f() { - this.in1 = 1; - var nin = sum(this.in1); + this.in = 1; + var nin = sum(this.in); var frmt = "(7(e10.3,1x))"; var fname = "foo"; var lunit = 0; this.N = 2; this.model = scicos_model(); this.model.sim = new ScilabString(["writef"]); - this.model.in = new ScilabDouble([this.in1]); + this.model.in = new ScilabDouble([this.in]); this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([-1],[lunit],[zeros((nin+1)*this.N,1)]); this.model.ipar = new ScilabDouble([length(fname)],[length(frmt)],[0],[this.N],[this._str2code[fname-1]],[this._str2code[frmt-1]]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([true,false]); - var exprs = [[sci2exp(this.in1)],[fname],[frmt],[string(this.N)]]; + var exprs = [[sci2exp(this.in)],[fname],[frmt],[string(this.N)]]; var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"WFILE_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); @@ -21512,7 +21512,7 @@ function WFILE_f() { var frmt = exprs[3-1]; this.set_param_popup_title = msprintf("Set %s block parameters","WFILE_f"); var options = { - in1:["Input Size",this.in1], + in:["Input Size",this.in], fname1:["Output File Name",this.fname1], frmt1:["Output Format",this.frmt1], N:["Buffer Size",this.N], @@ -21532,16 +21532,16 @@ function WFILE_f() { var frmt = exprs[3-1]; while (true) { var ok = true; - this.in1 = parseFloat(arguments[0]["in1"]); + this.in = parseFloat(arguments[0]["in"]); this.fname1 = parseFloat(arguments[0]["fname1"]); this.frmt1 = parseFloat(arguments[0]["frmt1"]); this.N = parseFloat(arguments[0]["N"]); - var exprs = [arguments[0]["in1"], arguments[0]["fname1"], arguments[0]["frmt1"], arguments[0]["N"]]; + var exprs = [arguments[0]["in"], arguments[0]["fname1"], arguments[0]["frmt1"], arguments[0]["N"]]; if (!ok) { break; } - this.in1 = int(this.in1); - var nin = this.in1; + this.in = int(this.in); + var nin = this.in; this.fname1 = pathconvert(stripblanks(this.fname1),false,true); this.frmt1 = stripblanks(this.frmt1); if (lunit>0&&min(length(frmt),1)!=min(length(this.frmt1),1)) { @@ -21568,8 +21568,8 @@ function WFILE_f() { } else if (this.N<2) { block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %d.","Buffer Size",this.N),"Must be greater than 1."); var ok = false; - } else if (this.in1<=0) { - block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %d.","Input Size",this.in1),"Strictly positive integer expected."); + } else if (this.in<=0) { + block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %d.","Input Size",this.in),"Strictly positive integer expected."); var ok = false; } if (ok) { @@ -21595,7 +21595,7 @@ function WFILE_f() { WFILE_f.prototype.importset = function WFILE_f() { var graphics = this.x.graphics; var ary = getData(graphics.exprs); - this.in1 = ary[0]; + this.in = ary[0]; this.fname1 = ary[1]; this.frmt1 = ary[2]; this.N = ary[3]; @@ -21697,8 +21697,8 @@ function WRITEAU_f() { /* autogenerated from "macros/Sinks/WRITEC_f.sci" */ function WRITEC_f() { WRITEC_f.prototype.define = function WRITEC_f() { - this.in1 = 1; - var nin = sum(this.in1); + this.in = 1; + var nin = sum(this.in); var frmt = "c "; var fname = "foo"; this.swap = 0; @@ -21706,13 +21706,13 @@ function WRITEC_f() { this.N = 2; this.model = scicos_model(); this.model.sim = list(new ScilabString(["writec"]), new ScilabDouble([2])); - this.model.in = new ScilabDouble([this.in1]); + this.model.in = new ScilabDouble([this.in]); this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([-1],[lunit],[zeros((nin+1)*this.N,1)]); this.model.ipar = new ScilabDouble([length(fname)],[this._str2code[frmt-1]],[this.N],[this.swap],[this._str2code[fname-1]]); this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([true,false]); - var exprs = [[sci2exp(this.in1)],[fname],[frmt],[string(this.N),string(this.swap)]]; + var exprs = [[sci2exp(this.in)],[fname],[frmt],[string(this.N),string(this.swap)]]; var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"WRITEC_f\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(exprs),gr_i); return new BasicBlock(this.x); @@ -21729,7 +21729,7 @@ function WRITEC_f() { var frmt = exprs[3-1]; this.set_param_popup_title = msprintf("Set %s block parameters","WRITEC_f"); var options = { - in1:["Input Size",this.in1], + in:["Input Size",this.in], fname1:["Output File Name",this.fname1], frmt1:["Output Format",this.frmt1], N:["Buffer Size",this.N], @@ -21746,17 +21746,17 @@ function WRITEC_f() { var frmt = exprs[3-1]; while (true) { var ok = true; - this.in1 = parseFloat(arguments[0]["in1"]); + this.in = parseFloat(arguments[0]["in"]); this.fname1 = parseFloat(arguments[0]["fname1"]); this.frmt1 = arguments[0]["frmt1"]; this.N = parseFloat(arguments[0]["N"]); this.swap = parseFloat(arguments[0]["swap"]); - var exprs = [arguments[0]["in1"], arguments[0]["fname1"], arguments[0]["frmt1"], arguments[0]["N"], arguments[0]["swap"]]; + var exprs = [arguments[0]["in"], arguments[0]["fname1"], arguments[0]["frmt1"], arguments[0]["N"], arguments[0]["swap"]]; if (!ok) { break; } - this.in1 = int(this.in1); - var nin = this.in1; + this.in = int(this.in); + var nin = this.in; this.fname1 = pathconvert(stripblanks(this.fname1),false,true); this.frmt1 = stripblanks(this.frmt1); var fmts = ["s","l","d","f","c","us","ul","uc","ull","uls","ubl","ubs","dl","fl","ll","sl","db","fb","lb","sb"]; @@ -21783,8 +21783,8 @@ function WRITEC_f() { } else if (this.N<1) { block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %d.","Buffer Size",this.N),"Strictly positive integer expected."); var ok = false; - } else if (this.in1<=0) { - block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %d.","Input Size",this.in1),"Strictly positive integer expected."); + } else if (this.in<=0) { + block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %d.","Input Size",this.in),"Strictly positive integer expected."); var ok = false; } else if (this.swap!=0&&this.swap!=1) { block_parameter_error(msprintf("Wrong value for \'%s\' parameter: %d.","Swap Mode",this.swap),msprintf("Must be in the interval %s.","[0, 1]")); @@ -21813,7 +21813,7 @@ function WRITEC_f() { WRITEC_f.prototype.importset = function WRITEC_f() { var graphics = this.x.graphics; var ary = getData(graphics.exprs); - this.in1 = ary[0]; + this.in = ary[0]; this.fname1 = ary[1]; this.frmt1 = ary[2]; this.N = ary[3]; @@ -24364,7 +24364,7 @@ function STEP() { this.set_param_popup_title = msprintf("Set %s block parameters","STEP_FUNCTION"); var options = { temps:["Step Time",this.temps], - in1:["Initial Value",this.in1], + in:["Initial Value",this.in], fi:["Final Value",this.fi], } return options; @@ -24374,21 +24374,21 @@ function STEP() { while (true) { var ok = true; this.temps = arguments[0]["temps"]; - this.in1 = arguments[0]["in1"]; + this.in = arguments[0]["in"]; this.fi = arguments[0]["fi"]; - var exprs = [arguments[0]["temps"], arguments[0]["in1"], arguments[0]["fi"]]; + var exprs = [arguments[0]["temps"], arguments[0]["in"], arguments[0]["fi"]]; if (!ok) { break; } - this.in1 = this.in1.slice(); + this.in = this.in.slice(); this.fi = this.fi.slice(); - if (size(this.in1,"*")!=size(this.fi,"*")) { - if (size(this.in1,"*")==1) { - this.in1 = this.in1*ones(this.fi); + if (size(this.in,"*")!=size(this.fi,"*")) { + if (size(this.in,"*")==1) { + this.in = this.in*ones(this.fi); } else if (size(this.fi,"*")==1) { - this.fi = this.fi*ones(this.in1); + this.fi = this.fi*ones(this.in); } else { - block_parameter_error(msprintf("\'Initial Value\' and \'Final Value\': incompatible sizes: %d and %d.",size(this.in1,"*"),size(this.fi,"*")),"Same sizes expected."); + block_parameter_error(msprintf("\'Initial Value\' and \'Final Value\': incompatible sizes: %d and %d.",size(this.in,"*"),size(this.fi,"*")),"Same sizes expected."); var ok = false; } } @@ -24405,7 +24405,7 @@ function STEP() { if (this.temps==0) { var rpar = [[this.fi],[this.fi]]; } else { - var rpar = [[this.in1],[this.fi]]; + var rpar = [[this.in],[this.fi]]; } this.model.rpar = new ScilabDouble(rpar); this.graphics.exprs = new ScilabDouble([exprs]); @@ -24423,7 +24423,7 @@ function STEP() { var graphics = this.x.graphics; var ary = getData(graphics.exprs); this.temps = ary[0]; - this.in1 = ary[1]; + this.in = ary[1]; this.fi = ary[2]; } STEP.prototype.getContainer = function STEP() { return new BasicBlock(this.x); } @@ -24817,18 +24817,18 @@ function TKSCALE() { 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); @@ -24839,13 +24839,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; @@ -24853,22 +24853,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 { @@ -24878,7 +24878,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]); @@ -24895,7 +24895,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); } @@ -24967,17 +24967,17 @@ function POSTONEG_f() { function ZCROSS_f() { ZCROSS_f.prototype.define = function ZCROSS_f() { var rpar = [[-1],[-1],[0],[0]]; - this.in1 = 1; + this.in = 1; this.model = scicos_model(); this.model.sim = list(new ScilabString(["zcross"]), new ScilabDouble([1])); - this.model.in = new ScilabDouble([this.in1]); - this.model.nzcross = new ScilabDouble([this.in1]); + this.model.in = new ScilabDouble([this.in]); + this.model.nzcross = new ScilabDouble([this.in]); this.model.evtout = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([-1],[-1],[0],[0]); this.model.blocktype = new ScilabString(["z"]); this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([true,false]); - var exprs = strcat(sci2exp(this.in1)); + var exprs = strcat(sci2exp(this.in)); var gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ZCROSS_f\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([exprs]),gr_i); return new BasicBlock(this.x); @@ -24989,7 +24989,7 @@ function ZCROSS_f() { var exprs = this.graphics.exprs; this.set_param_popup_title = "Set Zero-Crossing parameters"; var options = { - in1:["Input size",this.in1], + in:["Input size",this.in], } return options; } @@ -24997,24 +24997,24 @@ function ZCROSS_f() { var exprs = this.graphics.exprs; while (true) { var ok = true; - this.in1 = parseFloat(arguments[0]["in1"]); - var exprs = [arguments[0]["in1"]]; + this.in = parseFloat(arguments[0]["in"]); + var exprs = [arguments[0]["in"]]; if (!ok) { break; } - this.in1 = int(this.in1); - if (this.in1<=0) { + this.in = int(this.in); + if (this.in<=0) { message("Block must have at least one input"); throw "user error"; } else { var kk = 0; - for (jj=1;jj<=this.in1;jj+=1) { - var kk = kk+2^(this.in1+jj-1); + for (jj=1;jj<=this.in;jj+=1) { + var kk = kk+2^(this.in+jj-1); } - this.model.rpar = new ScilabDouble([-ones(kk,1)],[zeros(2^(2*this.in1)-kk,1)]); + this.model.rpar = new ScilabDouble([-ones(kk,1)],[zeros(2^(2*this.in)-kk,1)]); this.graphics.exprs = new ScilabDouble([exprs]); - this.model.in = new ScilabDouble([this.in1]); - this.model.nzcross = new ScilabDouble([this.in1]); + this.model.in = new ScilabDouble([this.in]); + this.model.nzcross = new ScilabDouble([this.in]); this.model.firing = new ScilabDouble([-1]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -25029,7 +25029,7 @@ function ZCROSS_f() { ZCROSS_f.prototype.importset = function ZCROSS_f() { var graphics = this.x.graphics; var ary = getData(graphics.exprs); - this.in1 = ary[0]; + this.in = ary[0]; } ZCROSS_f.prototype.getContainer = function ZCROSS_f() { return new BasicBlock(this.x); } } |