diff options
| author | Sunil Shetye | 2018-07-16 15:29:15 +0530 |
|---|---|---|
| committer | Sunil Shetye | 2018-07-16 15:31:24 +0530 |
| commit | 5929c9088b6d5dcd23e8bbf9abdc5c9b4a49df1f (patch) | |
| tree | 8b842ea29c504a11164c39221e948fdaa8fa9035 | |
| parent | 614f18061faa4fc126f0d3577792dd9adfb3f240 (diff) | |
| download | sci2js-5929c9088b6d5dcd23e8bbf9abdc5c9b4a49df1f.tar.gz sci2js-5929c9088b6d5dcd23e8bbf9abdc5c9b4a49df1f.tar.bz2 sci2js-5929c9088b6d5dcd23e8bbf9abdc5c9b4a49df1f.zip | |
treat third argument of standard_define as model expression
257 files changed, 527 insertions, 534 deletions
diff --git a/combined.js b/combined.js index c7abfda7..6203003b 100644 --- a/combined.js +++ b/combined.js @@ -9,7 +9,7 @@ function CLKFROM() { this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = "A"; - this.x = new standard_define(new ScilabDouble([2,1]),this.model,this.exprs," "); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabString([this.exprs])," "); this.x.graphics.id = "From"; return new BasicBlock(this.x); } @@ -58,7 +58,7 @@ function CLKGOTO() { this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [["A"],[sci2exp(1)]]; - this.x = new standard_define(new ScilabDouble([2,1]),this.model,this.exprs," "); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabDouble(this.exprs)," "); this.x.graphics.id = "Goto"; return new BasicBlock(this.x); } @@ -124,7 +124,7 @@ function CLKGotoTagVisibility() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = "A"; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKGotoTagVisibility\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } CLKGotoTagVisibility.prototype.details = function CLKGotoTagVisibility() { @@ -175,7 +175,7 @@ function DEMUX() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = string(this.out); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEMUX\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([.5,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([.5,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } DEMUX.prototype.details = function DEMUX() { @@ -250,7 +250,7 @@ function DEMUX_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = string(this.out); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEMUX_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([.5,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([.5,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } DEMUX_f.prototype.details = function DEMUX_f() { @@ -329,7 +329,7 @@ function ESELECT_f() { this.model.nzcross = new ScilabDouble([0]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ESELECT_f\",sz(1),sz(2));"]); this.exprs = [[string(this.out)],[string(1)],[string(this.model.nmode)]]; - this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } ESELECT_f.prototype.details = function ESELECT_f() { @@ -404,7 +404,7 @@ function EXTRACTOR() { this.model.ipar = new ScilabDouble([this.ind]); this.exprs = [sci2exp(this.ind)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACTOR\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(this.exprs),this.gr_i); return new BasicBlock(this.x); } EXTRACTOR.prototype.details = function EXTRACTOR() { @@ -459,7 +459,7 @@ function FROM() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = ["A"]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROM\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,1]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabString(this.exprs),this.gr_i); this.x.graphics.id = "From"; return new BasicBlock(this.x); } @@ -517,7 +517,7 @@ function FROMMO() { mo.outputs = "n"; this.exprs = ["A"]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMMO\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,1]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabString(this.exprs),this.gr_i); this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); } @@ -572,7 +572,7 @@ function GOTO() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [["A"],[sci2exp(1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GOTO\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,1]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabDouble(this.exprs),this.gr_i); this.x.graphics.id = "Goto"; return new BasicBlock(this.x); } @@ -638,7 +638,7 @@ function GOTOMO() { mo.inputs = "p"; this.exprs = [["A"],[sci2exp(1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GOTOMO\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,1]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabDouble(this.exprs),this.gr_i); this.x.graphics.in_implicit = ["I"]; return new BasicBlock(this.x); } @@ -702,7 +702,7 @@ function GotoTagVisibility() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = "A"; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GotoTagVisibility\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } GotoTagVisibility.prototype.details = function GotoTagVisibility() { @@ -757,7 +757,7 @@ function GotoTagVisibilityMO() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = "A"; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GotoTagVisibilityMO\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } GotoTagVisibilityMO.prototype.details = function GotoTagVisibilityMO() { @@ -810,7 +810,7 @@ function ISELECT_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[string(this.nout)],[string(this.z0+1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ISELECT_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } ISELECT_f.prototype.details = function ISELECT_f() { @@ -876,7 +876,7 @@ function ISELECT_m() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[sci2exp(1)],[sci2exp(this.nout)],[sci2exp(this.z0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ISELECT_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } ISELECT_m.prototype.details = function ISELECT_m() { @@ -942,7 +942,7 @@ function MUX() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = string(this.in1); this.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,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([.5,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } MUX.prototype.details = function MUX() { @@ -1015,7 +1015,7 @@ function MUX_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = string(this.in1); this.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,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([0.5,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } MUX_f.prototype.details = function MUX_f() { @@ -1090,7 +1090,7 @@ function M_SWITCH() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[string(this.nin)],[string(ipar)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"M_SWITCH\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } M_SWITCH.prototype.details = function M_SWITCH() { @@ -1164,7 +1164,7 @@ function NRMSOM_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [string(this.nin)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NRMSOM_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([.2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([.2,2]),this.model,new ScilabString(this.exprs),this.gr_i); return new BasicBlock(this.x); } NRMSOM_f.prototype.details = function NRMSOM_f() { @@ -1216,7 +1216,7 @@ function RELAY_f() { this.model.dep_ut = new ScilabBoolean([true,true]); this.exprs = [[string(this.nin)],[string(i0+1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RELAY_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } RELAY_f.prototype.details = function RELAY_f() { @@ -1271,7 +1271,7 @@ function SCALAR2VECTOR() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [string([this.nout])]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SCALAR2VECTOR\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(this.exprs),this.gr_i); return new BasicBlock(this.x); } SCALAR2VECTOR.prototype.details = function SCALAR2VECTOR() { @@ -1329,7 +1329,7 @@ function SELECT_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[string(this.nin)],[string(this.z0+1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SELECT_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } SELECT_f.prototype.details = function SELECT_f() { @@ -1395,7 +1395,7 @@ function SELECT_m() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[sci2exp(1)],[sci2exp(this.nin)],[sci2exp(this.z0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SELECT_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } SELECT_m.prototype.details = function SELECT_m() { @@ -1513,7 +1513,7 @@ function SWITCH2() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[string(ipar)],[string(rpar)],[string(this.nzz)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SWITCH2\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } SWITCH2.prototype.details = function SWITCH2() { @@ -1584,7 +1584,7 @@ function SWITCH2_m() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[sci2exp(1)],[string(ipar)],[string(rpar)],[string(this.nzz)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SWITCH2_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } SWITCH2_m.prototype.details = function SWITCH2_m() { @@ -1668,7 +1668,7 @@ function SWITCH_f() { this.model.dep_ut = new ScilabBoolean([true,true]); this.exprs = [[string(this.nin)],[string(i0+1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SWITCH_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } SWITCH_f.prototype.details = function SWITCH_f() { @@ -1757,7 +1757,7 @@ function CCS() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = new standard_define(new ScilabDouble([2.1,3]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2.1,3]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); @@ -1821,7 +1821,7 @@ function CVS() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = new standard_define(new ScilabDouble([2.1,3]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2.1,3]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); @@ -1859,7 +1859,7 @@ function Capacitor() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = string([[this.C],[this.v]]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Capacitor\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,1.1]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,1.1]),this.model,new ScilabString([this.exprs]),list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -1913,7 +1913,7 @@ function ConstantVoltage() { this.model.equations = new ScilabDouble([mo]); this.exprs = string(this.V); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ConstantVoltage\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([1.5,1.1]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([1.5,1.1]),this.model,new ScilabString([this.exprs]),list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -1961,7 +1961,7 @@ function CurrentSensor() { this.model.equations = new ScilabDouble([mo]); this.exprs = []; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CurrentSensor\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["E"]]; return new BasicBlock(this.x); @@ -2000,7 +2000,7 @@ function Diode() { this.model.equations = new ScilabDouble([mo]); this.exprs = string([[this.Ids],[this.Vt],[this.Maxexp],[this.R]]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Diode\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,1]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabString([this.exprs]),list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -2054,7 +2054,7 @@ function Ground() { this.model.equations = new ScilabDouble([mo]); this.exprs = ""; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Ground\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs]),list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new GroundBlock(this.x); @@ -2117,7 +2117,7 @@ function Gyrator() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); @@ -2196,7 +2196,7 @@ function IdealTransformer() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(this.exprs),list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); @@ -2246,7 +2246,7 @@ function Inductor() { this.model.equations = new ScilabDouble([mo]); this.exprs = string(this.L); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Inductor\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,0.9]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,0.9]),this.model,new ScilabString([this.exprs]),list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -2289,7 +2289,7 @@ function MOTOR() { this.model.dep_ut = new ScilabBoolean([true,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MOTOR\",sz(1),sz(2));"]); this.exprs = ""; - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); this.x.graphics.out_implicit = [["I"],["I"]]; this.x.graphics.in_implicit = ["I"]; return new BasicBlock(this.x); @@ -2332,7 +2332,7 @@ function NMOS() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = [[string(this.W)],[string(this.L)],[string(this.Beta)],[string(this.Vt)],[string(this.K2)],[string(this.K5)],[string(this.dW)],[string(this.dL)],[string(this.RDS)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NMOS\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["I"],["I"]]; return new BasicBlock(this.x); @@ -2426,7 +2426,7 @@ function NPN() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); @@ -2509,7 +2509,7 @@ function OpAmp() { this.model.rpar = new ScilabDouble(Z); this.exprs = string(Z); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OpAmp\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,5]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,5]),this.model,new ScilabString([this.exprs]),this.gr_i); this.x.graphics.in_implicit = [["I"],["I"]]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -2571,7 +2571,7 @@ function PMOS() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = [[string(this.W)],[string(this.L)],[string(this.Beta)],[string(this.Vt)],[string(this.K2)],[string(this.K5)],[string(this.dW)],[string(this.dL)],[string(this.RDS)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PMOS\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["I"],["I"]]; return new BasicBlock(this.x); @@ -2665,7 +2665,7 @@ function PNP() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); @@ -2744,7 +2744,7 @@ function PotentialSensor() { mo.outputs = ["v"]; this.model.equations = new ScilabDouble([mo]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PotentialSensor\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,"",list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([""]),list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["E"]; return new BasicBlock(this.x); @@ -2780,7 +2780,7 @@ function Resistor() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = string(this.R); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Resistor\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,1]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabString([this.exprs]),list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -2835,7 +2835,7 @@ function SineVoltage() { this.model.equations = new ScilabDouble([mo]); this.exprs = [[string(this.V)],[string(this.ph)],[string(this.frq)],[string(this.offset)],[string(this.start)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SineVoltage\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -2898,7 +2898,7 @@ function Switch() { this.model.rpar = new ScilabDouble([Z]); this.exprs = string(Z); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Switch\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),list(this.gr_i,0)); this.x.graphics.in_implicit = [["I"],["E"]]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -2952,7 +2952,7 @@ function VVsourceAC() { this.model.equations = new ScilabDouble([mo]); this.exprs = [string(this.FR)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VVsourceAC\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(this.exprs),list(this.gr_i,0)); this.x.graphics.in_implicit = ["I","E"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -3001,7 +3001,7 @@ function VariableResistor() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = []; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VariableResistor\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); this.x.graphics.in_implicit = ["I","E"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -3034,7 +3034,7 @@ function VoltageSensor() { this.model.equations = new ScilabDouble([mo]); this.exprs = []; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VoltageSensor\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["E"]]; return new VoltageSensorBlock(this.x); @@ -3071,7 +3071,7 @@ function VsourceAC() { this.model.equations = new ScilabDouble([mo]); this.exprs = [[string(this.VA)],[string(this.FR)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VsourceAC\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -3198,7 +3198,7 @@ function ANDLOG_f() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ANDLOG_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,3]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([3,3]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } ANDLOG_f.prototype.details = function ANDLOG_f() { @@ -3224,7 +3224,7 @@ function CLKSOMV_f() { this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKSOMV_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } CLKSOMV_f.prototype.details = function CLKSOMV_f() { @@ -3250,7 +3250,7 @@ function CLKSOM_f() { this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKSOM_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } CLKSOM_f.prototype.details = function CLKSOM_f() { @@ -3275,7 +3275,7 @@ function CLKSPLIT_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabBoolean([false,false,false]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,[],[]); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabDouble([]),[]); return new BasicBlock(this.x); } CLKSPLIT_f.prototype.details = function CLKSPLIT_f() { @@ -3303,7 +3303,7 @@ function END_c() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = string(this.tf); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"END_c\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } END_c.prototype.details = function END_c() { @@ -3350,7 +3350,7 @@ function EVTDLY_c() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[string(this.dt)],[sci2exp(this.ff)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTDLY_c\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } EVTDLY_c.prototype.details = function EVTDLY_c() { @@ -3404,7 +3404,7 @@ function EVTDLY_f() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[string(this.dt)],[sci2exp(this.ff)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTDLY_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } EVTDLY_f.prototype.details = function EVTDLY_f() { @@ -3455,7 +3455,7 @@ function EVTGEN_f() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = string(this.tt); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTGEN_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } EVTGEN_f.prototype.details = function EVTGEN_f() { @@ -3501,7 +3501,7 @@ function EVTVARDLY() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = string(this.model.firing); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTVARDLY\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } EVTVARDLY.prototype.details = function EVTVARDLY() { @@ -3543,7 +3543,7 @@ function HALT_f() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = string(this.n); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"HALT_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } HALT_f.prototype.details = function HALT_f() { @@ -3592,7 +3592,7 @@ function IFTHEL_f() { this.model.nzcross = new ScilabDouble([1]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IFTHEL_f\",sz(1),sz(2));"]); this.exprs = [[string(this.model.in)],[string(this.model.nmode)]]; - this.x = new standard_define(new ScilabDouble([3,3]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,3]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } IFTHEL_f.prototype.details = function IFTHEL_f() { @@ -3759,7 +3759,7 @@ function MFCLCK_f() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[string(this.dt)],[string(this.nn)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MFCLCK_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } MFCLCK_f.prototype.details = function MFCLCK_f() { @@ -3805,7 +3805,7 @@ function M_freq() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[sci2exp([[1],[2]])],[sci2exp([[0],[0]])]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"M_freq\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } M_freq.prototype.details = function M_freq() { @@ -3886,7 +3886,7 @@ function VirtualCLK0() { this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = []; - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs," "); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs)," "); return new BasicBlock(this.x); } VirtualCLK0.prototype.details = function VirtualCLK0() { @@ -4007,7 +4007,7 @@ function freq_div() { this.model.evtout = new ScilabDouble([1]); this.model.rpar = scs_m_1; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"freq_div\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } freq_div.prototype.details = function freq_div() { @@ -4136,7 +4136,7 @@ function Bache() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = [[string(this.Patm)],[string(this.A)],[string(this.ze1)],[string(this.ze2)],[string(this.zs1)],[string(this.zs2)],[string(this.z0)],[string(this.T0)],[string(this.p_rho)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Bache\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); this.x.graphics.in_implicit = [["I"],["I"]]; this.x.graphics.out_implicit = [["I"],["I"],["E"]]; return new BasicBlock(this.x); @@ -4231,7 +4231,7 @@ function Flowmeter() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); @@ -4287,7 +4287,7 @@ function PerteDP() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = [[string(this.L)],[string(this.D)],[string(this.lambda)],[string(this.z1)],[string(this.z2)],[string(this.p_rho)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PerteDP\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,1]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -4350,7 +4350,7 @@ function PuitsP() { this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.exprs = [[string(this.P0)],[string(this.T0)],[string(this.H0)],[string(this.option_temperature)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PuitsP\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; return new BasicBlock(this.x); } @@ -4410,7 +4410,7 @@ function SourceP() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = [[string(this.P0)],[string(this.T0)],[string(this.H0)],[string(this.option_temperature)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SourceP\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); } @@ -4470,7 +4470,7 @@ function VanneReglante() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = [[string(this.Cvmax)],[string(this.p_rho)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VanneReglante\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); this.x.graphics.in_implicit = [["I"],["E"]]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); @@ -4521,7 +4521,7 @@ function BITCLEAR() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[sci2exp(3)],[sci2exp(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BITCLEAR\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } BITCLEAR.prototype.details = function BITCLEAR() { @@ -4618,7 +4618,7 @@ function BITSET() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[sci2exp(3)],[sci2exp(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BITSET\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } BITSET.prototype.details = function BITSET() { @@ -4715,7 +4715,7 @@ function CONVERT() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[sci2exp(1)],[sci2exp(3)],[sci2exp(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONVERT\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } CONVERT.prototype.details = function CONVERT() { @@ -5171,7 +5171,7 @@ function DFLIPFLOP() { this.model.dep_ut = new ScilabBoolean([true,false]); this.model.rpar = new ScilabDouble([scs_m]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DFLIPFLOP\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,3]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } DFLIPFLOP.prototype.details = function DFLIPFLOP() { @@ -5222,7 +5222,7 @@ function DLATCH() { this.model.dep_ut = new ScilabBoolean([true,false]); this.model.rpar = new ScilabDouble([scs_m]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLATCH\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,3]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } DLATCH.prototype.details = function DLATCH() { @@ -5254,7 +5254,7 @@ function EXTRACTBITS() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[sci2exp(3)],[sci2exp(1)],[sci2exp(0)],[sci2exp(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACTBITS\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } EXTRACTBITS.prototype.details = function EXTRACTBITS() { @@ -5499,7 +5499,7 @@ function INTMUL() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[sci2exp(3)],[sci2exp(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTMUL\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } INTMUL.prototype.details = function INTMUL() { @@ -5645,7 +5645,7 @@ function JKFLIPFLOP() { this.model.dep_ut = new ScilabBoolean([true,false]); this.model.rpar = new ScilabDouble([scs_m]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"JKFLIPFLOP\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,3]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } JKFLIPFLOP.prototype.details = function JKFLIPFLOP() { @@ -5714,7 +5714,7 @@ function LOGIC() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[sci2exp(this.mat)],[sci2exp(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOGIC\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } LOGIC.prototype.details = function LOGIC() { @@ -5791,7 +5791,7 @@ function SHIFT() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[sci2exp(3)],[sci2exp(0)],[sci2exp(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SHIFT\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } SHIFT.prototype.details = function SHIFT() { @@ -5937,7 +5937,7 @@ function SRFLIPFLOP() { this.model.dep_ut = new ScilabBoolean([true,false]); this.model.rpar = new ScilabDouble([scs_m]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SRFLIPFLOP\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,3]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } SRFLIPFLOP.prototype.details = function SRFLIPFLOP() { @@ -6000,7 +6000,7 @@ function BIGSOM_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = sci2exp(this.sgn); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BIGSOM_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,3]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BigSom(this.x); } BIGSOM_f.prototype.details = function BIGSOM_f() { @@ -6047,7 +6047,7 @@ function CLINDUMMY_f() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([false,true]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLINDUMMY_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } CLINDUMMY_f.prototype.details = function CLINDUMMY_f() { @@ -6080,7 +6080,7 @@ function CLR() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLR\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } CLR.prototype.details = function CLR() { @@ -6167,7 +6167,7 @@ function CLR_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLR_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2.5,2.5]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2.5,2.5]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } CLR_f.prototype.details = function CLR_f() { @@ -6256,7 +6256,7 @@ function CLSS() { this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLSS\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } CLSS.prototype.details = function CLSS() { @@ -6362,7 +6362,7 @@ function CLSS_f() { this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLSS_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } CLSS_f.prototype.details = function CLSS_f() { @@ -6458,7 +6458,7 @@ function DELAYV_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[string(this.nin)],[strcat(string(z0.slice(1-1,$-1)),";")],[string(this.T)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DELAYV_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } DELAYV_f.prototype.details = function DELAYV_f() { @@ -6660,7 +6660,7 @@ function DERIV() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = []; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DERIV\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } DERIV.prototype.details = function DERIV() { @@ -6688,7 +6688,7 @@ function DIFF_c() { this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = [[strcat(sci2exp(this.x0[1-1]))],[strcat(sci2exp(this.x0[2-1]))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DIFF_c\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } DIFF_c.prototype.details = function DIFF_c() { @@ -6757,7 +6757,7 @@ function DLR() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLR\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } DLR.prototype.details = function DLR() { @@ -6843,7 +6843,7 @@ function DLR_f() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLR_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2.5,2.5]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2.5,2.5]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } DLR_f.prototype.details = function DLR_f() { @@ -6929,7 +6929,7 @@ function DLSS() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLSS\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } DLSS.prototype.details = function DLSS() { @@ -7034,7 +7034,7 @@ function DLSS_f() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLSS_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } DLSS_f.prototype.details = function DLSS_f() { @@ -7126,7 +7126,7 @@ function DOLLAR() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } DOLLAR.prototype.details = function DOLLAR() { @@ -7227,7 +7227,7 @@ function DOLLAR_f() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } DOLLAR_f.prototype.details = function DOLLAR_f() { @@ -7293,7 +7293,7 @@ function DOLLAR_m() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } DOLLAR_m.prototype.details = function DOLLAR_m() { @@ -7397,7 +7397,7 @@ function GAINBLK() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [strcat(sci2exp(this.gain))]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAINBLK\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } GAINBLK.prototype.details = function GAINBLK() { @@ -7556,7 +7556,7 @@ function GAINBLK_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [strcat(sci2exp(this.gain))]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAINBLK_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } GAINBLK_f.prototype.details = function GAINBLK_f() { @@ -7614,7 +7614,7 @@ function GAIN_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[strcat(sci2exp(this.gain))],[strcat(sci2exp(in1))],[strcat(sci2exp(out))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAIN_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } GAIN_f.prototype.details = function GAIN_f() { @@ -7673,7 +7673,7 @@ function INTEGRAL() { this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = string([[0],[0],[0],[this.maxp],[minp]]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); this.x.graphics.id = "1/s"; return new BasicBlock(this.x); } @@ -7767,7 +7767,7 @@ function INTEGRAL_f() { this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = strcat(sci2exp(this.x0)); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([this.exprs]),this.gr_i); return new BasicBlock(this.x); } INTEGRAL_f.prototype.details = function INTEGRAL_f() { @@ -7815,7 +7815,7 @@ function INTEGRAL_m() { this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = string([[0],[0],[0],[this.maxp],[minp]]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } INTEGRAL_m.prototype.details = function INTEGRAL_m() { @@ -7975,7 +7975,7 @@ function PID() { this.model.dep_ut = new ScilabBoolean([false,false]); this.model.rpar = new ScilabDouble([scs_m]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PID\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } PID.prototype.details = function PID() { @@ -8069,7 +8069,7 @@ function REGISTER() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = strcat(string(this.z0),";"); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"REGISTER\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([this.exprs]),this.gr_i); return new BasicBlock(this.x); } REGISTER.prototype.details = function REGISTER() { @@ -8161,7 +8161,7 @@ function REGISTER_f() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = strcat(string(this.z0),";"); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"REGISTER_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2.5,2.5]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2.5,2.5]),this.model,new ScilabDouble([this.exprs]),this.gr_i); return new BasicBlock(this.x); } REGISTER_f.prototype.details = function REGISTER_f() { @@ -8208,7 +8208,7 @@ function SAMPHOLD() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([true,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPHOLD\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model," ",this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([" "]),this.gr_i); return new BasicBlock(this.x); } SAMPHOLD.prototype.details = function SAMPHOLD() { @@ -8240,7 +8240,7 @@ function SAMPHOLD_m() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPHOLD_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i); return new BasicBlock(this.x); } SAMPHOLD_m.prototype.details = function SAMPHOLD_m() { @@ -8293,7 +8293,7 @@ function SAMPLEHOLD_f() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([true,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPLEHOLD_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model," ",this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([" "]),this.gr_i); return new BasicBlock(this.x); } SAMPLEHOLD_f.prototype.details = function SAMPLEHOLD_f() { @@ -8322,7 +8322,7 @@ function SOM_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[sci2exp(1)],[sci2exp(sgn)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SOM_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } SOM_f.prototype.details = function SOM_f() { @@ -8367,7 +8367,7 @@ function SUMMATION() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = sci2exp(this.sgn); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUMMATION\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,3]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabString([this.exprs]),this.gr_i); return new Summation(this.x); } SUMMATION.prototype.details = function SUMMATION() { @@ -8513,7 +8513,7 @@ function SUM_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUM_f\",sz(1),sz(2));"]); this.exprs = []; - this.x = new standard_define(new ScilabDouble([1,1]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } SUM_f.prototype.details = function SUM_f() { @@ -8550,7 +8550,7 @@ function TCLSS() { this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TCLSS\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } TCLSS.prototype.details = function TCLSS() { @@ -8653,7 +8653,7 @@ function TCLSS_f() { this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TCLSS_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } TCLSS_f.prototype.details = function TCLSS_f() { @@ -8751,7 +8751,7 @@ function TIME_DELAY() { this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = [[string(this.T)],[string(this.init)],[string(this.N)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TIME_DELAY\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3.5,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3.5,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } TIME_DELAY.prototype.details = function TIME_DELAY() { @@ -8821,7 +8821,7 @@ function VARIABLE_DELAY() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[string(this.T)],[string(this.init)],[string(this.N)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VARIABLE_DELAY\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } VARIABLE_DELAY.prototype.details = function VARIABLE_DELAY() { @@ -8897,7 +8897,7 @@ function CUMSUM() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[sci2exp(1)],[sci2exp(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CUMSUM\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),this.gr_i); return new BasicBlock(this.x); } CUMSUM.prototype.details = function CUMSUM() { @@ -8999,7 +8999,7 @@ function EXTRACT() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[sci2exp(1)],[sci2exp([1])],[sci2exp([1])]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACT\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),this.gr_i); return new BasicBlock(this.x); } EXTRACT.prototype.details = function EXTRACT() { @@ -9101,7 +9101,7 @@ function EXTTRI() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTTRI\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),this.gr_i); return new BasicBlock(this.x); } EXTTRI.prototype.details = function EXTTRI() { @@ -9200,7 +9200,7 @@ function MATBKSL() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATBKSL\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i); return new BasicBlock(this.x); } MATBKSL.prototype.details = function MATBKSL() { @@ -9277,7 +9277,7 @@ function MATCATH() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(2)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATCATH\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,3]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabString(label),this.gr_i); return new BasicBlock(this.x); } MATCATH.prototype.details = function MATCATH() { @@ -9345,7 +9345,7 @@ function MATCATV() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(2)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATCATV\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,3]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabString(label),this.gr_i); return new BasicBlock(this.x); } MATCATV.prototype.details = function MATCATV() { @@ -9412,7 +9412,7 @@ function MATDET() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDET\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i); return new BasicBlock(this.x); } MATDET.prototype.details = function MATDET() { @@ -9489,7 +9489,7 @@ function MATDIAG() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDIAG\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i); return new BasicBlock(this.x); } MATDIAG.prototype.details = function MATDIAG() { @@ -9566,7 +9566,7 @@ function MATDIV() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDIV\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i); return new BasicBlock(this.x); } MATDIV.prototype.details = function MATDIV() { @@ -9643,7 +9643,7 @@ function MATEIG() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATEIG\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(label),this.gr_i); return new BasicBlock(this.x); } MATEIG.prototype.details = function MATEIG() { @@ -9743,7 +9743,7 @@ function MATEXPM() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATEXPM\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i); return new BasicBlock(this.x); } MATEXPM.prototype.details = function MATEXPM() { @@ -9820,7 +9820,7 @@ function MATINV() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATINV\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i); return new BasicBlock(this.x); } MATINV.prototype.details = function MATINV() { @@ -9897,7 +9897,7 @@ function MATLU() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = sci2exp(1); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATLU\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([label]),this.gr_i); return new BasicBlock(this.x); } MATLU.prototype.details = function MATLU() { @@ -9975,7 +9975,7 @@ function MATMAGPHI() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATMAGPHI\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(label),this.gr_i); return new BasicBlock(this.x); } MATMAGPHI.prototype.details = function MATMAGPHI() { @@ -10045,7 +10045,7 @@ function MATMUL() { this.model.ipar = new ScilabDouble([1]); var label = [sci2exp(this.model.ipar)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATMUL\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(label),this.gr_i); return new BasicBlock(this.x); } MATMUL.prototype.details = function MATMUL() { @@ -10221,7 +10221,7 @@ function MATPINV() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATPINV\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i); return new BasicBlock(this.x); } MATPINV.prototype.details = function MATPINV() { @@ -10298,7 +10298,7 @@ function MATRESH() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[sci2exp(1)],[sci2exp([1,1])],[sci2exp([1,1])]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATRESH\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),this.gr_i); return new BasicBlock(this.x); } MATRESH.prototype.details = function MATRESH() { @@ -10404,7 +10404,7 @@ function MATSING() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATSING\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(label),this.gr_i); return new BasicBlock(this.x); } MATSING.prototype.details = function MATSING() { @@ -10507,7 +10507,7 @@ function MATSUM() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[sci2exp(1)],[sci2exp(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATSUM\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),this.gr_i); return new BasicBlock(this.x); } MATSUM.prototype.details = function MATSUM() { @@ -10599,7 +10599,7 @@ function MATTRAN() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATTRAN\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(label),this.gr_i); return new BasicBlock(this.x); } MATTRAN.prototype.details = function MATTRAN() { @@ -10682,7 +10682,7 @@ function MATZCONJ() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = []; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATZCONJ\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(label),this.gr_i); return new BasicBlock(this.x); } MATZCONJ.prototype.details = function MATZCONJ() { @@ -10721,7 +10721,7 @@ function MATZREIM() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = sci2exp(1); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATZREIM\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString([label]),this.gr_i); return new BasicBlock(this.x); } MATZREIM.prototype.details = function MATZREIM() { @@ -10802,7 +10802,7 @@ function RICC() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RICC\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(label),this.gr_i); return new BasicBlock(this.x); } RICC.prototype.details = function RICC() { @@ -10870,7 +10870,7 @@ function ROOTCOEF() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ROOTCOEF\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),this.gr_i); return new BasicBlock(this.x); } ROOTCOEF.prototype.details = function ROOTCOEF() { @@ -10939,7 +10939,7 @@ function SQRT() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SQRT\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i); return new BasicBlock(this.x); } SQRT.prototype.details = function SQRT() { @@ -11011,7 +11011,7 @@ function SUBMAT() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[sci2exp(1)],[sci2exp(1)],[sci2exp(1)],[sci2exp(1)],[sci2exp(1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUBMAT\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,new ScilabDouble(label),this.gr_i); return new BasicBlock(this.x); } SUBMAT.prototype.details = function SUBMAT() { @@ -11121,7 +11121,7 @@ function AUTOMAT() { this.model.ipar = new ScilabDouble(ipar); this.model.rpar = new ScilabDouble(rpar); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"AUTOMAT\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } AUTOMAT.prototype.details = function AUTOMAT() { @@ -11250,7 +11250,7 @@ function BACKLASH() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BACKLASH\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } BACKLASH.prototype.details = function BACKLASH() { @@ -11331,7 +11331,7 @@ function BOUNCE() { this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = [[strcat(sci2exp(this.rpar1))],[strcat(sci2exp(this.rpar2))],[strcat(sci2exp(this.walls))],[strcat(sci2exp(this.x))],[strcat(sci2exp(this.xd))],[strcat(sci2exp(this.y))],[strcat(sci2exp(this.yd))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BOUNCE\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } BOUNCE.prototype.details = function BOUNCE() { @@ -11460,7 +11460,7 @@ function BOUNCEXY() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[strcat(sci2exp(this.clrs))],[strcat(sci2exp(this.siz))],[strcat(sci2exp(this.win))],[strcat(sci2exp(1))],[strcat(sci2exp(this.xmin))],[strcat(sci2exp(this.xmax))],[strcat(sci2exp(this.ymin))],[strcat(sci2exp(this.ymax))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BOUNCEXY\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } BOUNCEXY.prototype.details = function BOUNCEXY() { @@ -11559,7 +11559,7 @@ function BPLATFORM() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = string(this.model.rpar); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BPLATFORM\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } BPLATFORM.prototype.details = function BPLATFORM() { @@ -12040,7 +12040,7 @@ function CONSTRAINT_c() { this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = "0"; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONSTRAINT_c\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } CONSTRAINT_c.prototype.details = function CONSTRAINT_c() { @@ -12101,7 +12101,7 @@ function DEADBAND() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[string(this.maxp)],[string(this.minp)],[string(this.model.nmode)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEADBAND\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } DEADBAND.prototype.details = function DEADBAND() { @@ -12234,7 +12234,7 @@ function DIFF_f() { this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = [[strcat(sci2exp(this.x0[1-1]))],[strcat(sci2exp(this.x0[2-1]))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DIFF_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } DIFF_f.prototype.details = function DIFF_f() { @@ -12337,7 +12337,7 @@ function EDGETRIGGER() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [string(this.edge)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EDGETRIGGER\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(this.exprs),this.gr_i); return new BasicBlock(this.x); } EDGETRIGGER.prototype.details = function EDGETRIGGER() { @@ -12447,7 +12447,7 @@ function EDGE_TRIGGER() { this.model.evtout = new ScilabDouble([1]); this.model.rpar = scs_m_1; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EDGE_TRIGGER\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } EDGE_TRIGGER.prototype.details = function EDGE_TRIGGER() { @@ -12532,7 +12532,7 @@ function ENDBLK() { scs_m_1.objs[2-1] = scicos_link(xx=[[292.104],[292.104],[261.83733],[261.83733],[292.104],[292.104]],yy=[[243.40305],[234.45067],[234.45067],[305.584],[305.584],[294.83162]],id="drawlink",thick=[0,0],ct=[5,-1],from=[1,1,0],to=[1,1,1]); this.model = scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ENDBLK\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } ENDBLK.prototype.details = function ENDBLK() { @@ -12694,7 +12694,7 @@ function Extract_Activation() { this.model.evtout = new ScilabDouble([1]); this.model.rpar = scs_m_1; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Extract_Activation\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } Extract_Activation.prototype.details = function Extract_Activation() { @@ -12727,7 +12727,7 @@ function HYSTHERESIS() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[string(rpar)],[string(sign(this.nzz))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"HYSTHERESIS\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } HYSTHERESIS.prototype.details = function HYSTHERESIS() { @@ -12785,7 +12785,7 @@ function IMPSPLIT_f() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,[],[]); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabDouble([]),[]); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I","I"]; return new BasicBlock(this.x); @@ -12817,7 +12817,7 @@ function LOGICAL_OP() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[string(this.nin)],[string(ipar)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOGICAL_OP\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } LOGICAL_OP.prototype.details = function LOGICAL_OP() { @@ -12961,7 +12961,7 @@ function MBLOCK() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"r"),1)]); this.model.equations = mo; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MBLOCK\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([this.exprs]),this.gr_i); this.x.graphics.in_implicit = this.intype; this.x.graphics.out_implicit = this.outtype; return new BasicBlock(this.x); @@ -13247,7 +13247,7 @@ function MEMORY_f() { this.model.blocktype = new ScilabString(["m"]); this.model.dep_ut = new ScilabBoolean([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MEMORY_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } MEMORY_f.prototype.details = function MEMORY_f() { @@ -13327,7 +13327,7 @@ function MPBLOCK() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"r"),1)]); this.model.equations = mo; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MPBLOCK\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([this.exprs]),this.gr_i); this.x.graphics.in_implicit = this.intype; this.x.graphics.out_implicit = this.outtype; return new BasicBlock(this.x); @@ -13594,7 +13594,7 @@ function PAL_f() { this.model.blocktype = new ScilabString(["h"]); this.model.dep_ut = new ScilabBoolean([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PAL_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),this.gr_i); this.x.graphics.id = scs.props.title[1-1]; return new BasicBlock(this.x); } @@ -13637,7 +13637,7 @@ function PENDULUM_ANIM() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = string(this.model.rpar); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PENDULUM_ANIM\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,3]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,3]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } PENDULUM_ANIM.prototype.details = function PENDULUM_ANIM() { @@ -13713,7 +13713,7 @@ function RATELIMITER() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[string(this.maxp)],[string(this.minp)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RATELIMITER\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3.5,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3.5,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } RATELIMITER.prototype.details = function RATELIMITER() { @@ -13764,7 +13764,7 @@ function RELATIONALOP() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[string(ipar)],[string(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RELATIONALOP\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); this.x.graphics.style = ["fontSize=13;fontStyle=1;displayedLabel="+label]; return new BasicBlock(this.x); } @@ -13865,7 +13865,7 @@ function SPLIT_f() { this.model.out = new ScilabDouble([-1],[-1],[-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,[],[]); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabDouble([]),[]); return new BasicBlock(this.x); } SPLIT_f.prototype.details = function SPLIT_f() { @@ -13901,7 +13901,7 @@ function SUPER_f() { this.model.blocktype = new ScilabString(["h"]); this.model.dep_ut = new ScilabBoolean([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUPER_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),this.gr_i); return new SuperBlock(this.x); } SUPER_f.prototype.details = function SUPER_f() { @@ -14176,7 +14176,7 @@ function func_block() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = "v=sin(u);y=u*v"; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"func_block\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } func_block.prototype.details = function func_block() { @@ -14223,7 +14223,7 @@ function generic_block() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp(this.model.in)],[sci2exp(this.model.out)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.firing)],["y"],["n"]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(label),this.gr_i); return new BasicBlock(this.x); } generic_block.prototype.details = function generic_block() { @@ -14350,7 +14350,7 @@ function generic_block2() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp(this.model.in)],[sci2exp(this.model.out)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block2\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(label),this.gr_i); return new BasicBlock(this.x); } generic_block2.prototype.details = function generic_block2() { @@ -14479,7 +14479,7 @@ function generic_block3() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp([this.model.in,this.model.in2])],[sci2exp(this.model.intyp)],[sci2exp([this.model.out,this.model.out2]),sci2exp(this.model.outtyp)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.odstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.opar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block3\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(label),this.gr_i); return new BasicBlock(this.x); } generic_block3.prototype.details = function generic_block3() { @@ -14860,7 +14860,7 @@ function ABSBLK_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ABSBLK_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } ABSBLK_f.prototype.details = function ABSBLK_f() { @@ -14889,7 +14889,7 @@ function ABS_VALUE() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [string([1])]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ABS_VALUE\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(this.exprs),this.gr_i); return new BasicBlock(this.x); } ABS_VALUE.prototype.details = function ABS_VALUE() { @@ -14938,7 +14938,7 @@ function COSBLK_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"COSBLK_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } COSBLK_f.prototype.details = function COSBLK_f() { @@ -14975,7 +14975,7 @@ function DLRADAPT_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[sci2exp(this.p)],[sci2exp(this.rn)],[sci2exp(this.rd,0)],[sci2exp(this.g)],[sci2exp(this.last_u)],[sci2exp(this.last_y)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLRADAPT_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } DLRADAPT_f.prototype.details = function DLRADAPT_f() { @@ -15043,7 +15043,7 @@ function EXPBLK_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = ["%e"]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXPBLK_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(this.exprs),this.gr_i); return new BasicBlock(this.x); } EXPBLK_f.prototype.details = function EXPBLK_f() { @@ -15097,7 +15097,7 @@ function EXPBLK_m() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = ["%e"]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXPBLK_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(this.exprs),this.gr_i); return new BasicBlock(this.x); } EXPBLK_m.prototype.details = function EXPBLK_m() { @@ -15145,7 +15145,7 @@ function FSV_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = " "; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FSV_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } FSV_f.prototype.details = function FSV_f() { @@ -15176,7 +15176,7 @@ function INTRP2BLK_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[strcat(sci2exp(this.a))],[strcat(sci2exp(this.b))],[strcat(sci2exp(this.c,0))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTRP2BLK_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } INTRP2BLK_f.prototype.details = function INTRP2BLK_f() { @@ -15233,7 +15233,7 @@ function INTRPLBLK_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[strcat(sci2exp(this.a))],[strcat(sci2exp(this.b))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTRPLBLK_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } INTRPLBLK_f.prototype.details = function INTRPLBLK_f() { @@ -15285,7 +15285,7 @@ function INVBLK() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = " "; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INVBLK\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } INVBLK.prototype.details = function INVBLK() { @@ -15312,7 +15312,7 @@ function INVBLK_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = " "; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INVBLK_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } INVBLK_f.prototype.details = function INVBLK_f() { @@ -15341,7 +15341,7 @@ function LOGBLK_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = "%e"; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOGBLK_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } LOGBLK_f.prototype.details = function LOGBLK_f() { @@ -15524,7 +15524,7 @@ function LOOKUP_c() { this.model.firing = new ScilabDouble([0]); this.exprs = [[sci2exp(this.Method)],[sci2exp(this.xx)],[sci2exp(this.yy)],[sci2exp(0)],[Graf]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOOKUP_c\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } LOOKUP_c.prototype.details = function LOOKUP_c() { @@ -15689,7 +15689,7 @@ function LOOKUP_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOOKUP_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } LOOKUP_f.prototype.details = function LOOKUP_f() { @@ -15747,7 +15747,7 @@ function MAXMIN() { this.model.ipar = new ScilabDouble([0]); this.exprs = [string(transpose([2,1,1]))]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MAXMIN\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(this.exprs),this.gr_i); this.x.graphics.style = "MAXMIN;displayedLabel=MAX"; return new BasicBlock(this.x); } @@ -15832,7 +15832,7 @@ function MAX_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = " "; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MAX_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } MAX_f.prototype.details = function MAX_f() { @@ -15860,7 +15860,7 @@ function MIN_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = sci2exp(in1); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MIN_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } MIN_f.prototype.details = function MIN_f() { @@ -15889,7 +15889,7 @@ function POWBLK_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = string(this.a); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"POWBLK_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } POWBLK_f.prototype.details = function POWBLK_f() { @@ -15941,7 +15941,7 @@ function PRODUCT() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = sci2exp(this.sgn); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PRODUCT\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,3]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabString([this.exprs]),this.gr_i); return new Product(this.x); } PRODUCT.prototype.details = function PRODUCT() { @@ -16010,7 +16010,7 @@ function PROD_f() { this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,[],[]); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabDouble([]),[]); return new BasicBlock(this.x); } PROD_f.prototype.details = function PROD_f() { @@ -16040,7 +16040,7 @@ function QUANT_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[string(this.pas)],[string(this.meth)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"QUANT_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } QUANT_f.prototype.details = function QUANT_f() { @@ -16105,7 +16105,7 @@ function SATURATION() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[string(this.maxp)],[string(this.minp)],[string(this.model.nmode)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SATURATION\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } SATURATION.prototype.details = function SATURATION() { @@ -16168,7 +16168,7 @@ function SAT_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[string(this.minp)],[string(this.maxp)],[string(slope)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAT_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } SAT_f.prototype.details = function SAT_f() { @@ -16224,7 +16224,7 @@ function SIGNUM() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [string([1])]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SIGNUM\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(this.exprs),this.gr_i); return new BasicBlock(this.x); } SIGNUM.prototype.details = function SIGNUM() { @@ -16273,7 +16273,7 @@ function SINBLK_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = " "; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SINBLK_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } SINBLK_f.prototype.details = function SINBLK_f() { @@ -16300,7 +16300,7 @@ function TANBLK_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = sci2exp(in1); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TANBLK_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } TANBLK_f.prototype.details = function TANBLK_f() { @@ -16327,7 +16327,7 @@ function TrigFun() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = "sin"; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TrigFun\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } TrigFun.prototype.details = function TrigFun() { @@ -16596,7 +16596,7 @@ function AFFICH_m() { this.model.label = new ScilabString([""]); this.exprs = [[sci2exp([this.model.in,this.model.in2])],[string(this.font)],[string(this.fontsize)],[string(this.colr)],[string(this.nt)],[string(this.nd)],[string(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"AFFICH_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new AfficheBlock(this.x); } AFFICH_m.prototype.details = function AFFICH_m() { @@ -16692,7 +16692,7 @@ function BARXY() { this.model.evtin = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.xmin],[this.xmax],[this.ymin],[this.ymax]); this.model.ipar = new ScilabDouble([1]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],[]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),[]); this.x.graphics.in_implicit = ["E","E"]; this.x.graphics.out_implicit = []; this.x.graphics.exprs = [["-15"],["15"],["-15"],["15"],["1"]]; @@ -16778,7 +16778,7 @@ function CANIMXY() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[string(this.nbr_curves)],[string(this.clrs)],[string(this.siz)],[string(this.win)],["[]"],["[]"],[string(this.xmin)],[string(this.xmax)],[string(this.ymin)],[string(this.ymax)],[string(this.N)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CANIMXY\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } CANIMXY.prototype.details = function CANIMXY() { @@ -16907,7 +16907,7 @@ function CANIMXY3D() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[string(this.nbr_curves)],[strcat(string(this.clrs)," ")],[strcat(string(this.siz)," ")],[string(this.win)],["[]"],["[]"],[strcat(string(this.vec_x)," ")],[strcat(string(this.vec_y)," ")],[strcat(string(this.vec_z)," ")],[strcat(string(this.param3ds)," ")],[string(this.N)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CANIMXY3D\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } CANIMXY3D.prototype.details = function CANIMXY3D() { @@ -17044,7 +17044,7 @@ function CEVENTSCOPE() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[sci2exp(this.nclock)],[strcat(sci2exp(this.clrs[this.nclock-1])," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.per)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CEVENTSCOPE\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } CEVENTSCOPE.prototype.details = function CEVENTSCOPE() { @@ -17151,7 +17151,7 @@ function CFSCOPE() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[strcat(string(this.clrs)," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.ymin)],[string(this.ymax)],[string(this.per)],[string(this.N)],[string([1])]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CFSCOPE\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } CFSCOPE.prototype.details = function CFSCOPE() { @@ -17260,7 +17260,7 @@ function CLKOUTV_f() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = string(this.prt); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,this.exprs," "); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs])," "); return new EventOutBlock(this.x); } CLKOUTV_f.prototype.details = function CLKOUTV_f() { @@ -17360,7 +17360,7 @@ function CLKOUT_f() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = string(this.prt); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,this.exprs," "); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs])," "); return new BasicBlock(this.x); } CLKOUT_f.prototype.details = function CLKOUT_f() { @@ -17420,7 +17420,7 @@ function CMAT3D() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[strcat(string(this.x)," ")],[strcat(string(y)," ")],[string("jetcolormap(25)")],[string(this.cmin)],[string(this.cmax)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CMAT3D\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } CMAT3D.prototype.details = function CMAT3D() { @@ -17498,7 +17498,7 @@ function CMATVIEW() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[string("jetcolormap(25)")],[string(this.cmin)],[string(this.cmax)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CMATVIEW\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } CMATVIEW.prototype.details = function CMATVIEW() { @@ -17575,7 +17575,7 @@ function CMSCOPE() { this.model.dep_ut = new ScilabBoolean([true,false]); this.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()]]; this.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,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } CMSCOPE.prototype.details = function CMSCOPE() { @@ -17726,7 +17726,7 @@ function CSCOPE() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[strcat(string(this.clrs)," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.ymin)],[string(this.ymax)],[string(this.per)],[string(this.N)],[transpose(string(0))],[emptystr()]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CSCOPE\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } CSCOPE.prototype.details = function CSCOPE() { @@ -17852,7 +17852,7 @@ function CSCOPXY() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[string(this.nbr_curves)],[sci2exp(this.clrs)],[sci2exp(this.siz)],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.xmin)],[string(this.xmax)],[string(this.ymin)],[string(this.ymax)],[string(this.N)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CSCOPXY\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } CSCOPXY.prototype.details = function CSCOPXY() { @@ -17980,7 +17980,7 @@ function CSCOPXY3D() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[string(this.nbr_curves)],[strcat(string(this.clrs)," ")],[strcat(string(this.siz)," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[strcat(string(this.vec_x)," ")],[strcat(string(this.vec_y)," ")],[strcat(string(this.vec_z)," ")],[strcat(string(this.param3ds)," ")],[string(this.N)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CSCOPXY3D\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } CSCOPXY3D.prototype.details = function CSCOPXY3D() { @@ -18112,7 +18112,7 @@ function OUTIMPL_f() { this.model.equations = new ScilabDouble([mo]); this.exprs = "1"; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OUTIMPL_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs]),this.gr_i); this.x.graphics.in_implicit = ["I"]; return new ImplicitOutBlock(this.x); } @@ -18169,7 +18169,7 @@ function OUT_f() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = string(this.prt); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OUT_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs]),this.gr_i); return new ExplicitOutBlock(this.x); } OUT_f.prototype.details = function OUT_f() { @@ -18228,7 +18228,7 @@ function TOWS_c() { this.model.dep_ut = new ScilabBoolean([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TOWS_c\",sz(1),sz(2));"]); this.exprs = [[string(this.nz)],[string(this.varnam)],[string(this.herit)]]; - this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } TOWS_c.prototype.details = function TOWS_c() { @@ -18296,7 +18296,7 @@ function TRASH_f() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = " "; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TRASH_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } TRASH_f.prototype.details = function TRASH_f() { @@ -18330,7 +18330,7 @@ function WFILE_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[sci2exp(this.in1)],[fname],[frmt],[string(this.N)]]; this.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,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } WFILE_f.prototype.details = function WFILE_f() { @@ -18435,7 +18435,7 @@ function WRITEAU_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [string(this.N),string(this.swap)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"WRITEAU_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabString(this.exprs),this.gr_i); return new BasicBlock(this.x); } WRITEAU_f.prototype.details = function WRITEAU_f() { @@ -18512,7 +18512,7 @@ function WRITEC_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[sci2exp(this.in1)],[fname],[frmt],[string(this.N),string(this.swap)]]; this.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,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } WRITEC_f.prototype.details = function WRITEC_f() { @@ -18612,7 +18612,7 @@ function CLKINV_f() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = string(this.prt); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKINV_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs]),this.gr_i); return new EventInBlock(this.x); } CLKINV_f.prototype.details = function CLKINV_f() { @@ -18661,7 +18661,7 @@ function CLKIN_f() { this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = string(this.prt); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,this.exprs," "); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs])," "); return new BasicBlock(this.x); } CLKIN_f.prototype.details = function CLKIN_f() { @@ -18909,7 +18909,7 @@ function CONST() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = strcat(sci2exp(this.C)); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([this.exprs]),this.gr_i); return new BasicBlock(this.x); } CONST.prototype.details = function CONST() { @@ -18960,7 +18960,7 @@ function CONST_f() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = strcat(sci2exp(this.C)); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([this.exprs]),this.gr_i); return new BasicBlock(this.x); } CONST_f.prototype.details = function CONST_f() { @@ -19011,7 +19011,7 @@ function CONST_m() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = sci2exp(this.C); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } CONST_m.prototype.details = function CONST_m() { @@ -19097,7 +19097,7 @@ function CURVE_c() { this.model.firing = new ScilabDouble([0]); this.exprs = [[sci2exp(this.Method)],[sci2exp(this.xx)],[sci2exp(this.yy)],[this.PeriodicOption],[Graf]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CURVE_c\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } CURVE_c.prototype.details = function CURVE_c() { @@ -19260,7 +19260,7 @@ function CURV_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CURV_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } CURV_f.prototype.details = function CURV_f() { @@ -19329,7 +19329,7 @@ function Counter() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[string(this.minim)],[string(this.maxim)],[string(this.rule)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Counter\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } Counter.prototype.details = function Counter() { @@ -19382,7 +19382,7 @@ function FROMWSB() { scs_m_1.objs[4-1] = scicos_link(xx=[[338.9421],[358.9421]],yy=[[281.584],[281.584]],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[3,1,1]); this.model = scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMWSB\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([5,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([5,2]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } FROMWSB.prototype.details = function FROMWSB() { @@ -19479,7 +19479,7 @@ function FROMWS_c() { this.model.dep_ut = new ScilabBoolean([false,true]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMWS_c\",sz(1),sz(2));"]); this.exprs = [[string(this.varnam)],[string(this.Method)],[string(this.ZC)],[string(this.OutEnd)]]; - this.x = new standard_define(new ScilabDouble([3.5,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3.5,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } FROMWS_c.prototype.details = function FROMWS_c() { @@ -19556,7 +19556,7 @@ function GENSIN_f() { this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = [[string(rpar[1-1])],[string(rpar[2-1])],[string(rpar[3-1])]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GENSIN_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } GENSIN_f.prototype.details = function GENSIN_f() { @@ -19617,7 +19617,7 @@ function GENSQR_f() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = string(this.Amplitude); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GENSQR_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } GENSQR_f.prototype.details = function GENSQR_f() { @@ -19701,7 +19701,7 @@ function GEN_SQR() { var F = 1; this.exprs = [sci2exp(Amin),sci2exp(Amax),sci2exp(rule),sci2exp(F)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GEN_SQR\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(this.exprs),this.gr_i); return new BasicBlock(this.x); } GEN_SQR.prototype.details = function GEN_SQR() { @@ -19774,7 +19774,7 @@ function Ground_g() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = []; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Ground_g\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } Ground_g.prototype.details = function Ground_g() { @@ -19806,7 +19806,7 @@ function INIMPL_f() { this.prt = 1; this.exprs = "1"; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INIMPL_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs]),this.gr_i); this.x.graphics.out_implicit = ["I"]; return new ImplicitInBlock(this.x); } @@ -19862,7 +19862,7 @@ function IN_f() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = sci2exp(prt); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IN_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs]),this.gr_i); return new ExplicitInBlock(this.x); } IN_f.prototype.details = function IN_f() { @@ -19932,7 +19932,7 @@ function Modulo_Count() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[string(this.ini_c)],[string(this.base)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Modulo_Count\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } Modulo_Count.prototype.details = function Modulo_Count() { @@ -20017,7 +20017,7 @@ function PULSE_SC() { var A = 1; this.exprs = [sci2exp(E),sci2exp(W),sci2exp(F),sci2exp(A)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PULSE_SC\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(this.exprs),this.gr_i); return new BasicBlock(this.x); } PULSE_SC.prototype.details = function PULSE_SC() { @@ -20093,7 +20093,7 @@ function RAMP() { this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = [string(rpar)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAMP\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(this.exprs),this.gr_i); return new BasicBlock(this.x); } RAMP.prototype.details = function RAMP() { @@ -20150,7 +20150,7 @@ function RAND_f() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[string(this.flag)],[sci2exp(this.a.slice())],[sci2exp(this.b.slice())],[string(this.model.dstate[1-1])]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAND_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } RAND_f.prototype.details = function RAND_f() { @@ -20228,7 +20228,7 @@ function RAND_m() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[sci2exp(1)],[string(this.flag)],[sci2exp([this.a])],[sci2exp([this.b])],[sci2exp([this.model.dstate[1-1],int(rand()*(10^7-1))])]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAND_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } RAND_m.prototype.details = function RAND_m() { @@ -20321,7 +20321,7 @@ function READAU_f() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[fname],[string(this.N)],[string(this.swap)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"READAU_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([5,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([5,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } READAU_f.prototype.details = function READAU_f() { @@ -20421,7 +20421,7 @@ function READC_f() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [["[]"],[sci2exp(this.outmask)],[fname],[frmt],[string(this.M)],[string(this.N)],[string(this.offset)],[string(this.swap)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"READC_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } READC_f.prototype.details = function READC_f() { @@ -20558,7 +20558,7 @@ function RFILE_f() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[sci2exp([])],[sci2exp(this.outmask)],[fname],[frmt],[string(this.N)],[sci2exp(out)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RFILE_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } RFILE_f.prototype.details = function RFILE_f() { @@ -20669,7 +20669,7 @@ function SAWTOOTH_f() { this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = " "; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAWTOOTH_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } SAWTOOTH_f.prototype.details = function SAWTOOTH_f() { @@ -20701,7 +20701,7 @@ function STEP() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[string(1)],[string(rpar)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"STEP\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } STEP.prototype.details = function STEP() { @@ -20813,7 +20813,7 @@ function STEP_FUNCTION() { this.model.outtyp = new ScilabDouble([1]); this.model.rpar = scs_m_1; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"STEP_FUNCTION\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } STEP_FUNCTION.prototype.details = function STEP_FUNCTION() { @@ -20897,7 +20897,7 @@ function SampleCLK() { this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[sci2exp(1)],[sci2exp(0)]]; - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs," "); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs)," "); return new BasicBlock(this.x); } SampleCLK.prototype.details = function SampleCLK() { @@ -20960,7 +20960,7 @@ function Sigbuilder() { scs_m_1.objs[8-1] = scicos_link(xx=[[349.49528],[349.49528]],yy=[[565.10704],[535.10704]],id="drawlink",thick=[0,0],ct=[5,-1],from=[3,1,0],to=[7,1,1]); this.model = scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=1,evtin=[],evtout=1,state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Sigbuilder\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } Sigbuilder.prototype.details = function Sigbuilder() { @@ -21047,7 +21047,7 @@ function TIME_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TIME_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } TIME_f.prototype.details = function TIME_f() { @@ -21077,7 +21077,7 @@ function TKSCALE() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[sci2exp(this.a)],[sci2exp(this.b)],[sci2exp(this.f)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TKSCALE\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } TKSCALE.prototype.details = function TKSCALE() { @@ -21124,7 +21124,7 @@ function GENERAL_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[strcat(sci2exp(this.in1))],[strcat(sci2exp(this.out))]]; this.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,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } GENERAL_f.prototype.details = function GENERAL_f() { @@ -21190,7 +21190,7 @@ function NEGTOPOS_f() { this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([true,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NEGTOPOS_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } NEGTOPOS_f.prototype.details = function NEGTOPOS_f() { @@ -21220,7 +21220,7 @@ function POSTONEG_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.model.firing = new ScilabDouble([-1]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"POSTONEG_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } POSTONEG_f.prototype.details = function POSTONEG_f() { @@ -21252,7 +21252,7 @@ function ZCROSS_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = strcat(sci2exp(this.in1)); this.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,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([this.exprs]),this.gr_i); return new BasicBlock(this.x); } ZCROSS_f.prototype.details = function ZCROSS_f() { diff --git a/js/Branching/CLKFROM.js b/js/Branching/CLKFROM.js index 34481156..e194738f 100644 --- a/js/Branching/CLKFROM.js +++ b/js/Branching/CLKFROM.js @@ -9,7 +9,7 @@ function CLKFROM() { this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = "A"; - this.x = new standard_define(new ScilabDouble([2,1]),this.model,this.exprs," "); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabString([this.exprs])," "); this.x.graphics.id = "From"; return new BasicBlock(this.x); } diff --git a/js/Branching/CLKGOTO.js b/js/Branching/CLKGOTO.js index 0bef1950..555bb858 100644 --- a/js/Branching/CLKGOTO.js +++ b/js/Branching/CLKGOTO.js @@ -10,7 +10,7 @@ function CLKGOTO() { this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [["A"],[sci2exp(1)]]; - this.x = new standard_define(new ScilabDouble([2,1]),this.model,this.exprs," "); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabDouble(this.exprs)," "); this.x.graphics.id = "Goto"; return new BasicBlock(this.x); } diff --git a/js/Branching/CLKGotoTagVisibility.js b/js/Branching/CLKGotoTagVisibility.js index 2cd648f3..7a8bad3d 100644 --- a/js/Branching/CLKGotoTagVisibility.js +++ b/js/Branching/CLKGotoTagVisibility.js @@ -16,7 +16,7 @@ function CLKGotoTagVisibility() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = "A"; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKGotoTagVisibility\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } CLKGotoTagVisibility.prototype.details = function CLKGotoTagVisibility() { diff --git a/js/Branching/DEMUX.js b/js/Branching/DEMUX.js index b5646b57..accb79b8 100644 --- a/js/Branching/DEMUX.js +++ b/js/Branching/DEMUX.js @@ -12,7 +12,7 @@ function DEMUX() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = string(this.out); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEMUX\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([.5,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([.5,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } DEMUX.prototype.details = function DEMUX() { diff --git a/js/Branching/DEMUX_f.js b/js/Branching/DEMUX_f.js index b63dc715..5eb55bd9 100644 --- a/js/Branching/DEMUX_f.js +++ b/js/Branching/DEMUX_f.js @@ -12,7 +12,7 @@ function DEMUX_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = string(this.out); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEMUX_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([.5,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([.5,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } DEMUX_f.prototype.details = function DEMUX_f() { diff --git a/js/Branching/ESELECT_f.js b/js/Branching/ESELECT_f.js index 1483d17a..7f84ec33 100644 --- a/js/Branching/ESELECT_f.js +++ b/js/Branching/ESELECT_f.js @@ -16,7 +16,7 @@ function ESELECT_f() { this.model.nzcross = new ScilabDouble([0]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ESELECT_f\",sz(1),sz(2));"]); this.exprs = [[string(this.out)],[string(1)],[string(this.model.nmode)]]; - this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } ESELECT_f.prototype.details = function ESELECT_f() { diff --git a/js/Branching/EXTRACTOR.js b/js/Branching/EXTRACTOR.js index 0db161c1..c04a8ed2 100644 --- a/js/Branching/EXTRACTOR.js +++ b/js/Branching/EXTRACTOR.js @@ -11,7 +11,7 @@ function EXTRACTOR() { this.model.ipar = new ScilabDouble([this.ind]); this.exprs = [sci2exp(this.ind)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACTOR\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(this.exprs),this.gr_i); return new BasicBlock(this.x); } EXTRACTOR.prototype.details = function EXTRACTOR() { diff --git a/js/Branching/FROM.js b/js/Branching/FROM.js index 7168937d..2a798ff9 100644 --- a/js/Branching/FROM.js +++ b/js/Branching/FROM.js @@ -15,7 +15,7 @@ function FROM() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = ["A"]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROM\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,1]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabString(this.exprs),this.gr_i); this.x.graphics.id = "From"; return new BasicBlock(this.x); } diff --git a/js/Branching/FROMMO.js b/js/Branching/FROMMO.js index a0ce70b5..6f28a70c 100644 --- a/js/Branching/FROMMO.js +++ b/js/Branching/FROMMO.js @@ -18,7 +18,7 @@ function FROMMO() { mo.outputs = "n"; this.exprs = ["A"]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMMO\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,1]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabString(this.exprs),this.gr_i); this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); } diff --git a/js/Branching/GOTO.js b/js/Branching/GOTO.js index d68cdc42..9816c30f 100644 --- a/js/Branching/GOTO.js +++ b/js/Branching/GOTO.js @@ -15,7 +15,7 @@ function GOTO() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [["A"],[sci2exp(1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GOTO\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,1]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabDouble(this.exprs),this.gr_i); this.x.graphics.id = "Goto"; return new BasicBlock(this.x); } diff --git a/js/Branching/GOTOMO.js b/js/Branching/GOTOMO.js index 70c4dfd0..09b3aadd 100644 --- a/js/Branching/GOTOMO.js +++ b/js/Branching/GOTOMO.js @@ -18,7 +18,7 @@ function GOTOMO() { mo.inputs = "p"; this.exprs = [["A"],[sci2exp(1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GOTOMO\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,1]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabDouble(this.exprs),this.gr_i); this.x.graphics.in_implicit = ["I"]; return new BasicBlock(this.x); } diff --git a/js/Branching/GotoTagVisibility.js b/js/Branching/GotoTagVisibility.js index c68ee62c..55be12df 100644 --- a/js/Branching/GotoTagVisibility.js +++ b/js/Branching/GotoTagVisibility.js @@ -16,7 +16,7 @@ function GotoTagVisibility() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = "A"; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GotoTagVisibility\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } GotoTagVisibility.prototype.details = function GotoTagVisibility() { diff --git a/js/Branching/GotoTagVisibilityMO.js b/js/Branching/GotoTagVisibilityMO.js index 5fe5f7e6..1fe14ab0 100644 --- a/js/Branching/GotoTagVisibilityMO.js +++ b/js/Branching/GotoTagVisibilityMO.js @@ -16,7 +16,7 @@ function GotoTagVisibilityMO() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = "A"; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GotoTagVisibilityMO\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } GotoTagVisibilityMO.prototype.details = function GotoTagVisibilityMO() { diff --git a/js/Branching/ISELECT_f.js b/js/Branching/ISELECT_f.js index 0146d570..7d356140 100644 --- a/js/Branching/ISELECT_f.js +++ b/js/Branching/ISELECT_f.js @@ -14,7 +14,7 @@ function ISELECT_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[string(this.nout)],[string(this.z0+1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ISELECT_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } ISELECT_f.prototype.details = function ISELECT_f() { diff --git a/js/Branching/ISELECT_m.js b/js/Branching/ISELECT_m.js index 6148db4b..70468296 100644 --- a/js/Branching/ISELECT_m.js +++ b/js/Branching/ISELECT_m.js @@ -22,7 +22,7 @@ function ISELECT_m() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[sci2exp(1)],[sci2exp(this.nout)],[sci2exp(this.z0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ISELECT_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } ISELECT_m.prototype.details = function ISELECT_m() { diff --git a/js/Branching/MUX.js b/js/Branching/MUX.js index 64b4c3c6..4644be89 100644 --- a/js/Branching/MUX.js +++ b/js/Branching/MUX.js @@ -11,7 +11,7 @@ function MUX() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = string(this.in1); this.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,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([.5,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } MUX.prototype.details = function MUX() { diff --git a/js/Branching/MUX_f.js b/js/Branching/MUX_f.js index 5d0bdf43..290188d8 100644 --- a/js/Branching/MUX_f.js +++ b/js/Branching/MUX_f.js @@ -11,7 +11,7 @@ function MUX_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = string(this.in1); this.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,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([0.5,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } MUX_f.prototype.details = function MUX_f() { diff --git a/js/Branching/M_SWITCH.js b/js/Branching/M_SWITCH.js index 843e56a3..16dc2c83 100644 --- a/js/Branching/M_SWITCH.js +++ b/js/Branching/M_SWITCH.js @@ -13,7 +13,7 @@ function M_SWITCH() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[string(this.nin)],[string(ipar)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"M_SWITCH\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } M_SWITCH.prototype.details = function M_SWITCH() { diff --git a/js/Branching/NRMSOM_f.js b/js/Branching/NRMSOM_f.js index 6310a88c..2de15638 100644 --- a/js/Branching/NRMSOM_f.js +++ b/js/Branching/NRMSOM_f.js @@ -11,7 +11,7 @@ function NRMSOM_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [string(this.nin)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NRMSOM_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([.2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([.2,2]),this.model,new ScilabString(this.exprs),this.gr_i); return new BasicBlock(this.x); } NRMSOM_f.prototype.details = function NRMSOM_f() { diff --git a/js/Branching/RELAY_f.js b/js/Branching/RELAY_f.js index c55047f1..579b986f 100644 --- a/js/Branching/RELAY_f.js +++ b/js/Branching/RELAY_f.js @@ -15,7 +15,7 @@ function RELAY_f() { this.model.dep_ut = new ScilabBoolean([true,true]); this.exprs = [[string(this.nin)],[string(i0+1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RELAY_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } RELAY_f.prototype.details = function RELAY_f() { diff --git a/js/Branching/SCALAR2VECTOR.js b/js/Branching/SCALAR2VECTOR.js index 9727f4d0..8442b522 100644 --- a/js/Branching/SCALAR2VECTOR.js +++ b/js/Branching/SCALAR2VECTOR.js @@ -10,7 +10,7 @@ function SCALAR2VECTOR() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [string([this.nout])]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SCALAR2VECTOR\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(this.exprs),this.gr_i); return new BasicBlock(this.x); } SCALAR2VECTOR.prototype.details = function SCALAR2VECTOR() { diff --git a/js/Branching/SELECT_f.js b/js/Branching/SELECT_f.js index ef371a9f..c425cb24 100644 --- a/js/Branching/SELECT_f.js +++ b/js/Branching/SELECT_f.js @@ -14,7 +14,7 @@ function SELECT_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[string(this.nin)],[string(this.z0+1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SELECT_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } SELECT_f.prototype.details = function SELECT_f() { diff --git a/js/Branching/SELECT_m.js b/js/Branching/SELECT_m.js index 7690d04d..b348723c 100644 --- a/js/Branching/SELECT_m.js +++ b/js/Branching/SELECT_m.js @@ -22,7 +22,7 @@ function SELECT_m() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[sci2exp(1)],[sci2exp(this.nin)],[sci2exp(this.z0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SELECT_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } SELECT_m.prototype.details = function SELECT_m() { diff --git a/js/Branching/SWITCH2.js b/js/Branching/SWITCH2.js index f4363888..a6febbdb 100644 --- a/js/Branching/SWITCH2.js +++ b/js/Branching/SWITCH2.js @@ -17,7 +17,7 @@ function SWITCH2() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[string(ipar)],[string(rpar)],[string(this.nzz)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SWITCH2\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } SWITCH2.prototype.details = function SWITCH2() { diff --git a/js/Branching/SWITCH2_m.js b/js/Branching/SWITCH2_m.js index e3f2313a..4950c22a 100644 --- a/js/Branching/SWITCH2_m.js +++ b/js/Branching/SWITCH2_m.js @@ -20,7 +20,7 @@ function SWITCH2_m() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[sci2exp(1)],[string(ipar)],[string(rpar)],[string(this.nzz)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SWITCH2_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } SWITCH2_m.prototype.details = function SWITCH2_m() { diff --git a/js/Branching/SWITCH_f.js b/js/Branching/SWITCH_f.js index 39ab5654..df143ab9 100644 --- a/js/Branching/SWITCH_f.js +++ b/js/Branching/SWITCH_f.js @@ -14,7 +14,7 @@ function SWITCH_f() { this.model.dep_ut = new ScilabBoolean([true,true]); this.exprs = [[string(this.nin)],[string(i0+1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SWITCH_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } SWITCH_f.prototype.details = function SWITCH_f() { diff --git a/js/Electrical/CCS.js b/js/Electrical/CCS.js index d42829ae..236ab983 100644 --- a/js/Electrical/CCS.js +++ b/js/Electrical/CCS.js @@ -44,7 +44,7 @@ function CCS() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = new standard_define(new ScilabDouble([2.1,3]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2.1,3]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); diff --git a/js/Electrical/CVS.js b/js/Electrical/CVS.js index 845ee04d..bf5c66f3 100644 --- a/js/Electrical/CVS.js +++ b/js/Electrical/CVS.js @@ -44,7 +44,7 @@ function CVS() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = new standard_define(new ScilabDouble([2.1,3]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2.1,3]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); diff --git a/js/Electrical/Capacitor.js b/js/Electrical/Capacitor.js index c542eb02..a890eedf 100644 --- a/js/Electrical/Capacitor.js +++ b/js/Electrical/Capacitor.js @@ -18,7 +18,7 @@ function Capacitor() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = string([[this.C],[this.v]]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Capacitor\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,1.1]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,1.1]),this.model,new ScilabString([this.exprs]),list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Electrical/ConstantVoltage.js b/js/Electrical/ConstantVoltage.js index b63e2cc1..bebb9c4e 100644 --- a/js/Electrical/ConstantVoltage.js +++ b/js/Electrical/ConstantVoltage.js @@ -17,7 +17,7 @@ function ConstantVoltage() { this.model.equations = new ScilabDouble([mo]); this.exprs = string(this.V); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ConstantVoltage\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([1.5,1.1]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([1.5,1.1]),this.model,new ScilabString([this.exprs]),list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Electrical/CurrentSensor.js b/js/Electrical/CurrentSensor.js index a2f3b791..a3370ccd 100644 --- a/js/Electrical/CurrentSensor.js +++ b/js/Electrical/CurrentSensor.js @@ -14,7 +14,7 @@ function CurrentSensor() { this.model.equations = new ScilabDouble([mo]); this.exprs = []; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CurrentSensor\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["E"]]; return new BasicBlock(this.x); diff --git a/js/Electrical/Diode.js b/js/Electrical/Diode.js index a25b513d..b6bdc083 100644 --- a/js/Electrical/Diode.js +++ b/js/Electrical/Diode.js @@ -20,7 +20,7 @@ function Diode() { this.model.equations = new ScilabDouble([mo]); this.exprs = string([[this.Ids],[this.Vt],[this.Maxexp],[this.R]]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Diode\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,1]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabString([this.exprs]),list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Electrical/Ground.js b/js/Electrical/Ground.js index 6674fde9..6e22af8e 100644 --- a/js/Electrical/Ground.js +++ b/js/Electrical/Ground.js @@ -13,7 +13,7 @@ function Ground() { this.model.equations = new ScilabDouble([mo]); this.exprs = ""; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Ground\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs]),list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new GroundBlock(this.x); diff --git a/js/Electrical/Gyrator.js b/js/Electrical/Gyrator.js index 9aeea7ab..fa5879d8 100644 --- a/js/Electrical/Gyrator.js +++ b/js/Electrical/Gyrator.js @@ -44,7 +44,7 @@ function Gyrator() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); diff --git a/js/Electrical/IdealTransformer.js b/js/Electrical/IdealTransformer.js index f1df4307..2d7284b9 100644 --- a/js/Electrical/IdealTransformer.js +++ b/js/Electrical/IdealTransformer.js @@ -44,7 +44,7 @@ function IdealTransformer() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(this.exprs),list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); diff --git a/js/Electrical/Inductor.js b/js/Electrical/Inductor.js index 1028683b..e2efde59 100644 --- a/js/Electrical/Inductor.js +++ b/js/Electrical/Inductor.js @@ -17,7 +17,7 @@ function Inductor() { this.model.equations = new ScilabDouble([mo]); this.exprs = string(this.L); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Inductor\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,0.9]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,0.9]),this.model,new ScilabString([this.exprs]),list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Electrical/MOTOR.js b/js/Electrical/MOTOR.js index 6ab8def6..e681218e 100644 --- a/js/Electrical/MOTOR.js +++ b/js/Electrical/MOTOR.js @@ -9,7 +9,7 @@ function MOTOR() { this.model.dep_ut = new ScilabBoolean([true,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MOTOR\",sz(1),sz(2));"]); this.exprs = ""; - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); this.x.graphics.out_implicit = [["I"],["I"]]; this.x.graphics.in_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Electrical/NMOS.js b/js/Electrical/NMOS.js index ce637283..9976ae99 100644 --- a/js/Electrical/NMOS.js +++ b/js/Electrical/NMOS.js @@ -24,7 +24,7 @@ function NMOS() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = [[string(this.W)],[string(this.L)],[string(this.Beta)],[string(this.Vt)],[string(this.K2)],[string(this.K5)],[string(this.dW)],[string(this.dL)],[string(this.RDS)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NMOS\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["I"],["I"]]; return new BasicBlock(this.x); diff --git a/js/Electrical/NPN.js b/js/Electrical/NPN.js index cd19be1e..665dbda0 100644 --- a/js/Electrical/NPN.js +++ b/js/Electrical/NPN.js @@ -44,7 +44,7 @@ function NPN() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); diff --git a/js/Electrical/OpAmp.js b/js/Electrical/OpAmp.js index e93e98cd..469ab014 100644 --- a/js/Electrical/OpAmp.js +++ b/js/Electrical/OpAmp.js @@ -18,7 +18,7 @@ function OpAmp() { this.model.rpar = new ScilabDouble(Z); this.exprs = string(Z); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OpAmp\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,5]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,5]),this.model,new ScilabString([this.exprs]),this.gr_i); this.x.graphics.in_implicit = [["I"],["I"]]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Electrical/PMOS.js b/js/Electrical/PMOS.js index b0f62361..f031f236 100644 --- a/js/Electrical/PMOS.js +++ b/js/Electrical/PMOS.js @@ -24,7 +24,7 @@ function PMOS() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = [[string(this.W)],[string(this.L)],[string(this.Beta)],[string(this.Vt)],[string(this.K2)],[string(this.K5)],[string(this.dW)],[string(this.dL)],[string(this.RDS)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PMOS\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["I"],["I"]]; return new BasicBlock(this.x); diff --git a/js/Electrical/PNP.js b/js/Electrical/PNP.js index 676cf5fd..ef2e280b 100644 --- a/js/Electrical/PNP.js +++ b/js/Electrical/PNP.js @@ -44,7 +44,7 @@ function PNP() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); diff --git a/js/Electrical/PotentialSensor.js b/js/Electrical/PotentialSensor.js index f5c9b76f..ae77c13a 100644 --- a/js/Electrical/PotentialSensor.js +++ b/js/Electrical/PotentialSensor.js @@ -14,7 +14,7 @@ function PotentialSensor() { mo.outputs = ["v"]; this.model.equations = new ScilabDouble([mo]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PotentialSensor\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,"",list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([""]),list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["E"]; return new BasicBlock(this.x); diff --git a/js/Electrical/Resistor.js b/js/Electrical/Resistor.js index ef2dcf5e..383e2735 100644 --- a/js/Electrical/Resistor.js +++ b/js/Electrical/Resistor.js @@ -17,7 +17,7 @@ function Resistor() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = string(this.R); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Resistor\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,1]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabString([this.exprs]),list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Electrical/SineVoltage.js b/js/Electrical/SineVoltage.js index 87b6e622..f4c18f51 100644 --- a/js/Electrical/SineVoltage.js +++ b/js/Electrical/SineVoltage.js @@ -21,7 +21,7 @@ function SineVoltage() { this.model.equations = new ScilabDouble([mo]); this.exprs = [[string(this.V)],[string(this.ph)],[string(this.frq)],[string(this.offset)],[string(this.start)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SineVoltage\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Electrical/Switch.js b/js/Electrical/Switch.js index ff334d1c..35407ac3 100644 --- a/js/Electrical/Switch.js +++ b/js/Electrical/Switch.js @@ -20,7 +20,7 @@ function Switch() { this.model.rpar = new ScilabDouble([Z]); this.exprs = string(Z); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Switch\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),list(this.gr_i,0)); this.x.graphics.in_implicit = [["I"],["E"]]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Electrical/VVsourceAC.js b/js/Electrical/VVsourceAC.js index 60dfb33b..49e9325c 100644 --- a/js/Electrical/VVsourceAC.js +++ b/js/Electrical/VVsourceAC.js @@ -18,7 +18,7 @@ function VVsourceAC() { this.model.equations = new ScilabDouble([mo]); this.exprs = [string(this.FR)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VVsourceAC\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(this.exprs),list(this.gr_i,0)); this.x.graphics.in_implicit = ["I","E"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Electrical/VariableResistor.js b/js/Electrical/VariableResistor.js index 40e446e7..2c884ba0 100644 --- a/js/Electrical/VariableResistor.js +++ b/js/Electrical/VariableResistor.js @@ -14,7 +14,7 @@ function VariableResistor() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = []; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VariableResistor\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); this.x.graphics.in_implicit = ["I","E"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Electrical/VoltageSensor.js b/js/Electrical/VoltageSensor.js index 3434e243..7ad9fe30 100644 --- a/js/Electrical/VoltageSensor.js +++ b/js/Electrical/VoltageSensor.js @@ -14,7 +14,7 @@ function VoltageSensor() { this.model.equations = new ScilabDouble([mo]); this.exprs = []; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VoltageSensor\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = [["I"],["E"]]; return new VoltageSensorBlock(this.x); diff --git a/js/Electrical/VsourceAC.js b/js/Electrical/VsourceAC.js index 72276f83..549b2b5e 100644 --- a/js/Electrical/VsourceAC.js +++ b/js/Electrical/VsourceAC.js @@ -18,7 +18,7 @@ function VsourceAC() { this.model.equations = new ScilabDouble([mo]); this.exprs = [[string(this.VA)],[string(this.FR)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VsourceAC\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Events/ANDLOG_f.js b/js/Events/ANDLOG_f.js index 6673fc62..127795ca 100644 --- a/js/Events/ANDLOG_f.js +++ b/js/Events/ANDLOG_f.js @@ -9,7 +9,7 @@ function ANDLOG_f() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ANDLOG_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,3]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([3,3]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } ANDLOG_f.prototype.details = function ANDLOG_f() { diff --git a/js/Events/CLKSOMV_f.js b/js/Events/CLKSOMV_f.js index 86479052..a4c2d797 100644 --- a/js/Events/CLKSOMV_f.js +++ b/js/Events/CLKSOMV_f.js @@ -9,7 +9,7 @@ function CLKSOMV_f() { this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKSOMV_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } CLKSOMV_f.prototype.details = function CLKSOMV_f() { diff --git a/js/Events/CLKSOM_f.js b/js/Events/CLKSOM_f.js index f1961cbc..b0e8c31c 100644 --- a/js/Events/CLKSOM_f.js +++ b/js/Events/CLKSOM_f.js @@ -9,7 +9,7 @@ function CLKSOM_f() { this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKSOM_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } CLKSOM_f.prototype.details = function CLKSOM_f() { diff --git a/js/Events/CLKSPLIT_f.js b/js/Events/CLKSPLIT_f.js index 87ce8b0d..6b55e089 100644 --- a/js/Events/CLKSPLIT_f.js +++ b/js/Events/CLKSPLIT_f.js @@ -8,7 +8,7 @@ function CLKSPLIT_f() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabBoolean([false,false,false]); this.model.dep_ut = new ScilabBoolean([false,false]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,[],[]); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabDouble([]),[]); return new BasicBlock(this.x); } CLKSPLIT_f.prototype.details = function CLKSPLIT_f() { diff --git a/js/Events/END_c.js b/js/Events/END_c.js index 455cc875..d1c5817a 100644 --- a/js/Events/END_c.js +++ b/js/Events/END_c.js @@ -11,7 +11,7 @@ function END_c() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = string(this.tf); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"END_c\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } END_c.prototype.details = function END_c() { diff --git a/js/Events/EVTDLY_c.js b/js/Events/EVTDLY_c.js index 98e5f88b..0abb9bca 100644 --- a/js/Events/EVTDLY_c.js +++ b/js/Events/EVTDLY_c.js @@ -13,7 +13,7 @@ function EVTDLY_c() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[string(this.dt)],[sci2exp(this.ff)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTDLY_c\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } EVTDLY_c.prototype.details = function EVTDLY_c() { diff --git a/js/Events/EVTDLY_f.js b/js/Events/EVTDLY_f.js index 0933ae9c..cd9c607b 100644 --- a/js/Events/EVTDLY_f.js +++ b/js/Events/EVTDLY_f.js @@ -13,7 +13,7 @@ function EVTDLY_f() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[string(this.dt)],[sci2exp(this.ff)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTDLY_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } EVTDLY_f.prototype.details = function EVTDLY_f() { diff --git a/js/Events/EVTGEN_f.js b/js/Events/EVTGEN_f.js index 9b8ad9c9..5c835346 100644 --- a/js/Events/EVTGEN_f.js +++ b/js/Events/EVTGEN_f.js @@ -10,7 +10,7 @@ function EVTGEN_f() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = string(this.tt); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTGEN_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } EVTGEN_f.prototype.details = function EVTGEN_f() { diff --git a/js/Events/EVTVARDLY.js b/js/Events/EVTVARDLY.js index cf5b553a..4732544f 100644 --- a/js/Events/EVTVARDLY.js +++ b/js/Events/EVTVARDLY.js @@ -12,7 +12,7 @@ function EVTVARDLY() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = string(this.model.firing); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EVTVARDLY\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } EVTVARDLY.prototype.details = function EVTVARDLY() { diff --git a/js/Events/HALT_f.js b/js/Events/HALT_f.js index 7d5fd5c3..e0ab69c9 100644 --- a/js/Events/HALT_f.js +++ b/js/Events/HALT_f.js @@ -11,7 +11,7 @@ function HALT_f() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = string(this.n); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"HALT_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } HALT_f.prototype.details = function HALT_f() { diff --git a/js/Events/IFTHEL_f.js b/js/Events/IFTHEL_f.js index 7ec78219..9a805282 100644 --- a/js/Events/IFTHEL_f.js +++ b/js/Events/IFTHEL_f.js @@ -15,7 +15,7 @@ function IFTHEL_f() { this.model.nzcross = new ScilabDouble([1]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IFTHEL_f\",sz(1),sz(2));"]); this.exprs = [[string(this.model.in)],[string(this.model.nmode)]]; - this.x = new standard_define(new ScilabDouble([3,3]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,3]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } IFTHEL_f.prototype.details = function IFTHEL_f() { diff --git a/js/Events/MFCLCK_f.js b/js/Events/MFCLCK_f.js index 74eb8405..72992ea3 100644 --- a/js/Events/MFCLCK_f.js +++ b/js/Events/MFCLCK_f.js @@ -15,7 +15,7 @@ function MFCLCK_f() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[string(this.dt)],[string(this.nn)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MFCLCK_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } MFCLCK_f.prototype.details = function MFCLCK_f() { diff --git a/js/Events/M_freq.js b/js/Events/M_freq.js index 255e34a0..1b3ee90b 100644 --- a/js/Events/M_freq.js +++ b/js/Events/M_freq.js @@ -12,7 +12,7 @@ function M_freq() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[sci2exp([[1],[2]])],[sci2exp([[0],[0]])]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"M_freq\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } M_freq.prototype.details = function M_freq() { diff --git a/js/Events/VirtualCLK0.js b/js/Events/VirtualCLK0.js index 6beb5115..dc7c6dad 100644 --- a/js/Events/VirtualCLK0.js +++ b/js/Events/VirtualCLK0.js @@ -10,7 +10,7 @@ function VirtualCLK0() { this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = []; - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs," "); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs)," "); return new BasicBlock(this.x); } VirtualCLK0.prototype.details = function VirtualCLK0() { diff --git a/js/Events/freq_div.js b/js/Events/freq_div.js index 17094d5d..faa29011 100644 --- a/js/Events/freq_div.js +++ b/js/Events/freq_div.js @@ -104,7 +104,7 @@ function freq_div() { this.model.evtout = new ScilabDouble([1]); this.model.rpar = scs_m_1; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"freq_div\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } freq_div.prototype.details = function freq_div() { diff --git a/js/Hydraulics/Bache.js b/js/Hydraulics/Bache.js index 7d023475..ffef23e2 100644 --- a/js/Hydraulics/Bache.js +++ b/js/Hydraulics/Bache.js @@ -29,7 +29,7 @@ function Bache() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = [[string(this.Patm)],[string(this.A)],[string(this.ze1)],[string(this.ze2)],[string(this.zs1)],[string(this.zs2)],[string(this.z0)],[string(this.T0)],[string(this.p_rho)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Bache\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); this.x.graphics.in_implicit = [["I"],["I"]]; this.x.graphics.out_implicit = [["I"],["I"],["E"]]; return new BasicBlock(this.x); diff --git a/js/Hydraulics/Flowmeter.js b/js/Hydraulics/Flowmeter.js index 7c6a1701..b4af13cd 100644 --- a/js/Hydraulics/Flowmeter.js +++ b/js/Hydraulics/Flowmeter.js @@ -44,7 +44,7 @@ function Flowmeter() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); this.model.out = new ScilabDouble([ones(size(MO,"*"),1)]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),list(this.gr_i,0)); this.x.graphics.in_implicit = Typein; this.x.graphics.out_implicit = Typeout; return new BasicBlock(this.x); diff --git a/js/Hydraulics/PerteDP.js b/js/Hydraulics/PerteDP.js index 1fdb0f97..7bb2c434 100644 --- a/js/Hydraulics/PerteDP.js +++ b/js/Hydraulics/PerteDP.js @@ -24,7 +24,7 @@ function PerteDP() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = [[string(this.L)],[string(this.D)],[string(this.lambda)],[string(this.z1)],[string(this.z2)],[string(this.p_rho)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PerteDP\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,1]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,1]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/Hydraulics/PuitsP.js b/js/Hydraulics/PuitsP.js index 04757d92..e9043c22 100644 --- a/js/Hydraulics/PuitsP.js +++ b/js/Hydraulics/PuitsP.js @@ -18,7 +18,7 @@ function PuitsP() { this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.exprs = [[string(this.P0)],[string(this.T0)],[string(this.H0)],[string(this.option_temperature)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PuitsP\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); this.x.graphics.in_implicit = ["I"]; return new BasicBlock(this.x); } diff --git a/js/Hydraulics/SourceP.js b/js/Hydraulics/SourceP.js index e7ad3820..7d36cfba 100644 --- a/js/Hydraulics/SourceP.js +++ b/js/Hydraulics/SourceP.js @@ -20,7 +20,7 @@ function SourceP() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = [[string(this.P0)],[string(this.T0)],[string(this.H0)],[string(this.option_temperature)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SourceP\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); } diff --git a/js/Hydraulics/VanneReglante.js b/js/Hydraulics/VanneReglante.js index 30a07f29..7d5dd695 100644 --- a/js/Hydraulics/VanneReglante.js +++ b/js/Hydraulics/VanneReglante.js @@ -20,7 +20,7 @@ function VanneReglante() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); this.exprs = [[string(this.Cvmax)],[string(this.p_rho)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VanneReglante\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,list(this.gr_i,0)); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),list(this.gr_i,0)); this.x.graphics.in_implicit = [["I"],["E"]]; this.x.graphics.out_implicit = ["I"]; return new BasicBlock(this.x); diff --git a/js/IntegerOp/BITCLEAR.js b/js/IntegerOp/BITCLEAR.js index 3f6a6448..812312a1 100644 --- a/js/IntegerOp/BITCLEAR.js +++ b/js/IntegerOp/BITCLEAR.js @@ -14,7 +14,7 @@ function BITCLEAR() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[sci2exp(3)],[sci2exp(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BITCLEAR\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } BITCLEAR.prototype.details = function BITCLEAR() { diff --git a/js/IntegerOp/BITSET.js b/js/IntegerOp/BITSET.js index b53090c8..035218c4 100644 --- a/js/IntegerOp/BITSET.js +++ b/js/IntegerOp/BITSET.js @@ -14,7 +14,7 @@ function BITSET() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[sci2exp(3)],[sci2exp(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BITSET\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } BITSET.prototype.details = function BITSET() { diff --git a/js/IntegerOp/CONVERT.js b/js/IntegerOp/CONVERT.js index b12dacbf..1eac1fae 100644 --- a/js/IntegerOp/CONVERT.js +++ b/js/IntegerOp/CONVERT.js @@ -16,7 +16,7 @@ function CONVERT() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[sci2exp(1)],[sci2exp(3)],[sci2exp(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONVERT\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } CONVERT.prototype.details = function CONVERT() { diff --git a/js/IntegerOp/DFLIPFLOP.js b/js/IntegerOp/DFLIPFLOP.js index 0d028b5c..7a0219c8 100644 --- a/js/IntegerOp/DFLIPFLOP.js +++ b/js/IntegerOp/DFLIPFLOP.js @@ -89,7 +89,7 @@ function DFLIPFLOP() { this.model.dep_ut = new ScilabBoolean([true,false]); this.model.rpar = new ScilabDouble([scs_m]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DFLIPFLOP\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,3]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } DFLIPFLOP.prototype.details = function DFLIPFLOP() { diff --git a/js/IntegerOp/DLATCH.js b/js/IntegerOp/DLATCH.js index c9e8d9b6..da4d72f4 100644 --- a/js/IntegerOp/DLATCH.js +++ b/js/IntegerOp/DLATCH.js @@ -34,7 +34,7 @@ function DLATCH() { this.model.dep_ut = new ScilabBoolean([true,false]); this.model.rpar = new ScilabDouble([scs_m]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLATCH\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,3]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } DLATCH.prototype.details = function DLATCH() { diff --git a/js/IntegerOp/EXTRACTBITS.js b/js/IntegerOp/EXTRACTBITS.js index b2623451..66c5dbfb 100644 --- a/js/IntegerOp/EXTRACTBITS.js +++ b/js/IntegerOp/EXTRACTBITS.js @@ -15,7 +15,7 @@ function EXTRACTBITS() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[sci2exp(3)],[sci2exp(1)],[sci2exp(0)],[sci2exp(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACTBITS\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } EXTRACTBITS.prototype.details = function EXTRACTBITS() { diff --git a/js/IntegerOp/INTMUL.js b/js/IntegerOp/INTMUL.js index 881cf447..e0670d92 100644 --- a/js/IntegerOp/INTMUL.js +++ b/js/IntegerOp/INTMUL.js @@ -16,7 +16,7 @@ function INTMUL() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[sci2exp(3)],[sci2exp(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTMUL\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } INTMUL.prototype.details = function INTMUL() { diff --git a/js/IntegerOp/JKFLIPFLOP.js b/js/IntegerOp/JKFLIPFLOP.js index 3c8ab1e0..fefbe032 100644 --- a/js/IntegerOp/JKFLIPFLOP.js +++ b/js/IntegerOp/JKFLIPFLOP.js @@ -45,7 +45,7 @@ function JKFLIPFLOP() { this.model.dep_ut = new ScilabBoolean([true,false]); this.model.rpar = new ScilabDouble([scs_m]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"JKFLIPFLOP\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,3]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } JKFLIPFLOP.prototype.details = function JKFLIPFLOP() { diff --git a/js/IntegerOp/LOGIC.js b/js/IntegerOp/LOGIC.js index 013b216f..ce05e1ab 100644 --- a/js/IntegerOp/LOGIC.js +++ b/js/IntegerOp/LOGIC.js @@ -17,7 +17,7 @@ function LOGIC() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[sci2exp(this.mat)],[sci2exp(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOGIC\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } LOGIC.prototype.details = function LOGIC() { diff --git a/js/IntegerOp/SHIFT.js b/js/IntegerOp/SHIFT.js index bc9058b6..bb7c16b6 100644 --- a/js/IntegerOp/SHIFT.js +++ b/js/IntegerOp/SHIFT.js @@ -17,7 +17,7 @@ function SHIFT() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[sci2exp(3)],[sci2exp(0)],[sci2exp(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SHIFT\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } SHIFT.prototype.details = function SHIFT() { diff --git a/js/IntegerOp/SRFLIPFLOP.js b/js/IntegerOp/SRFLIPFLOP.js index 90b4c965..c0256cd3 100644 --- a/js/IntegerOp/SRFLIPFLOP.js +++ b/js/IntegerOp/SRFLIPFLOP.js @@ -29,7 +29,7 @@ function SRFLIPFLOP() { this.model.dep_ut = new ScilabBoolean([true,false]); this.model.rpar = new ScilabDouble([scs_m]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SRFLIPFLOP\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,3]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } SRFLIPFLOP.prototype.details = function SRFLIPFLOP() { diff --git a/js/Linear/BIGSOM_f.js b/js/Linear/BIGSOM_f.js index 19a2132e..7eab70db 100644 --- a/js/Linear/BIGSOM_f.js +++ b/js/Linear/BIGSOM_f.js @@ -11,7 +11,7 @@ function BIGSOM_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = sci2exp(this.sgn); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BIGSOM_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,3]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BigSom(this.x); } BIGSOM_f.prototype.details = function BIGSOM_f() { diff --git a/js/Linear/CLINDUMMY_f.js b/js/Linear/CLINDUMMY_f.js index 14724c74..648c9aec 100644 --- a/js/Linear/CLINDUMMY_f.js +++ b/js/Linear/CLINDUMMY_f.js @@ -9,7 +9,7 @@ function CLINDUMMY_f() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([false,true]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLINDUMMY_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } CLINDUMMY_f.prototype.details = function CLINDUMMY_f() { diff --git a/js/Linear/CLR.js b/js/Linear/CLR.js index d134aa43..96bce872 100644 --- a/js/Linear/CLR.js +++ b/js/Linear/CLR.js @@ -16,7 +16,7 @@ function CLR() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLR\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } CLR.prototype.details = function CLR() { diff --git a/js/Linear/CLR_f.js b/js/Linear/CLR_f.js index 6d85a901..c6a4f351 100644 --- a/js/Linear/CLR_f.js +++ b/js/Linear/CLR_f.js @@ -16,7 +16,7 @@ function CLR_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLR_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2.5,2.5]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2.5,2.5]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } CLR_f.prototype.details = function CLR_f() { diff --git a/js/Linear/CLSS.js b/js/Linear/CLSS.js index 2b13f73d..bd2aa780 100644 --- a/js/Linear/CLSS.js +++ b/js/Linear/CLSS.js @@ -18,7 +18,7 @@ function CLSS() { this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLSS\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } CLSS.prototype.details = function CLSS() { diff --git a/js/Linear/CLSS_f.js b/js/Linear/CLSS_f.js index 3983e7cc..d8232101 100644 --- a/js/Linear/CLSS_f.js +++ b/js/Linear/CLSS_f.js @@ -18,7 +18,7 @@ function CLSS_f() { this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLSS_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } CLSS_f.prototype.details = function CLSS_f() { diff --git a/js/Linear/DELAYV_f.js b/js/Linear/DELAYV_f.js index 16d1eefe..7677921c 100644 --- a/js/Linear/DELAYV_f.js +++ b/js/Linear/DELAYV_f.js @@ -18,7 +18,7 @@ function DELAYV_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[string(this.nin)],[strcat(string(z0.slice(1-1,$-1)),";")],[string(this.T)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DELAYV_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } DELAYV_f.prototype.details = function DELAYV_f() { diff --git a/js/Linear/DERIV.js b/js/Linear/DERIV.js index 12e3c7ef..8d2599b3 100644 --- a/js/Linear/DERIV.js +++ b/js/Linear/DERIV.js @@ -9,7 +9,7 @@ function DERIV() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = []; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DERIV\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } DERIV.prototype.details = function DERIV() { diff --git a/js/Linear/DIFF_c.js b/js/Linear/DIFF_c.js index 93835c18..8167fd08 100644 --- a/js/Linear/DIFF_c.js +++ b/js/Linear/DIFF_c.js @@ -11,7 +11,7 @@ function DIFF_c() { this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = [[strcat(sci2exp(this.x0[1-1]))],[strcat(sci2exp(this.x0[2-1]))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DIFF_c\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } DIFF_c.prototype.details = function DIFF_c() { diff --git a/js/Linear/DLR.js b/js/Linear/DLR.js index 366af3a3..301fee22 100644 --- a/js/Linear/DLR.js +++ b/js/Linear/DLR.js @@ -17,7 +17,7 @@ function DLR() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLR\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } DLR.prototype.details = function DLR() { diff --git a/js/Linear/DLR_f.js b/js/Linear/DLR_f.js index b265a2b0..382213dc 100644 --- a/js/Linear/DLR_f.js +++ b/js/Linear/DLR_f.js @@ -17,7 +17,7 @@ function DLR_f() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLR_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2.5,2.5]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2.5,2.5]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } DLR_f.prototype.details = function DLR_f() { diff --git a/js/Linear/DLSS.js b/js/Linear/DLSS.js index a99c81d3..686c712e 100644 --- a/js/Linear/DLSS.js +++ b/js/Linear/DLSS.js @@ -17,7 +17,7 @@ function DLSS() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLSS\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } DLSS.prototype.details = function DLSS() { diff --git a/js/Linear/DLSS_f.js b/js/Linear/DLSS_f.js index 4afcf99d..a1f27482 100644 --- a/js/Linear/DLSS_f.js +++ b/js/Linear/DLSS_f.js @@ -17,7 +17,7 @@ function DLSS_f() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLSS_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } DLSS_f.prototype.details = function DLSS_f() { diff --git a/js/Linear/DOLLAR.js b/js/Linear/DOLLAR.js index 3b5d3ae4..6541259b 100644 --- a/js/Linear/DOLLAR.js +++ b/js/Linear/DOLLAR.js @@ -14,7 +14,7 @@ function DOLLAR() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } DOLLAR.prototype.details = function DOLLAR() { diff --git a/js/Linear/DOLLAR_f.js b/js/Linear/DOLLAR_f.js index 0e89c063..2d580656 100644 --- a/js/Linear/DOLLAR_f.js +++ b/js/Linear/DOLLAR_f.js @@ -14,7 +14,7 @@ function DOLLAR_f() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } DOLLAR_f.prototype.details = function DOLLAR_f() { diff --git a/js/Linear/DOLLAR_m.js b/js/Linear/DOLLAR_m.js index 9ccaa250..e33e3d33 100644 --- a/js/Linear/DOLLAR_m.js +++ b/js/Linear/DOLLAR_m.js @@ -14,7 +14,7 @@ function DOLLAR_m() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DOLLAR_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } DOLLAR_m.prototype.details = function DOLLAR_m() { diff --git a/js/Linear/GAINBLK.js b/js/Linear/GAINBLK.js index 89a5ca05..69ba2837 100644 --- a/js/Linear/GAINBLK.js +++ b/js/Linear/GAINBLK.js @@ -17,7 +17,7 @@ function GAINBLK() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [strcat(sci2exp(this.gain))]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAINBLK\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } GAINBLK.prototype.details = function GAINBLK() { diff --git a/js/Linear/GAINBLK_f.js b/js/Linear/GAINBLK_f.js index ee9759a4..2b768006 100644 --- a/js/Linear/GAINBLK_f.js +++ b/js/Linear/GAINBLK_f.js @@ -13,7 +13,7 @@ function GAINBLK_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [strcat(sci2exp(this.gain))]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAINBLK_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } GAINBLK_f.prototype.details = function GAINBLK_f() { diff --git a/js/Linear/GAIN_f.js b/js/Linear/GAIN_f.js index 1588ff5f..026f9ccb 100644 --- a/js/Linear/GAIN_f.js +++ b/js/Linear/GAIN_f.js @@ -13,7 +13,7 @@ function GAIN_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[strcat(sci2exp(this.gain))],[strcat(sci2exp(in1))],[strcat(sci2exp(out))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GAIN_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } GAIN_f.prototype.details = function GAIN_f() { diff --git a/js/Linear/INTEGRAL.js b/js/Linear/INTEGRAL.js index b2237506..b2aabccd 100644 --- a/js/Linear/INTEGRAL.js +++ b/js/Linear/INTEGRAL.js @@ -14,7 +14,7 @@ function INTEGRAL() { this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = string([[0],[0],[0],[this.maxp],[minp]]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); this.x.graphics.id = "1/s"; return new BasicBlock(this.x); } diff --git a/js/Linear/INTEGRAL_f.js b/js/Linear/INTEGRAL_f.js index f12f476a..ba635b5b 100644 --- a/js/Linear/INTEGRAL_f.js +++ b/js/Linear/INTEGRAL_f.js @@ -11,7 +11,7 @@ function INTEGRAL_f() { this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = strcat(sci2exp(this.x0)); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([this.exprs]),this.gr_i); return new BasicBlock(this.x); } INTEGRAL_f.prototype.details = function INTEGRAL_f() { diff --git a/js/Linear/INTEGRAL_m.js b/js/Linear/INTEGRAL_m.js index 3977d3c9..a3e59a09 100644 --- a/js/Linear/INTEGRAL_m.js +++ b/js/Linear/INTEGRAL_m.js @@ -16,7 +16,7 @@ function INTEGRAL_m() { this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = string([[0],[0],[0],[this.maxp],[minp]]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTEGRAL_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } INTEGRAL_m.prototype.details = function INTEGRAL_m() { diff --git a/js/Linear/PID.js b/js/Linear/PID.js index 179f12df..5e6e980e 100644 --- a/js/Linear/PID.js +++ b/js/Linear/PID.js @@ -36,7 +36,7 @@ function PID() { this.model.dep_ut = new ScilabBoolean([false,false]); this.model.rpar = new ScilabDouble([scs_m]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PID\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } PID.prototype.details = function PID() { diff --git a/js/Linear/REGISTER.js b/js/Linear/REGISTER.js index 03e3b2a0..f4e7e926 100644 --- a/js/Linear/REGISTER.js +++ b/js/Linear/REGISTER.js @@ -12,7 +12,7 @@ function REGISTER() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = strcat(string(this.z0),";"); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"REGISTER\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([this.exprs]),this.gr_i); return new BasicBlock(this.x); } REGISTER.prototype.details = function REGISTER() { diff --git a/js/Linear/REGISTER_f.js b/js/Linear/REGISTER_f.js index 094eef62..b593af07 100644 --- a/js/Linear/REGISTER_f.js +++ b/js/Linear/REGISTER_f.js @@ -12,7 +12,7 @@ function REGISTER_f() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = strcat(string(this.z0),";"); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"REGISTER_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2.5,2.5]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2.5,2.5]),this.model,new ScilabDouble([this.exprs]),this.gr_i); return new BasicBlock(this.x); } REGISTER_f.prototype.details = function REGISTER_f() { diff --git a/js/Linear/SAMPHOLD.js b/js/Linear/SAMPHOLD.js index 70de60f7..819763e1 100644 --- a/js/Linear/SAMPHOLD.js +++ b/js/Linear/SAMPHOLD.js @@ -10,7 +10,7 @@ function SAMPHOLD() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([true,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPHOLD\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model," ",this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([" "]),this.gr_i); return new BasicBlock(this.x); } SAMPHOLD.prototype.details = function SAMPHOLD() { diff --git a/js/Linear/SAMPHOLD_m.js b/js/Linear/SAMPHOLD_m.js index 4ca5517d..efc1adcc 100644 --- a/js/Linear/SAMPHOLD_m.js +++ b/js/Linear/SAMPHOLD_m.js @@ -14,7 +14,7 @@ function SAMPHOLD_m() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPHOLD_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i); return new BasicBlock(this.x); } SAMPHOLD_m.prototype.details = function SAMPHOLD_m() { diff --git a/js/Linear/SAMPLEHOLD_f.js b/js/Linear/SAMPLEHOLD_f.js index dae59724..fb9efb53 100644 --- a/js/Linear/SAMPLEHOLD_f.js +++ b/js/Linear/SAMPLEHOLD_f.js @@ -10,7 +10,7 @@ function SAMPLEHOLD_f() { this.model.blocktype = new ScilabString(["d"]); this.model.dep_ut = new ScilabBoolean([true,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAMPLEHOLD_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model," ",this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([" "]),this.gr_i); return new BasicBlock(this.x); } SAMPLEHOLD_f.prototype.details = function SAMPLEHOLD_f() { diff --git a/js/Linear/SOM_f.js b/js/Linear/SOM_f.js index 2682f8a8..b01c8bf5 100644 --- a/js/Linear/SOM_f.js +++ b/js/Linear/SOM_f.js @@ -11,7 +11,7 @@ function SOM_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[sci2exp(1)],[sci2exp(sgn)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SOM_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } SOM_f.prototype.details = function SOM_f() { diff --git a/js/Linear/SUMMATION.js b/js/Linear/SUMMATION.js index 84a441a8..905cc973 100644 --- a/js/Linear/SUMMATION.js +++ b/js/Linear/SUMMATION.js @@ -13,7 +13,7 @@ function SUMMATION() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = sci2exp(this.sgn); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUMMATION\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,3]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabString([this.exprs]),this.gr_i); return new Summation(this.x); } SUMMATION.prototype.details = function SUMMATION() { diff --git a/js/Linear/SUM_f.js b/js/Linear/SUM_f.js index 7cf09c90..e4bb2f8a 100644 --- a/js/Linear/SUM_f.js +++ b/js/Linear/SUM_f.js @@ -9,7 +9,7 @@ function SUM_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUM_f\",sz(1),sz(2));"]); this.exprs = []; - this.x = new standard_define(new ScilabDouble([1,1]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } SUM_f.prototype.details = function SUM_f() { diff --git a/js/Linear/TCLSS.js b/js/Linear/TCLSS.js index 3fda1d85..56aa6d16 100644 --- a/js/Linear/TCLSS.js +++ b/js/Linear/TCLSS.js @@ -20,7 +20,7 @@ function TCLSS() { this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TCLSS\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } TCLSS.prototype.details = function TCLSS() { diff --git a/js/Linear/TCLSS_f.js b/js/Linear/TCLSS_f.js index a92c94d8..e224fbf0 100644 --- a/js/Linear/TCLSS_f.js +++ b/js/Linear/TCLSS_f.js @@ -20,7 +20,7 @@ function TCLSS_f() { this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = [[strcat(sci2exp(this.A))],[strcat(sci2exp(this.B))],[strcat(sci2exp(this.C))],[strcat(sci2exp(this.D))],[strcat(sci2exp(this.x0))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TCLSS_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } TCLSS_f.prototype.details = function TCLSS_f() { diff --git a/js/Linear/TIME_DELAY.js b/js/Linear/TIME_DELAY.js index 89bc8dc3..6898b79a 100644 --- a/js/Linear/TIME_DELAY.js +++ b/js/Linear/TIME_DELAY.js @@ -15,7 +15,7 @@ function TIME_DELAY() { this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = [[string(this.T)],[string(this.init)],[string(this.N)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TIME_DELAY\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3.5,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3.5,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } TIME_DELAY.prototype.details = function TIME_DELAY() { diff --git a/js/Linear/VARIABLE_DELAY.js b/js/Linear/VARIABLE_DELAY.js index d8cb881d..1a0c4bfc 100644 --- a/js/Linear/VARIABLE_DELAY.js +++ b/js/Linear/VARIABLE_DELAY.js @@ -15,7 +15,7 @@ function VARIABLE_DELAY() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[string(this.T)],[string(this.init)],[string(this.N)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"VARIABLE_DELAY\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } VARIABLE_DELAY.prototype.details = function VARIABLE_DELAY() { diff --git a/js/MatrixOp/CUMSUM.js b/js/MatrixOp/CUMSUM.js index e2ae9582..82680d40 100644 --- a/js/MatrixOp/CUMSUM.js +++ b/js/MatrixOp/CUMSUM.js @@ -22,7 +22,7 @@ function CUMSUM() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[sci2exp(1)],[sci2exp(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CUMSUM\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),this.gr_i); return new BasicBlock(this.x); } CUMSUM.prototype.details = function CUMSUM() { diff --git a/js/MatrixOp/EXTRACT.js b/js/MatrixOp/EXTRACT.js index e71d07f2..3bf7f5f9 100644 --- a/js/MatrixOp/EXTRACT.js +++ b/js/MatrixOp/EXTRACT.js @@ -22,7 +22,7 @@ function EXTRACT() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[sci2exp(1)],[sci2exp([1])],[sci2exp([1])]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACT\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),this.gr_i); return new BasicBlock(this.x); } EXTRACT.prototype.details = function EXTRACT() { diff --git a/js/MatrixOp/EXTTRI.js b/js/MatrixOp/EXTTRI.js index eef761b9..aa605214 100644 --- a/js/MatrixOp/EXTTRI.js +++ b/js/MatrixOp/EXTTRI.js @@ -22,7 +22,7 @@ function EXTTRI() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTTRI\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),this.gr_i); return new BasicBlock(this.x); } EXTTRI.prototype.details = function EXTTRI() { diff --git a/js/MatrixOp/MATBKSL.js b/js/MatrixOp/MATBKSL.js index c91090d2..1abaa75b 100644 --- a/js/MatrixOp/MATBKSL.js +++ b/js/MatrixOp/MATBKSL.js @@ -22,7 +22,7 @@ function MATBKSL() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATBKSL\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i); return new BasicBlock(this.x); } MATBKSL.prototype.details = function MATBKSL() { diff --git a/js/MatrixOp/MATCATH.js b/js/MatrixOp/MATCATH.js index a547fdef..36708895 100644 --- a/js/MatrixOp/MATCATH.js +++ b/js/MatrixOp/MATCATH.js @@ -22,7 +22,7 @@ function MATCATH() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(2)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATCATH\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,3]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabString(label),this.gr_i); return new BasicBlock(this.x); } MATCATH.prototype.details = function MATCATH() { diff --git a/js/MatrixOp/MATCATV.js b/js/MatrixOp/MATCATV.js index b99fc5ad..70b11951 100644 --- a/js/MatrixOp/MATCATV.js +++ b/js/MatrixOp/MATCATV.js @@ -23,7 +23,7 @@ function MATCATV() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(2)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATCATV\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,3]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabString(label),this.gr_i); return new BasicBlock(this.x); } MATCATV.prototype.details = function MATCATV() { diff --git a/js/MatrixOp/MATDET.js b/js/MatrixOp/MATDET.js index 635de6a6..995c94a4 100644 --- a/js/MatrixOp/MATDET.js +++ b/js/MatrixOp/MATDET.js @@ -22,7 +22,7 @@ function MATDET() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDET\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i); return new BasicBlock(this.x); } MATDET.prototype.details = function MATDET() { diff --git a/js/MatrixOp/MATDIAG.js b/js/MatrixOp/MATDIAG.js index 5133d522..aa80bfe1 100644 --- a/js/MatrixOp/MATDIAG.js +++ b/js/MatrixOp/MATDIAG.js @@ -22,7 +22,7 @@ function MATDIAG() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDIAG\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i); return new BasicBlock(this.x); } MATDIAG.prototype.details = function MATDIAG() { diff --git a/js/MatrixOp/MATDIV.js b/js/MatrixOp/MATDIV.js index 847432e6..35b81a81 100644 --- a/js/MatrixOp/MATDIV.js +++ b/js/MatrixOp/MATDIV.js @@ -22,7 +22,7 @@ function MATDIV() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATDIV\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i); return new BasicBlock(this.x); } MATDIV.prototype.details = function MATDIV() { diff --git a/js/MatrixOp/MATEIG.js b/js/MatrixOp/MATEIG.js index bb1eb12c..56a5dab1 100644 --- a/js/MatrixOp/MATEIG.js +++ b/js/MatrixOp/MATEIG.js @@ -22,7 +22,7 @@ function MATEIG() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATEIG\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(label),this.gr_i); return new BasicBlock(this.x); } MATEIG.prototype.details = function MATEIG() { diff --git a/js/MatrixOp/MATEXPM.js b/js/MatrixOp/MATEXPM.js index fca1a921..7e96b899 100644 --- a/js/MatrixOp/MATEXPM.js +++ b/js/MatrixOp/MATEXPM.js @@ -22,7 +22,7 @@ function MATEXPM() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATEXPM\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i); return new BasicBlock(this.x); } MATEXPM.prototype.details = function MATEXPM() { diff --git a/js/MatrixOp/MATINV.js b/js/MatrixOp/MATINV.js index ee051754..aed1155e 100644 --- a/js/MatrixOp/MATINV.js +++ b/js/MatrixOp/MATINV.js @@ -22,7 +22,7 @@ function MATINV() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATINV\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i); return new BasicBlock(this.x); } MATINV.prototype.details = function MATINV() { diff --git a/js/MatrixOp/MATLU.js b/js/MatrixOp/MATLU.js index c2880d3f..5d119e87 100644 --- a/js/MatrixOp/MATLU.js +++ b/js/MatrixOp/MATLU.js @@ -22,7 +22,7 @@ function MATLU() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = sci2exp(1); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATLU\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([label]),this.gr_i); return new BasicBlock(this.x); } MATLU.prototype.details = function MATLU() { diff --git a/js/MatrixOp/MATMAGPHI.js b/js/MatrixOp/MATMAGPHI.js index 74b002b3..85b9dfa5 100644 --- a/js/MatrixOp/MATMAGPHI.js +++ b/js/MatrixOp/MATMAGPHI.js @@ -22,7 +22,7 @@ function MATMAGPHI() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATMAGPHI\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(label),this.gr_i); return new BasicBlock(this.x); } MATMAGPHI.prototype.details = function MATMAGPHI() { diff --git a/js/MatrixOp/MATMUL.js b/js/MatrixOp/MATMUL.js index cade1e5a..d19732dd 100644 --- a/js/MatrixOp/MATMUL.js +++ b/js/MatrixOp/MATMUL.js @@ -11,7 +11,7 @@ function MATMUL() { this.model.ipar = new ScilabDouble([1]); var label = [sci2exp(this.model.ipar)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATMUL\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(label),this.gr_i); return new BasicBlock(this.x); } MATMUL.prototype.details = function MATMUL() { diff --git a/js/MatrixOp/MATPINV.js b/js/MatrixOp/MATPINV.js index a8825b04..64fc901c 100644 --- a/js/MatrixOp/MATPINV.js +++ b/js/MatrixOp/MATPINV.js @@ -22,7 +22,7 @@ function MATPINV() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATPINV\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i); return new BasicBlock(this.x); } MATPINV.prototype.details = function MATPINV() { diff --git a/js/MatrixOp/MATRESH.js b/js/MatrixOp/MATRESH.js index 3ffb9fd6..2dd99416 100644 --- a/js/MatrixOp/MATRESH.js +++ b/js/MatrixOp/MATRESH.js @@ -22,7 +22,7 @@ function MATRESH() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[sci2exp(1)],[sci2exp([1,1])],[sci2exp([1,1])]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATRESH\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),this.gr_i); return new BasicBlock(this.x); } MATRESH.prototype.details = function MATRESH() { diff --git a/js/MatrixOp/MATSING.js b/js/MatrixOp/MATSING.js index 6f0abe08..68f78b93 100644 --- a/js/MatrixOp/MATSING.js +++ b/js/MatrixOp/MATSING.js @@ -22,7 +22,7 @@ function MATSING() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATSING\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(label),this.gr_i); return new BasicBlock(this.x); } MATSING.prototype.details = function MATSING() { diff --git a/js/MatrixOp/MATSUM.js b/js/MatrixOp/MATSUM.js index f2f0027c..c2e55a3e 100644 --- a/js/MatrixOp/MATSUM.js +++ b/js/MatrixOp/MATSUM.js @@ -22,7 +22,7 @@ function MATSUM() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[sci2exp(1)],[sci2exp(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATSUM\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),this.gr_i); return new BasicBlock(this.x); } MATSUM.prototype.details = function MATSUM() { diff --git a/js/MatrixOp/MATTRAN.js b/js/MatrixOp/MATTRAN.js index 09baf44f..94b4c12c 100644 --- a/js/MatrixOp/MATTRAN.js +++ b/js/MatrixOp/MATTRAN.js @@ -10,7 +10,7 @@ function MATTRAN() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATTRAN\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(label),this.gr_i); return new BasicBlock(this.x); } MATTRAN.prototype.details = function MATTRAN() { diff --git a/js/MatrixOp/MATZCONJ.js b/js/MatrixOp/MATZCONJ.js index 2b56c057..1fa6859a 100644 --- a/js/MatrixOp/MATZCONJ.js +++ b/js/MatrixOp/MATZCONJ.js @@ -22,7 +22,7 @@ function MATZCONJ() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = []; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATZCONJ\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(label),this.gr_i); return new BasicBlock(this.x); } MATZCONJ.prototype.details = function MATZCONJ() { diff --git a/js/MatrixOp/MATZREIM.js b/js/MatrixOp/MATZREIM.js index 681e6f8f..f58b1726 100644 --- a/js/MatrixOp/MATZREIM.js +++ b/js/MatrixOp/MATZREIM.js @@ -22,7 +22,7 @@ function MATZREIM() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = sci2exp(1); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MATZREIM\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString([label]),this.gr_i); return new BasicBlock(this.x); } MATZREIM.prototype.details = function MATZREIM() { diff --git a/js/MatrixOp/RICC.js b/js/MatrixOp/RICC.js index c9a9ead0..5633712b 100644 --- a/js/MatrixOp/RICC.js +++ b/js/MatrixOp/RICC.js @@ -22,7 +22,7 @@ function RICC() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RICC\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(label),this.gr_i); return new BasicBlock(this.x); } RICC.prototype.details = function RICC() { diff --git a/js/MatrixOp/ROOTCOEF.js b/js/MatrixOp/ROOTCOEF.js index f7b324dd..479c317d 100644 --- a/js/MatrixOp/ROOTCOEF.js +++ b/js/MatrixOp/ROOTCOEF.js @@ -22,7 +22,7 @@ function ROOTCOEF() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[sci2exp(1)],[sci2exp(1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ROOTCOEF\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(label),this.gr_i); return new BasicBlock(this.x); } ROOTCOEF.prototype.details = function ROOTCOEF() { diff --git a/js/MatrixOp/SQRT.js b/js/MatrixOp/SQRT.js index d9e1d94b..517f55dd 100644 --- a/js/MatrixOp/SQRT.js +++ b/js/MatrixOp/SQRT.js @@ -12,7 +12,7 @@ function SQRT() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [sci2exp(1)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SQRT\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(label),this.gr_i); return new BasicBlock(this.x); } SQRT.prototype.details = function SQRT() { diff --git a/js/MatrixOp/SUBMAT.js b/js/MatrixOp/SUBMAT.js index 46612834..b02901ec 100644 --- a/js/MatrixOp/SUBMAT.js +++ b/js/MatrixOp/SUBMAT.js @@ -22,7 +22,7 @@ function SUBMAT() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[sci2exp(1)],[sci2exp(1)],[sci2exp(1)],[sci2exp(1)],[sci2exp(1)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUBMAT\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,new ScilabDouble(label),this.gr_i); return new BasicBlock(this.x); } SUBMAT.prototype.details = function SUBMAT() { diff --git a/js/Misc/AUTOMAT.js b/js/Misc/AUTOMAT.js index 11057d0f..1e8806bb 100644 --- a/js/Misc/AUTOMAT.js +++ b/js/Misc/AUTOMAT.js @@ -24,7 +24,7 @@ function AUTOMAT() { this.model.ipar = new ScilabDouble(ipar); this.model.rpar = new ScilabDouble(rpar); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"AUTOMAT\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } AUTOMAT.prototype.details = function AUTOMAT() { diff --git a/js/Misc/BACKLASH.js b/js/Misc/BACKLASH.js index b2a69f86..2af53279 100644 --- a/js/Misc/BACKLASH.js +++ b/js/Misc/BACKLASH.js @@ -11,7 +11,7 @@ function BACKLASH() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BACKLASH\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } BACKLASH.prototype.details = function BACKLASH() { diff --git a/js/Misc/BOUNCE.js b/js/Misc/BOUNCE.js index bf1a4a1e..c2c9867f 100644 --- a/js/Misc/BOUNCE.js +++ b/js/Misc/BOUNCE.js @@ -35,7 +35,7 @@ function BOUNCE() { this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = [[strcat(sci2exp(this.rpar1))],[strcat(sci2exp(this.rpar2))],[strcat(sci2exp(this.walls))],[strcat(sci2exp(this.x))],[strcat(sci2exp(this.xd))],[strcat(sci2exp(this.y))],[strcat(sci2exp(this.yd))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BOUNCE\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } BOUNCE.prototype.details = function BOUNCE() { diff --git a/js/Misc/BOUNCEXY.js b/js/Misc/BOUNCEXY.js index 915a51de..0eed5d47 100644 --- a/js/Misc/BOUNCEXY.js +++ b/js/Misc/BOUNCEXY.js @@ -32,7 +32,7 @@ function BOUNCEXY() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[strcat(sci2exp(this.clrs))],[strcat(sci2exp(this.siz))],[strcat(sci2exp(this.win))],[strcat(sci2exp(1))],[strcat(sci2exp(this.xmin))],[strcat(sci2exp(this.xmax))],[strcat(sci2exp(this.ymin))],[strcat(sci2exp(this.ymax))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BOUNCEXY\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } BOUNCEXY.prototype.details = function BOUNCEXY() { diff --git a/js/Misc/BPLATFORM.js b/js/Misc/BPLATFORM.js index 37b101fc..49243956 100644 --- a/js/Misc/BPLATFORM.js +++ b/js/Misc/BPLATFORM.js @@ -18,7 +18,7 @@ function BPLATFORM() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = string(this.model.rpar); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BPLATFORM\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } BPLATFORM.prototype.details = function BPLATFORM() { diff --git a/js/Misc/CONSTRAINT_c.js b/js/Misc/CONSTRAINT_c.js index 988db1e1..0ea8c789 100644 --- a/js/Misc/CONSTRAINT_c.js +++ b/js/Misc/CONSTRAINT_c.js @@ -12,7 +12,7 @@ function CONSTRAINT_c() { this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = "0"; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONSTRAINT_c\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } CONSTRAINT_c.prototype.details = function CONSTRAINT_c() { diff --git a/js/Misc/DEADBAND.js b/js/Misc/DEADBAND.js index 8e044e7c..8bf9884b 100644 --- a/js/Misc/DEADBAND.js +++ b/js/Misc/DEADBAND.js @@ -15,7 +15,7 @@ function DEADBAND() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[string(this.maxp)],[string(this.minp)],[string(this.model.nmode)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DEADBAND\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } DEADBAND.prototype.details = function DEADBAND() { diff --git a/js/Misc/DIFF_f.js b/js/Misc/DIFF_f.js index 722f1350..d6a523c2 100644 --- a/js/Misc/DIFF_f.js +++ b/js/Misc/DIFF_f.js @@ -11,7 +11,7 @@ function DIFF_f() { this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = [[strcat(sci2exp(this.x0[1-1]))],[strcat(sci2exp(this.x0[2-1]))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DIFF_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } DIFF_f.prototype.details = function DIFF_f() { diff --git a/js/Misc/EDGETRIGGER.js b/js/Misc/EDGETRIGGER.js index f0699af4..04b3881a 100644 --- a/js/Misc/EDGETRIGGER.js +++ b/js/Misc/EDGETRIGGER.js @@ -13,7 +13,7 @@ function EDGETRIGGER() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [string(this.edge)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EDGETRIGGER\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(this.exprs),this.gr_i); return new BasicBlock(this.x); } EDGETRIGGER.prototype.details = function EDGETRIGGER() { diff --git a/js/Misc/EDGE_TRIGGER.js b/js/Misc/EDGE_TRIGGER.js index 4699c0b0..0faafe7f 100644 --- a/js/Misc/EDGE_TRIGGER.js +++ b/js/Misc/EDGE_TRIGGER.js @@ -78,7 +78,7 @@ function EDGE_TRIGGER() { this.model.evtout = new ScilabDouble([1]); this.model.rpar = scs_m_1; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EDGE_TRIGGER\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } EDGE_TRIGGER.prototype.details = function EDGE_TRIGGER() { diff --git a/js/Misc/ENDBLK.js b/js/Misc/ENDBLK.js index 3ef0abeb..a173fddf 100644 --- a/js/Misc/ENDBLK.js +++ b/js/Misc/ENDBLK.js @@ -6,7 +6,7 @@ function ENDBLK() { scs_m_1.objs[2-1] = scicos_link(xx=[[292.104],[292.104],[261.83733],[261.83733],[292.104],[292.104]],yy=[[243.40305],[234.45067],[234.45067],[305.584],[305.584],[294.83162]],id="drawlink",thick=[0,0],ct=[5,-1],from=[1,1,0],to=[1,1,1]); this.model = scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ENDBLK\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } ENDBLK.prototype.details = function ENDBLK() { diff --git a/js/Misc/Extract_Activation.js b/js/Misc/Extract_Activation.js index 164b496c..e42bbd03 100644 --- a/js/Misc/Extract_Activation.js +++ b/js/Misc/Extract_Activation.js @@ -83,7 +83,7 @@ function Extract_Activation() { this.model.evtout = new ScilabDouble([1]); this.model.rpar = scs_m_1; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Extract_Activation\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } Extract_Activation.prototype.details = function Extract_Activation() { diff --git a/js/Misc/HYSTHERESIS.js b/js/Misc/HYSTHERESIS.js index 19e73b50..f63ef6b7 100644 --- a/js/Misc/HYSTHERESIS.js +++ b/js/Misc/HYSTHERESIS.js @@ -16,7 +16,7 @@ function HYSTHERESIS() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[string(rpar)],[string(sign(this.nzz))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"HYSTHERESIS\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } HYSTHERESIS.prototype.details = function HYSTHERESIS() { diff --git a/js/Misc/IMPSPLIT_f.js b/js/Misc/IMPSPLIT_f.js index a54061e9..e9bfaa98 100644 --- a/js/Misc/IMPSPLIT_f.js +++ b/js/Misc/IMPSPLIT_f.js @@ -10,7 +10,7 @@ function IMPSPLIT_f() { this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(mo.inputs,"*"),1)]); this.model.out = new ScilabDouble([ones(size(mo.outputs,"*"),1)]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,[],[]); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabDouble([]),[]); this.x.graphics.in_implicit = ["I"]; this.x.graphics.out_implicit = ["I","I"]; return new BasicBlock(this.x); diff --git a/js/Misc/LOGICAL_OP.js b/js/Misc/LOGICAL_OP.js index cdb9ed51..b0884b8d 100644 --- a/js/Misc/LOGICAL_OP.js +++ b/js/Misc/LOGICAL_OP.js @@ -13,7 +13,7 @@ function LOGICAL_OP() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[string(this.nin)],[string(ipar)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOGICAL_OP\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } LOGICAL_OP.prototype.details = function LOGICAL_OP() { diff --git a/js/Misc/MBLOCK.js b/js/Misc/MBLOCK.js index 0ca1910a..44c8ca1c 100644 --- a/js/Misc/MBLOCK.js +++ b/js/Misc/MBLOCK.js @@ -27,7 +27,7 @@ function MBLOCK() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"r"),1)]); this.model.equations = mo; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MBLOCK\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([this.exprs]),this.gr_i); this.x.graphics.in_implicit = this.intype; this.x.graphics.out_implicit = this.outtype; return new BasicBlock(this.x); diff --git a/js/Misc/MEMORY_f.js b/js/Misc/MEMORY_f.js index 6489728b..f3687612 100644 --- a/js/Misc/MEMORY_f.js +++ b/js/Misc/MEMORY_f.js @@ -14,7 +14,7 @@ function MEMORY_f() { this.model.blocktype = new ScilabString(["m"]); this.model.dep_ut = new ScilabBoolean([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MEMORY_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } MEMORY_f.prototype.details = function MEMORY_f() { diff --git a/js/Misc/MPBLOCK.js b/js/Misc/MPBLOCK.js index 8b246576..a089a56e 100644 --- a/js/Misc/MPBLOCK.js +++ b/js/Misc/MPBLOCK.js @@ -27,7 +27,7 @@ function MPBLOCK() { this.model.out = new ScilabDouble([ones(size(mo.outputs,"r"),1)]); this.model.equations = mo; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MPBLOCK\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([this.exprs]),this.gr_i); this.x.graphics.in_implicit = this.intype; this.x.graphics.out_implicit = this.outtype; return new BasicBlock(this.x); diff --git a/js/Misc/PAL_f.js b/js/Misc/PAL_f.js index 8c5eca6e..f4d7bf06 100644 --- a/js/Misc/PAL_f.js +++ b/js/Misc/PAL_f.js @@ -11,7 +11,7 @@ function PAL_f() { this.model.blocktype = new ScilabString(["h"]); this.model.dep_ut = new ScilabBoolean([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PAL_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),this.gr_i); this.x.graphics.id = scs.props.title[1-1]; return new BasicBlock(this.x); } diff --git a/js/Misc/PENDULUM_ANIM.js b/js/Misc/PENDULUM_ANIM.js index 940c5b0f..c38cbcb4 100644 --- a/js/Misc/PENDULUM_ANIM.js +++ b/js/Misc/PENDULUM_ANIM.js @@ -18,7 +18,7 @@ function PENDULUM_ANIM() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = string(this.model.rpar); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PENDULUM_ANIM\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,3]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,3]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } PENDULUM_ANIM.prototype.details = function PENDULUM_ANIM() { diff --git a/js/Misc/RATELIMITER.js b/js/Misc/RATELIMITER.js index f3a168e8..0e61e53a 100644 --- a/js/Misc/RATELIMITER.js +++ b/js/Misc/RATELIMITER.js @@ -13,7 +13,7 @@ function RATELIMITER() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[string(this.maxp)],[string(this.minp)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RATELIMITER\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3.5,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3.5,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } RATELIMITER.prototype.details = function RATELIMITER() { diff --git a/js/Misc/RELATIONALOP.js b/js/Misc/RELATIONALOP.js index b4874f59..f9089a4a 100644 --- a/js/Misc/RELATIONALOP.js +++ b/js/Misc/RELATIONALOP.js @@ -12,7 +12,7 @@ function RELATIONALOP() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[string(ipar)],[string(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RELATIONALOP\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); this.x.graphics.style = ["fontSize=13;fontStyle=1;displayedLabel="+label]; return new BasicBlock(this.x); } diff --git a/js/Misc/SPLIT_f.js b/js/Misc/SPLIT_f.js index 03991e57..25a77818 100644 --- a/js/Misc/SPLIT_f.js +++ b/js/Misc/SPLIT_f.js @@ -7,7 +7,7 @@ function SPLIT_f() { this.model.out = new ScilabDouble([-1],[-1],[-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,[],[]); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabDouble([]),[]); return new BasicBlock(this.x); } SPLIT_f.prototype.details = function SPLIT_f() { diff --git a/js/Misc/SUPER_f.js b/js/Misc/SUPER_f.js index 42ac935d..f7ed1507 100644 --- a/js/Misc/SUPER_f.js +++ b/js/Misc/SUPER_f.js @@ -19,7 +19,7 @@ function SUPER_f() { this.model.blocktype = new ScilabString(["h"]); this.model.dep_ut = new ScilabBoolean([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SUPER_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),this.gr_i); return new SuperBlock(this.x); } SUPER_f.prototype.details = function SUPER_f() { diff --git a/js/Misc/func_block.js b/js/Misc/func_block.js index 54bc297f..f21a5066 100644 --- a/js/Misc/func_block.js +++ b/js/Misc/func_block.js @@ -9,7 +9,7 @@ function func_block() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = "v=sin(u);y=u*v"; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"func_block\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } func_block.prototype.details = function func_block() { diff --git a/js/Misc/generic_block.js b/js/Misc/generic_block.js index e6e9b94d..c8ef0332 100644 --- a/js/Misc/generic_block.js +++ b/js/Misc/generic_block.js @@ -18,7 +18,7 @@ function generic_block() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp(this.model.in)],[sci2exp(this.model.out)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.firing)],["y"],["n"]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(label),this.gr_i); return new BasicBlock(this.x); } generic_block.prototype.details = function generic_block() { diff --git a/js/Misc/generic_block2.js b/js/Misc/generic_block2.js index 4803ee3b..ccd515b7 100644 --- a/js/Misc/generic_block2.js +++ b/js/Misc/generic_block2.js @@ -18,7 +18,7 @@ function generic_block2() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp(this.model.in)],[sci2exp(this.model.out)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block2\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(label),this.gr_i); return new BasicBlock(this.x); } generic_block2.prototype.details = function generic_block2() { diff --git a/js/Misc/generic_block3.js b/js/Misc/generic_block3.js index ce288c44..63199c40 100644 --- a/js/Misc/generic_block3.js +++ b/js/Misc/generic_block3.js @@ -14,7 +14,7 @@ function generic_block3() { this.model.dep_ut = new ScilabBoolean([true,false]); var label = [[this.function_name],[sci2exp(this.funtyp)],[sci2exp([this.model.in,this.model.in2])],[sci2exp(this.model.intyp)],[sci2exp([this.model.out,this.model.out2]),sci2exp(this.model.outtyp)],[sci2exp(this.model.evtin)],[sci2exp(this.model.evtout)],[sci2exp(this.model.state)],[sci2exp(this.model.dstate)],[sci2exp(this.model.odstate)],[sci2exp(this.model.rpar)],[sci2exp(this.model.ipar)],[sci2exp(this.model.opar)],[sci2exp(this.model.nmode)],[sci2exp(this.model.nzcross)],[sci2exp(this.model.firing)],["y"],["n"]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"generic_block3\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,label,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(label),this.gr_i); return new BasicBlock(this.x); } generic_block3.prototype.details = function generic_block3() { diff --git a/js/NonLinear/ABSBLK_f.js b/js/NonLinear/ABSBLK_f.js index 39e5984c..0c8058bf 100644 --- a/js/NonLinear/ABSBLK_f.js +++ b/js/NonLinear/ABSBLK_f.js @@ -8,7 +8,7 @@ function ABSBLK_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ABSBLK_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } ABSBLK_f.prototype.details = function ABSBLK_f() { diff --git a/js/NonLinear/ABS_VALUE.js b/js/NonLinear/ABS_VALUE.js index 01c6d20c..5b092794 100644 --- a/js/NonLinear/ABS_VALUE.js +++ b/js/NonLinear/ABS_VALUE.js @@ -12,7 +12,7 @@ function ABS_VALUE() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [string([1])]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ABS_VALUE\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(this.exprs),this.gr_i); return new BasicBlock(this.x); } ABS_VALUE.prototype.details = function ABS_VALUE() { diff --git a/js/NonLinear/COSBLK_f.js b/js/NonLinear/COSBLK_f.js index ad166e28..7735a7ae 100644 --- a/js/NonLinear/COSBLK_f.js +++ b/js/NonLinear/COSBLK_f.js @@ -9,7 +9,7 @@ function COSBLK_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"COSBLK_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } COSBLK_f.prototype.details = function COSBLK_f() { diff --git a/js/NonLinear/DLRADAPT_f.js b/js/NonLinear/DLRADAPT_f.js index 7283dc3b..b3840590 100644 --- a/js/NonLinear/DLRADAPT_f.js +++ b/js/NonLinear/DLRADAPT_f.js @@ -20,7 +20,7 @@ function DLRADAPT_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[sci2exp(this.p)],[sci2exp(this.rn)],[sci2exp(this.rd,0)],[sci2exp(this.g)],[sci2exp(this.last_u)],[sci2exp(this.last_y)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLRADAPT_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } DLRADAPT_f.prototype.details = function DLRADAPT_f() { diff --git a/js/NonLinear/EXPBLK_f.js b/js/NonLinear/EXPBLK_f.js index 3cd716fa..707d8fd1 100644 --- a/js/NonLinear/EXPBLK_f.js +++ b/js/NonLinear/EXPBLK_f.js @@ -12,7 +12,7 @@ function EXPBLK_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = ["%e"]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXPBLK_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(this.exprs),this.gr_i); return new BasicBlock(this.x); } EXPBLK_f.prototype.details = function EXPBLK_f() { diff --git a/js/NonLinear/EXPBLK_m.js b/js/NonLinear/EXPBLK_m.js index 55185a54..ddef6624 100644 --- a/js/NonLinear/EXPBLK_m.js +++ b/js/NonLinear/EXPBLK_m.js @@ -16,7 +16,7 @@ function EXPBLK_m() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = ["%e"]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXPBLK_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(this.exprs),this.gr_i); return new BasicBlock(this.x); } EXPBLK_m.prototype.details = function EXPBLK_m() { diff --git a/js/NonLinear/FSV_f.js b/js/NonLinear/FSV_f.js index 364dd488..ff49f1af 100644 --- a/js/NonLinear/FSV_f.js +++ b/js/NonLinear/FSV_f.js @@ -10,7 +10,7 @@ function FSV_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = " "; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FSV_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } FSV_f.prototype.details = function FSV_f() { diff --git a/js/NonLinear/INTRP2BLK_f.js b/js/NonLinear/INTRP2BLK_f.js index 5cf1f22f..303cdffb 100644 --- a/js/NonLinear/INTRP2BLK_f.js +++ b/js/NonLinear/INTRP2BLK_f.js @@ -14,7 +14,7 @@ function INTRP2BLK_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[strcat(sci2exp(this.a))],[strcat(sci2exp(this.b))],[strcat(sci2exp(this.c,0))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTRP2BLK_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } INTRP2BLK_f.prototype.details = function INTRP2BLK_f() { diff --git a/js/NonLinear/INTRPLBLK_f.js b/js/NonLinear/INTRPLBLK_f.js index e9347b2c..64077254 100644 --- a/js/NonLinear/INTRPLBLK_f.js +++ b/js/NonLinear/INTRPLBLK_f.js @@ -12,7 +12,7 @@ function INTRPLBLK_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[strcat(sci2exp(this.a))],[strcat(sci2exp(this.b))]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTRPLBLK_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } INTRPLBLK_f.prototype.details = function INTRPLBLK_f() { diff --git a/js/NonLinear/INVBLK.js b/js/NonLinear/INVBLK.js index a86b86d4..324372b1 100644 --- a/js/NonLinear/INVBLK.js +++ b/js/NonLinear/INVBLK.js @@ -10,7 +10,7 @@ function INVBLK() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = " "; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INVBLK\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } INVBLK.prototype.details = function INVBLK() { diff --git a/js/NonLinear/INVBLK_f.js b/js/NonLinear/INVBLK_f.js index 1e344ded..1ce1e841 100644 --- a/js/NonLinear/INVBLK_f.js +++ b/js/NonLinear/INVBLK_f.js @@ -10,7 +10,7 @@ function INVBLK_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = " "; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INVBLK_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } INVBLK_f.prototype.details = function INVBLK_f() { diff --git a/js/NonLinear/LOGBLK_f.js b/js/NonLinear/LOGBLK_f.js index e2b14f15..3b97fb56 100644 --- a/js/NonLinear/LOGBLK_f.js +++ b/js/NonLinear/LOGBLK_f.js @@ -12,7 +12,7 @@ function LOGBLK_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = "%e"; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOGBLK_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } LOGBLK_f.prototype.details = function LOGBLK_f() { diff --git a/js/NonLinear/LOOKUP_c.js b/js/NonLinear/LOOKUP_c.js index 46efa138..9666b1c6 100644 --- a/js/NonLinear/LOOKUP_c.js +++ b/js/NonLinear/LOOKUP_c.js @@ -23,7 +23,7 @@ function LOOKUP_c() { this.model.firing = new ScilabDouble([0]); this.exprs = [[sci2exp(this.Method)],[sci2exp(this.xx)],[sci2exp(this.yy)],[sci2exp(0)],[Graf]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOOKUP_c\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } LOOKUP_c.prototype.details = function LOOKUP_c() { diff --git a/js/NonLinear/LOOKUP_f.js b/js/NonLinear/LOOKUP_f.js index 471833f3..d1d2abab 100644 --- a/js/NonLinear/LOOKUP_f.js +++ b/js/NonLinear/LOOKUP_f.js @@ -9,7 +9,7 @@ function LOOKUP_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOOKUP_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } LOOKUP_f.prototype.details = function LOOKUP_f() { diff --git a/js/NonLinear/MAXMIN.js b/js/NonLinear/MAXMIN.js index e2e7f3ef..d0c04381 100644 --- a/js/NonLinear/MAXMIN.js +++ b/js/NonLinear/MAXMIN.js @@ -10,7 +10,7 @@ function MAXMIN() { this.model.ipar = new ScilabDouble([0]); this.exprs = [string(transpose([2,1,1]))]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MAXMIN\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(this.exprs),this.gr_i); this.x.graphics.style = "MAXMIN;displayedLabel=MAX"; return new BasicBlock(this.x); } diff --git a/js/NonLinear/MAX_f.js b/js/NonLinear/MAX_f.js index c7a348bb..8b7bbfc8 100644 --- a/js/NonLinear/MAX_f.js +++ b/js/NonLinear/MAX_f.js @@ -11,7 +11,7 @@ function MAX_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = " "; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MAX_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } MAX_f.prototype.details = function MAX_f() { diff --git a/js/NonLinear/MIN_f.js b/js/NonLinear/MIN_f.js index 316e43e4..34647671 100644 --- a/js/NonLinear/MIN_f.js +++ b/js/NonLinear/MIN_f.js @@ -11,7 +11,7 @@ function MIN_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = sci2exp(in1); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"MIN_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } MIN_f.prototype.details = function MIN_f() { diff --git a/js/NonLinear/POWBLK_f.js b/js/NonLinear/POWBLK_f.js index a86c49a2..a6d2b383 100644 --- a/js/NonLinear/POWBLK_f.js +++ b/js/NonLinear/POWBLK_f.js @@ -12,7 +12,7 @@ function POWBLK_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = string(this.a); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"POWBLK_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } POWBLK_f.prototype.details = function POWBLK_f() { diff --git a/js/NonLinear/PRODUCT.js b/js/NonLinear/PRODUCT.js index 1f550e4a..ea3fb92f 100644 --- a/js/NonLinear/PRODUCT.js +++ b/js/NonLinear/PRODUCT.js @@ -11,7 +11,7 @@ function PRODUCT() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = sci2exp(this.sgn); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PRODUCT\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,3]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,new ScilabString([this.exprs]),this.gr_i); return new Product(this.x); } PRODUCT.prototype.details = function PRODUCT() { diff --git a/js/NonLinear/PROD_f.js b/js/NonLinear/PROD_f.js index 5d6903f4..ead16ab5 100644 --- a/js/NonLinear/PROD_f.js +++ b/js/NonLinear/PROD_f.js @@ -7,7 +7,7 @@ function PROD_f() { this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([true,false]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,[],[]); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabDouble([]),[]); return new BasicBlock(this.x); } PROD_f.prototype.details = function PROD_f() { diff --git a/js/NonLinear/QUANT_f.js b/js/NonLinear/QUANT_f.js index ca5cb9e4..b2642a10 100644 --- a/js/NonLinear/QUANT_f.js +++ b/js/NonLinear/QUANT_f.js @@ -13,7 +13,7 @@ function QUANT_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[string(this.pas)],[string(this.meth)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"QUANT_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } QUANT_f.prototype.details = function QUANT_f() { diff --git a/js/NonLinear/SATURATION.js b/js/NonLinear/SATURATION.js index c87c0edf..c53f10ec 100644 --- a/js/NonLinear/SATURATION.js +++ b/js/NonLinear/SATURATION.js @@ -15,7 +15,7 @@ function SATURATION() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[string(this.maxp)],[string(this.minp)],[string(this.model.nmode)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SATURATION\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } SATURATION.prototype.details = function SATURATION() { diff --git a/js/NonLinear/SAT_f.js b/js/NonLinear/SAT_f.js index 8a5cf3ef..06eaa83f 100644 --- a/js/NonLinear/SAT_f.js +++ b/js/NonLinear/SAT_f.js @@ -15,7 +15,7 @@ function SAT_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[string(this.minp)],[string(this.maxp)],[string(slope)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAT_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } SAT_f.prototype.details = function SAT_f() { diff --git a/js/NonLinear/SIGNUM.js b/js/NonLinear/SIGNUM.js index dc5b69cf..075f4c92 100644 --- a/js/NonLinear/SIGNUM.js +++ b/js/NonLinear/SIGNUM.js @@ -12,7 +12,7 @@ function SIGNUM() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [string([1])]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SIGNUM\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(this.exprs),this.gr_i); return new BasicBlock(this.x); } SIGNUM.prototype.details = function SIGNUM() { diff --git a/js/NonLinear/SINBLK_f.js b/js/NonLinear/SINBLK_f.js index 7d850bd4..5a5d5548 100644 --- a/js/NonLinear/SINBLK_f.js +++ b/js/NonLinear/SINBLK_f.js @@ -9,7 +9,7 @@ function SINBLK_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = " "; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SINBLK_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } SINBLK_f.prototype.details = function SINBLK_f() { diff --git a/js/NonLinear/TANBLK_f.js b/js/NonLinear/TANBLK_f.js index 288dd11f..05a576da 100644 --- a/js/NonLinear/TANBLK_f.js +++ b/js/NonLinear/TANBLK_f.js @@ -10,7 +10,7 @@ function TANBLK_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = sci2exp(in1); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TANBLK_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } TANBLK_f.prototype.details = function TANBLK_f() { diff --git a/js/NonLinear/TrigFun.js b/js/NonLinear/TrigFun.js index 2a18fff8..a3857b52 100644 --- a/js/NonLinear/TrigFun.js +++ b/js/NonLinear/TrigFun.js @@ -9,7 +9,7 @@ function TrigFun() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = "sin"; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TrigFun\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } TrigFun.prototype.details = function TrigFun() { diff --git a/js/Sinks/AFFICH_m.js b/js/Sinks/AFFICH_m.js index 7f3e1884..581d2b8b 100644 --- a/js/Sinks/AFFICH_m.js +++ b/js/Sinks/AFFICH_m.js @@ -20,7 +20,7 @@ function AFFICH_m() { this.model.label = new ScilabString([""]); this.exprs = [[sci2exp([this.model.in,this.model.in2])],[string(this.font)],[string(this.fontsize)],[string(this.colr)],[string(this.nt)],[string(this.nd)],[string(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"AFFICH_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new AfficheBlock(this.x); } AFFICH_m.prototype.details = function AFFICH_m() { diff --git a/js/Sinks/BARXY.js b/js/Sinks/BARXY.js index 6f930930..6a8e9510 100644 --- a/js/Sinks/BARXY.js +++ b/js/Sinks/BARXY.js @@ -15,7 +15,7 @@ function BARXY() { this.model.evtin = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.xmin],[this.xmax],[this.ymin],[this.ymax]); this.model.ipar = new ScilabDouble([1]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],[]); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),[]); this.x.graphics.in_implicit = ["E","E"]; this.x.graphics.out_implicit = []; this.x.graphics.exprs = [["-15"],["15"],["-15"],["15"],["1"]]; diff --git a/js/Sinks/CANIMXY.js b/js/Sinks/CANIMXY.js index fe146bdb..89318d22 100644 --- a/js/Sinks/CANIMXY.js +++ b/js/Sinks/CANIMXY.js @@ -25,7 +25,7 @@ function CANIMXY() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[string(this.nbr_curves)],[string(this.clrs)],[string(this.siz)],[string(this.win)],["[]"],["[]"],[string(this.xmin)],[string(this.xmax)],[string(this.ymin)],[string(this.ymax)],[string(this.N)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CANIMXY\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } CANIMXY.prototype.details = function CANIMXY() { diff --git a/js/Sinks/CANIMXY3D.js b/js/Sinks/CANIMXY3D.js index 5e4130e0..5208223f 100644 --- a/js/Sinks/CANIMXY3D.js +++ b/js/Sinks/CANIMXY3D.js @@ -25,7 +25,7 @@ function CANIMXY3D() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[string(this.nbr_curves)],[strcat(string(this.clrs)," ")],[strcat(string(this.siz)," ")],[string(this.win)],["[]"],["[]"],[strcat(string(this.vec_x)," ")],[strcat(string(this.vec_y)," ")],[strcat(string(this.vec_z)," ")],[strcat(string(this.param3ds)," ")],[string(this.N)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CANIMXY3D\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } CANIMXY3D.prototype.details = function CANIMXY3D() { diff --git a/js/Sinks/CEVENTSCOPE.js b/js/Sinks/CEVENTSCOPE.js index 829b25f4..5f14a547 100644 --- a/js/Sinks/CEVENTSCOPE.js +++ b/js/Sinks/CEVENTSCOPE.js @@ -16,7 +16,7 @@ function CEVENTSCOPE() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[sci2exp(this.nclock)],[strcat(sci2exp(this.clrs[this.nclock-1])," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.per)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CEVENTSCOPE\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } CEVENTSCOPE.prototype.details = function CEVENTSCOPE() { diff --git a/js/Sinks/CFSCOPE.js b/js/Sinks/CFSCOPE.js index f4728d1b..22d2d014 100644 --- a/js/Sinks/CFSCOPE.js +++ b/js/Sinks/CFSCOPE.js @@ -18,7 +18,7 @@ function CFSCOPE() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[strcat(string(this.clrs)," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.ymin)],[string(this.ymax)],[string(this.per)],[string(this.N)],[string([1])]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CFSCOPE\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } CFSCOPE.prototype.details = function CFSCOPE() { diff --git a/js/Sinks/CLKOUTV_f.js b/js/Sinks/CLKOUTV_f.js index d4e24f00..9ec8b81b 100644 --- a/js/Sinks/CLKOUTV_f.js +++ b/js/Sinks/CLKOUTV_f.js @@ -10,7 +10,7 @@ function CLKOUTV_f() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = string(this.prt); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,this.exprs," "); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs])," "); return new EventOutBlock(this.x); } CLKOUTV_f.prototype.details = function CLKOUTV_f() { diff --git a/js/Sinks/CLKOUT_f.js b/js/Sinks/CLKOUT_f.js index c3df65bc..5927fb95 100644 --- a/js/Sinks/CLKOUT_f.js +++ b/js/Sinks/CLKOUT_f.js @@ -10,7 +10,7 @@ function CLKOUT_f() { this.model.firing = new ScilabDouble([]); this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = string(this.prt); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,this.exprs," "); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs])," "); return new BasicBlock(this.x); } CLKOUT_f.prototype.details = function CLKOUT_f() { diff --git a/js/Sinks/CMAT3D.js b/js/Sinks/CMAT3D.js index 16bf0515..0ae33284 100644 --- a/js/Sinks/CMAT3D.js +++ b/js/Sinks/CMAT3D.js @@ -21,7 +21,7 @@ function CMAT3D() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[strcat(string(this.x)," ")],[strcat(string(y)," ")],[string("jetcolormap(25)")],[string(this.cmin)],[string(this.cmax)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CMAT3D\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } CMAT3D.prototype.details = function CMAT3D() { diff --git a/js/Sinks/CMATVIEW.js b/js/Sinks/CMATVIEW.js index 8057448d..c4c1736f 100644 --- a/js/Sinks/CMATVIEW.js +++ b/js/Sinks/CMATVIEW.js @@ -19,7 +19,7 @@ function CMATVIEW() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[string("jetcolormap(25)")],[string(this.cmin)],[string(this.cmax)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CMATVIEW\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } CMATVIEW.prototype.details = function CMATVIEW() { diff --git a/js/Sinks/CMSCOPE.js b/js/Sinks/CMSCOPE.js index 9629d0fe..69787569 100644 --- a/js/Sinks/CMSCOPE.js +++ b/js/Sinks/CMSCOPE.js @@ -24,7 +24,7 @@ function CMSCOPE() { this.model.dep_ut = new ScilabBoolean([true,false]); this.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()]]; this.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,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } CMSCOPE.prototype.details = function CMSCOPE() { diff --git a/js/Sinks/CSCOPE.js b/js/Sinks/CSCOPE.js index 0b900290..0fcf3788 100644 --- a/js/Sinks/CSCOPE.js +++ b/js/Sinks/CSCOPE.js @@ -20,7 +20,7 @@ function CSCOPE() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[strcat(string(this.clrs)," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.ymin)],[string(this.ymax)],[string(this.per)],[string(this.N)],[transpose(string(0))],[emptystr()]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CSCOPE\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } CSCOPE.prototype.details = function CSCOPE() { diff --git a/js/Sinks/CSCOPXY.js b/js/Sinks/CSCOPXY.js index dc2de406..596baa67 100644 --- a/js/Sinks/CSCOPXY.js +++ b/js/Sinks/CSCOPXY.js @@ -24,7 +24,7 @@ function CSCOPXY() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[string(this.nbr_curves)],[sci2exp(this.clrs)],[sci2exp(this.siz)],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[string(this.xmin)],[string(this.xmax)],[string(this.ymin)],[string(this.ymax)],[string(this.N)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CSCOPXY\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } CSCOPXY.prototype.details = function CSCOPXY() { diff --git a/js/Sinks/CSCOPXY3D.js b/js/Sinks/CSCOPXY3D.js index 17563238..dbbbbbac 100644 --- a/js/Sinks/CSCOPXY3D.js +++ b/js/Sinks/CSCOPXY3D.js @@ -24,7 +24,7 @@ function CSCOPXY3D() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[string(this.nbr_curves)],[strcat(string(this.clrs)," ")],[strcat(string(this.siz)," ")],[string(this.win)],[sci2exp([])],[sci2exp(this.wdim)],[strcat(string(this.vec_x)," ")],[strcat(string(this.vec_y)," ")],[strcat(string(this.vec_z)," ")],[strcat(string(this.param3ds)," ")],[string(this.N)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CSCOPXY3D\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } CSCOPXY3D.prototype.details = function CSCOPXY3D() { diff --git a/js/Sinks/OUTIMPL_f.js b/js/Sinks/OUTIMPL_f.js index cb0dc93b..e60d5341 100644 --- a/js/Sinks/OUTIMPL_f.js +++ b/js/Sinks/OUTIMPL_f.js @@ -15,7 +15,7 @@ function OUTIMPL_f() { this.model.equations = new ScilabDouble([mo]); this.exprs = "1"; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OUTIMPL_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs]),this.gr_i); this.x.graphics.in_implicit = ["I"]; return new ImplicitOutBlock(this.x); } diff --git a/js/Sinks/OUT_f.js b/js/Sinks/OUT_f.js index 4867bf10..93a0c6d9 100644 --- a/js/Sinks/OUT_f.js +++ b/js/Sinks/OUT_f.js @@ -13,7 +13,7 @@ function OUT_f() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = string(this.prt); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"OUT_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs]),this.gr_i); return new ExplicitOutBlock(this.x); } OUT_f.prototype.details = function OUT_f() { diff --git a/js/Sinks/TOWS_c.js b/js/Sinks/TOWS_c.js index fadd92fe..2348f814 100644 --- a/js/Sinks/TOWS_c.js +++ b/js/Sinks/TOWS_c.js @@ -20,7 +20,7 @@ function TOWS_c() { this.model.dep_ut = new ScilabBoolean([false,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TOWS_c\",sz(1),sz(2));"]); this.exprs = [[string(this.nz)],[string(this.varnam)],[string(this.herit)]]; - this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } TOWS_c.prototype.details = function TOWS_c() { diff --git a/js/Sinks/TRASH_f.js b/js/Sinks/TRASH_f.js index ba16065f..699bd12d 100644 --- a/js/Sinks/TRASH_f.js +++ b/js/Sinks/TRASH_f.js @@ -10,7 +10,7 @@ function TRASH_f() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = " "; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TRASH_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } TRASH_f.prototype.details = function TRASH_f() { diff --git a/js/Sinks/WFILE_f.js b/js/Sinks/WFILE_f.js index 3015b1ca..f622f917 100644 --- a/js/Sinks/WFILE_f.js +++ b/js/Sinks/WFILE_f.js @@ -17,7 +17,7 @@ function WFILE_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[sci2exp(this.in1)],[fname],[frmt],[string(this.N)]]; this.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,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } WFILE_f.prototype.details = function WFILE_f() { diff --git a/js/Sinks/WRITEAU_f.js b/js/Sinks/WRITEAU_f.js index c332e0ed..b72e0e93 100644 --- a/js/Sinks/WRITEAU_f.js +++ b/js/Sinks/WRITEAU_f.js @@ -18,7 +18,7 @@ function WRITEAU_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [string(this.N),string(this.swap)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"WRITEAU_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabString(this.exprs),this.gr_i); return new BasicBlock(this.x); } WRITEAU_f.prototype.details = function WRITEAU_f() { diff --git a/js/Sinks/WRITEC_f.js b/js/Sinks/WRITEC_f.js index 0eb100f4..2419c66e 100644 --- a/js/Sinks/WRITEC_f.js +++ b/js/Sinks/WRITEC_f.js @@ -18,7 +18,7 @@ function WRITEC_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[sci2exp(this.in1)],[fname],[frmt],[string(this.N),string(this.swap)]]; this.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,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } WRITEC_f.prototype.details = function WRITEC_f() { diff --git a/js/Sources/CLKINV_f.js b/js/Sources/CLKINV_f.js index 47127717..140623c7 100644 --- a/js/Sources/CLKINV_f.js +++ b/js/Sources/CLKINV_f.js @@ -11,7 +11,7 @@ function CLKINV_f() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = string(this.prt); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CLKINV_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs]),this.gr_i); return new EventInBlock(this.x); } CLKINV_f.prototype.details = function CLKINV_f() { diff --git a/js/Sources/CLKIN_f.js b/js/Sources/CLKIN_f.js index d4829280..73cd143c 100644 --- a/js/Sources/CLKIN_f.js +++ b/js/Sources/CLKIN_f.js @@ -10,7 +10,7 @@ function CLKIN_f() { this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = string(this.prt); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,this.exprs," "); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs])," "); return new BasicBlock(this.x); } CLKIN_f.prototype.details = function CLKIN_f() { diff --git a/js/Sources/CONST.js b/js/Sources/CONST.js index 99bbac2b..c48814a6 100644 --- a/js/Sources/CONST.js +++ b/js/Sources/CONST.js @@ -11,7 +11,7 @@ function CONST() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = strcat(sci2exp(this.C)); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([this.exprs]),this.gr_i); return new BasicBlock(this.x); } CONST.prototype.details = function CONST() { diff --git a/js/Sources/CONST_f.js b/js/Sources/CONST_f.js index 3ef8149c..22b503c3 100644 --- a/js/Sources/CONST_f.js +++ b/js/Sources/CONST_f.js @@ -11,7 +11,7 @@ function CONST_f() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = strcat(sci2exp(this.C)); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([this.exprs]),this.gr_i); return new BasicBlock(this.x); } CONST_f.prototype.details = function CONST_f() { diff --git a/js/Sources/CONST_m.js b/js/Sources/CONST_m.js index 70921450..7996dfc3 100644 --- a/js/Sources/CONST_m.js +++ b/js/Sources/CONST_m.js @@ -14,7 +14,7 @@ function CONST_m() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = sci2exp(this.C); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONST_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } CONST_m.prototype.details = function CONST_m() { diff --git a/js/Sources/CURVE_c.js b/js/Sources/CURVE_c.js index d570080d..4e040c1c 100644 --- a/js/Sources/CURVE_c.js +++ b/js/Sources/CURVE_c.js @@ -20,7 +20,7 @@ function CURVE_c() { this.model.firing = new ScilabDouble([0]); this.exprs = [[sci2exp(this.Method)],[sci2exp(this.xx)],[sci2exp(this.yy)],[this.PeriodicOption],[Graf]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CURVE_c\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } CURVE_c.prototype.details = function CURVE_c() { diff --git a/js/Sources/CURV_f.js b/js/Sources/CURV_f.js index 1c694d99..32a9fd29 100644 --- a/js/Sources/CURV_f.js +++ b/js/Sources/CURV_f.js @@ -16,7 +16,7 @@ function CURV_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CURV_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } CURV_f.prototype.details = function CURV_f() { diff --git a/js/Sources/Counter.js b/js/Sources/Counter.js index 804b9666..79fbc87a 100644 --- a/js/Sources/Counter.js +++ b/js/Sources/Counter.js @@ -15,7 +15,7 @@ function Counter() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[string(this.minim)],[string(this.maxim)],[string(this.rule)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Counter\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } Counter.prototype.details = function Counter() { diff --git a/js/Sources/FROMWSB.js b/js/Sources/FROMWSB.js index 059510d1..ea9aa8c9 100644 --- a/js/Sources/FROMWSB.js +++ b/js/Sources/FROMWSB.js @@ -8,7 +8,7 @@ function FROMWSB() { scs_m_1.objs[4-1] = scicos_link(xx=[[338.9421],[358.9421]],yy=[[281.584],[281.584]],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[3,1,1]); this.model = scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMWSB\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([5,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([5,2]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } FROMWSB.prototype.details = function FROMWSB() { diff --git a/js/Sources/FROMWS_c.js b/js/Sources/FROMWS_c.js index 2e7844d2..714ff8fe 100644 --- a/js/Sources/FROMWS_c.js +++ b/js/Sources/FROMWS_c.js @@ -18,7 +18,7 @@ function FROMWS_c() { this.model.dep_ut = new ScilabBoolean([false,true]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"FROMWS_c\",sz(1),sz(2));"]); this.exprs = [[string(this.varnam)],[string(this.Method)],[string(this.ZC)],[string(this.OutEnd)]]; - this.x = new standard_define(new ScilabDouble([3.5,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3.5,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } FROMWS_c.prototype.details = function FROMWS_c() { diff --git a/js/Sources/GENSIN_f.js b/js/Sources/GENSIN_f.js index 18dfd652..b141b1a7 100644 --- a/js/Sources/GENSIN_f.js +++ b/js/Sources/GENSIN_f.js @@ -13,7 +13,7 @@ function GENSIN_f() { this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = [[string(rpar[1-1])],[string(rpar[2-1])],[string(rpar[3-1])]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GENSIN_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } GENSIN_f.prototype.details = function GENSIN_f() { diff --git a/js/Sources/GENSQR_f.js b/js/Sources/GENSQR_f.js index 0fbb44b9..7c09ea48 100644 --- a/js/Sources/GENSQR_f.js +++ b/js/Sources/GENSQR_f.js @@ -13,7 +13,7 @@ function GENSQR_f() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = string(this.Amplitude); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GENSQR_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } GENSQR_f.prototype.details = function GENSQR_f() { diff --git a/js/Sources/GEN_SQR.js b/js/Sources/GEN_SQR.js index 01b23731..acd68578 100644 --- a/js/Sources/GEN_SQR.js +++ b/js/Sources/GEN_SQR.js @@ -47,7 +47,7 @@ function GEN_SQR() { var F = 1; this.exprs = [sci2exp(Amin),sci2exp(Amax),sci2exp(rule),sci2exp(F)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"GEN_SQR\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(this.exprs),this.gr_i); return new BasicBlock(this.x); } GEN_SQR.prototype.details = function GEN_SQR() { diff --git a/js/Sources/Ground_g.js b/js/Sources/Ground_g.js index 6dbf9bf3..1fe4898b 100644 --- a/js/Sources/Ground_g.js +++ b/js/Sources/Ground_g.js @@ -15,7 +15,7 @@ function Ground_g() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = []; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Ground_g\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } Ground_g.prototype.details = function Ground_g() { diff --git a/js/Sources/INIMPL_f.js b/js/Sources/INIMPL_f.js index c6b8133c..91304a4c 100644 --- a/js/Sources/INIMPL_f.js +++ b/js/Sources/INIMPL_f.js @@ -15,7 +15,7 @@ function INIMPL_f() { this.prt = 1; this.exprs = "1"; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INIMPL_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs]),this.gr_i); this.x.graphics.out_implicit = ["I"]; return new ImplicitInBlock(this.x); } diff --git a/js/Sources/IN_f.js b/js/Sources/IN_f.js index 2d293530..31326a50 100644 --- a/js/Sources/IN_f.js +++ b/js/Sources/IN_f.js @@ -12,7 +12,7 @@ function IN_f() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = sci2exp(prt); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IN_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([1,1]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([1,1]),this.model,new ScilabString([this.exprs]),this.gr_i); return new ExplicitInBlock(this.x); } IN_f.prototype.details = function IN_f() { diff --git a/js/Sources/Modulo_Count.js b/js/Sources/Modulo_Count.js index da9413fb..d3d8fc63 100644 --- a/js/Sources/Modulo_Count.js +++ b/js/Sources/Modulo_Count.js @@ -13,7 +13,7 @@ function Modulo_Count() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[string(this.ini_c)],[string(this.base)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Modulo_Count\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } Modulo_Count.prototype.details = function Modulo_Count() { diff --git a/js/Sources/PULSE_SC.js b/js/Sources/PULSE_SC.js index e59c3a36..6ec87ef7 100644 --- a/js/Sources/PULSE_SC.js +++ b/js/Sources/PULSE_SC.js @@ -42,7 +42,7 @@ function PULSE_SC() { var A = 1; this.exprs = [sci2exp(E),sci2exp(W),sci2exp(F),sci2exp(A)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PULSE_SC\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString(this.exprs),this.gr_i); return new BasicBlock(this.x); } PULSE_SC.prototype.details = function PULSE_SC() { diff --git a/js/Sources/RAMP.js b/js/Sources/RAMP.js index a50b550b..4e351fee 100644 --- a/js/Sources/RAMP.js +++ b/js/Sources/RAMP.js @@ -16,7 +16,7 @@ function RAMP() { this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = [string(rpar)]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAMP\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabString(this.exprs),this.gr_i); return new BasicBlock(this.x); } RAMP.prototype.details = function RAMP() { diff --git a/js/Sources/RAND_f.js b/js/Sources/RAND_f.js index 072839b4..0cdd5b9c 100644 --- a/js/Sources/RAND_f.js +++ b/js/Sources/RAND_f.js @@ -17,7 +17,7 @@ function RAND_f() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[string(this.flag)],[sci2exp(this.a.slice())],[sci2exp(this.b.slice())],[string(this.model.dstate[1-1])]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAND_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } RAND_f.prototype.details = function RAND_f() { diff --git a/js/Sources/RAND_m.js b/js/Sources/RAND_m.js index af6c26bb..f5753151 100644 --- a/js/Sources/RAND_m.js +++ b/js/Sources/RAND_m.js @@ -26,7 +26,7 @@ function RAND_m() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[sci2exp(1)],[string(this.flag)],[sci2exp([this.a])],[sci2exp([this.b])],[sci2exp([this.model.dstate[1-1],int(rand()*(10^7-1))])]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RAND_m\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } RAND_m.prototype.details = function RAND_m() { diff --git a/js/Sources/READAU_f.js b/js/Sources/READAU_f.js index 499d61dc..1d6748b9 100644 --- a/js/Sources/READAU_f.js +++ b/js/Sources/READAU_f.js @@ -22,7 +22,7 @@ function READAU_f() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[fname],[string(this.N)],[string(this.swap)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"READAU_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([5,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([5,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } READAU_f.prototype.details = function READAU_f() { diff --git a/js/Sources/READC_f.js b/js/Sources/READC_f.js index e00c0d90..a52a4711 100644 --- a/js/Sources/READC_f.js +++ b/js/Sources/READC_f.js @@ -26,7 +26,7 @@ function READC_f() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [["[]"],[sci2exp(this.outmask)],[fname],[frmt],[string(this.M)],[string(this.N)],[string(this.offset)],[string(this.swap)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"READC_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } READC_f.prototype.details = function READC_f() { diff --git a/js/Sources/RFILE_f.js b/js/Sources/RFILE_f.js index 4e7e4653..a05b52ed 100644 --- a/js/Sources/RFILE_f.js +++ b/js/Sources/RFILE_f.js @@ -22,7 +22,7 @@ function RFILE_f() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[sci2exp([])],[sci2exp(this.outmask)],[fname],[frmt],[string(this.N)],[sci2exp(out)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"RFILE_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } RFILE_f.prototype.details = function RFILE_f() { diff --git a/js/Sources/SAWTOOTH_f.js b/js/Sources/SAWTOOTH_f.js index 89e6d378..7f975daf 100644 --- a/js/Sources/SAWTOOTH_f.js +++ b/js/Sources/SAWTOOTH_f.js @@ -10,7 +10,7 @@ function SAWTOOTH_f() { this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = " "; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SAWTOOTH_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabString([this.exprs]),this.gr_i); return new BasicBlock(this.x); } SAWTOOTH_f.prototype.details = function SAWTOOTH_f() { diff --git a/js/Sources/STEP.js b/js/Sources/STEP.js index 21b9f45e..a5779be2 100644 --- a/js/Sources/STEP.js +++ b/js/Sources/STEP.js @@ -15,7 +15,7 @@ function STEP() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[string(1)],[string(rpar)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"STEP\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } STEP.prototype.details = function STEP() { diff --git a/js/Sources/STEP_FUNCTION.js b/js/Sources/STEP_FUNCTION.js index 10024cd5..bda1f4b5 100644 --- a/js/Sources/STEP_FUNCTION.js +++ b/js/Sources/STEP_FUNCTION.js @@ -48,7 +48,7 @@ function STEP_FUNCTION() { this.model.outtyp = new ScilabDouble([1]); this.model.rpar = scs_m_1; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"STEP_FUNCTION\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } STEP_FUNCTION.prototype.details = function STEP_FUNCTION() { diff --git a/js/Sources/SampleCLK.js b/js/Sources/SampleCLK.js index 9595688c..55e4663a 100644 --- a/js/Sources/SampleCLK.js +++ b/js/Sources/SampleCLK.js @@ -9,7 +9,7 @@ function SampleCLK() { this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[sci2exp(1)],[sci2exp(0)]]; - this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs," "); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble(this.exprs)," "); return new BasicBlock(this.x); } SampleCLK.prototype.details = function SampleCLK() { diff --git a/js/Sources/Sigbuilder.js b/js/Sources/Sigbuilder.js index e2c9c722..b4f130fc 100644 --- a/js/Sources/Sigbuilder.js +++ b/js/Sources/Sigbuilder.js @@ -12,7 +12,7 @@ function Sigbuilder() { scs_m_1.objs[8-1] = scicos_link(xx=[[349.49528],[349.49528]],yy=[[565.10704],[535.10704]],id="drawlink",thick=[0,0],ct=[5,-1],from=[3,1,0],to=[7,1,1]); this.model = scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=1,evtin=[],evtout=1,state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Sigbuilder\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } Sigbuilder.prototype.details = function Sigbuilder() { diff --git a/js/Sources/TIME_f.js b/js/Sources/TIME_f.js index 23feae55..f0b39c13 100644 --- a/js/Sources/TIME_f.js +++ b/js/Sources/TIME_f.js @@ -7,7 +7,7 @@ function TIME_f() { this.model.blocktype = new ScilabString(["c"]); this.model.dep_ut = new ScilabBoolean([false,true]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TIME_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } TIME_f.prototype.details = function TIME_f() { diff --git a/js/Sources/TKSCALE.js b/js/Sources/TKSCALE.js index bd1b757c..a487f386 100644 --- a/js/Sources/TKSCALE.js +++ b/js/Sources/TKSCALE.js @@ -13,7 +13,7 @@ function TKSCALE() { this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = [[sci2exp(this.a)],[sci2exp(this.b)],[sci2exp(this.f)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"TKSCALE\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } TKSCALE.prototype.details = function TKSCALE() { diff --git a/js/Threshold/GENERAL_f.js b/js/Threshold/GENERAL_f.js index 60c2ac11..155a0e43 100644 --- a/js/Threshold/GENERAL_f.js +++ b/js/Threshold/GENERAL_f.js @@ -15,7 +15,7 @@ function GENERAL_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = [[strcat(sci2exp(this.in1))],[strcat(sci2exp(this.out))]]; this.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,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,new ScilabDouble(this.exprs),this.gr_i); return new BasicBlock(this.x); } GENERAL_f.prototype.details = function GENERAL_f() { diff --git a/js/Threshold/NEGTOPOS_f.js b/js/Threshold/NEGTOPOS_f.js index 6c140a45..c7ee7792 100644 --- a/js/Threshold/NEGTOPOS_f.js +++ b/js/Threshold/NEGTOPOS_f.js @@ -11,7 +11,7 @@ function NEGTOPOS_f() { this.model.firing = new ScilabDouble([-1]); this.model.dep_ut = new ScilabBoolean([true,false]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NEGTOPOS_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } NEGTOPOS_f.prototype.details = function NEGTOPOS_f() { diff --git a/js/Threshold/POSTONEG_f.js b/js/Threshold/POSTONEG_f.js index 1ea900af..528a23e7 100644 --- a/js/Threshold/POSTONEG_f.js +++ b/js/Threshold/POSTONEG_f.js @@ -12,7 +12,7 @@ function POSTONEG_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.model.firing = new ScilabDouble([-1]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"POSTONEG_f\",sz(1),sz(2));"]); - this.x = new standard_define(new ScilabDouble([2,2]),this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([]),this.gr_i); return new BasicBlock(this.x); } POSTONEG_f.prototype.details = function POSTONEG_f() { diff --git a/js/Threshold/ZCROSS_f.js b/js/Threshold/ZCROSS_f.js index ec218c09..26d9fba1 100644 --- a/js/Threshold/ZCROSS_f.js +++ b/js/Threshold/ZCROSS_f.js @@ -14,7 +14,7 @@ function ZCROSS_f() { this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = strcat(sci2exp(this.in1)); this.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,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,new ScilabDouble([this.exprs]),this.gr_i); return new BasicBlock(this.x); } ZCROSS_f.prototype.details = function ZCROSS_f() { @@ -140,7 +140,7 @@ Rule 134 getvaluearg4 -> listcall Rule 135 standarddefineassignment -> lterm ASSIGNMENT STANDARD_DEFINE OPENBRACKET standarddefinearg1 COMMA standarddefinearg2 COMMA standarddefinearg3 COMMA standarddefinearg4 CLOSEBRACKET EOL Rule 136 standarddefinearg1 -> expression Rule 137 standarddefinearg2 -> expression -Rule 138 standarddefinearg3 -> expression +Rule 138 standarddefinearg3 -> modelexpression Rule 139 standarddefinearg4 -> expression Rule 140 standarddefinearg4 -> listcall Rule 141 ltermarraylist -> ltermarraylist COMMA ltermarraylistterm @@ -341,7 +341,7 @@ elseifstatementblock : 54 55 57 elsestatement : 59 60 elsestatementblock : 53 55 63 endstatementblock : 33 34 50 52 53 54 55 61 62 63 -expression : 67 67 67 68 68 68 69 69 70 70 73 75 76 89 90 91 92 93 94 95 97 99 100 104 105 105 110 112 114 117 133 136 137 138 139 152 153 154 155 155 156 158 159 160 164 166 168 170 172 173 174 181 182 182 183 183 184 184 185 186 186 187 188 192 195 195 196 197 197 197 197 198 199 199 200 200 209 209 210 210 210 211 211 211 211 212 212 213 214 216 217 218 219 219 220 220 222 222 223 223 223 224 225 225 225 226 226 226 226 227 227 227 228 228 229 229 230 233 240 240 241 241 +expression : 67 67 67 68 68 68 69 69 70 70 73 75 76 89 90 91 92 93 94 95 97 99 100 104 105 105 110 112 114 117 133 136 137 139 152 153 154 155 155 156 158 159 160 164 166 168 170 172 173 174 181 182 182 183 183 184 184 185 186 186 187 188 192 195 195 196 197 197 197 197 198 199 199 200 200 209 209 210 210 210 211 211 211 211 212 212 213 214 216 217 218 219 219 220 220 222 222 223 223 223 224 225 225 225 226 226 226 226 227 227 227 228 228 229 229 230 233 240 240 241 241 forstatement : 51 forstatementblock : 50 forstatementblocks : 26 27 @@ -370,7 +370,7 @@ listcall : 98 111 113 134 140 157 161 162 163 165 167 169 171 185 lterm : 5 6 7 8 9 37 97 98 115 135 192 195 196 197 198 199 200 202 203 204 205 ltermarraylist : 141 201 ltermarraylistterm : 141 142 -modelexpression : 106 107 +modelexpression : 106 107 138 modelexpressionlist : 108 112 113 modelvar : 101 104 105 106 107 resumestatementblocks : 31 32 @@ -12942,6 +12942,7 @@ state 320 (223) term -> expression . COLON expression COLON expression EOL reduce using rule 114 (modelexpression -> expression .) + COMMA reduce using rule 114 (modelexpression -> expression .) TRANSPOSE shift and go to state 171 MULTIPLICATION shift and go to state 175 ADDITION shift and go to state 170 @@ -16375,6 +16376,7 @@ state 428 (109) modelexpression -> LIST OPENBRACKET CLOSEBRACKET . EOL reduce using rule 109 (modelexpression -> LIST OPENBRACKET CLOSEBRACKET .) + COMMA reduce using rule 109 (modelexpression -> LIST OPENBRACKET CLOSEBRACKET .) state 429 @@ -17384,6 +17386,7 @@ state 467 (108) modelexpression -> LIST OPENBRACKET modelexpressionlist CLOSEBRACKET . EOL reduce using rule 108 (modelexpression -> LIST OPENBRACKET modelexpressionlist CLOSEBRACKET .) + COMMA reduce using rule 108 (modelexpression -> LIST OPENBRACKET modelexpressionlist CLOSEBRACKET .) state 468 @@ -17683,7 +17686,10 @@ state 481 state 482 (135) standarddefineassignment -> lterm ASSIGNMENT STANDARD_DEFINE OPENBRACKET standarddefinearg1 COMMA standarddefinearg2 COMMA . standarddefinearg3 COMMA standarddefinearg4 CLOSEBRACKET EOL - (138) standarddefinearg3 -> . expression + (138) standarddefinearg3 -> . modelexpression + (108) modelexpression -> . LIST OPENBRACKET modelexpressionlist CLOSEBRACKET + (109) modelexpression -> . LIST OPENBRACKET CLOSEBRACKET + (114) modelexpression -> . expression (174) expression -> . OPENBRACKET expression CLOSEBRACKET (175) expression -> . OPENSQBRACKET termarrayarraylist CLOSESQBRACKET (176) expression -> . OPENSQBRACKET termarrayarraylist SEMICOLON CLOSESQBRACKET @@ -17745,6 +17751,7 @@ state 482 (250) termvar -> . MODEL (251) termvar -> . IN + LIST shift and go to state 319 OPENBRACKET shift and go to state 89 OPENSQBRACKET shift and go to state 97 ADDITION shift and go to state 99 @@ -17767,9 +17774,10 @@ state 482 IN shift and go to state 95 term shift and go to state 94 - standarddefinearg3 shift and go to state 507 + modelexpression shift and go to state 507 + standarddefinearg3 shift and go to state 508 termvar shift and go to state 90 - expression shift and go to state 508 + expression shift and go to state 320 state 483 @@ -18344,31 +18352,16 @@ state 506 state 507 - (135) standarddefineassignment -> lterm ASSIGNMENT STANDARD_DEFINE OPENBRACKET standarddefinearg1 COMMA standarddefinearg2 COMMA standarddefinearg3 . COMMA standarddefinearg4 CLOSEBRACKET EOL + (138) standarddefinearg3 -> modelexpression . - COMMA shift and go to state 525 + COMMA reduce using rule 138 (standarddefinearg3 -> modelexpression .) state 508 - (138) standarddefinearg3 -> expression . - (181) expression -> expression . TRANSPOSE - (182) expression -> expression . MULTIPLICATION expression - (183) expression -> expression . ADDITION expression - (184) expression -> expression . COMPARISON expression - (185) expression -> expression . COMPARISON listcall - (186) expression -> expression . LOGICAL expression - (240) expression -> expression . ADDITION expression MULTIPLICATION PREVAR_COMPLEX - (241) expression -> expression . ADDITION PREVAR_COMPLEX MULTIPLICATION expression - (223) term -> expression . COLON expression COLON expression + (135) standarddefineassignment -> lterm ASSIGNMENT STANDARD_DEFINE OPENBRACKET standarddefinearg1 COMMA standarddefinearg2 COMMA standarddefinearg3 . COMMA standarddefinearg4 CLOSEBRACKET EOL - COMMA reduce using rule 138 (standarddefinearg3 -> expression .) - TRANSPOSE shift and go to state 171 - MULTIPLICATION shift and go to state 175 - ADDITION shift and go to state 170 - COMPARISON shift and go to state 169 - LOGICAL shift and go to state 172 - COLON shift and go to state 174 + COMMA shift and go to state 525 state 509 diff --git a/sci2jsyacc.py b/sci2jsyacc.py index 202650ef..a673b210 100755 --- a/sci2jsyacc.py +++ b/sci2jsyacc.py @@ -767,7 +767,7 @@ def p_standarddefinearg2_expression(p): p[0] = '%s' % (value) def p_standarddefinearg3_expression(p): - 'standarddefinearg3 : expression' + 'standarddefinearg3 : modelexpression' value = p[1][0] p[0] = '%s' % (value) |