diff options
519 files changed, 4246 insertions, 3964 deletions
diff --git a/combined.js b/combined.js index 56135dae..5c7f83dd 100644 --- a/combined.js +++ b/combined.js @@ -7,7 +7,7 @@ function CLKFROM() { this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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.graphics.id = "From"; @@ -56,7 +56,7 @@ function CLKGOTO() { this.model.ipar = new ScilabDouble([int(1)]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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.graphics.id = "Goto"; @@ -121,7 +121,7 @@ function CLKGotoTagVisibility() { this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabBoolean([false]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -172,7 +172,7 @@ function DEMUX() { this.model.ipar = new ScilabDouble([this.out]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -247,7 +247,7 @@ function DEMUX_f() { this.model.ipar = new ScilabDouble([this.out]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -324,7 +324,7 @@ function ESELECT_f() { this.model.evtout = new ScilabDouble([ones(this.out,1)]); this.model.blocktype = new ScilabString(["l"]); this.model.firing = new ScilabDouble([-ones(this.out,1)]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.model.nmode = new ScilabDouble([0]); this.model.nzcross = new ScilabDouble([0]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ESELECT_f\",sz(1),sz(2));"]); @@ -400,7 +400,7 @@ function EXTRACTOR() { this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); 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));"]); @@ -456,7 +456,7 @@ function FROM() { this.model.ipar = new ScilabDouble([]); this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -511,7 +511,7 @@ function FROMMO() { this.model.ipar = new ScilabDouble([]); this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); var mo = modelica(); mo.model = "frommo"; mo.outputs = "n"; @@ -569,7 +569,7 @@ function GOTO() { this.model.ipar = new ScilabDouble([int(1)]); this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -632,7 +632,7 @@ function GOTOMO() { this.model.ipar = new ScilabDouble([int(1)]); this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); var mo = modelica(); mo.model = "gotomo"; mo.inputs = "p"; @@ -699,7 +699,7 @@ function GotoTagVisibility() { this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabBoolean([false]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -754,7 +754,7 @@ function GotoTagVisibilityMO() { this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabBoolean([false]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -807,7 +807,7 @@ function ISELECT_f() { this.model.evtin = new ScilabDouble([ones(out)]); this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -873,7 +873,7 @@ function ISELECT_m() { this.model.evtin = new ScilabDouble([ones(this.nout,1)]); this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -939,7 +939,7 @@ function MUX() { this.model.out = new ScilabDouble([0]); this.model.ipar = new ScilabDouble([this.in1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -1012,7 +1012,7 @@ function MUX_f() { this.model.out = new ScilabDouble([0]); this.model.ipar = new ScilabDouble([this.in1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -1087,7 +1087,7 @@ function M_SWITCH() { this.model.out = new ScilabDouble([-1]); this.model.ipar = new ScilabDouble(ipar); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -1161,7 +1161,7 @@ function NRMSOM_f() { this.model.in = new ScilabDouble(in1); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -1213,7 +1213,7 @@ function RELAY_f() { this.model.dstate = new ScilabDouble([i0]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,true]); + 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); @@ -1268,7 +1268,7 @@ function SCALAR2VECTOR() { this.model.out = new ScilabDouble([this.nout]); this.model.in = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -1326,7 +1326,7 @@ function SELECT_f() { this.model.evtin = new ScilabDouble([ones(in1)]); this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -1392,7 +1392,7 @@ function SELECT_m() { this.model.evtin = new ScilabDouble([ones(this.nin,1)]); this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -1510,7 +1510,7 @@ function SWITCH2() { this.model.nzcross = new ScilabDouble([this.nzz]); this.model.nmode = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -1581,7 +1581,7 @@ function SWITCH2_m() { this.model.nzcross = new ScilabDouble([this.nzz]); this.model.nmode = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -1665,7 +1665,7 @@ function SWITCH_f() { this.model.ipar = new ScilabDouble([i0]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,true]); + 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); @@ -1752,7 +1752,7 @@ function CCS() { this.exprs = []; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CCS\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); @@ -1816,7 +1816,7 @@ function CVS() { this.exprs = []; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CVS\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); @@ -1848,7 +1848,7 @@ function Capacitor() { this.model.rpar = new ScilabDouble([this.C],[this.v]); this.model.sim = new ScilabString(["Capacitor"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "Capacitor"; mo.inputs = "p"; @@ -1904,7 +1904,7 @@ function ConstantVoltage() { this.model.out = new ScilabDouble([1]); this.model.sim = new ScilabString(["ConstantVoltage"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); var mo = modelica(); mo.model = "ConstantVoltage"; mo.inputs = "p"; @@ -1953,7 +1953,7 @@ function CurrentSensor() { this.model.out = new ScilabDouble([1],[1]); this.model.sim = new ScilabString(["CurrentSensor"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "CurrentSensor"; mo.inputs = "p"; @@ -1991,7 +1991,7 @@ function Diode() { this.model.out = new ScilabDouble([1]); this.model.sim = new ScilabString(["Diode"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "Diode"; mo.inputs = "p"; @@ -2047,7 +2047,7 @@ function Ground() { this.model.out = new ScilabDouble([]); this.model.sim = new ScilabString(["Ground"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "Ground"; mo.inputs = "p"; @@ -2112,7 +2112,7 @@ function Gyrator() { this.exprs = [["1"],["1"]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Gyrator\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); @@ -2191,7 +2191,7 @@ function IdealTransformer() { this.exprs = ["1"]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IdealTransformer\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); @@ -2237,7 +2237,7 @@ function Inductor() { this.model.rpar = new ScilabDouble([this.L]); this.model.sim = new ScilabString(["Inductor"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "Inductor"; mo.inputs = "p"; @@ -2286,7 +2286,7 @@ function MOTOR() { this.model.in = new ScilabDouble([1]); this.model.sim = new ScilabString(["motor"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -2321,7 +2321,7 @@ function NMOS() { this.RDS = 1.e+7; this.model.sim = new ScilabString(["NMOS"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "NMOS"; mo.outputs = [["D"],["B"],["S"]]; @@ -2421,7 +2421,7 @@ function NPN() { this.exprs = [["50"],["0.1"],["1.e-16"],["0.02"],["0.12e-9"],["5e-9"],["1e-12"],["0.4e-12"],["0.5e-12"],["0.8"],["0.4"],["0.8"],["0.333"],["1e-15"],["1e-15"],["0.02585"],["40"]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NPN\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); @@ -2497,7 +2497,7 @@ function OpAmp() { this.model = scicos_model(); this.model.sim = new ScilabString(["OpAmp"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = this.model.sim; mo.inputs = [["in_p"],["in_n"]]; @@ -2560,7 +2560,7 @@ function PMOS() { this.RDS = 1.e+7; this.model.sim = new ScilabString(["PMOS"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "PMOS"; mo.outputs = [["D"],["B"],["S"]]; @@ -2660,7 +2660,7 @@ function PNP() { this.exprs = [["50"],["0.1"],["1.e-16"],["0.02"],["0.12e-9"],["5e-9"],["1e-12"],["0.4e-12"],["0.5e-12"],["0.8"],["0.4"],["0.8"],["0.333"],["1e-15"],["1e-15"],["0.02585"],["40"]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PNP\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); @@ -2737,7 +2737,7 @@ function PotentialSensor() { this.model.rpar = new ScilabDouble([]); this.model.sim = new ScilabString(["PotentialSensor"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "PotentialSensor"; mo.inputs = "p"; @@ -2769,7 +2769,7 @@ function Resistor() { this.model.rpar = new ScilabDouble([this.R]); this.model.sim = new ScilabString(["resistor"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "Resistor"; mo.inputs = "p"; @@ -2826,7 +2826,7 @@ function SineVoltage() { this.model.rpar = new ScilabDouble([this.V],[this.ph],[this.frq],[this.offset],[this.start]); this.model.sim = new ScilabString(["SineVoltage"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "SineVoltage"; mo.inputs = "p"; @@ -2886,7 +2886,7 @@ function Switch() { var Z = eval(S); this.model.sim = new ScilabString(["Switch"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = this.model.sim; mo.inputs = [["p"],["inp"]]; @@ -2943,7 +2943,7 @@ function VVsourceAC() { this.model.rpar = new ScilabDouble([this.FR]); this.model.sim = new ScilabString(["VVsourceAC"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "VVsourceAC"; mo.inputs = ["p","VA"]; @@ -2991,7 +2991,7 @@ function VariableResistor() { this.model = scicos_model(); this.model.sim = new ScilabString(["VariableResistor"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "VariableResistor"; mo.inputs = ["p","R"]; @@ -3026,7 +3026,7 @@ function VoltageSensor() { this.model.out = new ScilabDouble([1],[1]); this.model.sim = new ScilabString(["VoltageSensor"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "VoltageSensor"; mo.inputs = "p"; @@ -3062,7 +3062,7 @@ function VsourceAC() { this.model.rpar = new ScilabDouble([this.VA],[this.FR]); this.model.sim = new ScilabString(["VsourceAC"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "VsourceAC"; mo.inputs = "p"; @@ -3196,7 +3196,7 @@ function ANDLOG_f() { this.model.evtin = new ScilabDouble([1],[1]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); return new BasicBlock(this.x); @@ -3222,7 +3222,7 @@ function CLKSOMV_f() { this.model.evtout = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); return new BasicBlock(this.x); @@ -3248,7 +3248,7 @@ function CLKSOM_f() { this.model.evtout = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); return new BasicBlock(this.x); @@ -3273,8 +3273,8 @@ function CLKSPLIT_f() { this.model.evtin = new ScilabDouble([1]); this.model.evtout = new ScilabDouble([1],[1]); this.model.blocktype = new ScilabString(["d"]); - this.model.firing = new ScilabDouble([false,false,false]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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,[],[]); return new BasicBlock(this.x); } @@ -3300,7 +3300,7 @@ function END_c() { this.model.evtout = new ScilabDouble([1]); this.model.firing = new ScilabDouble([this.tf]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -3347,7 +3347,7 @@ function EVTDLY_c() { this.model.rpar = new ScilabDouble([this.dt],[this.ff]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([this.ff]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -3401,7 +3401,7 @@ function EVTDLY_f() { this.model.rpar = new ScilabDouble([this.dt]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([this.ff]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -3452,7 +3452,7 @@ function EVTGEN_f() { this.model.evtout = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([this.tt]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -3498,7 +3498,7 @@ function EVTVARDLY() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -3540,7 +3540,7 @@ function HALT_f() { this.model.dstate = new ScilabDouble([0]); this.model.ipar = new ScilabDouble([0]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -3587,7 +3587,7 @@ function IFTHEL_f() { this.model.evtout = new ScilabDouble([1],[1]); this.model.blocktype = new ScilabString(["l"]); this.model.firing = new ScilabDouble([-1,-1]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.model.nmode = new ScilabDouble([1]); this.model.nzcross = new ScilabDouble([1]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IFTHEL_f\",sz(1),sz(2));"]); @@ -3621,7 +3621,7 @@ function IFTHEL_f() { if (!ok) { break; } - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); if (this.nmod!=0) { this.nmod = 1; } @@ -3756,7 +3756,7 @@ function MFCLCK_f() { this.model.ipar = new ScilabDouble([this.nn]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1,0]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -3802,7 +3802,7 @@ function M_freq() { this.model.opar = list([[1,1,0],[1,1,1],[1,3,2]], new ScilabDouble([1]), new ScilabDouble([0]), new ScilabDouble([0])); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([0,-1,-1]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -3884,7 +3884,7 @@ function VirtualCLK0() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = []; this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs," "); return new BasicBlock(this.x); @@ -4125,7 +4125,7 @@ function Bache() { this.model.rpar = new ScilabDouble([this.Patm],[this.A],[this.ze1],[this.ze2],[this.zs1],[this.zs2],[this.z0],[this.T0],[this.p_rho]); this.model.sim = new ScilabString(["Bache"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "Bache"; mo.inputs = ["Ce1","Ce2"]; @@ -4226,7 +4226,7 @@ function Flowmeter() { this.exprs = "1"; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Flowmeter\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); @@ -4276,7 +4276,7 @@ function PerteDP() { this.model.rpar = new ScilabDouble([this.L],[this.D],[this.lambda],[this.z1],[this.z2],[this.p_rho]); this.model.sim = new ScilabString(["PerteDP"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "PerteDP"; mo.inputs = "C1"; @@ -4341,7 +4341,7 @@ function PuitsP() { this.model.rpar = new ScilabDouble([this.P0],[this.T0],[this.H0],[this.option_temperature]); this.model.sim = new ScilabString(["Puits"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "Puits"; mo.inputs = ["C"]; @@ -4399,7 +4399,7 @@ function SourceP() { this.model.rpar = new ScilabDouble([this.P0],[this.T0],[this.H0],[this.option_temperature]); this.model.sim = new ScilabString(["Source"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "Source"; mo.inputs = []; @@ -4459,7 +4459,7 @@ function VanneReglante() { this.model.rpar = new ScilabDouble([this.Cvmax],[this.p_rho]); this.model.sim = new ScilabString(["VanneReglante"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "VanneReglante"; mo.inputs = ["C1","Ouv"]; @@ -4518,7 +4518,7 @@ function BITCLEAR() { this.model.outtyp = new ScilabDouble([3]); this.model.opar = list(new ScilabDouble([int32(0)])); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -4615,7 +4615,7 @@ function BITSET() { this.model.outtyp = new ScilabDouble([3]); this.model.opar = list(new ScilabDouble([uint32(0)])); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -4712,7 +4712,7 @@ function CONVERT() { this.model.rpar = new ScilabDouble([]); this.model.ipar = new ScilabDouble([sgn]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -5168,7 +5168,7 @@ function DFLIPFLOP() { this.model.outtyp = new ScilabDouble([5,5]); this.model.blocktype = new ScilabString(["h"]); this.model.firing = new ScilabBoolean([false]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -5219,7 +5219,7 @@ function DLATCH() { this.model.outtyp = new ScilabDouble([5,5]); this.model.blocktype = new ScilabString(["h"]); this.model.firing = new ScilabBoolean([false]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -5251,7 +5251,7 @@ function EXTRACTBITS() { this.model.outtyp = new ScilabDouble([3]); this.model.ipar = new ScilabDouble([0,numb]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -5496,7 +5496,7 @@ function INTMUL() { this.model.rpar = new ScilabDouble([]); this.model.ipar = new ScilabDouble([sgn]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -5642,7 +5642,7 @@ function JKFLIPFLOP() { this.model.outtyp = new ScilabDouble([5,5]); this.model.blocktype = new ScilabString(["h"]); this.model.firing = new ScilabBoolean([false]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -5711,7 +5711,7 @@ function LOGIC() { this.model.opar = list(new ScilabDouble([int8(this.mat)])); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabBoolean([false]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -5788,7 +5788,7 @@ function SHIFT() { this.model.rpar = new ScilabDouble([]); this.model.ipar = new ScilabDouble(sgn); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -5934,7 +5934,7 @@ function SRFLIPFLOP() { this.model.outtyp = new ScilabDouble([5,5]); this.model.blocktype = new ScilabString(["h"]); this.model.firing = new ScilabBoolean([false]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -5997,7 +5997,7 @@ function BIGSOM_f() { this.model.out = new ScilabDouble([-1]); this.model.rpar = new ScilabDouble(this.sgn); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -6045,7 +6045,7 @@ function CLINDUMMY_f() { this.model.state = new ScilabDouble([x0]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([false,true]); + 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); return new BasicBlock(this.x); @@ -6078,7 +6078,7 @@ function CLR() { this.model.state = new ScilabDouble([x0]); this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + 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); return new BasicBlock(this.x); @@ -6132,7 +6132,7 @@ function CLR() { var mmm = [false,true]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = new ScilabDouble(mmm); + this.model.dep_ut = new ScilabBoolean(mmm); } if (ns1<=ns) { var x0 = x0.slice(1-1,ns1); @@ -6165,7 +6165,7 @@ function CLR_f() { this.model.state = new ScilabDouble([x0]); this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + 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); return new BasicBlock(this.x); @@ -6219,7 +6219,7 @@ function CLR_f() { var mmm = [false,true]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = new ScilabDouble(mmm); + this.model.dep_ut = new ScilabBoolean(mmm); } if (ns1<=ns) { var x0 = x0.slice(1-1,ns1); @@ -6253,7 +6253,7 @@ function CLSS() { this.model.state = new ScilabDouble([this.x0]); this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + 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); @@ -6326,10 +6326,10 @@ function CLSS() { var mmm = [false,true]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = new ScilabDouble(mmm); + this.model.dep_ut = new ScilabBoolean(mmm); } } else { - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); } this.model.state = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble(rpar); @@ -6359,7 +6359,7 @@ function CLSS_f() { this.model.state = new ScilabDouble([this.x0]); this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + 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); @@ -6422,10 +6422,10 @@ function CLSS_f() { var mmm = [false,true]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = new ScilabDouble(mmm); + this.model.dep_ut = new ScilabBoolean(mmm); } } else { - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); } this.model.state = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble(rpar); @@ -6455,7 +6455,7 @@ function DELAYV_f() { this.model.rpar = new ScilabDouble([this.T/(size(this.zz0,"*"))]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([0,-1]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -6657,7 +6657,7 @@ function DERIV() { this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["x"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -6685,7 +6685,7 @@ function DIFF_c() { this.model.out = new ScilabDouble([1]); this.model.state = new ScilabDouble(this.x0); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + 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); @@ -6755,7 +6755,7 @@ function DLR() { this.model.dstate = new ScilabDouble(x0.slice()); this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); return new BasicBlock(this.x); @@ -6813,7 +6813,7 @@ function DLR() { var mmm = [false,false]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = new ScilabDouble(mmm); + this.model.dep_ut = new ScilabBoolean(mmm); } this.x.graphics = this.graphics; this.x.model = this.model; @@ -6841,7 +6841,7 @@ function DLR_f() { this.model.dstate = new ScilabDouble(x0.slice()); this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); return new BasicBlock(this.x); @@ -6899,7 +6899,7 @@ function DLR_f() { var mmm = [false,false]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = new ScilabDouble(mmm); + this.model.dep_ut = new ScilabBoolean(mmm); } this.x.graphics = this.graphics; this.x.model = this.model; @@ -6926,7 +6926,7 @@ function DLSS() { this.model.dstate = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -6999,10 +6999,10 @@ function DLSS() { var mmm = [false,false]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = new ScilabDouble(mmm); + this.model.dep_ut = new ScilabBoolean(mmm); } } else { - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); } this.model.dstate = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble(rpar); @@ -7031,7 +7031,7 @@ function DLSS_f() { this.model.dstate = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -7094,10 +7094,10 @@ function DLSS_f() { var mmm = [false,false]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = new ScilabDouble(mmm); + this.model.dep_ut = new ScilabBoolean(mmm); } } else { - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); } this.model.dstate = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble(rpar); @@ -7124,7 +7124,7 @@ function DOLLAR() { this.model.evtin = new ScilabDouble([1-this.inh]); this.model.dstate = new ScilabDouble([z]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); return new BasicBlock(this.x); @@ -7225,7 +7225,7 @@ function DOLLAR_f() { this.model.evtin = new ScilabDouble([1-this.inh]); this.model.dstate = new ScilabDouble([z]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); return new BasicBlock(this.x); @@ -7291,7 +7291,7 @@ function DOLLAR_m() { this.model.evtin = new ScilabDouble([1-this.inh]); this.model.dstate = new ScilabDouble([z]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); return new BasicBlock(this.x); @@ -7394,7 +7394,7 @@ function GAINBLK() { this.model.out2 = new ScilabDouble([out2]); this.model.rpar = new ScilabDouble([this.gain]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -7553,7 +7553,7 @@ function GAINBLK_f() { this.model.out = new ScilabDouble([out]); this.model.rpar = new ScilabDouble([this.gain]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -7611,7 +7611,7 @@ function GAIN_f() { this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.gain]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -7670,7 +7670,7 @@ function INTEGRAL() { this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + 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); @@ -7764,7 +7764,7 @@ function INTEGRAL_f() { this.model.out = new ScilabDouble([1]); this.model.state = new ScilabDouble([this.x0]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + 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); @@ -7812,7 +7812,7 @@ function INTEGRAL_m() { this.model.out2 = new ScilabDouble([1]); this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + 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); @@ -7972,7 +7972,7 @@ function PID() { this.model.outtyp = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["h"]); this.model.firing = new ScilabBoolean([false]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -8066,7 +8066,7 @@ function REGISTER() { this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -8158,7 +8158,7 @@ function REGISTER_f() { this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -8206,7 +8206,7 @@ function SAMPHOLD() { this.model.out = new ScilabDouble([-1]); this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); return new BasicBlock(this.x); @@ -8237,7 +8237,7 @@ function SAMPHOLD_m() { this.model.out2 = new ScilabDouble([-2]); this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -8291,7 +8291,7 @@ function SAMPLEHOLD_f() { this.model.out = new ScilabDouble([-1]); this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); return new BasicBlock(this.x); @@ -8319,7 +8319,7 @@ function SOM_f() { this.model.out = new ScilabDouble([-1]); this.model.rpar = new ScilabDouble(sgn); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -8364,7 +8364,7 @@ function SUMMATION() { this.model.out2 = new ScilabDouble([-2]); this.model.ipar = new ScilabDouble(this.sgn); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -8510,7 +8510,7 @@ function SUM_f() { this.model.in = new ScilabDouble([-1],[-1],[-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -8547,7 +8547,7 @@ function TCLSS() { this.model.state = new ScilabDouble([this.x0]); this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + 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); @@ -8610,10 +8610,10 @@ function TCLSS() { var mmm = [false,true]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = new ScilabDouble(mmm); + this.model.dep_ut = new ScilabBoolean(mmm); } } else { - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); } this.model.state = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble(rpar); @@ -8650,7 +8650,7 @@ function TCLSS_f() { this.model.state = new ScilabDouble([this.x0]); this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + 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); @@ -8713,10 +8713,10 @@ function TCLSS_f() { var mmm = [false,true]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = new ScilabDouble(mmm); + this.model.dep_ut = new ScilabBoolean(mmm); } } else { - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); } this.model.state = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble(rpar); @@ -8748,7 +8748,7 @@ function TIME_DELAY() { this.model.rpar = new ScilabDouble([this.T,this.init]); this.model.ipar = new ScilabDouble([this.N]); this.model.blocktype = new ScilabString(["x"]); - this.model.dep_ut = new ScilabDouble([false,true]); + 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); @@ -8795,7 +8795,7 @@ function TIME_DELAY() { this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.rpar = new ScilabDouble([this.T],[this.init]); this.model.ipar = new ScilabDouble([this.N]); - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); this.x.graphics = this.graphics; this.x.model = this.model; break; @@ -8818,7 +8818,7 @@ function VARIABLE_DELAY() { this.model.rpar = new ScilabDouble([this.T,this.init]); this.model.ipar = new ScilabDouble([this.N]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -8894,7 +8894,7 @@ function CUMSUM() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -8996,7 +8996,7 @@ function EXTRACT() { this.model.ipar = new ScilabDouble([1,1,1,1]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -9098,7 +9098,7 @@ function EXTTRI() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -9197,7 +9197,7 @@ function MATBKSL() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -9274,7 +9274,7 @@ function MATCATH() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -9342,7 +9342,7 @@ function MATCATV() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -9409,7 +9409,7 @@ function MATDET() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -9486,7 +9486,7 @@ function MATDIAG() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -9563,7 +9563,7 @@ function MATDIV() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -9640,7 +9640,7 @@ function MATEIG() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -9740,7 +9740,7 @@ function MATEXPM() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -9817,7 +9817,7 @@ function MATINV() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -9894,7 +9894,7 @@ function MATLU() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -9972,7 +9972,7 @@ function MATMAGPHI() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -10041,7 +10041,7 @@ function MATMUL() { this.model.in2 = new ScilabDouble([-2],[-3]); this.model.out = new ScilabDouble([-1]); this.model.out2 = new ScilabDouble([-3]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); 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));"]); @@ -10218,7 +10218,7 @@ function MATPINV() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -10295,7 +10295,7 @@ function MATRESH() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -10401,7 +10401,7 @@ function MATSING() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -10504,7 +10504,7 @@ function MATSUM() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -10596,7 +10596,7 @@ function MATTRAN() { this.model.in2 = new ScilabDouble([-2]); this.model.out = new ScilabDouble([-2]); this.model.out2 = new ScilabDouble([-1]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -10679,7 +10679,7 @@ function MATZCONJ() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -10718,7 +10718,7 @@ function MATZREIM() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -10799,7 +10799,7 @@ function RICC() { this.model.ipar = new ScilabDouble([1],[1]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -10867,7 +10867,7 @@ function ROOTCOEF() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -10936,7 +10936,7 @@ function SQRT() { this.model.outtyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); this.model.out2 = new ScilabDouble([-2]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -11008,7 +11008,7 @@ function SUBMAT() { this.model.ipar = new ScilabDouble([1],[1],[1],[1]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -11117,7 +11117,7 @@ function AUTOMAT() { this.model.blocktype = new ScilabString(["c"]); this.model.evtout = new ScilabDouble([1]); this.model.firing = new ScilabDouble([-1]); - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); 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));"]); @@ -11248,7 +11248,7 @@ function BACKLASH() { this.model.rpar = new ScilabDouble([0],[1]); this.model.nzcross = new ScilabDouble([2]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); return new BasicBlock(this.x); @@ -11328,7 +11328,7 @@ function BOUNCE() { this.model.ipar = new ScilabDouble(ipar); this.model.nzcross = new ScilabDouble([n*(n-1)/2+4*n]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + 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); @@ -11457,7 +11457,7 @@ function BOUNCEXY() { this.model.ipar = new ScilabDouble([this.win],[this.imode],[this.clrs.slice()]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -11556,7 +11556,7 @@ function BPLATFORM() { this.model.dstate = new ScilabDouble([0]); this.model.rpar = new ScilabDouble([this.plen],[this.csiz],[this.phi],[this.xmin],[this.xmax],[this.ymin],[this.ymax]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -11647,7 +11647,7 @@ function CBLOCK() { this.model.ipar = new ScilabDouble(this.ipar); this.model.blocktype = new ScilabString([typ]); this.model.firing = new ScilabDouble(auto); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.model.nzcross = new ScilabDouble([this.ng]); var label = list(transpose([funam,"n",sci2exp(in1),sci2exp(out),sci2exp(clkin),sci2exp(clkout),sci2exp(x0),sci2exp(0),sci2exp(z0),sci2exp(this.rpar),sci2exp(this.ipar),sci2exp(auto),"y","n"]),[]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CBLOCK\",sz(1),sz(2));"]); @@ -11769,7 +11769,7 @@ function CBLOCK() { this.model.rpar = new ScilabDouble(this.rpar); this.model.ipar = new ScilabDouble([this.ipar]); this.model.firing = new ScilabDouble([this.auto0]); - this.model.dep_ut = new ScilabDouble(dep_ut); + this.model.dep_ut = new ScilabBoolean(dep_ut); this.model.nzcross = new ScilabDouble([this.ng]); label[2-1] = tt; this.x.model = this.model; @@ -11798,7 +11798,7 @@ function CBLOCK4() { this.model.out = new ScilabDouble([1]); this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var label = list([[funam],["n"],[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),\"CBLOCK4\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([4,2]),this.model,label,this.gr_i); @@ -11928,7 +11928,7 @@ function CBLOCK4() { this.model.firing = new ScilabDouble([this.auto0]); this.model.nzcross = new ScilabDouble([this.nzcr]); this.model.nmode = new ScilabDouble([this.nmode]); - this.model.dep_ut = new ScilabDouble(dep_ut); + this.model.dep_ut = new ScilabBoolean(dep_ut); label[2-1] = tt; this.x.model = this.model; this.graphics.exprs = new ScilabDouble([label]); @@ -11957,7 +11957,7 @@ function CONSTRAINT2_c() { this.model.state = new ScilabDouble([this.x0],[this.xd0]); this.model.ipar = new ScilabDouble(this.id); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = list(strcat(sci2exp(this.x0)),strcat(sci2exp(this.xd0)),strcat(sci2exp(this.id))); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONSTRAINT2_c\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); @@ -12037,7 +12037,7 @@ function CONSTRAINT_c() { this.model.ipar = new ScilabDouble([0]); this.model.state = new ScilabDouble(this.x0); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + 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); @@ -12098,7 +12098,7 @@ function DEADBAND() { this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -12231,7 +12231,7 @@ function DIFF_f() { this.model.out = new ScilabDouble([1]); this.model.state = new ScilabDouble(this.x0); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + 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); @@ -12334,7 +12334,7 @@ function EDGETRIGGER() { this.model.nzcross = new ScilabDouble([1]); this.model.ipar = new ScilabDouble([sign(this.edge)]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -12724,7 +12724,7 @@ function HYSTHERESIS() { this.model.nzcross = new ScilabDouble([this.nzz]); this.model.nmode = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -12814,7 +12814,7 @@ function LOGICAL_OP() { this.model.out = new ScilabDouble([-1]); this.model.ipar = new ScilabDouble(ipar); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -12946,7 +12946,7 @@ function MBLOCK() { this.exprs = tlist(["MBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],sci2exp(this.in1.slice()),sci2exp(this.intype.slice()),sci2exp(this.out.slice()),sci2exp(this.outtype.slice()),sci2exp(param.slice()),list(string(0.1),string(.0001)),sci2exp(this.pprop.slice()),nameF,[]); this.model = scicos_model(); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); this.model.rpar = new ScilabDouble([]); for (i=1;i<=lstsize(paramv);i+=1) { this.model.rpar = new ScilabDouble([this.model.rpar],[paramv[i-1].slice()]); @@ -13245,7 +13245,7 @@ function MEMORY_f() { this.model.dstate = new ScilabDouble([0]); this.model.rpar = new ScilabDouble([z]); this.model.blocktype = new ScilabString(["m"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); return new BasicBlock(this.x); @@ -13312,7 +13312,7 @@ function MPBLOCK() { this.exprs = tlist(["MPBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],sci2exp(this.in1.slice()),sci2exp(this.intype.slice()),sci2exp(this.out.slice()),sci2exp(this.outtype.slice()),sci2exp(param.slice()),list(string(0.1),string(.0001)),sci2exp(pprop.slice()),nameF,[]); this.model = scicos_model(); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,true]); + this.model.dep_ut = new ScilabBoolean([true,true]); this.model.rpar = new ScilabDouble([]); for (i=1;i<=lstsize(paramv);i+=1) { this.model.rpar = new ScilabDouble([this.model.rpar],[paramv[i-1].slice()]); @@ -13592,7 +13592,7 @@ function PAL_f() { this.model.out = new ScilabDouble([]); this.model.rpar = new ScilabDouble([scs]); this.model.blocktype = new ScilabString(["h"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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.graphics.id = scs.props.title[1-1]; @@ -13634,7 +13634,7 @@ function PENDULUM_ANIM() { this.model.dstate = new ScilabDouble([0]); this.model.rpar = new ScilabDouble([this.plen],[this.csiz],[this.phi],[this.xmin],[this.xmax],[this.ymin],[this.ymax]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -13710,7 +13710,7 @@ function RATELIMITER() { this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -13761,7 +13761,7 @@ function RELATIONALOP() { this.model.out = new ScilabDouble([1]); this.model.ipar = new ScilabDouble(ipar); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -13864,7 +13864,7 @@ function SPLIT_f() { this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1],[-1],[-1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.x = new standard_define(new ScilabDouble([1,1]),this.model,[],[]); return new BasicBlock(this.x); } @@ -13899,7 +13899,7 @@ function SUPER_f() { this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([scs]); this.model.blocktype = new ScilabString(["h"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); return new SuperBlock(this.x); @@ -14017,7 +14017,7 @@ function c_block() { this.model.ipar = new ScilabDouble([0]); this.model.blocktype = new ScilabString([typ]); this.model.firing = new ScilabDouble(auto); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var label = list([[sci2exp(in1)],[sci2exp(out)],[strcat(sci2exp(this.rpar))],[this.funam]],list([])); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"c_block\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([3,2]),this.model,label,this.gr_i); @@ -14098,7 +14098,7 @@ function fortran_block() { this.model.ipar = new ScilabDouble([0]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.funam = "forty"; var label = list([[sci2exp(this.model.in)],[sci2exp(this.model.out)],[strcat(sci2exp(this.model.rpar))],[this.funam]],list([])); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"fortran_block\",sz(1),sz(2));"]); @@ -14173,7 +14173,7 @@ function func_block() { this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -14220,7 +14220,7 @@ function generic_block() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -14321,7 +14321,7 @@ function generic_block() { this.model.rpar = new ScilabDouble(this.rpar); this.model.ipar = new ScilabDouble([this.ipar]); this.model.firing = new ScilabDouble([this.auto0]); - this.model.dep_ut = new ScilabDouble(dep_ut); + this.model.dep_ut = new ScilabBoolean(dep_ut); this.graphics.exprs = new ScilabDouble([label]); break; } @@ -14347,7 +14347,7 @@ function generic_block2() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -14454,7 +14454,7 @@ function generic_block2() { this.model.firing = new ScilabDouble([this.auto0]); this.model.nzcross = new ScilabDouble([this.nzcr]); this.model.nmode = new ScilabDouble([this.nmode]); - this.model.dep_ut = new ScilabDouble(dep_ut); + this.model.dep_ut = new ScilabBoolean(dep_ut); this.graphics.exprs = new ScilabDouble([label]); break; } @@ -14476,7 +14476,7 @@ function generic_block3() { this.model.out = new ScilabDouble([1]); this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -14599,7 +14599,7 @@ function generic_block3() { this.model.firing = new ScilabDouble([this.auto0]); this.model.nzcross = new ScilabDouble([this.nzcr]); this.model.nmode = new ScilabDouble([this.nmode]); - this.model.dep_ut = new ScilabDouble(dep_ut); + this.model.dep_ut = new ScilabBoolean(dep_ut); this.graphics.exprs = new ScilabDouble([label]); break; } @@ -14633,7 +14633,7 @@ function scifunc_block() { this.model.opar = list(); this.model.blocktype = new ScilabString([typ]); this.model.firing = new ScilabDouble(auto); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = list([[sci2exp(in1)],[sci2exp(out)],[sci2exp(clkin)],[sci2exp(clkout)],[strcat(sci2exp(x0))],[strcat(sci2exp(z0))],[strcat(sci2exp(this.rpar))],[sci2exp(auto)]],list("y1=sin(u1)"," "," ","y1=sin(u1)"," "," "," ")); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"scifunc_block\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); @@ -14758,7 +14758,7 @@ function scifunc_block_m() { this.model.opar = list(); this.model.blocktype = new ScilabString([typ]); this.model.firing = new ScilabDouble(auto); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = list([[sci2exp([in1,in1])],[sci2exp([out,out])],[sci2exp(clkin)],[sci2exp(clkout)],[strcat(sci2exp(x0))],[strcat(sci2exp(z0))],[strcat(sci2exp(this.rpar))],[sci2exp(auto)],[sci2exp(0)]],list("y1=sin(u1)"," "," ","y1=sin(u1)"," "," "," ")); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"scifunc_block_m\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); @@ -14858,7 +14858,7 @@ function ABSBLK_f() { this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); return new BasicBlock(this.x); @@ -14886,7 +14886,7 @@ function ABS_VALUE() { this.model.nzcross = new ScilabDouble([nu]); this.model.nmode = new ScilabDouble([nu]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -14936,7 +14936,7 @@ function COSBLK_f() { this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); return new BasicBlock(this.x); @@ -14972,7 +14972,7 @@ function DLRADAPT_f() { this.model.ipar = new ScilabDouble([0],[2],[2]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -15040,7 +15040,7 @@ function EXPBLK_f() { this.model.out = new ScilabDouble([-1]); this.model.rpar = new ScilabDouble([this.a]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -15094,7 +15094,7 @@ function EXPBLK_m() { this.model.outtyp = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.a]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -15142,7 +15142,7 @@ function FSV_f() { this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([in1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -15173,7 +15173,7 @@ function INTRP2BLK_f() { this.model.rpar = new ScilabDouble([this.a],[this.b],[this.c.slice()]); this.model.ipar = new ScilabDouble([2],[2]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -15230,7 +15230,7 @@ function INTRPLBLK_f() { this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.a],[this.b]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -15282,7 +15282,7 @@ function INVBLK() { this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([in1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -15309,7 +15309,7 @@ function INVBLK_f() { this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([in1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -15338,7 +15338,7 @@ function LOGBLK_f() { this.model.out = new ScilabDouble([-1]); this.model.rpar = new ScilabDouble([this.a]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -15396,7 +15396,7 @@ function LOOKUP2D() { this.model.rpar = new ScilabDouble([this.xx.slice()],[this.yy.slice()],[this.zz.slice()]); this.model.ipar = new ScilabDouble([Nx],[Ny],[this.Method]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = list(strcat(sci2exp(this.xx)),strcat(sci2exp(this.yy)),strcat(sci2exp(this.zz)),sci2exp(this.Method),Graf); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOOKUP2D\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,this.exprs,this.gr_i); @@ -15518,7 +15518,7 @@ function LOOKUP_c() { this.model.rpar = new ScilabDouble([this.xx.slice()],[this.yy.slice()]); this.model.ipar = new ScilabDouble([N],[this.Method],[0],[0]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.model.evtin = new ScilabDouble([]); this.model.evtout = new ScilabDouble([]); this.model.firing = new ScilabDouble([0]); @@ -15687,7 +15687,7 @@ function LOOKUP_f() { this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([-2],[-1],[1],[2],[-1],[1],[-1],[1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); return new BasicBlock(this.x); @@ -15743,7 +15743,7 @@ function MAXMIN() { this.model.out = new ScilabDouble([1]); this.model.in = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); 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));"]); @@ -15829,7 +15829,7 @@ function MAX_f() { this.model.out = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([0],[0]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -15857,7 +15857,7 @@ function MIN_f() { this.model.out = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([0],[0]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -15886,7 +15886,7 @@ function POWBLK_f() { this.model.out = new ScilabDouble([-1]); this.model.rpar = new ScilabDouble([this.a]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -15938,7 +15938,7 @@ function PRODUCT() { this.model.out = new ScilabDouble([-1]); this.model.ipar = new ScilabDouble(this.sgn); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -16009,7 +16009,7 @@ function PROD_f() { this.model.in = new ScilabDouble([-1],[-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.x = new standard_define(new ScilabDouble([1,1]),this.model,[],[]); return new BasicBlock(this.x); } @@ -16037,7 +16037,7 @@ function QUANT_f() { this.model.rpar = new ScilabDouble([this.pas]); this.model.ipar = new ScilabDouble([this.meth]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -16102,7 +16102,7 @@ function SATURATION() { this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -16165,7 +16165,7 @@ function SAT_f() { this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.minp],[this.maxp],[slope]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -16221,7 +16221,7 @@ function SIGNUM() { this.model.nzcross = new ScilabDouble([nu]); this.model.nmode = new ScilabDouble([nu]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -16270,7 +16270,7 @@ function SINBLK_f() { this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -16297,7 +16297,7 @@ function TANBLK_f() { this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([in1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -16324,7 +16324,7 @@ function TrigFun() { this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -16371,7 +16371,7 @@ function PDE() { this.model.in = new ScilabDouble([1],[1],[1],[1],[1]); this.model.out = new ScilabDouble([10],[0]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); var params_pde = tlist([["paramspde"],["a"],["b"],["txt_exp"],["check_op1"],["a1"],["b1"],["check_op2"],["a2"],["b2"],["check_op3"],["a3"],["b3"],["check_op4"],["a4"],["b4"],["check_op5"],["a5"],["b5"],["check_op6"],["a6"],["b6"],["check_op7"],["a7"],["b7"],["discr_cst"],["discr_non_cst"],["signe"],["rad_automatique"],["rad_manuel"],["methode"],["ord1"],["ord2"],["ord3"],["degre"],["nnode"],["txt_pas"],["CI"],["dCI"],["CLa"],["CLa_exp"],["CLb"],["CLb_exp"],["points"]],"","","","0","","IN_EDP1(t)","0","","IN_EDP2(t)","0","","IN_EDP3(t)","0","","IN_EDP4(t)","0","","IN_EDP5(t)","0","","IN_EDP6(t)","0","","IN_EDP7(t)","0","0","0","0","0","0","","","","","","","","","0","IN_CL1(t)","0","IN_CL2(t)",""); var label = list(params_pde,[],""); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PDE\",sz(1),sz(2));"]); @@ -16592,7 +16592,7 @@ function AFFICH_m() { this.model.ipar = new ScilabDouble([this.font],[this.fontsize],[this.colr],[1000],[this.nt],[this.nd],[this.in1[1-1][1-1]]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); 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));"]); @@ -16685,7 +16685,7 @@ function BARXY() { this.ymax = 15; this.model.sim = list(new ScilabString(["BARXY_sim"]), new ScilabDouble([5])); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.model.in = new ScilabDouble([-1],[-1]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([]); @@ -16775,7 +16775,7 @@ function CANIMXY() { this.model.ipar = new ScilabDouble([this.win],[1],[this.N],[this.clrs],[this.siz],[0],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -16904,7 +16904,7 @@ function CANIMXY3D() { this.model.ipar = new ScilabDouble([this.win],[8],[this.N],[this.clrs.slice()],[this.siz.slice()],[8],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -17041,7 +17041,7 @@ function CEVENTSCOPE() { this.model.rpar = new ScilabDouble([this.per]); this.model.ipar = new ScilabDouble([this.win],[1],[this.clrs[this.nclock-1]],[this.wpos.slice()],[this.wdim.slice()]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -17148,7 +17148,7 @@ function CFSCOPE() { this.model.rpar = new ScilabDouble([0],[this.ymin],[this.ymax],[this.per]); this.model.ipar = new ScilabDouble([this.win],[1],[this.N],[this.clrs],[this.wpos],[this.wdim],[1],[1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -17238,7 +17238,7 @@ function CFSCOPE() { this.model.rpar = new ScilabDouble(rpar); this.model.ipar = new ScilabDouble(ipar); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -17258,7 +17258,7 @@ function CLKOUTV_f() { this.model.ipar = new ScilabDouble([this.prt]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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," "); return new EventOutBlock(this.x); @@ -17358,7 +17358,7 @@ function CLKOUT_f() { this.model.ipar = new ScilabDouble([this.prt]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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," "); return new BasicBlock(this.x); @@ -17417,7 +17417,7 @@ function CMAT3D() { this.model.ipar = new ScilabDouble([this.cmin],[this.cmax],[size_c],[size_x],[size_y]); this.model.rpar = new ScilabDouble([this.colormap.slice()],[this.x],[y]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -17495,7 +17495,7 @@ function CMATVIEW() { this.model.ipar = new ScilabDouble([this.cmin],[this.cmax],[size_c]); this.model.rpar = new ScilabDouble([alpha_c],[beta_c],[this.colormap.slice()]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -17572,7 +17572,7 @@ function CMSCOPE() { this.model.rpar = new ScilabDouble([0],[period.slice()],[yy.slice()]); this.model.ipar = new ScilabDouble([this.win],[size(this.in1,"*")],[this.N],[this.wpos.slice()],[this.wdim.slice()],[this.in1.slice()],[this.clrs.slice(1-1,sum(this.in1))]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -17723,7 +17723,7 @@ function CSCOPE() { this.model.rpar = new ScilabDouble([0],[this.ymin],[this.ymax],[this.per]); this.model.ipar = new ScilabDouble([this.win],[1],[this.N],[this.clrs],[this.wpos],[this.wdim]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -17849,7 +17849,7 @@ function CSCOPXY() { this.model.rpar = new ScilabDouble([this.xmin],[this.xmax],[this.ymin],[this.ymax]); this.model.ipar = new ScilabDouble([this.win],[1],[this.N],[this.clrs],[this.siz],[1],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -17977,7 +17977,7 @@ function CSCOPXY3D() { this.model.rpar = new ScilabDouble([this.vec_x.slice()],[this.vec_y.slice()],[this.vec_z.slice()],[this.param3ds.slice()]); this.model.ipar = new ScilabDouble([this.win],[8],[this.N],[this.clrs.slice()],[this.siz.slice()],[8],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -18105,7 +18105,7 @@ function OUTIMPL_f() { this.model.sim = new ScilabString(["outimpl"]); this.model.ipar = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); var mo = modelica(); mo.model = "PORT"; mo.inputs = "n"; @@ -18166,7 +18166,7 @@ function OUT_f() { this.model.intyp = new ScilabDouble([-1]); this.model.ipar = new ScilabDouble([this.prt]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -18225,7 +18225,7 @@ function TOWS_c() { this.model.ipar = new ScilabDouble([this.nz],[length(this.varnam)],[transpose(this.ascii[this.varnam-1])]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -18293,7 +18293,7 @@ function TRASH_f() { this.model.in = new ScilabDouble([in1]); this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -18327,7 +18327,7 @@ function WFILE_f() { this.model.dstate = new ScilabDouble([-1],[lunit],[zeros((nin+1)*this.N,1)]); this.model.ipar = new ScilabDouble([length(fname)],[length(frmt)],[0],[this.N],[this._str2code[fname-1]],[this._str2code[frmt-1]]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -18405,7 +18405,7 @@ function WFILE_f() { this.model.in = new ScilabDouble([nin]); this.model.dstate = new ScilabDouble(dstate); this.model.ipar = new ScilabDouble(ipar); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; @@ -18432,7 +18432,7 @@ function WRITEAU_f() { this.model.dstate = new ScilabDouble([-1],[lunit],[zeros((nin+1)*this.N,1)]); this.model.ipar = new ScilabDouble([length(fname)],[this._str2code[frmt-1]],[this.N],[this.swap],[this._str2code[fname-1]]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -18509,7 +18509,7 @@ function WRITEC_f() { this.model.dstate = new ScilabDouble([-1],[lunit],[zeros((nin+1)*this.N,1)]); this.model.ipar = new ScilabDouble([length(fname)],[this._str2code[frmt-1]],[this.N],[this.swap],[this._str2code[fname-1]]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -18609,7 +18609,7 @@ function CLKINV_f() { this.model.ipar = new ScilabDouble([this.prt]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -18659,7 +18659,7 @@ function CLKIN_f() { this.model.ipar = new ScilabDouble([this.prt]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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," "); return new BasicBlock(this.x); @@ -18906,7 +18906,7 @@ function CONST() { this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.C]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -18957,7 +18957,7 @@ function CONST_f() { this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.C]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -19008,7 +19008,7 @@ function CONST_m() { this.model.rpar = new ScilabDouble(this.C); this.model.opar = list(); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -19091,7 +19091,7 @@ function CURVE_c() { this.model.rpar = new ScilabDouble([this.xx.slice()],[this.yy.slice()]); this.model.ipar = new ScilabDouble([N],[this.Method],[1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); this.model.evtin = new ScilabDouble([1]); this.model.evtout = new ScilabDouble([1]); this.model.firing = new ScilabDouble([0]); @@ -19258,7 +19258,7 @@ function CURV_f() { this.model.rpar = new ScilabDouble([xx],[yy],[rect.slice()]); this.model.ipar = new ScilabDouble([size(xx,1)],[axisdata.slice()]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + 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); return new BasicBlock(this.x); @@ -19326,7 +19326,7 @@ function Counter() { this.model.dstate = new ScilabDouble([0]); this.model.ipar = new ScilabDouble([this.rule],[this.maxim],[this.minim]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -19476,7 +19476,7 @@ function FROMWS_c() { this.model.evtout = new ScilabDouble([1]); this.model.firing = new ScilabDouble([0]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,true]); + 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); @@ -19553,7 +19553,7 @@ function GENSIN_f() { this.model.outtyp = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([1],[1],[0]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + 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); @@ -19614,7 +19614,7 @@ function GENSQR_f() { this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([this.Amplitude]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -19690,7 +19690,7 @@ function GEN_SQR() { this.model.opar = list(); this.model.blocktype = new ScilabString(["h"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); this.model.label = new ScilabString([""]); this.model.nzcross = new ScilabDouble([0]); this.model.nmode = new ScilabDouble([0]); @@ -19771,7 +19771,7 @@ function Ground_g() { this.model.rpar = new ScilabDouble([]); this.model.opar = list(C); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -19797,7 +19797,7 @@ function INIMPL_f() { this.model.out = new ScilabDouble([-1]); this.model.out2 = new ScilabDouble([1]); this.model.ipar = new ScilabDouble([1]); - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); this.model.blocktype = new ScilabString(["c"]); var mo = modelica(); mo.model = "PORT"; @@ -19859,7 +19859,7 @@ function IN_f() { this.model.outtyp = new ScilabDouble([-1]); this.model.ipar = new ScilabDouble([prt]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -19929,7 +19929,7 @@ function Modulo_Count() { this.model.dstate = new ScilabDouble([this.ini_c]); this.model.ipar = new ScilabDouble([this.base]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -20006,7 +20006,7 @@ function PULSE_SC() { this.model.opar = list(); this.model.blocktype = new ScilabString(["h"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); this.model.label = new ScilabString([""]); this.model.nzcross = new ScilabDouble([0]); this.model.nmode = new ScilabDouble([0]); @@ -20090,7 +20090,7 @@ function RAMP() { this.model.blocktype = new ScilabString(["c"]); this.model.nmode = new ScilabDouble([1]); this.model.nzcross = new ScilabDouble([1]); - this.model.dep_ut = new ScilabDouble([false,true]); + 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); @@ -20147,7 +20147,7 @@ function RAND_f() { this.model.rpar = new ScilabDouble([this.a.slice()],[this.b.slice()]); this.model.ipar = new ScilabDouble([this.flag]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -20225,7 +20225,7 @@ function RAND_m() { this.model.ipar = new ScilabDouble([this.flag]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -20318,7 +20318,7 @@ function READAU_f() { this.model.dstate = new ScilabDouble([1],[1],[lunit],[zeros(this.N*M,1)]); this.model.ipar = new ScilabDouble([length(fname)],[this._str2code[frmt-1]],[ievt],[this.N],[M],[this.swap],[offset],[this._str2code[fname-1]],[tmask],[outmask]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -20418,7 +20418,7 @@ function READC_f() { this.model.ipar = new ScilabDouble([length(fname)],[this._str2code[frmt-1]],[ievt],[this.N],[this.M],[this.swap],[this.offset],[this._str2code[fname-1]],[tmask],[this.outmask]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -20555,7 +20555,7 @@ function RFILE_f() { this.model.dstate = new ScilabDouble(dstate); this.model.ipar = new ScilabDouble([length(fname)],[length(frmt)],[0],[this.N],[this._str2code[fname-1]],[this._str2code[frmt-1]],[tmask],[this.outmask]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -20666,7 +20666,7 @@ function SAWTOOTH_f() { this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([0]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + 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); @@ -20698,7 +20698,7 @@ function STEP() { this.model.firing = new ScilabDouble([1]); this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -20895,7 +20895,7 @@ function SampleCLK() { this.model.rpar = new ScilabDouble([1,0]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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," "); return new BasicBlock(this.x); @@ -21045,7 +21045,7 @@ function TIME_f() { this.model.sim = new ScilabString(["timblk"]); this.model.out = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + 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); return new BasicBlock(this.x); @@ -21074,7 +21074,7 @@ function TKSCALE() { this.model.evtin = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.a],[this.b],[this.f]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -21121,7 +21121,7 @@ function GENERAL_f() { this.model.rpar = new ScilabDouble([0],[0],[0],[0]); this.model.blocktype = new ScilabString(["z"]); this.model.firing = new ScilabDouble([-ones(this.out,1)]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -21188,7 +21188,7 @@ function NEGTOPOS_f() { this.model.rpar = new ScilabDouble([-1],[-1],[0],[-1]); this.model.blocktype = new ScilabString(["z"]); this.model.firing = new ScilabDouble([-1]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); return new BasicBlock(this.x); @@ -21217,7 +21217,7 @@ function POSTONEG_f() { this.model.evtout = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([-1],[-1],[-1],[0]); this.model.blocktype = new ScilabString(["z"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -21249,7 +21249,7 @@ function ZCROSS_f() { this.model.rpar = new ScilabDouble([-1],[-1],[0],[0]); this.model.blocktype = new ScilabString(["z"]); this.model.firing = new ScilabDouble([-1]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/Branching/CLKFROM.js b/js/Branching/CLKFROM.js index 3775c0b9..34481156 100644 --- a/js/Branching/CLKFROM.js +++ b/js/Branching/CLKFROM.js @@ -7,7 +7,7 @@ function CLKFROM() { this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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.graphics.id = "From"; diff --git a/js/Branching/CLKFROM.pickle b/js/Branching/CLKFROM.pickle index 75776b33..03b08283 100644 --- a/js/Branching/CLKFROM.pickle +++ b/js/Branching/CLKFROM.pickle @@ -42,7 +42,7 @@ sS'graphics.exprs' p10 NsS'model.dep_ut' p11 -S'vector' +S'vector_boolean' p12 sS'exprs' p13 @@ -63,15 +63,16 @@ p18 g8 sS'typ' p19 -g12 -sS'model.opar' +S'vector' p20 -S'list' +sS'model.opar' p21 -sS'model.firing' +S'list' p22 +sS'model.firing' +p23 g2 sS'x.graphics.id' -p23 +p24 g4 s.
\ No newline at end of file diff --git a/js/Branching/CLKGOTO.js b/js/Branching/CLKGOTO.js index c5fad0c4..0bef1950 100644 --- a/js/Branching/CLKGOTO.js +++ b/js/Branching/CLKGOTO.js @@ -8,7 +8,7 @@ function CLKGOTO() { this.model.ipar = new ScilabDouble([int(1)]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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.graphics.id = "Goto"; diff --git a/js/Branching/CLKGOTO.pickle b/js/Branching/CLKGOTO.pickle index f6501445..1d8387b8 100644 --- a/js/Branching/CLKGOTO.pickle +++ b/js/Branching/CLKGOTO.pickle @@ -49,7 +49,7 @@ p12 g4 sS'model.dep_ut' p13 -S'vector' +S'vector_boolean' p14 sS'exprs' p15 @@ -76,15 +76,16 @@ p23 g2 sS'typ' p24 -g14 -sS'model.opar' +S'vector' p25 -S'list' +sS'model.opar' p26 -sS'model.firing' +S'list' p27 +sS'model.firing' +p28 g2 sS'model.blocktype' -p28 +p29 g4 s.
\ No newline at end of file diff --git a/js/Branching/CLKGotoTagVisibility.js b/js/Branching/CLKGotoTagVisibility.js index c28ac482..2cd648f3 100644 --- a/js/Branching/CLKGotoTagVisibility.js +++ b/js/Branching/CLKGotoTagVisibility.js @@ -13,7 +13,7 @@ function CLKGotoTagVisibility() { this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabBoolean([false]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Branching/CLKGotoTagVisibility.pickle b/js/Branching/CLKGotoTagVisibility.pickle index 5e227bec..8a8a7330 100644 --- a/js/Branching/CLKGotoTagVisibility.pickle +++ b/js/Branching/CLKGotoTagVisibility.pickle @@ -78,19 +78,20 @@ p24 g15 sS'model.dep_ut' p25 -g6 -sS'exprs' +S'vector_boolean' p26 +sS'exprs' +p27 g15 sS'gr_i' -p27 +p28 g6 sS'model.outtyp' -p28 +p29 g9 sS'x' -p29 -NsS'model' p30 +NsS'model' +p31 g2 s.
\ No newline at end of file diff --git a/js/Branching/DEMUX.js b/js/Branching/DEMUX.js index 9d311dd6..b5646b57 100644 --- a/js/Branching/DEMUX.js +++ b/js/Branching/DEMUX.js @@ -9,7 +9,7 @@ function DEMUX() { this.model.ipar = new ScilabDouble([this.out]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/Branching/DEMUX.pickle b/js/Branching/DEMUX.pickle index 1ea8e3a7..544bab46 100644 --- a/js/Branching/DEMUX.pickle +++ b/js/Branching/DEMUX.pickle @@ -48,39 +48,40 @@ S'double' p14 sS'model.dep_ut' p15 -g4 -sS'exprs' +S'vector_boolean' p16 +sS'exprs' +p17 g8 sS'x.model' -p17 -NsS'gr_i' p18 +NsS'gr_i' +p19 g4 sS'model.in' -p19 +p20 g14 sS'graphics' -p20 +p21 g10 sS'y' -p21 +p22 g4 sS'x' -p22 -NsS'model' p23 +NsS'model' +p24 g10 sS'model.ipar' -p24 +p25 g14 sS'typ' -p25 +p26 g4 sS'model.firing' -p26 +p27 g4 sS'out' -p27 +p28 g14 s.
\ No newline at end of file diff --git a/js/Branching/DEMUX_f.js b/js/Branching/DEMUX_f.js index 9202d190..b63dc715 100644 --- a/js/Branching/DEMUX_f.js +++ b/js/Branching/DEMUX_f.js @@ -9,7 +9,7 @@ function DEMUX_f() { this.model.ipar = new ScilabDouble([this.out]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/Branching/DEMUX_f.pickle b/js/Branching/DEMUX_f.pickle index 1ea8e3a7..544bab46 100644 --- a/js/Branching/DEMUX_f.pickle +++ b/js/Branching/DEMUX_f.pickle @@ -48,39 +48,40 @@ S'double' p14 sS'model.dep_ut' p15 -g4 -sS'exprs' +S'vector_boolean' p16 +sS'exprs' +p17 g8 sS'x.model' -p17 -NsS'gr_i' p18 +NsS'gr_i' +p19 g4 sS'model.in' -p19 +p20 g14 sS'graphics' -p20 +p21 g10 sS'y' -p21 +p22 g4 sS'x' -p22 -NsS'model' p23 +NsS'model' +p24 g10 sS'model.ipar' -p24 +p25 g14 sS'typ' -p25 +p26 g4 sS'model.firing' -p26 +p27 g4 sS'out' -p27 +p28 g14 s.
\ No newline at end of file diff --git a/js/Branching/ESELECT_f.js b/js/Branching/ESELECT_f.js index 54588d0e..1483d17a 100644 --- a/js/Branching/ESELECT_f.js +++ b/js/Branching/ESELECT_f.js @@ -11,7 +11,7 @@ function ESELECT_f() { this.model.evtout = new ScilabDouble([ones(this.out,1)]); this.model.blocktype = new ScilabString(["l"]); this.model.firing = new ScilabDouble([-ones(this.out,1)]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.model.nmode = new ScilabDouble([0]); this.model.nzcross = new ScilabDouble([0]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"ESELECT_f\",sz(1),sz(2));"]); diff --git a/js/Branching/ESELECT_f.pickle b/js/Branching/ESELECT_f.pickle index 347553e3..56a802e6 100644 --- a/js/Branching/ESELECT_f.pickle +++ b/js/Branching/ESELECT_f.pickle @@ -36,7 +36,7 @@ S'double' p6 sS'model.dep_ut' p7 -S'vector' +S'vector_boolean' p8 sS'out' p9 @@ -52,57 +52,58 @@ p12 g2 sS'typ' p13 -g8 -sS'model.evtin' +S'vector' p14 +sS'model.evtin' +p15 g6 sS'exprs[2-1]' -p15 -S'string' p16 -sS'model.firing' +S'string' p17 +sS'model.firing' +p18 g6 sS'model.sim' -p18 -S'list' p19 -sS'model.evtout' +S'list' p20 +sS'model.evtout' +p21 g6 sS'model.nmode' -p21 +p22 g6 sS'exprs[3-1]' -p22 -g16 -sS'model.in' p23 +g17 +sS'model.in' +p24 g6 sS'graphics.exprs' -p24 -NsS'model.nzcross' p25 +NsS'model.nzcross' +p26 g6 sS'model.blocktype' -p26 -g16 -sS'nmod' p27 +g17 +sS'nmod' +p28 g6 sS'exprs' -p28 -S'matrix' p29 -sS'gr_i' +S'matrix' p30 -g8 -sS'y' +sS'gr_i' p31 -g8 -sS'x' +g14 +sS'y' p32 -NsS'model' +g14 +sS'x' p33 +NsS'model' +p34 g2 s.
\ No newline at end of file diff --git a/js/Branching/EXTRACTOR.js b/js/Branching/EXTRACTOR.js index b8d25027..0db161c1 100644 --- a/js/Branching/EXTRACTOR.js +++ b/js/Branching/EXTRACTOR.js @@ -7,7 +7,7 @@ function EXTRACTOR() { this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); 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));"]); diff --git a/js/Branching/EXTRACTOR.pickle b/js/Branching/EXTRACTOR.pickle index d54d0fb3..2c70431e 100644 --- a/js/Branching/EXTRACTOR.pickle +++ b/js/Branching/EXTRACTOR.pickle @@ -42,35 +42,36 @@ NsS'x.model' p11 NsS'model.dep_ut' p12 -S'vector' +S'vector_boolean' p13 sS'exprs' p14 -g13 -sS'ind' +S'vector' p15 +sS'ind' +p16 g4 sS'gr_i' -p16 -g13 -sS'model.in' p17 +g15 +sS'model.in' +p18 g4 sS'graphics' -p18 +p19 g8 sS'y' -p19 -g13 -sS'x' p20 -NsS'model' +g15 +sS'x' p21 +NsS'model' +p22 g8 sS'model.ipar' -p22 +p23 g4 sS'typ' -p23 -g13 +p24 +g15 s.
\ No newline at end of file diff --git a/js/Branching/FROM.js b/js/Branching/FROM.js index 658831b1..7168937d 100644 --- a/js/Branching/FROM.js +++ b/js/Branching/FROM.js @@ -12,7 +12,7 @@ function FROM() { this.model.ipar = new ScilabDouble([]); this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Branching/FROM.pickle b/js/Branching/FROM.pickle index 679be93c..7b2dab46 100644 --- a/js/Branching/FROM.pickle +++ b/js/Branching/FROM.pickle @@ -77,19 +77,20 @@ p23 g12 sS'model.dep_ut' p24 -g8 -sS'exprs' +S'vector_boolean' p25 +sS'exprs' +p26 g8 sS'gr_i' -p26 +p27 g8 sS'model.outtyp' -p27 +p28 g6 sS'x' -p28 -NsS'model' p29 +NsS'model' +p30 g2 s.
\ No newline at end of file diff --git a/js/Branching/FROMMO.js b/js/Branching/FROMMO.js index 15f0066f..a0ce70b5 100644 --- a/js/Branching/FROMMO.js +++ b/js/Branching/FROMMO.js @@ -12,7 +12,7 @@ function FROMMO() { this.model.ipar = new ScilabDouble([]); this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); var mo = modelica(); mo.model = "frommo"; mo.outputs = "n"; diff --git a/js/Branching/FROMMO.pickle b/js/Branching/FROMMO.pickle index 28322662..6377e098 100644 --- a/js/Branching/FROMMO.pickle +++ b/js/Branching/FROMMO.pickle @@ -86,19 +86,20 @@ p26 g8 sS'model.dep_ut' p27 -g10 -sS'exprs' +S'vector_boolean' p28 +sS'exprs' +p29 g10 sS'gr_i' -p29 +p30 g10 sS'model.outtyp' -p30 +p31 g8 sS'x' -p31 -NsS'model' p32 +NsS'model' +p33 g2 s.
\ No newline at end of file diff --git a/js/Branching/GOTO.js b/js/Branching/GOTO.js index d83ec85d..d68cdc42 100644 --- a/js/Branching/GOTO.js +++ b/js/Branching/GOTO.js @@ -12,7 +12,7 @@ function GOTO() { this.model.ipar = new ScilabDouble([int(1)]); this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Branching/GOTO.pickle b/js/Branching/GOTO.pickle index 7ba2a3c3..6e20e181 100644 --- a/js/Branching/GOTO.pickle +++ b/js/Branching/GOTO.pickle @@ -85,20 +85,21 @@ p26 g13 sS'model.dep_ut' p27 -g8 -sS'exprs' +S'vector_boolean' p28 -S'matrix' +sS'exprs' p29 -sS'gr_i' +S'matrix' p30 +sS'gr_i' +p31 g8 sS'model.outtyp' -p31 +p32 g2 sS'x' -p32 -NsS'model' p33 +NsS'model' +p34 g5 s.
\ No newline at end of file diff --git a/js/Branching/GOTOMO.js b/js/Branching/GOTOMO.js index a2b2d18c..70c4dfd0 100644 --- a/js/Branching/GOTOMO.js +++ b/js/Branching/GOTOMO.js @@ -12,7 +12,7 @@ function GOTOMO() { this.model.ipar = new ScilabDouble([int(1)]); this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); var mo = modelica(); mo.model = "gotomo"; mo.inputs = "p"; diff --git a/js/Branching/GOTOMO.pickle b/js/Branching/GOTOMO.pickle index cc8af0d9..9c5805ba 100644 --- a/js/Branching/GOTOMO.pickle +++ b/js/Branching/GOTOMO.pickle @@ -94,20 +94,21 @@ p29 g2 sS'model.dep_ut' p30 -g10 -sS'exprs' +S'vector_boolean' p31 -S'matrix' +sS'exprs' p32 -sS'gr_i' +S'matrix' p33 +sS'gr_i' +p34 g10 sS'model.outtyp' -p34 +p35 g2 sS'x' -p35 -NsS'model' p36 +NsS'model' +p37 g5 s.
\ No newline at end of file diff --git a/js/Branching/GotoTagVisibility.js b/js/Branching/GotoTagVisibility.js index dc5fbfa0..c68ee62c 100644 --- a/js/Branching/GotoTagVisibility.js +++ b/js/Branching/GotoTagVisibility.js @@ -13,7 +13,7 @@ function GotoTagVisibility() { this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabBoolean([false]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Branching/GotoTagVisibility.pickle b/js/Branching/GotoTagVisibility.pickle index 5e227bec..8a8a7330 100644 --- a/js/Branching/GotoTagVisibility.pickle +++ b/js/Branching/GotoTagVisibility.pickle @@ -78,19 +78,20 @@ p24 g15 sS'model.dep_ut' p25 -g6 -sS'exprs' +S'vector_boolean' p26 +sS'exprs' +p27 g15 sS'gr_i' -p27 +p28 g6 sS'model.outtyp' -p28 +p29 g9 sS'x' -p29 -NsS'model' p30 +NsS'model' +p31 g2 s.
\ No newline at end of file diff --git a/js/Branching/GotoTagVisibilityMO.js b/js/Branching/GotoTagVisibilityMO.js index e2fc5b73..5fe5f7e6 100644 --- a/js/Branching/GotoTagVisibilityMO.js +++ b/js/Branching/GotoTagVisibilityMO.js @@ -13,7 +13,7 @@ function GotoTagVisibilityMO() { this.model.opar = list(new ScilabString(["A"])); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabBoolean([false]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Branching/GotoTagVisibilityMO.pickle b/js/Branching/GotoTagVisibilityMO.pickle index 5e227bec..8a8a7330 100644 --- a/js/Branching/GotoTagVisibilityMO.pickle +++ b/js/Branching/GotoTagVisibilityMO.pickle @@ -78,19 +78,20 @@ p24 g15 sS'model.dep_ut' p25 -g6 -sS'exprs' +S'vector_boolean' p26 +sS'exprs' +p27 g15 sS'gr_i' -p27 +p28 g6 sS'model.outtyp' -p28 +p29 g9 sS'x' -p29 -NsS'model' p30 +NsS'model' +p31 g2 s.
\ No newline at end of file diff --git a/js/Branching/ISELECT_f.js b/js/Branching/ISELECT_f.js index 9ad6e505..0146d570 100644 --- a/js/Branching/ISELECT_f.js +++ b/js/Branching/ISELECT_f.js @@ -11,7 +11,7 @@ function ISELECT_f() { this.model.evtin = new ScilabDouble([ones(out)]); this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/Branching/ISELECT_f.pickle b/js/Branching/ISELECT_f.pickle index ed8bf469..3a73aad5 100644 --- a/js/Branching/ISELECT_f.pickle +++ b/js/Branching/ISELECT_f.pickle @@ -45,7 +45,7 @@ sS'graphics.exprs' p11 NsS'model.dep_ut' p12 -S'vector' +S'vector_boolean' p13 sS'model.blocktype' p14 @@ -58,31 +58,32 @@ sS'x.model' p17 NsS'gr_i' p18 -g13 -sS'z0' +S'vector' p19 +sS'z0' +p20 g6 sS'model.in' -p20 +p21 g6 sS'graphics' -p21 +p22 g9 sS'y' -p22 -g13 -sS'x' p23 -NsS'model' +g19 +sS'x' p24 +NsS'model' +p25 g9 sS'typ' -p25 -g13 -sS'nout' p26 +g19 +sS'nout' +p27 g6 sS'out' -p27 +p28 g4 s.
\ No newline at end of file diff --git a/js/Branching/ISELECT_m.js b/js/Branching/ISELECT_m.js index d31861e2..6148db4b 100644 --- a/js/Branching/ISELECT_m.js +++ b/js/Branching/ISELECT_m.js @@ -19,7 +19,7 @@ function ISELECT_m() { this.model.evtin = new ScilabDouble([ones(this.nout,1)]); this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/Branching/ISELECT_m.pickle b/js/Branching/ISELECT_m.pickle index 2fd47018..696cb0db 100644 --- a/js/Branching/ISELECT_m.pickle +++ b/js/Branching/ISELECT_m.pickle @@ -106,25 +106,26 @@ S'string' p33 sS'model.dep_ut' p34 -g7 -sS'exprs' +S'vector_boolean' p35 +sS'exprs' +p36 g10 sS'gr_i' -p36 +p37 g7 sS'y' -p37 +p38 g7 sS'x' -p38 -NsS'model' p39 +NsS'model' +p40 g4 sS'ot' -p40 +p41 g33 sS'nout' -p41 +p42 g2 s.
\ No newline at end of file diff --git a/js/Branching/MUX.js b/js/Branching/MUX.js index ece52555..64b4c3c6 100644 --- a/js/Branching/MUX.js +++ b/js/Branching/MUX.js @@ -8,7 +8,7 @@ function MUX() { this.model.out = new ScilabDouble([0]); this.model.ipar = new ScilabDouble([this.in1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/Branching/MUX.pickle b/js/Branching/MUX.pickle index b8a51212..e89840ef 100644 --- a/js/Branching/MUX.pickle +++ b/js/Branching/MUX.pickle @@ -47,7 +47,7 @@ p13 g4 sS'model.dep_ut' p14 -S'vector' +S'vector_boolean' p15 sS'exprs' p16 @@ -56,28 +56,29 @@ sS'x.model' p17 NsS'gr_i' p18 -g15 -sS'model.in' +S'vector' p19 -g15 -sS'graphics' +sS'model.in' p20 +g19 +sS'graphics' +p21 g10 sS'y' -p21 -g15 -sS'x' p22 -NsS'model' +g19 +sS'x' p23 +NsS'model' +p24 g10 sS'model.ipar' -p24 +p25 g4 sS'typ' -p25 -g15 -sS'nout' p26 +g19 +sS'nout' +p27 g4 s.
\ No newline at end of file diff --git a/js/Branching/MUX_f.js b/js/Branching/MUX_f.js index 52bb4318..5d0bdf43 100644 --- a/js/Branching/MUX_f.js +++ b/js/Branching/MUX_f.js @@ -8,7 +8,7 @@ function MUX_f() { this.model.out = new ScilabDouble([0]); this.model.ipar = new ScilabDouble([this.in1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/Branching/MUX_f.pickle b/js/Branching/MUX_f.pickle index b8a51212..e89840ef 100644 --- a/js/Branching/MUX_f.pickle +++ b/js/Branching/MUX_f.pickle @@ -47,7 +47,7 @@ p13 g4 sS'model.dep_ut' p14 -S'vector' +S'vector_boolean' p15 sS'exprs' p16 @@ -56,28 +56,29 @@ sS'x.model' p17 NsS'gr_i' p18 -g15 -sS'model.in' +S'vector' p19 -g15 -sS'graphics' +sS'model.in' p20 +g19 +sS'graphics' +p21 g10 sS'y' -p21 -g15 -sS'x' p22 -NsS'model' +g19 +sS'x' p23 +NsS'model' +p24 g10 sS'model.ipar' -p24 +p25 g4 sS'typ' -p25 -g15 -sS'nout' p26 +g19 +sS'nout' +p27 g4 s.
\ No newline at end of file diff --git a/js/Branching/M_SWITCH.js b/js/Branching/M_SWITCH.js index 1e9ceb39..843e56a3 100644 --- a/js/Branching/M_SWITCH.js +++ b/js/Branching/M_SWITCH.js @@ -10,7 +10,7 @@ function M_SWITCH() { this.model.out = new ScilabDouble([-1]); this.model.ipar = new ScilabDouble(ipar); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/Branching/M_SWITCH.pickle b/js/Branching/M_SWITCH.pickle index 46a2872c..9cfd3442 100644 --- a/js/Branching/M_SWITCH.pickle +++ b/js/Branching/M_SWITCH.pickle @@ -78,25 +78,26 @@ S'string' p23 sS'model.dep_ut' p24 -g10 -sS'exprs' +S'vector_boolean' p25 +sS'exprs' +p26 g5 sS'gr_i' -p26 +p27 g10 sS'ipar' -p27 +p28 g5 sS'y' -p28 +p29 g10 sS'x' -p29 -NsS'model' p30 +NsS'model' +p31 g2 sS'ot' -p31 +p32 g8 s.
\ No newline at end of file diff --git a/js/Branching/NRMSOM_f.js b/js/Branching/NRMSOM_f.js index 8c56f5d1..6310a88c 100644 --- a/js/Branching/NRMSOM_f.js +++ b/js/Branching/NRMSOM_f.js @@ -8,7 +8,7 @@ function NRMSOM_f() { this.model.in = new ScilabDouble(in1); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/Branching/NRMSOM_f.pickle b/js/Branching/NRMSOM_f.pickle index e0d55699..011b8839 100644 --- a/js/Branching/NRMSOM_f.pickle +++ b/js/Branching/NRMSOM_f.pickle @@ -46,31 +46,32 @@ S'matrix' p12 sS'model.dep_ut' p13 -S'vector' +S'vector_boolean' p14 sS'exprs' p15 -g14 -sS'x.model' +S'vector' p16 -NsS'gr_i' +sS'x.model' p17 -g14 -sS'model.in' +NsS'gr_i' p18 +g16 +sS'model.in' +p19 g12 sS'graphics' -p19 +p20 g8 sS'y' -p20 -g14 -sS'x' p21 -NsS'model' +g16 +sS'x' p22 +NsS'model' +p23 g8 sS'typ' -p23 -g14 +p24 +g16 s.
\ No newline at end of file diff --git a/js/Branching/RELAY_f.js b/js/Branching/RELAY_f.js index 0e348a7c..c55047f1 100644 --- a/js/Branching/RELAY_f.js +++ b/js/Branching/RELAY_f.js @@ -12,7 +12,7 @@ function RELAY_f() { this.model.dstate = new ScilabDouble([i0]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,true]); + 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); diff --git a/js/Branching/RELAY_f.pickle b/js/Branching/RELAY_f.pickle index 9103134c..ef5f9ec9 100644 --- a/js/Branching/RELAY_f.pickle +++ b/js/Branching/RELAY_f.pickle @@ -74,21 +74,22 @@ S'string' p22 sS'model.dep_ut' p23 -g11 -sS'exprs' +S'vector_boolean' p24 +sS'exprs' +p25 g17 sS'gr_i' -p25 +p26 g11 sS'ipar' -p26 -NsS'y' p27 +NsS'y' +p28 g11 sS'x' -p28 -NsS'model' p29 +NsS'model' +p30 g4 s.
\ No newline at end of file diff --git a/js/Branching/SCALAR2VECTOR.js b/js/Branching/SCALAR2VECTOR.js index a78d2fdc..9727f4d0 100644 --- a/js/Branching/SCALAR2VECTOR.js +++ b/js/Branching/SCALAR2VECTOR.js @@ -7,7 +7,7 @@ function SCALAR2VECTOR() { this.model.out = new ScilabDouble([this.nout]); this.model.in = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/Branching/SCALAR2VECTOR.pickle b/js/Branching/SCALAR2VECTOR.pickle index 95f52eb3..2b404522 100644 --- a/js/Branching/SCALAR2VECTOR.pickle +++ b/js/Branching/SCALAR2VECTOR.pickle @@ -44,34 +44,35 @@ sS'graphics.exprs' p12 NsS'model.dep_ut' p13 -S'vector' +S'vector_boolean' p14 sS'exprs' p15 -g14 -sS'x.model' +S'vector' p16 -NsS'gr_i' +sS'x.model' p17 -g14 -sS'model.in' +NsS'gr_i' p18 +g16 +sS'model.in' +p19 g4 sS'graphics' -p19 +p20 g10 sS'y' -p20 -g14 -sS'x' p21 -NsS'model' +g16 +sS'x' p22 +NsS'model' +p23 g10 sS'typ' -p23 -g14 -sS'nout' p24 +g16 +sS'nout' +p25 g4 s.
\ No newline at end of file diff --git a/js/Branching/SELECT_f.js b/js/Branching/SELECT_f.js index ec241d1a..ef371a9f 100644 --- a/js/Branching/SELECT_f.js +++ b/js/Branching/SELECT_f.js @@ -11,7 +11,7 @@ function SELECT_f() { this.model.evtin = new ScilabDouble([ones(in1)]); this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/Branching/SELECT_f.pickle b/js/Branching/SELECT_f.pickle index 00b654cc..b09ecfbf 100644 --- a/js/Branching/SELECT_f.pickle +++ b/js/Branching/SELECT_f.pickle @@ -51,7 +51,7 @@ S'matrix' p13 sS'model.dep_ut' p14 -S'vector' +S'vector_boolean' p15 sS'exprs' p16 @@ -60,29 +60,30 @@ sS'x.model' p17 NsS'gr_i' p18 -g15 -sS'z0' +S'vector' p19 +sS'z0' +p20 g4 sS'model.in' -p20 +p21 g13 sS'graphics' -p21 +p22 g8 sS'y' -p22 -g15 -sS'x' p23 -NsS'model' +g19 +sS'x' p24 +NsS'model' +p25 g8 sS'typ' -p25 -g15 -sS'model.blocktype' p26 -S'string' +g19 +sS'model.blocktype' p27 +S'string' +p28 s.
\ No newline at end of file diff --git a/js/Branching/SELECT_m.js b/js/Branching/SELECT_m.js index ad79cc27..7690d04d 100644 --- a/js/Branching/SELECT_m.js +++ b/js/Branching/SELECT_m.js @@ -19,7 +19,7 @@ function SELECT_m() { this.model.evtin = new ScilabDouble([ones(this.nin,1)]); this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/Branching/SELECT_m.pickle b/js/Branching/SELECT_m.pickle index f4d96d76..e4d06d0c 100644 --- a/js/Branching/SELECT_m.pickle +++ b/js/Branching/SELECT_m.pickle @@ -109,22 +109,23 @@ p34 g7 sS'model.dep_ut' p35 -g11 -sS'exprs' +S'vector_boolean' p36 +sS'exprs' +p37 g13 sS'gr_i' -p37 +p38 g11 sS'y' -p38 +p39 g11 sS'x' -p39 -NsS'model' p40 +NsS'model' +p41 g4 sS'ot' -p41 +p42 g11 s.
\ No newline at end of file diff --git a/js/Branching/SELF_SWITCH.pickle b/js/Branching/SELF_SWITCH.pickle index 55184003..4353efb2 100644 --- a/js/Branching/SELF_SWITCH.pickle +++ b/js/Branching/SELF_SWITCH.pickle @@ -27,7 +27,7 @@ S'double' p4 sS'x.model.dep_ut' p5 -S'vector' +S'vector_boolean' p6 sS'diagram.objs[1-1].graphics.pout' p7 @@ -53,92 +53,93 @@ p14 g2 sS'x.graphics.gr_i' p15 -g6 -sS'x.graphics.pout' +S'vector' p16 +sS'x.graphics.pout' +p17 g4 sS'diagram.objs[3-1].graphics.pout' -p17 +p18 g4 sS'x.model.blocktype' -p18 +p19 g9 sS'diagram.objs[2-1].graphics.pin' -p19 +p20 g4 sS'diagram.objs[7-1]' -p20 +p21 g4 sS'diagram.objs[6-1]' -p21 +p22 g4 sS'diagram.objs[5-1]' -p22 +p23 g4 sS'x.graphics.in_implicit' -p23 -g6 -sS'diagram.objs[3-1].model.rpar' p24 +g16 +sS'diagram.objs[3-1].model.rpar' +p25 g4 sS'diagram.objs[4-1]' -p25 +p26 g2 sS'x.graphics.in_style' -p26 +p27 g9 sS'stateOpen' -p27 -S'boolean' p28 -sS'x.graphics.out_implicit' +S'boolean' p29 -g6 -sS'diagram.objs[4-1].graphics.pout' +sS'x.graphics.out_implicit' p30 +g16 +sS'diagram.objs[4-1].graphics.pout' +p31 g4 sS'diagram' -p31 +p32 g4 sS'x.graphics.pin' -p32 +p33 g4 sS'x.model.opar' -p33 -S'list' p34 -sS'typ' +S'list' p35 -g34 -sS'x.model.sim' +sS'typ' p36 +g35 +sS'x.model.sim' +p37 g9 sS'diagram.objs[4-1].graphics.pin' -p37 -g6 -sS'x.graphics.style' p38 +g16 +sS'x.graphics.style' +p39 g9 sS'diagram.objs[3-1].graphics.exprs' -p39 +p40 g9 sS'x.model.in' -p40 +p41 g4 sS'x.gui' -p41 +p42 g9 sS'x.graphics.sz' -p42 -g6 -sS'diagram.objs[4-1].graphics.exprs' p43 -S'matrix' +g16 +sS'diagram.objs[4-1].graphics.exprs' p44 -sS'y' +S'matrix' p45 +sS'y' +p46 g4 sS'x' -p46 +p47 g4 s.
\ No newline at end of file diff --git a/js/Branching/SWITCH2.js b/js/Branching/SWITCH2.js index dc97fdbc..f4363888 100644 --- a/js/Branching/SWITCH2.js +++ b/js/Branching/SWITCH2.js @@ -14,7 +14,7 @@ function SWITCH2() { this.model.nzcross = new ScilabDouble([this.nzz]); this.model.nmode = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/Branching/SWITCH2.pickle b/js/Branching/SWITCH2.pickle index 34ad8f7d..4f8888b6 100644 --- a/js/Branching/SWITCH2.pickle +++ b/js/Branching/SWITCH2.pickle @@ -36,7 +36,7 @@ sS'x.model' p6 NsS'model.dep_ut' p7 -S'vector' +S'vector_boolean' p8 sS'model.out' p9 @@ -46,57 +46,58 @@ p10 g2 sS'typ' p11 -g8 -sS'model.sim' +S'vector' p12 -S'list' +sS'model.sim' p13 -sS'model.nmode' +S'list' p14 +sS'model.nmode' +p15 g5 sS'model.rpar' -p15 +p16 g5 sS'in1' -p16 -S'matrix' p17 -sS'model.in' +S'matrix' p18 -g17 -sS'graphics.exprs' +sS'model.in' p19 -NsS'model.ipar' +g18 +sS'graphics.exprs' p20 -g8 -sS'model.nzcross' +NsS'model.ipar' p21 +g12 +sS'model.nzcross' +p22 g5 sS'model.blocktype' -p22 -S'string' p23 -sS'nzz' +S'string' p24 +sS'nzz' +p25 g5 sS'rule' -p25 +p26 g5 sS'exprs' -p26 -g17 -sS'gr_i' p27 -g8 -sS'ipar' +g18 +sS'gr_i' p28 -g8 -sS'y' +g12 +sS'ipar' p29 -g8 -sS'x' +g12 +sS'y' p30 -NsS'model' +g12 +sS'x' p31 +NsS'model' +p32 g2 s.
\ No newline at end of file diff --git a/js/Branching/SWITCH2_m.js b/js/Branching/SWITCH2_m.js index 211b8a1a..e3f2313a 100644 --- a/js/Branching/SWITCH2_m.js +++ b/js/Branching/SWITCH2_m.js @@ -17,7 +17,7 @@ function SWITCH2_m() { this.model.nzcross = new ScilabDouble([this.nzz]); this.model.nmode = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/Branching/SWITCH2_m.pickle b/js/Branching/SWITCH2_m.pickle index 9bdd61dc..686b6898 100644 --- a/js/Branching/SWITCH2_m.pickle +++ b/js/Branching/SWITCH2_m.pickle @@ -39,7 +39,7 @@ p6 g2 sS'model.dep_ut' p7 -S'vector' +S'vector_boolean' p8 sS'model.out' p9 @@ -48,84 +48,85 @@ sS'it[3-1]' p10 NsS'out' p11 -g8 -sS'model.in2' +S'vector' p12 -S'matrix' +sS'model.in2' p13 -sS'model.intyp' +S'matrix' p14 +sS'model.intyp' +p15 g5 sS'x.graphics' -p15 +p16 g2 sS'it[2-1]' -p16 +p17 g5 sS'typ' -p17 -g8 -sS'model.sim' p18 -S'list' +g12 +sS'model.sim' p19 -sS'model.out2' +S'list' p20 +sS'model.out2' +p21 g5 sS'model.nmode' -p21 +p22 g5 sS'model.rpar' -p22 +p23 g5 sS'in1' -p23 -g8 -sS'model.outtyp' p24 +g12 +sS'model.outtyp' +p25 g5 sS'model.in' -p25 -g13 -sS'graphics.exprs' p26 -NsS'model.ipar' +g14 +sS'graphics.exprs' p27 -g8 -sS'model.nzcross' +NsS'model.ipar' p28 +g12 +sS'model.nzcross' +p29 g5 sS'ok' -p29 -S'boolean' p30 -sS'model.blocktype' +S'boolean' p31 -S'string' +sS'model.blocktype' p32 -sS'nzz' +S'string' p33 +sS'nzz' +p34 g5 sS'rule' -p34 +p35 g5 sS'exprs' -p35 -g13 -sS'gr_i' p36 -g8 -sS'ipar' +g14 +sS'gr_i' p37 -g8 -sS'y' +g12 +sS'ipar' p38 -g8 -sS'x' +g12 +sS'y' p39 -NsS'model' +g12 +sS'x' p40 +NsS'model' +p41 g2 sS'it[1-1]' -p41 +p42 Ns.
\ No newline at end of file diff --git a/js/Branching/SWITCH_f.js b/js/Branching/SWITCH_f.js index 151ec1a6..39ab5654 100644 --- a/js/Branching/SWITCH_f.js +++ b/js/Branching/SWITCH_f.js @@ -11,7 +11,7 @@ function SWITCH_f() { this.model.ipar = new ScilabDouble([i0]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,true]); + 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); diff --git a/js/Branching/SWITCH_f.pickle b/js/Branching/SWITCH_f.pickle index c9faffa8..e9f05526 100644 --- a/js/Branching/SWITCH_f.pickle +++ b/js/Branching/SWITCH_f.pickle @@ -71,21 +71,22 @@ S'string' p21 sS'model.dep_ut' p22 -g9 -sS'exprs' +S'vector_boolean' p23 +sS'exprs' +p24 g15 sS'gr_i' -p24 +p25 g9 sS'ipar' -p25 -NsS'y' p26 +NsS'y' +p27 g9 sS'x' -p27 -NsS'model' p28 +NsS'model' +p29 g2 s.
\ No newline at end of file diff --git a/js/Electrical/CCS.js b/js/Electrical/CCS.js index a28ddf88..d42829ae 100644 --- a/js/Electrical/CCS.js +++ b/js/Electrical/CCS.js @@ -39,7 +39,7 @@ function CCS() { this.exprs = []; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CCS\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); diff --git a/js/Electrical/CCS.pickle b/js/Electrical/CCS.pickle index e1251121..e4144780 100644 --- a/js/Electrical/CCS.pickle +++ b/js/Electrical/CCS.pickle @@ -92,26 +92,27 @@ p29 g11 sS'model.dep_ut' p30 -g6 -sS'exprs' +S'vector_boolean' p31 +sS'exprs' +p32 g6 sS'gr_i' -p32 +p33 g6 sS'PortName' -p33 +p34 g11 sS'x' -p34 +p35 g2 sS'model' -p35 +p36 g2 sS'ParametersName' -p36 +p37 g6 sS'mo' -p37 +p38 g8 s.
\ No newline at end of file diff --git a/js/Electrical/CVS.js b/js/Electrical/CVS.js index 0896afe9..845ee04d 100644 --- a/js/Electrical/CVS.js +++ b/js/Electrical/CVS.js @@ -39,7 +39,7 @@ function CVS() { this.exprs = []; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CVS\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); diff --git a/js/Electrical/CVS.pickle b/js/Electrical/CVS.pickle index e1251121..e4144780 100644 --- a/js/Electrical/CVS.pickle +++ b/js/Electrical/CVS.pickle @@ -92,26 +92,27 @@ p29 g11 sS'model.dep_ut' p30 -g6 -sS'exprs' +S'vector_boolean' p31 +sS'exprs' +p32 g6 sS'gr_i' -p32 +p33 g6 sS'PortName' -p33 +p34 g11 sS'x' -p34 +p35 g2 sS'model' -p35 +p36 g2 sS'ParametersName' -p36 +p37 g6 sS'mo' -p37 +p38 g8 s.
\ No newline at end of file diff --git a/js/Electrical/Capacitor.js b/js/Electrical/Capacitor.js index f6f5f7b8..c542eb02 100644 --- a/js/Electrical/Capacitor.js +++ b/js/Electrical/Capacitor.js @@ -7,7 +7,7 @@ function Capacitor() { this.model.rpar = new ScilabDouble([this.C],[this.v]); this.model.sim = new ScilabString(["Capacitor"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "Capacitor"; mo.inputs = "p"; diff --git a/js/Electrical/Capacitor.pickle b/js/Electrical/Capacitor.pickle index 8afd2cda..8e48a96f 100644 --- a/js/Electrical/Capacitor.pickle +++ b/js/Electrical/Capacitor.pickle @@ -85,25 +85,26 @@ p26 g2 sS'model.dep_ut' p27 -g12 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p28 +sS'model.equations.parameters[2-1]' +p29 g14 sS'exprs' -p29 +p30 g5 sS'gr_i' -p30 +p31 g12 sS'v' -p31 +p32 g8 sS'y' -p32 +p33 g12 sS'x' -p33 -NsS'model' p34 +NsS'model' +p35 g2 s.
\ No newline at end of file diff --git a/js/Electrical/ConstantVoltage.js b/js/Electrical/ConstantVoltage.js index d2f80fb1..b63e2cc1 100644 --- a/js/Electrical/ConstantVoltage.js +++ b/js/Electrical/ConstantVoltage.js @@ -8,7 +8,7 @@ function ConstantVoltage() { this.model.out = new ScilabDouble([1]); this.model.sim = new ScilabString(["ConstantVoltage"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); var mo = modelica(); mo.model = "ConstantVoltage"; mo.inputs = "p"; diff --git a/js/Electrical/ConstantVoltage.pickle b/js/Electrical/ConstantVoltage.pickle index 7a66a82b..f05caaee 100644 --- a/js/Electrical/ConstantVoltage.pickle +++ b/js/Electrical/ConstantVoltage.pickle @@ -82,22 +82,23 @@ p25 g8 sS'model.dep_ut' p26 -g13 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p27 +sS'model.equations.parameters[2-1]' +p28 g15 sS'exprs' -p28 +p29 g5 sS'gr_i' -p29 +p30 g13 sS'y' -p30 +p31 g13 sS'x' -p31 -NsS'model' p32 +NsS'model' +p33 g2 s.
\ No newline at end of file diff --git a/js/Electrical/CurrentSensor.js b/js/Electrical/CurrentSensor.js index c0468b36..a2f3b791 100644 --- a/js/Electrical/CurrentSensor.js +++ b/js/Electrical/CurrentSensor.js @@ -6,7 +6,7 @@ function CurrentSensor() { this.model.out = new ScilabDouble([1],[1]); this.model.sim = new ScilabString(["CurrentSensor"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "CurrentSensor"; mo.inputs = "p"; diff --git a/js/Electrical/CurrentSensor.pickle b/js/Electrical/CurrentSensor.pickle index 7cc82643..152bc012 100644 --- a/js/Electrical/CurrentSensor.pickle +++ b/js/Electrical/CurrentSensor.pickle @@ -45,32 +45,33 @@ p12 g2 sS'model.dep_ut' p13 -g7 -sS'model.out' +S'vector_boolean' p14 +sS'model.out' +p15 g9 sS'gr_i' -p15 +p16 g7 sS'x.graphics.in_implicit' -p16 +p17 g7 sS'model.in' -p17 +p18 g4 sS'y' -p18 +p19 g7 sS'x' -p19 -NsS'model' p20 -S'object' +NsS'model' p21 -sS'typ' +S'object' p22 +sS'typ' +p23 g7 sS'mo.outputs' -p23 +p24 g9 s.
\ No newline at end of file diff --git a/js/Electrical/Diode.js b/js/Electrical/Diode.js index 65e930f2..5cd03621 100644 --- a/js/Electrical/Diode.js +++ b/js/Electrical/Diode.js @@ -11,7 +11,7 @@ function Diode() { this.model.out = new ScilabDouble([1]); this.model.sim = new ScilabString(["Diode"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "Diode"; mo.inputs = "p"; diff --git a/js/Electrical/Diode.pickle b/js/Electrical/Diode.pickle index 10292bf2..786733de 100644 --- a/js/Electrical/Diode.pickle +++ b/js/Electrical/Diode.pickle @@ -98,22 +98,23 @@ p29 g5 sS'model.dep_ut' p30 -g12 -sS'exprs' +S'vector_boolean' p31 +sS'exprs' +p32 g10 sS'gr_i' -p32 +p33 g12 sS'Vt' -p33 +p34 g5 sS'y' -p34 +p35 g12 sS'x' -p35 -NsS'model' p36 +NsS'model' +p37 g2 s.
\ No newline at end of file diff --git a/js/Electrical/Ground.js b/js/Electrical/Ground.js index dc6565bc..6674fde9 100644 --- a/js/Electrical/Ground.js +++ b/js/Electrical/Ground.js @@ -6,7 +6,7 @@ function Ground() { this.model.out = new ScilabDouble([]); this.model.sim = new ScilabString(["Ground"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "Ground"; mo.inputs = "p"; diff --git a/js/Electrical/Ground.pickle b/js/Electrical/Ground.pickle index fd8415fa..c429dc77 100644 --- a/js/Electrical/Ground.pickle +++ b/js/Electrical/Ground.pickle @@ -44,29 +44,30 @@ p11 g2 sS'model.dep_ut' p12 -g8 -sS'model.out' +S'vector_boolean' p13 +sS'model.out' +p14 g8 sS'gr_i' -p14 +p15 g8 sS'x.graphics.in_implicit' -p15 +p16 g8 sS'model.in' -p16 +p17 g8 sS'y' -p17 +p18 g8 sS'x' -p18 -NsS'model' p19 -S'object' +NsS'model' p20 -sS'typ' +S'object' p21 +sS'typ' +p22 g8 s.
\ No newline at end of file diff --git a/js/Electrical/Gyrator.js b/js/Electrical/Gyrator.js index 4f0a53fc..9aeea7ab 100644 --- a/js/Electrical/Gyrator.js +++ b/js/Electrical/Gyrator.js @@ -39,7 +39,7 @@ function Gyrator() { this.exprs = [["1"],["1"]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Gyrator\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); diff --git a/js/Electrical/Gyrator.pickle b/js/Electrical/Gyrator.pickle index f219c232..6ae47a7e 100644 --- a/js/Electrical/Gyrator.pickle +++ b/js/Electrical/Gyrator.pickle @@ -105,25 +105,26 @@ p32 g8 sS'model.dep_ut' p33 -g20 -sS'exprs' +S'vector_boolean' p34 +sS'exprs' +p35 g8 sS'x.graphics.exprs' -p35 -NsS'PortName' p36 +NsS'PortName' +p37 g8 sS'x' -p37 +p38 g4 sS'model' -p38 +p39 g4 sS'ParametersName' -p39 +p40 g8 sS'MO' -p40 +p41 g8 s.
\ No newline at end of file diff --git a/js/Electrical/IdealTransformer.js b/js/Electrical/IdealTransformer.js index 962bfdcc..f1df4307 100644 --- a/js/Electrical/IdealTransformer.js +++ b/js/Electrical/IdealTransformer.js @@ -39,7 +39,7 @@ function IdealTransformer() { this.exprs = ["1"]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IdealTransformer\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); diff --git a/js/Electrical/IdealTransformer.pickle b/js/Electrical/IdealTransformer.pickle index 1b921a73..2228b43d 100644 --- a/js/Electrical/IdealTransformer.pickle +++ b/js/Electrical/IdealTransformer.pickle @@ -103,25 +103,26 @@ p32 g14 sS'model.dep_ut' p33 -g8 -sS'exprs' +S'vector_boolean' p34 +sS'exprs' +p35 g8 sS'x.graphics.exprs' -p35 -NsS'PortName' p36 +NsS'PortName' +p37 g14 sS'x' -p37 +p38 g4 sS'model' -p38 +p39 g4 sS'ParametersName' -p39 +p40 g8 sS'MO' -p40 +p41 g14 s.
\ No newline at end of file diff --git a/js/Electrical/Inductor.js b/js/Electrical/Inductor.js index 13b55641..1028683b 100644 --- a/js/Electrical/Inductor.js +++ b/js/Electrical/Inductor.js @@ -8,7 +8,7 @@ function Inductor() { this.model.rpar = new ScilabDouble([this.L]); this.model.sim = new ScilabString(["Inductor"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "Inductor"; mo.inputs = "p"; diff --git a/js/Electrical/Inductor.pickle b/js/Electrical/Inductor.pickle index 6d73f4a8..fa521d31 100644 --- a/js/Electrical/Inductor.pickle +++ b/js/Electrical/Inductor.pickle @@ -82,22 +82,23 @@ p25 g16 sS'model.dep_ut' p26 -g8 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p27 +sS'model.equations.parameters[2-1]' +p28 g13 sS'exprs' -p28 +p29 g5 sS'gr_i' -p29 +p30 g8 sS'y' -p30 +p31 g8 sS'x' -p31 -NsS'model' p32 +NsS'model' +p33 g2 s.
\ No newline at end of file diff --git a/js/Electrical/MOTOR.js b/js/Electrical/MOTOR.js index 1cf40079..6ab8def6 100644 --- a/js/Electrical/MOTOR.js +++ b/js/Electrical/MOTOR.js @@ -6,7 +6,7 @@ function MOTOR() { this.model.in = new ScilabDouble([1]); this.model.sim = new ScilabString(["motor"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/Electrical/MOTOR.pickle b/js/Electrical/MOTOR.pickle index 9ea67544..fc3dbc05 100644 --- a/js/Electrical/MOTOR.pickle +++ b/js/Electrical/MOTOR.pickle @@ -31,30 +31,31 @@ S'matrix' p6 sS'model.dep_ut' p7 -S'vector' +S'vector_boolean' p8 sS'model.out' p9 g6 sS'gr_i' p10 -g8 -sS'x.graphics.in_implicit' +S'vector' p11 -g8 -sS'model.in' +sS'x.graphics.in_implicit' p12 -g8 -sS'y' +g11 +sS'model.in' p13 -g8 -sS'x' +g11 +sS'y' p14 -NsS'model' +g11 +sS'x' p15 -S'object' +NsS'model' p16 -sS'typ' +S'object' p17 -g8 +sS'typ' +p18 +g11 s.
\ No newline at end of file diff --git a/js/Electrical/NMOS.js b/js/Electrical/NMOS.js index 2b8792b1..ce637283 100644 --- a/js/Electrical/NMOS.js +++ b/js/Electrical/NMOS.js @@ -13,7 +13,7 @@ function NMOS() { this.RDS = 1.e+7; this.model.sim = new ScilabString(["NMOS"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "NMOS"; mo.outputs = [["D"],["B"],["S"]]; diff --git a/js/Electrical/NMOS.pickle b/js/Electrical/NMOS.pickle index 40c50c53..7201b86f 100644 --- a/js/Electrical/NMOS.pickle +++ b/js/Electrical/NMOS.pickle @@ -117,25 +117,26 @@ p32 g4 sS'model.dep_ut' p33 -g16 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p34 +sS'model.equations.parameters[2-1]' +p35 g18 sS'exprs' -p35 +p36 g23 sS'gr_i' -p36 +p37 g16 sS'Vt' -p37 +p38 g2 sS'y' -p38 +p39 g16 sS'x' -p39 -NsS'model' p40 +NsS'model' +p41 g4 s.
\ No newline at end of file diff --git a/js/Electrical/NPN.js b/js/Electrical/NPN.js index f86ae303..cd19be1e 100644 --- a/js/Electrical/NPN.js +++ b/js/Electrical/NPN.js @@ -39,7 +39,7 @@ function NPN() { this.exprs = [["50"],["0.1"],["1.e-16"],["0.02"],["0.12e-9"],["5e-9"],["1e-12"],["0.4e-12"],["0.5e-12"],["0.8"],["0.4"],["0.8"],["0.333"],["1e-15"],["1e-15"],["0.02585"],["40"]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"NPN\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); diff --git a/js/Electrical/NPN.pickle b/js/Electrical/NPN.pickle index d473e586..1fb6d728 100644 --- a/js/Electrical/NPN.pickle +++ b/js/Electrical/NPN.pickle @@ -135,25 +135,26 @@ p32 g8 sS'model.dep_ut' p33 -g20 -sS'exprs' +S'vector_boolean' p34 +sS'exprs' +p35 g8 sS'x.graphics.exprs' -p35 -NsS'PortName' p36 +NsS'PortName' +p37 g8 sS'x' -p37 +p38 g4 sS'model' -p38 +p39 g4 sS'ParametersName' -p39 +p40 g8 sS'MO' -p40 +p41 g8 s.
\ No newline at end of file diff --git a/js/Electrical/OpAmp.js b/js/Electrical/OpAmp.js index 00bbdc6a..e93e98cd 100644 --- a/js/Electrical/OpAmp.js +++ b/js/Electrical/OpAmp.js @@ -6,7 +6,7 @@ function OpAmp() { this.model = scicos_model(); this.model.sim = new ScilabString(["OpAmp"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = this.model.sim; mo.inputs = [["in_p"],["in_n"]]; diff --git a/js/Electrical/OpAmp.pickle b/js/Electrical/OpAmp.pickle index f8d3e7a6..bb3307a5 100644 --- a/js/Electrical/OpAmp.pickle +++ b/js/Electrical/OpAmp.pickle @@ -90,22 +90,23 @@ p27 g2 sS'model.dep_ut' p28 -g18 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p29 +sS'model.equations.parameters[2-1]' +p30 g14 sS'exprs' -p30 +p31 g5 sS'gr_i' -p31 +p32 g18 sS'y' -p32 +p33 g18 sS'x' -p33 -NsS'model' p34 +NsS'model' +p35 g2 s.
\ No newline at end of file diff --git a/js/Electrical/PMOS.js b/js/Electrical/PMOS.js index 81ffddc7..b0f62361 100644 --- a/js/Electrical/PMOS.js +++ b/js/Electrical/PMOS.js @@ -13,7 +13,7 @@ function PMOS() { this.RDS = 1.e+7; this.model.sim = new ScilabString(["PMOS"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "PMOS"; mo.outputs = [["D"],["B"],["S"]]; diff --git a/js/Electrical/PMOS.pickle b/js/Electrical/PMOS.pickle index 40c50c53..7201b86f 100644 --- a/js/Electrical/PMOS.pickle +++ b/js/Electrical/PMOS.pickle @@ -117,25 +117,26 @@ p32 g4 sS'model.dep_ut' p33 -g16 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p34 +sS'model.equations.parameters[2-1]' +p35 g18 sS'exprs' -p35 +p36 g23 sS'gr_i' -p36 +p37 g16 sS'Vt' -p37 +p38 g2 sS'y' -p38 +p39 g16 sS'x' -p39 -NsS'model' p40 +NsS'model' +p41 g4 s.
\ No newline at end of file diff --git a/js/Electrical/PNP.js b/js/Electrical/PNP.js index 38ed38e9..676cf5fd 100644 --- a/js/Electrical/PNP.js +++ b/js/Electrical/PNP.js @@ -39,7 +39,7 @@ function PNP() { this.exprs = [["50"],["0.1"],["1.e-16"],["0.02"],["0.12e-9"],["5e-9"],["1e-12"],["0.4e-12"],["0.5e-12"],["0.8"],["0.4"],["0.8"],["0.333"],["1e-15"],["1e-15"],["0.02585"],["40"]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PNP\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); diff --git a/js/Electrical/PNP.pickle b/js/Electrical/PNP.pickle index d473e586..1fb6d728 100644 --- a/js/Electrical/PNP.pickle +++ b/js/Electrical/PNP.pickle @@ -135,25 +135,26 @@ p32 g8 sS'model.dep_ut' p33 -g20 -sS'exprs' +S'vector_boolean' p34 +sS'exprs' +p35 g8 sS'x.graphics.exprs' -p35 -NsS'PortName' p36 +NsS'PortName' +p37 g8 sS'x' -p37 +p38 g4 sS'model' -p38 +p39 g4 sS'ParametersName' -p39 +p40 g8 sS'MO' -p40 +p41 g8 s.
\ No newline at end of file diff --git a/js/Electrical/PotentialSensor.js b/js/Electrical/PotentialSensor.js index b3cc63f8..f5c9b76f 100644 --- a/js/Electrical/PotentialSensor.js +++ b/js/Electrical/PotentialSensor.js @@ -7,7 +7,7 @@ function PotentialSensor() { this.model.rpar = new ScilabDouble([]); this.model.sim = new ScilabString(["PotentialSensor"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "PotentialSensor"; mo.inputs = "p"; diff --git a/js/Electrical/PotentialSensor.pickle b/js/Electrical/PotentialSensor.pickle index d78a09c2..4ffd6a0b 100644 --- a/js/Electrical/PotentialSensor.pickle +++ b/js/Electrical/PotentialSensor.pickle @@ -53,23 +53,24 @@ p14 g7 sS'model.dep_ut' p15 -g7 -sS'model.in' +S'vector_boolean' p16 +sS'model.in' +p17 g7 sS'y' -p17 +p18 g7 sS'x' -p18 -NsS'model' p19 -S'object' +NsS'model' p20 -sS'typ' +S'object' p21 +sS'typ' +p22 g7 sS'mo.outputs' -p22 +p23 g7 s.
\ No newline at end of file diff --git a/js/Electrical/Resistor.js b/js/Electrical/Resistor.js index 412b0f56..ef2dcf5e 100644 --- a/js/Electrical/Resistor.js +++ b/js/Electrical/Resistor.js @@ -6,7 +6,7 @@ function Resistor() { this.model.rpar = new ScilabDouble([this.R]); this.model.sim = new ScilabString(["resistor"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "Resistor"; mo.inputs = "p"; diff --git a/js/Electrical/Resistor.pickle b/js/Electrical/Resistor.pickle index 7e4c24cf..9e75b190 100644 --- a/js/Electrical/Resistor.pickle +++ b/js/Electrical/Resistor.pickle @@ -82,22 +82,23 @@ p25 g2 sS'model.dep_ut' p26 -g12 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p27 +sS'model.equations.parameters[2-1]' +p28 g14 sS'exprs' -p28 +p29 g5 sS'gr_i' -p29 +p30 g12 sS'y' -p30 +p31 g12 sS'x' -p31 -NsS'model' p32 +NsS'model' +p33 g2 s.
\ No newline at end of file diff --git a/js/Electrical/SineVoltage.js b/js/Electrical/SineVoltage.js index 30df974f..87b6e622 100644 --- a/js/Electrical/SineVoltage.js +++ b/js/Electrical/SineVoltage.js @@ -12,7 +12,7 @@ function SineVoltage() { this.model.rpar = new ScilabDouble([this.V],[this.ph],[this.frq],[this.offset],[this.start]); this.model.sim = new ScilabString(["SineVoltage"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "SineVoltage"; mo.inputs = "p"; diff --git a/js/Electrical/SineVoltage.pickle b/js/Electrical/SineVoltage.pickle index 569ed239..46bb2f90 100644 --- a/js/Electrical/SineVoltage.pickle +++ b/js/Electrical/SineVoltage.pickle @@ -103,22 +103,23 @@ p30 g12 sS'model.dep_ut' p31 -g8 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p32 +sS'model.equations.parameters[2-1]' +p33 g18 sS'exprs' -p33 +p34 g25 sS'gr_i' -p34 +p35 g8 sS'y' -p35 +p36 g8 sS'x' -p36 -NsS'model' p37 +NsS'model' +p38 g2 s.
\ No newline at end of file diff --git a/js/Electrical/Switch.js b/js/Electrical/Switch.js index a6fe5f09..ff334d1c 100644 --- a/js/Electrical/Switch.js +++ b/js/Electrical/Switch.js @@ -8,7 +8,7 @@ function Switch() { var Z = eval(S); this.model.sim = new ScilabString(["Switch"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = this.model.sim; mo.inputs = [["p"],["inp"]]; diff --git a/js/Electrical/Switch.pickle b/js/Electrical/Switch.pickle index a84cfd60..4ec1aed2 100644 --- a/js/Electrical/Switch.pickle +++ b/js/Electrical/Switch.pickle @@ -94,22 +94,23 @@ p29 g2 sS'model.dep_ut' p30 -g19 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p31 +sS'model.equations.parameters[2-1]' +p32 g14 sS'exprs' -p32 +p33 g5 sS'gr_i' -p33 +p34 g19 sS'y' -p34 +p35 g19 sS'x' -p35 -NsS'model' p36 +NsS'model' +p37 g2 s.
\ No newline at end of file diff --git a/js/Electrical/VVsourceAC.js b/js/Electrical/VVsourceAC.js index 7d1be7c6..60dfb33b 100644 --- a/js/Electrical/VVsourceAC.js +++ b/js/Electrical/VVsourceAC.js @@ -9,7 +9,7 @@ function VVsourceAC() { this.model.rpar = new ScilabDouble([this.FR]); this.model.sim = new ScilabString(["VVsourceAC"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "VVsourceAC"; mo.inputs = ["p","VA"]; diff --git a/js/Electrical/VVsourceAC.pickle b/js/Electrical/VVsourceAC.pickle index d2b9a6cb..3b6c49a6 100644 --- a/js/Electrical/VVsourceAC.pickle +++ b/js/Electrical/VVsourceAC.pickle @@ -86,22 +86,23 @@ p27 g2 sS'model.dep_ut' p28 -g11 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p29 +sS'model.equations.parameters[2-1]' +p30 g16 sS'exprs' -p30 +p31 g11 sS'gr_i' -p31 +p32 g11 sS'y' -p32 +p33 g11 sS'x' -p33 -NsS'model' p34 +NsS'model' +p35 g6 s.
\ No newline at end of file diff --git a/js/Electrical/VariableResistor.js b/js/Electrical/VariableResistor.js index 5bf7a900..40e446e7 100644 --- a/js/Electrical/VariableResistor.js +++ b/js/Electrical/VariableResistor.js @@ -4,7 +4,7 @@ function VariableResistor() { this.model = scicos_model(); this.model.sim = new ScilabString(["VariableResistor"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "VariableResistor"; mo.inputs = ["p","R"]; diff --git a/js/Electrical/VariableResistor.pickle b/js/Electrical/VariableResistor.pickle index af8c8af0..645f7075 100644 --- a/js/Electrical/VariableResistor.pickle +++ b/js/Electrical/VariableResistor.pickle @@ -45,31 +45,32 @@ p12 g2 sS'model.dep_ut' p13 -g7 -sS'model.out' +S'vector_boolean' p14 +sS'model.out' +p15 g4 sS'gr_i' -p15 +p16 g7 sS'x.graphics.in_implicit' -p16 +p17 g7 sS'model.in' -p17 +p18 g4 sS'y' -p18 +p19 g7 sS'x' -p19 -NsS'model' p20 +NsS'model' +p21 g10 sS'typ' -p21 +p22 g7 sS'mo.outputs' -p22 +p23 g2 s.
\ No newline at end of file diff --git a/js/Electrical/VoltageSensor.js b/js/Electrical/VoltageSensor.js index 0308bd9a..3434e243 100644 --- a/js/Electrical/VoltageSensor.js +++ b/js/Electrical/VoltageSensor.js @@ -6,7 +6,7 @@ function VoltageSensor() { this.model.out = new ScilabDouble([1],[1]); this.model.sim = new ScilabString(["VoltageSensor"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "VoltageSensor"; mo.inputs = "p"; diff --git a/js/Electrical/VoltageSensor.pickle b/js/Electrical/VoltageSensor.pickle index 7cc82643..152bc012 100644 --- a/js/Electrical/VoltageSensor.pickle +++ b/js/Electrical/VoltageSensor.pickle @@ -45,32 +45,33 @@ p12 g2 sS'model.dep_ut' p13 -g7 -sS'model.out' +S'vector_boolean' p14 +sS'model.out' +p15 g9 sS'gr_i' -p15 +p16 g7 sS'x.graphics.in_implicit' -p16 +p17 g7 sS'model.in' -p17 +p18 g4 sS'y' -p18 +p19 g7 sS'x' -p19 -NsS'model' p20 -S'object' +NsS'model' p21 -sS'typ' +S'object' p22 +sS'typ' +p23 g7 sS'mo.outputs' -p23 +p24 g9 s.
\ No newline at end of file diff --git a/js/Electrical/VsourceAC.js b/js/Electrical/VsourceAC.js index a5bf800a..72276f83 100644 --- a/js/Electrical/VsourceAC.js +++ b/js/Electrical/VsourceAC.js @@ -9,7 +9,7 @@ function VsourceAC() { this.model.rpar = new ScilabDouble([this.VA],[this.FR]); this.model.sim = new ScilabString(["VsourceAC"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "VsourceAC"; mo.inputs = "p"; diff --git a/js/Electrical/VsourceAC.pickle b/js/Electrical/VsourceAC.pickle index 89aeb7b9..7d0bc6da 100644 --- a/js/Electrical/VsourceAC.pickle +++ b/js/Electrical/VsourceAC.pickle @@ -88,22 +88,23 @@ p27 g2 sS'model.dep_ut' p28 -g11 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p29 +sS'model.equations.parameters[2-1]' +p30 g16 sS'exprs' -p30 +p31 g22 sS'gr_i' -p31 +p32 g11 sS'y' -p32 +p33 g11 sS'x' -p33 -NsS'model' p34 +NsS'model' +p35 g6 s.
\ No newline at end of file diff --git a/js/Events/ANDBLK.pickle b/js/Events/ANDBLK.pickle index 28ad2060..e00bbee6 100644 --- a/js/Events/ANDBLK.pickle +++ b/js/Events/ANDBLK.pickle @@ -62,161 +62,162 @@ p19 g10 sS'x.model.dep_ut' p20 -g14 -sS'split.graphics.orig' +S'vector_boolean' p21 +sS'split.graphics.orig' +p22 g16 sS'x.model.rpar' -p22 +p23 g8 sS'ifthel' -p23 +p24 g2 sS'split.graphics.peout' -p24 +p25 g16 sS'output_port.graphics.pein' -p25 +p26 g8 sS'diagram.objs[2-1]' -p26 +p27 g2 sS'andlog' -p27 +p28 g2 sS'x.model.firing' -p28 +p29 g10 sS'ifthel.graphics.pin' -p29 +p30 g8 sS'output_port.model.ipar' -p30 +p31 g8 sS'typ' -p31 +p32 g14 sS'split.graphics.pein' -p32 +p33 g8 sS'input_port2.graphics.flip' -p33 +p34 g10 sS'x.model.blocktype' -p34 +p35 g4 sS'andlog.graphics.pein' -p35 +p36 g16 sS'x.graphics.peout' -p36 +p37 g8 sS'diagram.objs[7-1]' -p37 +p38 g2 sS'diagram.objs[6-1]' -p38 +p39 g8 sS'split' -p39 +p40 g2 sS'andlog.graphics.pout' -p40 +p41 g8 sS'diagram.objs[8-1]' -p41 +p42 g8 sS'diagram.objs[3-1]' -p42 +p43 g2 sS'input_port1.graphics.sz' -p43 +p44 g14 sS'diagram.objs[5-1]' -p44 +p45 g2 sS'andlog.graphics.orig' -p45 +p46 g14 sS'diagram.objs[4-1]' -p46 +p47 g8 sS'x.graphics.gr_i' -p47 +p48 g14 sS'ifthel.graphics.pein' -p48 +p49 g8 sS'ifthel.graphics.orig' -p49 +p50 g14 sS'input_port2.model.ipar' -p50 +p51 g8 sS'diagram' -p51 +p52 g8 sS'input_port2.graphics.peout' -p52 +p53 g8 sS'diagram.objs[10-1]' -p53 +p54 g2 sS'output_port.graphics.sz' -p54 +p55 g14 sS'andlog.graphics.sz' -p55 +p56 g14 sS'diagram.objs[12-1]' -p56 +p57 g8 sS'ifthel.graphics.peout' -p57 +p58 g16 sS'input_port1.graphics.orig' -p58 +p59 g14 sS'x.model.sim' -p59 +p60 g4 sS'output_port' -p60 +p61 g2 sS'andlog.graphics.flip' -p61 +p62 g10 sS'input_port1.graphics.peout' -p62 +p63 g8 sS'ifthel.graphics.sz' -p63 +p64 g14 sS'ifthel.graphics.flip' -p64 +p65 g10 sS'x.graphics.sz' -p65 +p66 g14 sS'input_port1.model.ipar' -p66 +p67 g8 sS'input_port2.graphics.exprs' -p67 +p68 g4 sS'output_port.graphics.orig' -p68 +p69 g14 sS'y' -p69 +p70 g14 sS'x' -p70 +p71 g8 sS'diagram.objs[11-1]' -p71 +p72 g8 sS'x.model.evtout' -p72 +p73 g8 s.
\ No newline at end of file diff --git a/js/Events/ANDLOG_f.js b/js/Events/ANDLOG_f.js index cf51bb95..6673fc62 100644 --- a/js/Events/ANDLOG_f.js +++ b/js/Events/ANDLOG_f.js @@ -7,7 +7,7 @@ function ANDLOG_f() { this.model.evtin = new ScilabDouble([1],[1]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); return new BasicBlock(this.x); diff --git a/js/Events/ANDLOG_f.pickle b/js/Events/ANDLOG_f.pickle index fdfefb34..30d979c2 100644 --- a/js/Events/ANDLOG_f.pickle +++ b/js/Events/ANDLOG_f.pickle @@ -28,7 +28,7 @@ S'matrix' p5 sS'model.dep_ut' p6 -S'vector' +S'vector_boolean' p7 sS'model.out' p8 @@ -36,20 +36,21 @@ S'double' p9 sS'gr_i' p10 -g7 -sS'y' +S'vector' p11 -g7 -sS'x' +sS'y' p12 -NsS'model' +g11 +sS'x' p13 -S'object' +NsS'model' p14 -sS'typ' +S'object' p15 -g7 -sS'model.firing' +sS'typ' p16 -g7 +g11 +sS'model.firing' +p17 +g11 s.
\ No newline at end of file diff --git a/js/Events/CLKSOMV_f.js b/js/Events/CLKSOMV_f.js index 87658adc..86479052 100644 --- a/js/Events/CLKSOMV_f.js +++ b/js/Events/CLKSOMV_f.js @@ -7,7 +7,7 @@ function CLKSOMV_f() { this.model.evtout = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); return new BasicBlock(this.x); diff --git a/js/Events/CLKSOMV_f.pickle b/js/Events/CLKSOMV_f.pickle index 4f194448..13328761 100644 --- a/js/Events/CLKSOMV_f.pickle +++ b/js/Events/CLKSOMV_f.pickle @@ -32,27 +32,28 @@ S'matrix' p7 sS'model.dep_ut' p8 -S'vector' +S'vector_boolean' p9 sS'p' p10 g4 sS'gr_i' p11 -g9 -sS'y' +S'vector' p12 -g9 -sS'x' +sS'y' p13 -NsS'model' +g12 +sS'x' p14 -S'object' +NsS'model' p15 -sS'typ' +S'object' p16 -g9 -sS'model.firing' +sS'typ' p17 +g12 +sS'model.firing' +p18 g4 s.
\ No newline at end of file diff --git a/js/Events/CLKSOM_f.js b/js/Events/CLKSOM_f.js index a6846cb5..f1961cbc 100644 --- a/js/Events/CLKSOM_f.js +++ b/js/Events/CLKSOM_f.js @@ -7,7 +7,7 @@ function CLKSOM_f() { this.model.evtout = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); return new BasicBlock(this.x); diff --git a/js/Events/CLKSOM_f.pickle b/js/Events/CLKSOM_f.pickle index 4f194448..13328761 100644 --- a/js/Events/CLKSOM_f.pickle +++ b/js/Events/CLKSOM_f.pickle @@ -32,27 +32,28 @@ S'matrix' p7 sS'model.dep_ut' p8 -S'vector' +S'vector_boolean' p9 sS'p' p10 g4 sS'gr_i' p11 -g9 -sS'y' +S'vector' p12 -g9 -sS'x' +sS'y' p13 -NsS'model' +g12 +sS'x' p14 -S'object' +NsS'model' p15 -sS'typ' +S'object' p16 -g9 -sS'model.firing' +sS'typ' p17 +g12 +sS'model.firing' +p18 g4 s.
\ No newline at end of file diff --git a/js/Events/CLKSPLIT_f.js b/js/Events/CLKSPLIT_f.js index 5914708d..87ce8b0d 100644 --- a/js/Events/CLKSPLIT_f.js +++ b/js/Events/CLKSPLIT_f.js @@ -6,8 +6,8 @@ function CLKSPLIT_f() { this.model.evtin = new ScilabDouble([1]); this.model.evtout = new ScilabDouble([1],[1]); this.model.blocktype = new ScilabString(["d"]); - this.model.firing = new ScilabDouble([false,false,false]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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,[],[]); return new BasicBlock(this.x); } diff --git a/js/Events/CLKSPLIT_f.pickle b/js/Events/CLKSPLIT_f.pickle index fc3b9c64..3235bd26 100644 --- a/js/Events/CLKSPLIT_f.pickle +++ b/js/Events/CLKSPLIT_f.pickle @@ -28,7 +28,7 @@ p5 g2 sS'model.dep_ut' p6 -S'vector' +S'vector_boolean' p7 sS'model.evtin' p8 @@ -36,17 +36,18 @@ S'double' p9 sS'y' p10 -g7 -sS'x' +S'vector' p11 -NsS'model' +sS'x' p12 -S'object' +NsS'model' p13 -sS'typ' +S'object' p14 -g7 -sS'model.firing' +sS'typ' p15 +g11 +sS'model.firing' +p16 g7 s.
\ No newline at end of file diff --git a/js/Events/END_c.js b/js/Events/END_c.js index c2d17e73..455cc875 100644 --- a/js/Events/END_c.js +++ b/js/Events/END_c.js @@ -8,7 +8,7 @@ function END_c() { this.model.evtout = new ScilabDouble([1]); this.model.firing = new ScilabDouble([this.tf]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Events/END_c.pickle b/js/Events/END_c.pickle index 6dde99ec..d39b4b9d 100644 --- a/js/Events/END_c.pickle +++ b/js/Events/END_c.pickle @@ -39,7 +39,7 @@ sS'graphics.exprs' p9 NsS'model.dep_ut' p10 -S'vector' +S'vector_boolean' p11 sS'tf' p12 @@ -52,25 +52,26 @@ sS'x.model' p15 NsS'gr_i' p16 -g11 -sS'graphics' +S'vector' p17 +sS'graphics' +p18 g7 sS'y' -p18 -g11 -sS'x' p19 -NsS'model' +g17 +sS'x' p20 +NsS'model' +p21 g7 sS'typ' -p21 -g11 -sS'model.firing' p22 +g17 +sS'model.firing' +p23 g4 sS'model.blocktype' -p23 +p24 g14 s.
\ No newline at end of file diff --git a/js/Events/EVTDLY_c.js b/js/Events/EVTDLY_c.js index 4d1ac134..98e5f88b 100644 --- a/js/Events/EVTDLY_c.js +++ b/js/Events/EVTDLY_c.js @@ -10,7 +10,7 @@ function EVTDLY_c() { this.model.rpar = new ScilabDouble([this.dt],[this.ff]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([this.ff]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Events/EVTDLY_c.pickle b/js/Events/EVTDLY_c.pickle index 05b5a38c..d6bbd0fa 100644 --- a/js/Events/EVTDLY_c.pickle +++ b/js/Events/EVTDLY_c.pickle @@ -58,32 +58,33 @@ S'vector' p17 sS'model.dep_ut' p18 -g17 -sS'ff' +S'vector_boolean' p19 +sS'ff' +p20 g4 sS'graphics' -p20 +p21 g9 sS'y' -p21 +p22 g17 sS'x' -p22 -NsS'model' p23 +NsS'model' +p24 g9 sS'typ' -p24 +p25 g17 sS'dt' -p25 +p26 g4 sS'model.firing' -p26 +p27 g4 sS'model.blocktype' -p27 -S'string' p28 +S'string' +p29 s.
\ No newline at end of file diff --git a/js/Events/EVTDLY_f.js b/js/Events/EVTDLY_f.js index e170b269..0933ae9c 100644 --- a/js/Events/EVTDLY_f.js +++ b/js/Events/EVTDLY_f.js @@ -10,7 +10,7 @@ function EVTDLY_f() { this.model.rpar = new ScilabDouble([this.dt]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([this.ff]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Events/EVTDLY_f.pickle b/js/Events/EVTDLY_f.pickle index 2b1cdf63..8f4831ec 100644 --- a/js/Events/EVTDLY_f.pickle +++ b/js/Events/EVTDLY_f.pickle @@ -58,31 +58,32 @@ S'vector' p17 sS'model.dep_ut' p18 -g17 -sS'ff' +S'vector_boolean' p19 +sS'ff' +p20 g4 sS'graphics' -p20 +p21 g9 sS'y' -p21 +p22 g17 sS'x' -p22 -NsS'model' p23 +NsS'model' +p24 g9 sS'typ' -p24 +p25 g17 sS'dt' -p25 +p26 g4 sS'model.firing' -p26 +p27 g4 sS'model.blocktype' -p27 +p28 g2 s.
\ No newline at end of file diff --git a/js/Events/EVTGEN_f.js b/js/Events/EVTGEN_f.js index 00dd9f20..9b8ad9c9 100644 --- a/js/Events/EVTGEN_f.js +++ b/js/Events/EVTGEN_f.js @@ -7,7 +7,7 @@ function EVTGEN_f() { this.model.evtout = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([this.tt]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Events/EVTGEN_f.pickle b/js/Events/EVTGEN_f.pickle index df0c32d3..2fcdb628 100644 --- a/js/Events/EVTGEN_f.pickle +++ b/js/Events/EVTGEN_f.pickle @@ -42,7 +42,7 @@ sS'graphics.exprs' p10 NsS'model.dep_ut' p11 -S'vector' +S'vector_boolean' p12 sS'exprs' p13 @@ -52,22 +52,23 @@ p14 g7 sS'gr_i' p15 -g12 -sS'graphics' +S'vector' p16 +sS'graphics' +p17 g7 sS'y' -p17 -g12 -sS'x' p18 -NsS'model' +g16 +sS'x' p19 +NsS'model' +p20 g7 sS'typ' -p20 -g12 -sS'model.firing' p21 +g16 +sS'model.firing' +p22 g4 s.
\ No newline at end of file diff --git a/js/Events/EVTVARDLY.js b/js/Events/EVTVARDLY.js index b37945aa..cf5b553a 100644 --- a/js/Events/EVTVARDLY.js +++ b/js/Events/EVTVARDLY.js @@ -9,7 +9,7 @@ function EVTVARDLY() { this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/Events/EVTVARDLY.pickle b/js/Events/EVTVARDLY.pickle index b6833454..cf9f65c6 100644 --- a/js/Events/EVTVARDLY.pickle +++ b/js/Events/EVTVARDLY.pickle @@ -39,7 +39,7 @@ sS'graphics.exprs' p9 NsS'model.dep_ut' p10 -S'vector' +S'vector_boolean' p11 sS'exprs' p12 @@ -49,28 +49,29 @@ sS'x.model' p14 NsS'gr_i' p15 -g11 -sS'model.in' +S'vector' p16 +sS'model.in' +p17 g4 sS'graphics' -p17 +p18 g7 sS'y' -p18 -g11 -sS'x' p19 -NsS'model' +g16 +sS'x' p20 +NsS'model' +p21 g7 sS'typ' -p21 -g11 -sS'model.firing' p22 +g16 +sS'model.firing' +p23 g4 sS'model.blocktype' -p23 +p24 g13 s.
\ No newline at end of file diff --git a/js/Events/HALT_f.js b/js/Events/HALT_f.js index 1a991818..7d5fd5c3 100644 --- a/js/Events/HALT_f.js +++ b/js/Events/HALT_f.js @@ -8,7 +8,7 @@ function HALT_f() { this.model.dstate = new ScilabDouble([0]); this.model.ipar = new ScilabDouble([0]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Events/HALT_f.pickle b/js/Events/HALT_f.pickle index 7f346c16..eb4ae364 100644 --- a/js/Events/HALT_f.pickle +++ b/js/Events/HALT_f.pickle @@ -39,7 +39,7 @@ sS'graphics.exprs' p9 NsS'model.dep_ut' p10 -S'vector' +S'vector_boolean' p11 sS'n' p12 @@ -51,25 +51,26 @@ sS'x.model' p14 NsS'gr_i' p15 -g11 -sS'graphics' +S'vector' p16 +sS'graphics' +p17 g7 sS'y' -p17 -g11 -sS'x' p18 -NsS'model' +g16 +sS'x' p19 +NsS'model' +p20 g7 sS'model.ipar' -p20 +p21 g4 sS'typ' -p21 -g11 -sS'model.blocktype' p22 +g16 +sS'model.blocktype' +p23 g2 s.
\ No newline at end of file diff --git a/js/Events/IFTHEL_f.js b/js/Events/IFTHEL_f.js index 19ad6ce3..7ec78219 100644 --- a/js/Events/IFTHEL_f.js +++ b/js/Events/IFTHEL_f.js @@ -10,7 +10,7 @@ function IFTHEL_f() { this.model.evtout = new ScilabDouble([1],[1]); this.model.blocktype = new ScilabString(["l"]); this.model.firing = new ScilabDouble([-1,-1]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.model.nmode = new ScilabDouble([1]); this.model.nzcross = new ScilabDouble([1]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"IFTHEL_f\",sz(1),sz(2));"]); @@ -44,7 +44,7 @@ function IFTHEL_f() { if (!ok) { break; } - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); if (this.nmod!=0) { this.nmod = 1; } diff --git a/js/Events/IFTHEL_f.pickle b/js/Events/IFTHEL_f.pickle index 24cd316f..77e313b9 100644 --- a/js/Events/IFTHEL_f.pickle +++ b/js/Events/IFTHEL_f.pickle @@ -86,19 +86,20 @@ p26 g8 sS'model.dep_ut' p27 -g6 -sS'exprs' +S'vector_boolean' p28 +sS'exprs' +p29 g20 sS'gr_i' -p29 +p30 g6 sS'y' -p30 +p31 g6 sS'x' -p31 -NsS'model' p32 +NsS'model' +p33 g2 s.
\ No newline at end of file diff --git a/js/Events/MFCLCK_f.js b/js/Events/MFCLCK_f.js index 5500683b..74eb8405 100644 --- a/js/Events/MFCLCK_f.js +++ b/js/Events/MFCLCK_f.js @@ -12,7 +12,7 @@ function MFCLCK_f() { this.model.ipar = new ScilabDouble([this.nn]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1,0]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Events/MFCLCK_f.pickle b/js/Events/MFCLCK_f.pickle index cabc0c72..9a07850c 100644 --- a/js/Events/MFCLCK_f.pickle +++ b/js/Events/MFCLCK_f.pickle @@ -78,19 +78,20 @@ p23 g14 sS'model.dep_ut' p24 -g12 -sS'exprs' +S'vector_boolean' p25 +sS'exprs' +p26 g16 sS'gr_i' -p26 +p27 g12 sS'y' -p27 +p28 g12 sS'x' -p28 -NsS'model' p29 +NsS'model' +p30 g4 s.
\ No newline at end of file diff --git a/js/Events/M_freq.js b/js/Events/M_freq.js index 31498c81..255e34a0 100644 --- a/js/Events/M_freq.js +++ b/js/Events/M_freq.js @@ -9,7 +9,7 @@ function M_freq() { this.model.opar = list([[1,1,0],[1,1,1],[1,3,2]], new ScilabDouble([1]), new ScilabDouble([0]), new ScilabDouble([0])); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([0,-1,-1]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Events/M_freq.pickle b/js/Events/M_freq.pickle index bda14450..c66a8c64 100644 --- a/js/Events/M_freq.pickle +++ b/js/Events/M_freq.pickle @@ -93,25 +93,26 @@ p28 g17 sS'model.dep_ut' p29 -g13 -sS'exprs' +S'vector_boolean' p30 +sS'exprs' +p31 g17 sS'gr_i' -p31 +p32 g13 sS'y' -p32 +p33 g13 sS'x' -p33 -NsS'model' p34 +NsS'model' +p35 g2 sS'ot' -p35 +p36 g17 sS'k' -p36 +p37 g17 s.
\ No newline at end of file diff --git a/js/Events/VirtualCLK0.js b/js/Events/VirtualCLK0.js index 1457a521..6beb5115 100644 --- a/js/Events/VirtualCLK0.js +++ b/js/Events/VirtualCLK0.js @@ -8,7 +8,7 @@ function VirtualCLK0() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); this.exprs = []; this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs," "); return new BasicBlock(this.x); diff --git a/js/Events/VirtualCLK0.pickle b/js/Events/VirtualCLK0.pickle index d35c048d..b44a7f0c 100644 --- a/js/Events/VirtualCLK0.pickle +++ b/js/Events/VirtualCLK0.pickle @@ -28,31 +28,32 @@ S'vector' p5 sS'model.dep_ut' p6 -g5 -sS'model.evtin' +S'vector_boolean' p7 -S'double' +sS'model.evtin' p8 -sS'y' +S'double' p9 +sS'y' +p10 g5 sS'x' -p10 -NsS'model' p11 -S'object' +NsS'model' p12 -sS'model.ipar' +S'object' p13 +sS'model.ipar' +p14 g5 sS'typ' -p14 +p15 g5 sS'model.opar' -p15 -S'list' p16 -sS'model.firing' +S'list' p17 -g8 +sS'model.firing' +p18 +g9 s.
\ No newline at end of file diff --git a/js/Hydraulics/Bache.js b/js/Hydraulics/Bache.js index 985822af..7d023475 100644 --- a/js/Hydraulics/Bache.js +++ b/js/Hydraulics/Bache.js @@ -18,7 +18,7 @@ function Bache() { this.model.rpar = new ScilabDouble([this.Patm],[this.A],[this.ze1],[this.ze2],[this.zs1],[this.zs2],[this.z0],[this.T0],[this.p_rho]); this.model.sim = new ScilabString(["Bache"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "Bache"; mo.inputs = ["Ce1","Ce2"]; diff --git a/js/Hydraulics/Bache.pickle b/js/Hydraulics/Bache.pickle index 2df2dbe9..c4842111 100644 --- a/js/Hydraulics/Bache.pickle +++ b/js/Hydraulics/Bache.pickle @@ -126,25 +126,26 @@ p35 g2 sS'model.dep_ut' p36 -g15 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p37 +sS'model.equations.parameters[2-1]' +p38 g19 sS'exprs' -p38 +p39 g17 sS'gr_i' -p39 +p40 g15 sS'p_rho' -p40 +p41 g8 sS'y' -p41 +p42 g15 sS'x' -p42 -NsS'model' p43 +NsS'model' +p44 g2 s.
\ No newline at end of file diff --git a/js/Hydraulics/Flowmeter.js b/js/Hydraulics/Flowmeter.js index 626793c5..7c6a1701 100644 --- a/js/Hydraulics/Flowmeter.js +++ b/js/Hydraulics/Flowmeter.js @@ -39,7 +39,7 @@ function Flowmeter() { this.exprs = "1"; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"Flowmeter\",sz(1),sz(2));"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); mo.model = ModelName; this.model.equations = new ScilabDouble([mo]); this.model.in = new ScilabDouble([ones(size(MI,"*"),1)]); diff --git a/js/Hydraulics/Flowmeter.pickle b/js/Hydraulics/Flowmeter.pickle index 761970c0..17e70da6 100644 --- a/js/Hydraulics/Flowmeter.pickle +++ b/js/Hydraulics/Flowmeter.pickle @@ -103,25 +103,26 @@ p32 g13 sS'model.dep_ut' p33 -g20 -sS'exprs' +S'vector_boolean' p34 +sS'exprs' +p35 g6 sS'x.graphics.exprs' -p35 -NsS'PortName' p36 +NsS'PortName' +p37 g13 sS'x' -p37 +p38 g4 sS'model' -p38 +p39 g4 sS'ParametersName' -p39 +p40 g6 sS'MO' -p40 +p41 g13 s.
\ No newline at end of file diff --git a/js/Hydraulics/PerteDP.js b/js/Hydraulics/PerteDP.js index 991c97f2..1fdb0f97 100644 --- a/js/Hydraulics/PerteDP.js +++ b/js/Hydraulics/PerteDP.js @@ -13,7 +13,7 @@ function PerteDP() { this.model.rpar = new ScilabDouble([this.L],[this.D],[this.lambda],[this.z1],[this.z2],[this.p_rho]); this.model.sim = new ScilabString(["PerteDP"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "PerteDP"; mo.inputs = "C1"; diff --git a/js/Hydraulics/PerteDP.pickle b/js/Hydraulics/PerteDP.pickle index 9a6a7868..b854926d 100644 --- a/js/Hydraulics/PerteDP.pickle +++ b/js/Hydraulics/PerteDP.pickle @@ -102,28 +102,29 @@ p29 g2 sS'model.dep_ut' p30 -g12 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p31 +sS'model.equations.parameters[2-1]' +p32 g14 sS'exprs' -p32 +p33 g22 sS'gr_i' -p33 +p34 g12 sS'p_rho' -p34 +p35 g8 sS'y' -p35 +p36 g12 sS'x' -p36 -NsS'model' p37 +NsS'model' +p38 g2 sS'lambda' -p38 +p39 g8 s.
\ No newline at end of file diff --git a/js/Hydraulics/PuitsP.js b/js/Hydraulics/PuitsP.js index 1fa51bff..04757d92 100644 --- a/js/Hydraulics/PuitsP.js +++ b/js/Hydraulics/PuitsP.js @@ -9,7 +9,7 @@ function PuitsP() { this.model.rpar = new ScilabDouble([this.P0],[this.T0],[this.H0],[this.option_temperature]); this.model.sim = new ScilabString(["Puits"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "Puits"; mo.inputs = ["C"]; diff --git a/js/Hydraulics/PuitsP.pickle b/js/Hydraulics/PuitsP.pickle index a9dafdc3..c3099d29 100644 --- a/js/Hydraulics/PuitsP.pickle +++ b/js/Hydraulics/PuitsP.pickle @@ -86,25 +86,26 @@ p25 g2 sS'model.dep_ut' p26 -g9 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p27 +sS'model.equations.parameters[2-1]' +p28 g14 sS'exprs' -p28 +p29 g19 sS'gr_i' -p29 +p30 g9 sS'y' -p30 +p31 g9 sS'x' -p31 -NsS'model' p32 +NsS'model' +p33 g2 sS'H0' -p33 +p34 g12 s.
\ No newline at end of file diff --git a/js/Hydraulics/SourceP.js b/js/Hydraulics/SourceP.js index f4907aaf..e7ad3820 100644 --- a/js/Hydraulics/SourceP.js +++ b/js/Hydraulics/SourceP.js @@ -9,7 +9,7 @@ function SourceP() { this.model.rpar = new ScilabDouble([this.P0],[this.T0],[this.H0],[this.option_temperature]); this.model.sim = new ScilabString(["Source"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "Source"; mo.inputs = []; diff --git a/js/Hydraulics/SourceP.pickle b/js/Hydraulics/SourceP.pickle index 9cf7d20a..4d269b4a 100644 --- a/js/Hydraulics/SourceP.pickle +++ b/js/Hydraulics/SourceP.pickle @@ -92,25 +92,26 @@ p27 g2 sS'model.dep_ut' p28 -g11 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p29 +sS'model.equations.parameters[2-1]' +p30 g14 sS'exprs' -p30 +p31 g21 sS'gr_i' -p31 +p32 g11 sS'y' -p32 +p33 g11 sS'x' -p33 -NsS'model' p34 +NsS'model' +p35 g2 sS'H0' -p35 +p36 g8 s.
\ No newline at end of file diff --git a/js/Hydraulics/VanneReglante.js b/js/Hydraulics/VanneReglante.js index c44ccdbf..30a07f29 100644 --- a/js/Hydraulics/VanneReglante.js +++ b/js/Hydraulics/VanneReglante.js @@ -9,7 +9,7 @@ function VanneReglante() { this.model.rpar = new ScilabDouble([this.Cvmax],[this.p_rho]); this.model.sim = new ScilabString(["VanneReglante"]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var mo = modelica(); mo.model = "VanneReglante"; mo.inputs = ["C1","Ouv"]; diff --git a/js/Hydraulics/VanneReglante.pickle b/js/Hydraulics/VanneReglante.pickle index 01b477cf..662d2cf8 100644 --- a/js/Hydraulics/VanneReglante.pickle +++ b/js/Hydraulics/VanneReglante.pickle @@ -85,25 +85,26 @@ p26 g2 sS'model.dep_ut' p27 -g12 -sS'model.equations.parameters[2-1]' +S'vector_boolean' p28 +sS'model.equations.parameters[2-1]' +p29 g16 sS'exprs' -p29 +p30 g14 sS'gr_i' -p30 +p31 g12 sS'p_rho' -p31 +p32 g7 sS'y' -p32 +p33 g12 sS'x' -p33 -NsS'model' p34 +NsS'model' +p35 g2 s.
\ No newline at end of file diff --git a/js/IntegerOp/BITCLEAR.js b/js/IntegerOp/BITCLEAR.js index 6d81f4d7..3f6a6448 100644 --- a/js/IntegerOp/BITCLEAR.js +++ b/js/IntegerOp/BITCLEAR.js @@ -11,7 +11,7 @@ function BITCLEAR() { this.model.outtyp = new ScilabDouble([3]); this.model.opar = list(new ScilabDouble([int32(0)])); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/IntegerOp/BITCLEAR.pickle b/js/IntegerOp/BITCLEAR.pickle index dd6af494..b1c039db 100644 --- a/js/IntegerOp/BITCLEAR.pickle +++ b/js/IntegerOp/BITCLEAR.pickle @@ -85,25 +85,26 @@ S'string' p26 sS'model.dep_ut' p27 -g9 -sS'n' +S'vector_boolean' p28 +sS'n' +p29 g7 sS'exprs' -p29 -S'matrix' p30 -sS'gr_i' +S'matrix' p31 +sS'gr_i' +p32 g9 sS'y' -p32 +p33 g9 sS'x' -p33 -NsS'model' p34 +NsS'model' +p35 g2 sS'ot' -p35 +p36 Ns.
\ No newline at end of file diff --git a/js/IntegerOp/BITSET.js b/js/IntegerOp/BITSET.js index 383d7931..b53090c8 100644 --- a/js/IntegerOp/BITSET.js +++ b/js/IntegerOp/BITSET.js @@ -11,7 +11,7 @@ function BITSET() { this.model.outtyp = new ScilabDouble([3]); this.model.opar = list(new ScilabDouble([uint32(0)])); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/IntegerOp/BITSET.pickle b/js/IntegerOp/BITSET.pickle index dd6af494..b1c039db 100644 --- a/js/IntegerOp/BITSET.pickle +++ b/js/IntegerOp/BITSET.pickle @@ -85,25 +85,26 @@ S'string' p26 sS'model.dep_ut' p27 -g9 -sS'n' +S'vector_boolean' p28 +sS'n' +p29 g7 sS'exprs' -p29 -S'matrix' p30 -sS'gr_i' +S'matrix' p31 +sS'gr_i' +p32 g9 sS'y' -p32 +p33 g9 sS'x' -p33 -NsS'model' p34 +NsS'model' +p35 g2 sS'ot' -p35 +p36 Ns.
\ No newline at end of file diff --git a/js/IntegerOp/CONVERT.js b/js/IntegerOp/CONVERT.js index 2e2eb015..b12dacbf 100644 --- a/js/IntegerOp/CONVERT.js +++ b/js/IntegerOp/CONVERT.js @@ -13,7 +13,7 @@ function CONVERT() { this.model.rpar = new ScilabDouble([]); this.model.ipar = new ScilabDouble([sgn]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/IntegerOp/CONVERT.pickle b/js/IntegerOp/CONVERT.pickle index 2a3fa64a..094416c8 100644 --- a/js/IntegerOp/CONVERT.pickle +++ b/js/IntegerOp/CONVERT.pickle @@ -91,23 +91,24 @@ S'string' p27 sS'model.dep_ut' p28 -g10 -sS'exprs' +S'vector_boolean' p29 -S'matrix' +sS'exprs' p30 -sS'gr_i' +S'matrix' p31 +sS'gr_i' +p32 g10 sS'y' -p32 +p33 g10 sS'x' -p33 -NsS'model' p34 +NsS'model' +p35 g2 sS'ot' -p35 +p36 g5 s.
\ No newline at end of file diff --git a/js/IntegerOp/DFLIPFLOP.js b/js/IntegerOp/DFLIPFLOP.js index b92a5905..0d028b5c 100644 --- a/js/IntegerOp/DFLIPFLOP.js +++ b/js/IntegerOp/DFLIPFLOP.js @@ -86,7 +86,7 @@ function DFLIPFLOP() { this.model.outtyp = new ScilabDouble([5,5]); this.model.blocktype = new ScilabString(["h"]); this.model.firing = new ScilabBoolean([false]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/IntegerOp/DFLIPFLOP.pickle b/js/IntegerOp/DFLIPFLOP.pickle index 8f30eb1f..77edf88d 100644 --- a/js/IntegerOp/DFLIPFLOP.pickle +++ b/js/IntegerOp/DFLIPFLOP.pickle @@ -208,38 +208,39 @@ p67 g2 sS'model.dep_ut' p68 -g22 -sS'scs_m.objs[43-1]' +S'vector_boolean' p69 +sS'scs_m.objs[43-1]' +p70 g2 sS'scs_m.objs[1-1]' -p70 +p71 g2 sS'model.sim' -p71 -S'string' p72 -sS'scs_m.objs[32-1]' +S'string' p73 +sS'scs_m.objs[32-1]' +p74 g2 sS'scs_m.objs[12-1]' -p74 +p75 g2 sS'scs_m.objs[24-1]' -p75 +p76 g2 sS'model.blocktype' -p76 -g72 -sS'y' p77 +g73 +sS'y' +p78 g22 sS'x' -p78 -NsS'scs_m.objs[27-1]' p79 +NsS'scs_m.objs[27-1]' +p80 g2 sS'scs_m.objs[35-1]' -p80 +p81 g2 s.
\ No newline at end of file diff --git a/js/IntegerOp/DLATCH.js b/js/IntegerOp/DLATCH.js index 9f99ed3d..c9e8d9b6 100644 --- a/js/IntegerOp/DLATCH.js +++ b/js/IntegerOp/DLATCH.js @@ -31,7 +31,7 @@ function DLATCH() { this.model.outtyp = new ScilabDouble([5,5]); this.model.blocktype = new ScilabString(["h"]); this.model.firing = new ScilabBoolean([false]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/IntegerOp/DLATCH.pickle b/js/IntegerOp/DLATCH.pickle index 519c7f47..6f7b6171 100644 --- a/js/IntegerOp/DLATCH.pickle +++ b/js/IntegerOp/DLATCH.pickle @@ -108,24 +108,25 @@ p33 g6 sS'model.dep_ut' p34 -g11 -sS'scs_m.objs[1-1]' +S'vector_boolean' p35 +sS'scs_m.objs[1-1]' +p36 g6 sS'gr_i' -p36 +p37 g11 sS'model.firing' -p37 -S'boolean' p38 -sS'y' +S'boolean' p39 +sS'y' +p40 g11 sS'x' -p40 -NsS'model' p41 -S'object' +NsS'model' p42 +S'object' +p43 s.
\ No newline at end of file diff --git a/js/IntegerOp/EXTRACTBITS.js b/js/IntegerOp/EXTRACTBITS.js index afa6ea2e..b2623451 100644 --- a/js/IntegerOp/EXTRACTBITS.js +++ b/js/IntegerOp/EXTRACTBITS.js @@ -12,7 +12,7 @@ function EXTRACTBITS() { this.model.outtyp = new ScilabDouble([3]); this.model.ipar = new ScilabDouble([0,numb]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/IntegerOp/EXTRACTBITS.pickle b/js/IntegerOp/EXTRACTBITS.pickle index 351da178..be93e054 100644 --- a/js/IntegerOp/EXTRACTBITS.pickle +++ b/js/IntegerOp/EXTRACTBITS.pickle @@ -41,79 +41,80 @@ p7 g4 sS'model.dep_ut' p8 -g2 -sS'model.out' +S'vector_boolean' p9 -S'double' +sS'model.out' p10 -sS'out' +S'double' p11 +sS'out' +p12 g2 sS'model.in2' -p12 -g10 -sS'model.intyp' p13 -g10 -sS'x.graphics' +g11 +sS'model.intyp' p14 +g11 +sS'x.graphics' +p15 g4 sS'model.sim' -p15 -S'list' p16 -sS'model.out2' +S'list' p17 -g10 -sS'in1' +sS'model.out2' p18 +g11 +sS'in1' +p19 g2 sS'model.outtyp' -p19 -g10 -sS'model.in' p20 -g10 -sS'graphics.exprs' +g11 +sS'model.in' p21 -NsS'bit' +g11 +sS'graphics.exprs' p22 -g10 -sS'model.ipar' +NsS'bit' p23 +g11 +sS'model.ipar' +p24 g2 sS'typ' -p24 +p25 g2 sS'bitstr' -p25 -g10 -sS'ok' p26 -S'boolean' +g11 +sS'ok' p27 -sS'model.blocktype' +S'boolean' p28 -S'string' +sS'model.blocktype' p29 -sS'rule' +S'string' p30 -g10 -sS'exprs' +sS'rule' p31 -S'matrix' +g11 +sS'exprs' p32 -sS'gr_i' +S'matrix' p33 +sS'gr_i' +p34 g2 sS'y' -p34 +p35 g2 sS'x' -p35 -NsS'model' p36 +NsS'model' +p37 g4 sS'ot' -p37 +p38 Ns.
\ No newline at end of file diff --git a/js/IntegerOp/INTMUL.js b/js/IntegerOp/INTMUL.js index fde3f0aa..881cf447 100644 --- a/js/IntegerOp/INTMUL.js +++ b/js/IntegerOp/INTMUL.js @@ -13,7 +13,7 @@ function INTMUL() { this.model.rpar = new ScilabDouble([]); this.model.ipar = new ScilabDouble([sgn]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/IntegerOp/INTMUL.pickle b/js/IntegerOp/INTMUL.pickle index 644e2bf3..1ead3178 100644 --- a/js/IntegerOp/INTMUL.pickle +++ b/js/IntegerOp/INTMUL.pickle @@ -90,21 +90,22 @@ p28 g5 sS'model.dep_ut' p29 -g11 -sS'exprs' +S'vector_boolean' p30 +sS'exprs' +p31 g13 sS'gr_i' -p31 +p32 g11 sS'y' -p32 +p33 g11 sS'x' -p33 -NsS'model' p34 +NsS'model' +p35 g2 sS'ot' -p35 +p36 Ns.
\ No newline at end of file diff --git a/js/IntegerOp/JKFLIPFLOP.js b/js/IntegerOp/JKFLIPFLOP.js index 63b245c0..3c8ab1e0 100644 --- a/js/IntegerOp/JKFLIPFLOP.js +++ b/js/IntegerOp/JKFLIPFLOP.js @@ -42,7 +42,7 @@ function JKFLIPFLOP() { this.model.outtyp = new ScilabDouble([5,5]); this.model.blocktype = new ScilabString(["h"]); this.model.firing = new ScilabBoolean([false]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/IntegerOp/JKFLIPFLOP.pickle b/js/IntegerOp/JKFLIPFLOP.pickle index 08628169..e65a481f 100644 --- a/js/IntegerOp/JKFLIPFLOP.pickle +++ b/js/IntegerOp/JKFLIPFLOP.pickle @@ -85,135 +85,136 @@ p25 g7 sS'model.dep_ut' p26 -g22 -sS'newpar[size(newpar)+1-1]' +S'vector_boolean' p27 +sS'newpar[size(newpar)+1-1]' +p28 g7 sS'init' -p28 +p29 g7 sS'scs_m_1' -p29 +p30 g7 sS'scs_m.objs[22-1]' -p30 +p31 g7 sS'scs_m_1.objs[2-1]' -p31 +p32 g7 sS'init_old' -p32 +p33 g7 sS'scs_m.objs[13-1]' -p33 +p34 g7 sS'model.firing' -p34 -S'boolean' p35 -sS'newpar' +S'boolean' p36 -S'list' +sS'newpar' p37 -sS'model.in2' +S'list' p38 +sS'model.in2' +p39 g11 sS'scs_m.objs[6-1]' -p39 +p40 g7 sS'scs_m.objs[9-1]' -p40 +p41 g7 sS'model.odstate[1-1]' -p41 +p42 g7 sS'model.out2' -p42 +p43 g11 sS'model.rpar' -p43 +p44 g7 sS'scs_m.objs[3-1]' -p44 +p45 g7 sS'scs_m_1.objs[4-1]' -p45 +p46 g7 sS'scs_m.objs[16-1]' -p46 +p47 g7 sS'scs_m.objs[11-1]' -p47 +p48 g7 sS'scs_m.objs[14-1]' -p48 +p49 g7 sS'scs_m.objs[17-1]' -p49 +p50 g7 sS'model.in' -p50 +p51 g11 sS'scs_m_1.objs[5-1]' -p51 +p52 g7 sS'path' -p52 -NsS'scs_m.objs[4-1]' p53 +NsS'scs_m.objs[4-1]' +p54 g7 sS'scs_m.objs[7-1]' -p54 +p55 g7 sS'typ' -p55 -g37 -sS'model.outtyp' p56 +g38 +sS'model.outtyp' +p57 g22 sS'needcompile' -p57 +p58 g7 sS'arg1.model' -p58 +p59 g2 sS'model.blocktype' -p59 +p60 g4 sS'scs_m.objs[8-1]' -p60 +p61 g7 sS'scs_m.objs[15-1]' -p61 +p62 g7 sS'scs_m.objs[21-1]' -p62 +p63 g7 sS'scs_m_1.objs[1-1]' -p63 +p64 g7 sS'arg1.model.rpar.objs[path-1]' -p64 +p65 g2 sS'exprs' -p65 +p66 g7 sS'gr_i' -p66 +p67 g22 sS'scs_m.objs[12-1]' -p67 +p68 g7 sS'y' -p68 +p69 g7 sS'x' -p69 +p70 g2 sS'model' -p70 +p71 g2 sS'arg1.model.rpar' -p71 +p72 g2 s.
\ No newline at end of file diff --git a/js/IntegerOp/LOGIC.js b/js/IntegerOp/LOGIC.js index 7add8e96..013b216f 100644 --- a/js/IntegerOp/LOGIC.js +++ b/js/IntegerOp/LOGIC.js @@ -14,7 +14,7 @@ function LOGIC() { this.model.opar = list(new ScilabDouble([int8(this.mat)])); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabBoolean([false]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/IntegerOp/LOGIC.pickle b/js/IntegerOp/LOGIC.pickle index 7f0a03e2..59a29827 100644 --- a/js/IntegerOp/LOGIC.pickle +++ b/js/IntegerOp/LOGIC.pickle @@ -98,25 +98,26 @@ S'string' p31 sS'model.dep_ut' p32 -g9 -sS'exprs' +S'vector_boolean' p33 +sS'exprs' +p34 g11 sS'gr_i' -p34 +p35 g9 sS'y' -p35 +p36 g9 sS'x' -p36 -NsS'model' p37 +NsS'model' +p38 g2 sS'ot' -p38 +p39 g5 sS'nout' -p39 +p40 g5 s.
\ No newline at end of file diff --git a/js/IntegerOp/SHIFT.js b/js/IntegerOp/SHIFT.js index 561f2faa..bc9058b6 100644 --- a/js/IntegerOp/SHIFT.js +++ b/js/IntegerOp/SHIFT.js @@ -14,7 +14,7 @@ function SHIFT() { this.model.rpar = new ScilabDouble([]); this.model.ipar = new ScilabDouble(sgn); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/IntegerOp/SHIFT.pickle b/js/IntegerOp/SHIFT.pickle index d71a0979..61e6ba3a 100644 --- a/js/IntegerOp/SHIFT.pickle +++ b/js/IntegerOp/SHIFT.pickle @@ -87,21 +87,22 @@ S'string' p27 sS'model.dep_ut' p28 -g18 -sS'exprs' +S'vector_boolean' p29 +sS'exprs' +p30 g9 sS'gr_i' -p30 +p31 g18 sS'y' -p31 +p32 g18 sS'x' -p32 -NsS'model' p33 +NsS'model' +p34 g4 sS'ot' -p34 +p35 Ns.
\ No newline at end of file diff --git a/js/IntegerOp/SRFLIPFLOP.js b/js/IntegerOp/SRFLIPFLOP.js index b8b762cf..90b4c965 100644 --- a/js/IntegerOp/SRFLIPFLOP.js +++ b/js/IntegerOp/SRFLIPFLOP.js @@ -26,7 +26,7 @@ function SRFLIPFLOP() { this.model.outtyp = new ScilabDouble([5,5]); this.model.blocktype = new ScilabString(["h"]); this.model.firing = new ScilabBoolean([false]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/IntegerOp/SRFLIPFLOP.pickle b/js/IntegerOp/SRFLIPFLOP.pickle index a1c8301d..a7f8d534 100644 --- a/js/IntegerOp/SRFLIPFLOP.pickle +++ b/js/IntegerOp/SRFLIPFLOP.pickle @@ -67,104 +67,105 @@ p19 g13 sS'model.dep_ut' p20 -g18 -sS'newpar[size(newpar)+1-1]' +S'vector_boolean' p21 -NsS'init' +sS'newpar[size(newpar)+1-1]' p22 +NsS'init' +p23 g13 sS'scs_m.objs[12-1]' -p23 +p24 g13 sS'init_old' -p24 +p25 g13 sS'scs_m.objs[13-1]' -p25 +p26 g13 sS'newpar' -p26 -S'list' p27 -sS'model.in2' +S'list' p28 +sS'model.in2' +p29 g8 sS'scs_m.objs[6-1]' -p29 +p30 g13 sS'scs_m.objs[9-1]' -p30 +p31 g13 sS'model.odstate[1-1]' -p31 +p32 g13 sS'model.out2' -p32 +p33 g8 sS'model.rpar' -p33 +p34 g13 sS'scs_m.objs[3-1]' -p34 +p35 g13 sS'model.outtyp' -p35 +p36 g18 sS'scs_m.objs[11-1]' -p36 +p37 g13 sS'scs_m.objs[14-1]' -p37 +p38 g13 sS'model.in' -p38 +p39 g8 sS'path' -p39 -NsS'scs_m.objs[4-1]' p40 +NsS'scs_m.objs[4-1]' +p41 g13 sS'scs_m.objs[7-1]' -p41 +p42 g13 sS'typ' -p42 -g27 -sS'needcompile' p43 +g28 +sS'needcompile' +p44 g13 sS'arg1.model' -p44 +p45 g2 sS'model.blocktype' -p45 +p46 g4 sS'scs_m.objs[8-1]' -p46 +p47 g13 sS'arg1.model.rpar.objs[path-1]' -p47 +p48 g2 sS'exprs' -p48 +p49 g13 sS'gr_i' -p49 +p50 g18 sS'model.firing' -p50 -S'boolean' p51 -sS'y' +S'boolean' p52 +sS'y' +p53 g13 sS'x' -p53 +p54 g2 sS'model' -p54 +p55 g2 sS'arg1.model.rpar' -p55 +p56 g2 s.
\ No newline at end of file diff --git a/js/Linear/BIGSOM_f.js b/js/Linear/BIGSOM_f.js index 1aac8643..19a2132e 100644 --- a/js/Linear/BIGSOM_f.js +++ b/js/Linear/BIGSOM_f.js @@ -8,7 +8,7 @@ function BIGSOM_f() { this.model.out = new ScilabDouble([-1]); this.model.rpar = new ScilabDouble(this.sgn); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/Linear/BIGSOM_f.pickle b/js/Linear/BIGSOM_f.pickle index 5b4d88ba..90662ba0 100644 --- a/js/Linear/BIGSOM_f.pickle +++ b/js/Linear/BIGSOM_f.pickle @@ -59,22 +59,23 @@ S'vector' p18 sS'model.dep_ut' p19 -g18 -sS'model.in' +S'vector_boolean' p20 +sS'model.in' +p21 g2 sS'graphics' -p21 +p22 g10 sS'y' -p22 +p23 g18 sS'x' -p23 -NsS'model' p24 +NsS'model' +p25 g10 sS'typ' -p25 +p26 g18 s.
\ No newline at end of file diff --git a/js/Linear/CLINDUMMY_f.js b/js/Linear/CLINDUMMY_f.js index 81066883..14724c74 100644 --- a/js/Linear/CLINDUMMY_f.js +++ b/js/Linear/CLINDUMMY_f.js @@ -7,7 +7,7 @@ function CLINDUMMY_f() { this.model.state = new ScilabDouble([x0]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([false,true]); + 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); return new BasicBlock(this.x); diff --git a/js/Linear/CLINDUMMY_f.pickle b/js/Linear/CLINDUMMY_f.pickle index c620f0d2..2718e79a 100644 --- a/js/Linear/CLINDUMMY_f.pickle +++ b/js/Linear/CLINDUMMY_f.pickle @@ -25,31 +25,32 @@ S'string' p4 sS'model.dep_ut' p5 -S'vector' +S'vector_boolean' p6 sS'gr_i' p7 -g6 -sS'model.state' +S'vector' p8 -S'double' +sS'model.state' p9 -sS'y' +S'double' p10 -g6 -sS'x' +sS'y' p11 -NsS'x0' +g8 +sS'x' p12 -g9 -sS'typ' +NsS'x0' p13 -g6 -sS'model' +g10 +sS'typ' p14 -S'object' +g8 +sS'model' p15 -sS'model.firing' +S'object' p16 -g6 +sS'model.firing' +p17 +g8 s.
\ No newline at end of file diff --git a/js/Linear/CLR.js b/js/Linear/CLR.js index ff53605b..d134aa43 100644 --- a/js/Linear/CLR.js +++ b/js/Linear/CLR.js @@ -14,7 +14,7 @@ function CLR() { this.model.state = new ScilabDouble([x0]); this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + 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); return new BasicBlock(this.x); @@ -68,7 +68,7 @@ function CLR() { var mmm = [false,true]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = new ScilabDouble(mmm); + this.model.dep_ut = new ScilabBoolean(mmm); } if (ns1<=ns) { var x0 = x0.slice(1-1,ns1); diff --git a/js/Linear/CLR.pickle b/js/Linear/CLR.pickle index b238e029..7d9eff5b 100644 --- a/js/Linear/CLR.pickle +++ b/js/Linear/CLR.pickle @@ -76,7 +76,7 @@ p21 g5 sS'mmm' p22 -S'vector' +S'vector_boolean' p23 sS'model.state' p24 @@ -91,35 +91,36 @@ p27 g8 sS'typ' p28 -g23 -sS'ok' +S'vector' p29 -S'boolean' +sS'ok' p30 -sS'model.blocktype' +S'boolean' p31 -S'string' +sS'model.blocktype' p32 -sS'model.dep_ut' +S'string' p33 +sS'model.dep_ut' +p34 g23 sS'exprs' -p34 +p35 g5 sS'gr_i' -p35 -g23 -sS'PREVAR_scicos_context' p36 -NsS'y' +g29 +sS'PREVAR_scicos_context' p37 -g23 -sS'x' +NsS'y' p38 -NsS'model' +g29 +sS'x' p39 +NsS'model' +p40 g2 sS'nout' -p40 +p41 g8 s.
\ No newline at end of file diff --git a/js/Linear/CLR_f.js b/js/Linear/CLR_f.js index 7caf5a3d..6d85a901 100644 --- a/js/Linear/CLR_f.js +++ b/js/Linear/CLR_f.js @@ -14,7 +14,7 @@ function CLR_f() { this.model.state = new ScilabDouble([x0]); this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + 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); return new BasicBlock(this.x); @@ -68,7 +68,7 @@ function CLR_f() { var mmm = [false,true]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = new ScilabDouble(mmm); + this.model.dep_ut = new ScilabBoolean(mmm); } if (ns1<=ns) { var x0 = x0.slice(1-1,ns1); diff --git a/js/Linear/CLR_f.pickle b/js/Linear/CLR_f.pickle index b238e029..7d9eff5b 100644 --- a/js/Linear/CLR_f.pickle +++ b/js/Linear/CLR_f.pickle @@ -76,7 +76,7 @@ p21 g5 sS'mmm' p22 -S'vector' +S'vector_boolean' p23 sS'model.state' p24 @@ -91,35 +91,36 @@ p27 g8 sS'typ' p28 -g23 -sS'ok' +S'vector' p29 -S'boolean' +sS'ok' p30 -sS'model.blocktype' +S'boolean' p31 -S'string' +sS'model.blocktype' p32 -sS'model.dep_ut' +S'string' p33 +sS'model.dep_ut' +p34 g23 sS'exprs' -p34 +p35 g5 sS'gr_i' -p35 -g23 -sS'PREVAR_scicos_context' p36 -NsS'y' +g29 +sS'PREVAR_scicos_context' p37 -g23 -sS'x' +NsS'y' p38 -NsS'model' +g29 +sS'x' p39 +NsS'model' +p40 g2 sS'nout' -p40 +p41 g8 s.
\ No newline at end of file diff --git a/js/Linear/CLSS.js b/js/Linear/CLSS.js index ecc80b33..2b13f73d 100644 --- a/js/Linear/CLSS.js +++ b/js/Linear/CLSS.js @@ -15,7 +15,7 @@ function CLSS() { this.model.state = new ScilabDouble([this.x0]); this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + 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); @@ -88,10 +88,10 @@ function CLSS() { var mmm = [false,true]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = new ScilabDouble(mmm); + this.model.dep_ut = new ScilabBoolean(mmm); } } else { - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); } this.model.state = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble(rpar); diff --git a/js/Linear/CLSS.pickle b/js/Linear/CLSS.pickle index b52f30c8..0d6f50f2 100644 --- a/js/Linear/CLSS.pickle +++ b/js/Linear/CLSS.pickle @@ -73,7 +73,7 @@ p18 g5 sS'mmm' p19 -S'vector' +S'vector_boolean' p20 sS'model.state' p21 @@ -89,30 +89,31 @@ p24 g8 sS'typ' p25 -g20 -sS'model.blocktype' +S'vector' p26 -S'string' +sS'model.blocktype' p27 -sS'model.dep_ut' +S'string' p28 +sS'model.dep_ut' +p29 g20 sS'exprs' -p29 +p30 g5 sS'gr_i' -p30 -g20 -sS'okD' p31 -S'boolean' +g26 +sS'okD' p32 -sS'y' +S'boolean' p33 -g20 -sS'x' +sS'y' p34 -NsS'model' +g26 +sS'x' p35 +NsS'model' +p36 g2 s.
\ No newline at end of file diff --git a/js/Linear/CLSS_f.js b/js/Linear/CLSS_f.js index c9dc7a15..3983e7cc 100644 --- a/js/Linear/CLSS_f.js +++ b/js/Linear/CLSS_f.js @@ -15,7 +15,7 @@ function CLSS_f() { this.model.state = new ScilabDouble([this.x0]); this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + 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); @@ -78,10 +78,10 @@ function CLSS_f() { var mmm = [false,true]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = new ScilabDouble(mmm); + this.model.dep_ut = new ScilabBoolean(mmm); } } else { - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); } this.model.state = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble(rpar); diff --git a/js/Linear/CLSS_f.pickle b/js/Linear/CLSS_f.pickle index 95d63454..3dc6c326 100644 --- a/js/Linear/CLSS_f.pickle +++ b/js/Linear/CLSS_f.pickle @@ -73,7 +73,7 @@ p18 g5 sS'mmm' p19 -S'vector' +S'vector_boolean' p20 sS'model.state' p21 @@ -89,26 +89,27 @@ p24 g8 sS'typ' p25 -g20 -sS'model.blocktype' +S'vector' p26 -S'string' +sS'model.blocktype' p27 -sS'model.dep_ut' +S'string' p28 +sS'model.dep_ut' +p29 g20 sS'exprs' -p29 +p30 g5 sS'gr_i' -p30 -g20 -sS'y' p31 -g20 -sS'x' +g26 +sS'y' p32 -NsS'model' +g26 +sS'x' p33 +NsS'model' +p34 g2 s.
\ No newline at end of file diff --git a/js/Linear/DELAYV_f.js b/js/Linear/DELAYV_f.js index e199ccdd..16d1eefe 100644 --- a/js/Linear/DELAYV_f.js +++ b/js/Linear/DELAYV_f.js @@ -15,7 +15,7 @@ function DELAYV_f() { this.model.rpar = new ScilabDouble([this.T/(size(this.zz0,"*"))]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([0,-1]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/Linear/DELAYV_f.pickle b/js/Linear/DELAYV_f.pickle index 30ddbeca..81a7bc97 100644 --- a/js/Linear/DELAYV_f.pickle +++ b/js/Linear/DELAYV_f.pickle @@ -92,19 +92,20 @@ S'string' p28 sS'model.dep_ut' p29 -g7 -sS'exprs' +S'vector_boolean' p30 +sS'exprs' +p31 g18 sS'gr_i' -p31 +p32 g7 sS'y' -p32 +p33 g7 sS'x' -p33 -NsS'model' p34 +NsS'model' +p35 g4 s.
\ No newline at end of file diff --git a/js/Linear/DELAY_f.pickle b/js/Linear/DELAY_f.pickle index 4eebe89b..86fac0f1 100644 --- a/js/Linear/DELAY_f.pickle +++ b/js/Linear/DELAY_f.pickle @@ -218,72 +218,73 @@ p71 g8 sS'x.model.dep_ut' p72 -g15 -sS'o' +S'vector_boolean' p73 +sS'o' +p74 g2 sS'evtdly.graphics.pein' -p74 +p75 g4 sS'diagram.objs[3-1]' -p75 +p76 g2 sS'evtdly.graphics.flip' -p76 +p77 g19 sS'register.graphics.pin' -p77 +p78 g4 sS'ppath[2-1]' -p78 -NsS'diagram.objs[6-1]' p79 +NsS'diagram.objs[6-1]' +p80 g4 sS'split' -p80 +p81 g2 sS'register_exprs' -p81 -NsS'diagram.objs[8-1]' p82 +NsS'diagram.objs[8-1]' +p83 g2 sS'mess' -p83 +p84 g8 sS'diagram' -p84 +p85 g4 sS'y' -p85 +p86 g4 sS'newpar[$+1-1]' -p86 +p87 g4 sS'register.graphics' -p87 +p88 g2 sS'typ' -p88 +p89 g22 sS'register.graphics.exprs' -p89 +p90 g6 sS'x.graphics.pout' -p90 +p91 g4 sS'register' -p91 +p92 g2 sS'exprs' -p92 +p93 g8 sS'output_port.graphics.orig' -p93 +p94 g15 sS'x.graphics.pin' -p94 +p95 g4 sS'register.graphics.flip' -p95 +p96 g19 s.
\ No newline at end of file diff --git a/js/Linear/DERIV.js b/js/Linear/DERIV.js index fbcfac9b..12e3c7ef 100644 --- a/js/Linear/DERIV.js +++ b/js/Linear/DERIV.js @@ -6,7 +6,7 @@ function DERIV() { this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["x"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/Linear/DERIV.pickle b/js/Linear/DERIV.pickle index f2e5a169..f97402c1 100644 --- a/js/Linear/DERIV.pickle +++ b/js/Linear/DERIV.pickle @@ -29,27 +29,28 @@ S'vector' p6 sS'model.dep_ut' p7 -g6 -sS'model.out' +S'vector_boolean' p8 -S'double' +sS'model.out' p9 -sS'gr_i' +S'double' p10 +sS'gr_i' +p11 g6 sS'model.in' -p11 -g9 -sS'y' p12 +g10 +sS'y' +p13 g6 sS'x' -p13 -NsS'model' p14 -S'object' +NsS'model' p15 -sS'typ' +S'object' p16 +sS'typ' +p17 g6 s.
\ No newline at end of file diff --git a/js/Linear/DIFF_c.js b/js/Linear/DIFF_c.js index b597fbba..93835c18 100644 --- a/js/Linear/DIFF_c.js +++ b/js/Linear/DIFF_c.js @@ -8,7 +8,7 @@ function DIFF_c() { this.model.out = new ScilabDouble([1]); this.model.state = new ScilabDouble(this.x0); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + 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); diff --git a/js/Linear/DIFF_c.pickle b/js/Linear/DIFF_c.pickle index 57c006e4..cf3a2b5f 100644 --- a/js/Linear/DIFF_c.pickle +++ b/js/Linear/DIFF_c.pickle @@ -73,23 +73,24 @@ S'string' p22 sS'model.dep_ut' p23 -g6 -sS'exprs' +S'vector_boolean' p24 +sS'exprs' +p25 g16 sS'gr_i' -p25 +p26 g6 sS'ask_again' -p26 -S'boolean' p27 -sS'y' +S'boolean' p28 +sS'y' +p29 g6 sS'x' -p29 -NsS'model' p30 +NsS'model' +p31 g2 s.
\ No newline at end of file diff --git a/js/Linear/DLR.js b/js/Linear/DLR.js index 32bce17a..366af3a3 100644 --- a/js/Linear/DLR.js +++ b/js/Linear/DLR.js @@ -15,7 +15,7 @@ function DLR() { this.model.dstate = new ScilabDouble(x0.slice()); this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); return new BasicBlock(this.x); @@ -73,7 +73,7 @@ function DLR() { var mmm = [false,false]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = new ScilabDouble(mmm); + this.model.dep_ut = new ScilabBoolean(mmm); } this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Linear/DLR.pickle b/js/Linear/DLR.pickle index 00444412..ae140424 100644 --- a/js/Linear/DLR.pickle +++ b/js/Linear/DLR.pickle @@ -83,43 +83,44 @@ p24 g7 sS'mmm' p25 -g2 -sS'model.in' +S'vector_boolean' p26 +sS'model.in' +p27 g10 sS'graphics.exprs' -p27 -NsS'x0' p28 +NsS'x0' +p29 g10 sS'typ' -p29 +p30 g2 sS'ok' -p30 -S'boolean' p31 -sS'model.blocktype' +S'boolean' p32 -S'string' +sS'model.blocktype' p33 -sS'model.dep_ut' +S'string' p34 -g2 -sS'exprs' +sS'model.dep_ut' p35 +g26 +sS'exprs' +p36 g7 sS'gr_i' -p36 +p37 g2 sS'PREVAR_scicos_context' -p37 -NsS'y' p38 +NsS'y' +p39 g2 sS'x' -p39 -NsS'model' p40 +NsS'model' +p41 g4 s.
\ No newline at end of file diff --git a/js/Linear/DLR_f.js b/js/Linear/DLR_f.js index 1182d540..b265a2b0 100644 --- a/js/Linear/DLR_f.js +++ b/js/Linear/DLR_f.js @@ -15,7 +15,7 @@ function DLR_f() { this.model.dstate = new ScilabDouble(x0.slice()); this.model.rpar = new ScilabDouble([A.slice()],[B.slice()],[C.slice()],[D.slice()]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); return new BasicBlock(this.x); @@ -73,7 +73,7 @@ function DLR_f() { var mmm = [false,false]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = new ScilabDouble(mmm); + this.model.dep_ut = new ScilabBoolean(mmm); } this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Linear/DLR_f.pickle b/js/Linear/DLR_f.pickle index 9c02362b..308f93d4 100644 --- a/js/Linear/DLR_f.pickle +++ b/js/Linear/DLR_f.pickle @@ -83,42 +83,43 @@ p24 g7 sS'mmm' p25 -g2 -sS'model.in' +S'vector_boolean' p26 +sS'model.in' +p27 g10 sS'graphics.exprs' -p27 -NsS'x0' p28 +NsS'x0' +p29 g10 sS'typ' -p29 +p30 g2 sS'ok' -p30 -S'boolean' p31 -sS'model.blocktype' +S'boolean' p32 +sS'model.blocktype' +p33 g18 sS'model.dep_ut' -p33 -g2 -sS'exprs' p34 +g26 +sS'exprs' +p35 g7 sS'gr_i' -p35 +p36 g2 sS'PREVAR_scicos_context' -p36 -NsS'y' p37 +NsS'y' +p38 g2 sS'x' -p38 -NsS'model' p39 +NsS'model' +p40 g4 s.
\ No newline at end of file diff --git a/js/Linear/DLSS.js b/js/Linear/DLSS.js index 31fa0860..a99c81d3 100644 --- a/js/Linear/DLSS.js +++ b/js/Linear/DLSS.js @@ -14,7 +14,7 @@ function DLSS() { this.model.dstate = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -87,10 +87,10 @@ function DLSS() { var mmm = [false,false]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = new ScilabDouble(mmm); + this.model.dep_ut = new ScilabBoolean(mmm); } } else { - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); } this.model.dstate = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble(rpar); diff --git a/js/Linear/DLSS.pickle b/js/Linear/DLSS.pickle index 098b35e0..b2842dad 100644 --- a/js/Linear/DLSS.pickle +++ b/js/Linear/DLSS.pickle @@ -80,42 +80,43 @@ p21 g7 sS'mmm' p22 -g2 -sS'model.in' +S'vector_boolean' p23 +sS'model.in' +p24 g10 sS'graphics.exprs' -p24 +p25 g10 sS'x0' -p25 +p26 g10 sS'typ' -p26 +p27 g2 sS'model.blocktype' -p27 -S'string' p28 -sS'model.dep_ut' +S'string' p29 -g2 -sS'exprs' +sS'model.dep_ut' p30 +g23 +sS'exprs' +p31 g7 sS'gr_i' -p31 +p32 g2 sS'okD' -p32 -S'boolean' p33 -sS'y' +S'boolean' p34 +sS'y' +p35 g2 sS'x' -p35 -NsS'model' p36 +NsS'model' +p37 g4 s.
\ No newline at end of file diff --git a/js/Linear/DLSS_f.js b/js/Linear/DLSS_f.js index 8197a635..4afcf99d 100644 --- a/js/Linear/DLSS_f.js +++ b/js/Linear/DLSS_f.js @@ -14,7 +14,7 @@ function DLSS_f() { this.model.dstate = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); @@ -77,10 +77,10 @@ function DLSS_f() { var mmm = [false,false]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = new ScilabDouble(mmm); + this.model.dep_ut = new ScilabBoolean(mmm); } } else { - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); } this.model.dstate = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble(rpar); diff --git a/js/Linear/DLSS_f.pickle b/js/Linear/DLSS_f.pickle index a0a9e9ef..a754a23a 100644 --- a/js/Linear/DLSS_f.pickle +++ b/js/Linear/DLSS_f.pickle @@ -80,38 +80,39 @@ p21 g7 sS'mmm' p22 -g2 -sS'model.in' +S'vector_boolean' p23 +sS'model.in' +p24 g10 sS'graphics.exprs' -p24 +p25 g10 sS'x0' -p25 +p26 g10 sS'typ' -p26 +p27 g2 sS'model.blocktype' -p27 -S'string' p28 -sS'model.dep_ut' +S'string' p29 -g2 -sS'exprs' +sS'model.dep_ut' p30 +g23 +sS'exprs' +p31 g7 sS'gr_i' -p31 +p32 g2 sS'y' -p32 +p33 g2 sS'x' -p33 -NsS'model' p34 +NsS'model' +p35 g4 s.
\ No newline at end of file diff --git a/js/Linear/DOLLAR.js b/js/Linear/DOLLAR.js index ed4b52e3..3b5d3ae4 100644 --- a/js/Linear/DOLLAR.js +++ b/js/Linear/DOLLAR.js @@ -12,7 +12,7 @@ function DOLLAR() { this.model.evtin = new ScilabDouble([1-this.inh]); this.model.dstate = new ScilabDouble([z]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); return new BasicBlock(this.x); diff --git a/js/Linear/DOLLAR.pickle b/js/Linear/DOLLAR.pickle index f7c5f3ef..9722d530 100644 --- a/js/Linear/DOLLAR.pickle +++ b/js/Linear/DOLLAR.pickle @@ -87,22 +87,23 @@ p26 g17 sS'model.dep_ut' p27 -g13 -sS'exprs' +S'vector_boolean' p28 +sS'exprs' +p29 g17 sS'gr_i' -p29 +p30 g13 sS'y' -p30 +p31 g13 sS'x' -p31 -NsS'model' p32 +NsS'model' +p33 g6 sS'z' -p33 +p34 g4 s.
\ No newline at end of file diff --git a/js/Linear/DOLLAR_f.js b/js/Linear/DOLLAR_f.js index 2d0d3cef..0e89c063 100644 --- a/js/Linear/DOLLAR_f.js +++ b/js/Linear/DOLLAR_f.js @@ -12,7 +12,7 @@ function DOLLAR_f() { this.model.evtin = new ScilabDouble([1-this.inh]); this.model.dstate = new ScilabDouble([z]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); return new BasicBlock(this.x); diff --git a/js/Linear/DOLLAR_f.pickle b/js/Linear/DOLLAR_f.pickle index a13815c6..1a4e2da9 100644 --- a/js/Linear/DOLLAR_f.pickle +++ b/js/Linear/DOLLAR_f.pickle @@ -71,22 +71,23 @@ p20 g14 sS'model.dep_ut' p21 -g10 -sS'exprs' +S'vector_boolean' p22 +sS'exprs' +p23 g14 sS'gr_i' -p23 +p24 g10 sS'y' -p24 +p25 g10 sS'x' -p25 -NsS'model' p26 +NsS'model' +p27 g4 sS'z' -p27 +p28 g2 s.
\ No newline at end of file diff --git a/js/Linear/DOLLAR_m.js b/js/Linear/DOLLAR_m.js index d4ff905b..9ccaa250 100644 --- a/js/Linear/DOLLAR_m.js +++ b/js/Linear/DOLLAR_m.js @@ -12,7 +12,7 @@ function DOLLAR_m() { this.model.evtin = new ScilabDouble([1-this.inh]); this.model.dstate = new ScilabDouble([z]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); return new BasicBlock(this.x); diff --git a/js/Linear/DOLLAR_m.pickle b/js/Linear/DOLLAR_m.pickle index f7c5f3ef..9722d530 100644 --- a/js/Linear/DOLLAR_m.pickle +++ b/js/Linear/DOLLAR_m.pickle @@ -87,22 +87,23 @@ p26 g17 sS'model.dep_ut' p27 -g13 -sS'exprs' +S'vector_boolean' p28 +sS'exprs' +p29 g17 sS'gr_i' -p29 +p30 g13 sS'y' -p30 +p31 g13 sS'x' -p31 -NsS'model' p32 +NsS'model' +p33 g6 sS'z' -p33 +p34 g4 s.
\ No newline at end of file diff --git a/js/Linear/GAINBLK.js b/js/Linear/GAINBLK.js index c4b5b6bd..89a5ca05 100644 --- a/js/Linear/GAINBLK.js +++ b/js/Linear/GAINBLK.js @@ -14,7 +14,7 @@ function GAINBLK() { this.model.out2 = new ScilabDouble([out2]); this.model.rpar = new ScilabDouble([this.gain]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/Linear/GAINBLK.pickle b/js/Linear/GAINBLK.pickle index cb04b8b9..7da48052 100644 --- a/js/Linear/GAINBLK.pickle +++ b/js/Linear/GAINBLK.pickle @@ -87,25 +87,26 @@ S'string' p27 sS'model.dep_ut' p28 -g21 -sS'exprs' +S'vector_boolean' p29 +sS'exprs' +p30 g21 sS'gr_i' -p30 +p31 g21 sS'y' -p31 +p32 g21 sS'x' -p32 -NsS'model' p33 +NsS'model' +p34 g2 sS'ot' -p34 +p35 g5 sS'gain' -p35 +p36 g5 s.
\ No newline at end of file diff --git a/js/Linear/GAINBLK_f.js b/js/Linear/GAINBLK_f.js index 96bb2408..ee9759a4 100644 --- a/js/Linear/GAINBLK_f.js +++ b/js/Linear/GAINBLK_f.js @@ -10,7 +10,7 @@ function GAINBLK_f() { this.model.out = new ScilabDouble([out]); this.model.rpar = new ScilabDouble([this.gain]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/Linear/GAINBLK_f.pickle b/js/Linear/GAINBLK_f.pickle index 5e42aab2..8cc5fe17 100644 --- a/js/Linear/GAINBLK_f.pickle +++ b/js/Linear/GAINBLK_f.pickle @@ -34,7 +34,7 @@ S'object' p7 sS'model.dep_ut' p8 -S'vector' +S'vector_boolean' p9 sS'arg1' p10 @@ -49,33 +49,34 @@ p13 g4 sS'exprs' p14 -g9 -sS'x.model' +S'vector' p15 -NsS'gr_i' +sS'x.model' p16 -g9 -sS'gain' +NsS'gr_i' p17 +g15 +sS'gain' +p18 g4 sS'model.in' -p18 +p19 g4 sS'graphics' -p19 +p20 g7 sS'y' -p20 -g9 -sS'x' p21 -NsS'model' +g15 +sS'x' p22 +NsS'model' +p23 g7 sS'typ' -p23 -g9 -sS'out' p24 +g15 +sS'out' +p25 g4 s.
\ No newline at end of file diff --git a/js/Linear/GAIN_f.js b/js/Linear/GAIN_f.js index e2840ef3..1588ff5f 100644 --- a/js/Linear/GAIN_f.js +++ b/js/Linear/GAIN_f.js @@ -10,7 +10,7 @@ function GAIN_f() { this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.gain]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/Linear/GAIN_f.pickle b/js/Linear/GAIN_f.pickle index 0482236e..06f61c9b 100644 --- a/js/Linear/GAIN_f.pickle +++ b/js/Linear/GAIN_f.pickle @@ -34,7 +34,7 @@ S'object' p7 sS'model.dep_ut' p8 -S'vector' +S'vector_boolean' p9 sS'arg1' p10 @@ -55,28 +55,29 @@ sS'x.model' p16 NsS'gr_i' p17 -g9 -sS'gain' +S'vector' p18 +sS'gain' +p19 g4 sS'model.in' -p19 +p20 g4 sS'graphics' -p20 +p21 g7 sS'y' -p21 -g9 -sS'x' p22 -NsS'model' +g18 +sS'x' p23 +NsS'model' +p24 g7 sS'typ' -p24 -g9 -sS'out' p25 +g18 +sS'out' +p26 g4 s.
\ No newline at end of file diff --git a/js/Linear/INTEGRAL.js b/js/Linear/INTEGRAL.js index b49390be..b2237506 100644 --- a/js/Linear/INTEGRAL.js +++ b/js/Linear/INTEGRAL.js @@ -11,7 +11,7 @@ function INTEGRAL() { this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + 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); diff --git a/js/Linear/INTEGRAL.pickle b/js/Linear/INTEGRAL.pickle index 29133f78..9a75a132 100644 --- a/js/Linear/INTEGRAL.pickle +++ b/js/Linear/INTEGRAL.pickle @@ -100,19 +100,20 @@ p29 g22 sS'model.dep_ut' p30 -g7 -sS'exprs' +S'vector_boolean' p31 +sS'exprs' +p32 g22 sS'gr_i' -p32 +p33 g7 sS'y' -p33 +p34 g7 sS'x' -p34 -NsS'model' p35 +NsS'model' +p36 g4 s.
\ No newline at end of file diff --git a/js/Linear/INTEGRAL_f.js b/js/Linear/INTEGRAL_f.js index 06315b43..f12f476a 100644 --- a/js/Linear/INTEGRAL_f.js +++ b/js/Linear/INTEGRAL_f.js @@ -8,7 +8,7 @@ function INTEGRAL_f() { this.model.out = new ScilabDouble([1]); this.model.state = new ScilabDouble([this.x0]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + 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); diff --git a/js/Linear/INTEGRAL_f.pickle b/js/Linear/INTEGRAL_f.pickle index 616e0306..e935bbf7 100644 --- a/js/Linear/INTEGRAL_f.pickle +++ b/js/Linear/INTEGRAL_f.pickle @@ -43,36 +43,37 @@ sS'graphics.exprs' p11 NsS'model.dep_ut' p12 -g7 -sS'exprs' +S'vector_boolean' p13 +sS'exprs' +p14 g4 sS'x.model' -p14 -NsS'gr_i' p15 +NsS'gr_i' +p16 g7 sS'model.state' -p16 +p17 g4 sS'model.in' -p17 +p18 g4 sS'graphics' -p18 +p19 g9 sS'y' -p19 +p20 g7 sS'x' -p20 -NsS'model' p21 +NsS'model' +p22 g9 sS'typ' -p22 +p23 g7 sS'x0' -p23 +p24 g4 s.
\ No newline at end of file diff --git a/js/Linear/INTEGRAL_m.js b/js/Linear/INTEGRAL_m.js index 78a33647..3977d3c9 100644 --- a/js/Linear/INTEGRAL_m.js +++ b/js/Linear/INTEGRAL_m.js @@ -13,7 +13,7 @@ function INTEGRAL_m() { this.model.out2 = new ScilabDouble([1]); this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + 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); diff --git a/js/Linear/INTEGRAL_m.pickle b/js/Linear/INTEGRAL_m.pickle index 3dec972a..5a9e7ec4 100644 --- a/js/Linear/INTEGRAL_m.pickle +++ b/js/Linear/INTEGRAL_m.pickle @@ -111,24 +111,25 @@ S'string' p33 sS'model.dep_ut' p34 -g9 -sS'exprs' +S'vector_boolean' p35 +sS'exprs' +p36 g33 sS'gr_i' -p36 +p37 g9 sS'graphics.exprs' -p37 -NsS'y' p38 +NsS'y' +p39 g9 sS'x' -p39 -NsS'model' p40 +NsS'model' +p41 g4 sS'ot' -p41 +p42 g2 s.
\ No newline at end of file diff --git a/js/Linear/PID.js b/js/Linear/PID.js index 43867618..179f12df 100644 --- a/js/Linear/PID.js +++ b/js/Linear/PID.js @@ -33,7 +33,7 @@ function PID() { this.model.outtyp = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["h"]); this.model.firing = new ScilabBoolean([false]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Linear/PID.pickle b/js/Linear/PID.pickle index eee87a0b..bb17417d 100644 --- a/js/Linear/PID.pickle +++ b/js/Linear/PID.pickle @@ -110,142 +110,143 @@ p32 g2 sS'model.dep_ut' p33 -g17 -sS'scs_m.objs[5-1]' +S'vector_boolean' p34 +sS'scs_m.objs[5-1]' +p35 g4 sS'newpar[size(newpar)+1-1]' -p35 +p36 g4 sS'to' -p36 +p37 g2 sS'ppath[2-1]' -p37 +p38 g4 sS'exprs[2-1]' -p38 +p39 g4 sS'scs_m.objs[12-1]' -p39 +p40 g4 sS'scs_m.objs[13-1]' -p40 +p41 g4 sS'd_old' -p41 -NsS'newpar' p42 +NsS'newpar' +p43 g10 sS'model.in2' -p43 +p44 g4 sS'scs_m.objs[6-1]' -p44 +p45 g4 sS'scs_m.objs[9-1]' -p45 +p46 g4 sS'xx2.graphics' -p46 +p47 g2 sS'i_old' -p47 -NsS'scs_m.objs[3-1]' p48 +NsS'scs_m.objs[3-1]' +p49 g4 sS'arg1.model.rpar.objs[ppath[3-1]-1]' -p49 +p50 g2 sS'ppath[1-1]' -p50 +p51 g4 sS'exprs[3-1]' -p51 +p52 g4 sS'scs_m.objs[14-1]' -p52 +p53 g4 sS'scs_m.objs[17-1]' -p53 +p54 g4 sS'model.in' -p54 +p55 g4 sS'scs_m.objs[4-1]' -p55 +p56 g4 sS'scs_m.objs[7-1]' -p56 +p57 g4 sS'typ' -p57 +p58 g10 sS'model.outtyp' -p58 +p59 g4 sS'p_old' -p59 -NsS'needcompile' p60 +NsS'needcompile' +p61 g4 sS'scs_m' -p61 +p62 g4 sS'arg1.model' -p62 +p63 g2 sS'xx3.graphics' -p63 +p64 g2 sS'model.blocktype' -p64 -S'string' p65 -sS'scs_m.objs[8-1]' +S'string' p66 +sS'scs_m.objs[8-1]' +p67 g4 sS'xx3.model' -p67 +p68 g2 sS'scs_m.objs[21-1]' -p68 +p69 g4 sS'scs_m.objs[15-1]' -p69 +p70 g4 sS'scs_m.objs[16-1]' -p70 +p71 g4 sS'o' -p71 +p72 g2 sS'scs_m.objs[1-1]' -p72 +p73 g4 sS'model.sim' -p73 -g65 -sS'scs_m.objs[11-1]' p74 +g66 +sS'scs_m.objs[11-1]' +p75 g4 sS'model.firing' -p75 -S'boolean' p76 -sS'arg1.model.rpar.objs[ppath[1-1]-1]' +S'boolean' p77 +sS'arg1.model.rpar.objs[ppath[1-1]-1]' +p78 g2 sS'y' -p78 +p79 g4 sS'x' -p79 +p80 g2 sS'model' -p80 +p81 g2 sS'arg1.model.rpar' -p81 +p82 g2 s.
\ No newline at end of file diff --git a/js/Linear/REGISTER.js b/js/Linear/REGISTER.js index 69f74e42..03e3b2a0 100644 --- a/js/Linear/REGISTER.js +++ b/js/Linear/REGISTER.js @@ -9,7 +9,7 @@ function REGISTER() { this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Linear/REGISTER.pickle b/js/Linear/REGISTER.pickle index b62872a5..8c7cb6dc 100644 --- a/js/Linear/REGISTER.pickle +++ b/js/Linear/REGISTER.pickle @@ -75,19 +75,20 @@ S'string' p23 sS'model.dep_ut' p24 -g12 -sS'exprs' +S'vector_boolean' p25 +sS'exprs' +p26 g4 sS'gr_i' -p26 +p27 g12 sS'y' -p27 +p28 g12 sS'x' -p28 -NsS'model' p29 +NsS'model' +p30 g6 s.
\ No newline at end of file diff --git a/js/Linear/REGISTER_f.js b/js/Linear/REGISTER_f.js index 86ed6807..094eef62 100644 --- a/js/Linear/REGISTER_f.js +++ b/js/Linear/REGISTER_f.js @@ -9,7 +9,7 @@ function REGISTER_f() { this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([this.z0]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Linear/REGISTER_f.pickle b/js/Linear/REGISTER_f.pickle index b26b470a..f52a8cc3 100644 --- a/js/Linear/REGISTER_f.pickle +++ b/js/Linear/REGISTER_f.pickle @@ -58,25 +58,26 @@ p17 g4 sS'model.dep_ut' p18 -g16 -sS'model.in' +S'vector_boolean' p19 +sS'model.in' +p20 g4 sS'graphics' -p20 +p21 g9 sS'y' -p21 +p22 g16 sS'x' -p22 -NsS'model' p23 +NsS'model' +p24 g9 sS'typ' -p24 +p25 g16 sS'model.blocktype' -p25 +p26 g2 s.
\ No newline at end of file diff --git a/js/Linear/SAMPHOLD.js b/js/Linear/SAMPHOLD.js index c942c6c6..70de60f7 100644 --- a/js/Linear/SAMPHOLD.js +++ b/js/Linear/SAMPHOLD.js @@ -8,7 +8,7 @@ function SAMPHOLD() { this.model.out = new ScilabDouble([-1]); this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); return new BasicBlock(this.x); diff --git a/js/Linear/SAMPHOLD.pickle b/js/Linear/SAMPHOLD.pickle index f1cea574..b09e1bf1 100644 --- a/js/Linear/SAMPHOLD.pickle +++ b/js/Linear/SAMPHOLD.pickle @@ -36,26 +36,27 @@ p9 g8 sS'model.dep_ut' p10 -g6 -sS'model.out' +S'vector_boolean' p11 +sS'model.out' +p12 g8 sS'gr_i' -p12 +p13 g6 sS'model.in' -p13 +p14 g8 sS'y' -p14 +p15 g6 sS'x' -p15 -NsS'model' p16 -S'object' +NsS'model' p17 -sS'typ' +S'object' p18 +sS'typ' +p19 g6 s.
\ No newline at end of file diff --git a/js/Linear/SAMPHOLD_m.js b/js/Linear/SAMPHOLD_m.js index f9348de3..4ca5517d 100644 --- a/js/Linear/SAMPHOLD_m.js +++ b/js/Linear/SAMPHOLD_m.js @@ -11,7 +11,7 @@ function SAMPHOLD_m() { this.model.out2 = new ScilabDouble([-2]); this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/Linear/SAMPHOLD_m.pickle b/js/Linear/SAMPHOLD_m.pickle index f07148fc..17ea2010 100644 --- a/js/Linear/SAMPHOLD_m.pickle +++ b/js/Linear/SAMPHOLD_m.pickle @@ -81,17 +81,18 @@ S'string' p25 sS'model.dep_ut' p26 -g9 -sS'gr_i' +S'vector_boolean' p27 +sS'gr_i' +p28 g9 sS'y' -p28 +p29 g9 sS'x' -p29 +p30 g2 sS'model' -p30 +p31 g2 s.
\ No newline at end of file diff --git a/js/Linear/SAMPLEHOLD_f.js b/js/Linear/SAMPLEHOLD_f.js index dca7f1d5..dae59724 100644 --- a/js/Linear/SAMPLEHOLD_f.js +++ b/js/Linear/SAMPLEHOLD_f.js @@ -8,7 +8,7 @@ function SAMPLEHOLD_f() { this.model.out = new ScilabDouble([-1]); this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); return new BasicBlock(this.x); diff --git a/js/Linear/SAMPLEHOLD_f.pickle b/js/Linear/SAMPLEHOLD_f.pickle index e0302878..418a8f45 100644 --- a/js/Linear/SAMPLEHOLD_f.pickle +++ b/js/Linear/SAMPLEHOLD_f.pickle @@ -35,26 +35,27 @@ p8 g7 sS'model.dep_ut' p9 -g5 -sS'model.out' +S'vector_boolean' p10 +sS'model.out' +p11 g7 sS'gr_i' -p11 +p12 g5 sS'model.in' -p12 +p13 g7 sS'y' -p13 +p14 g5 sS'x' -p14 -NsS'model' p15 -S'object' +NsS'model' p16 -sS'typ' +S'object' p17 +sS'typ' +p18 g5 s.
\ No newline at end of file diff --git a/js/Linear/SOM_f.js b/js/Linear/SOM_f.js index 93c287fd..2682f8a8 100644 --- a/js/Linear/SOM_f.js +++ b/js/Linear/SOM_f.js @@ -8,7 +8,7 @@ function SOM_f() { this.model.out = new ScilabDouble([-1]); this.model.rpar = new ScilabDouble(sgn); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/Linear/SOM_f.pickle b/js/Linear/SOM_f.pickle index bc3f8c1b..6dbd734b 100644 --- a/js/Linear/SOM_f.pickle +++ b/js/Linear/SOM_f.pickle @@ -52,26 +52,27 @@ p15 g13 sS'model.dep_ut' p16 -g13 -sS'str' +S'vector_boolean' p17 +sS'str' +p18 g6 sS'graphics' -p18 +p19 g9 sS'y' -p19 +p20 g13 sS'x' -p20 -NsS'model' p21 +NsS'model' +p22 g9 sS'typ' -p22 +p23 g13 sS'model.blocktype' -p23 -S'string' p24 +S'string' +p25 s.
\ No newline at end of file diff --git a/js/Linear/SUMMATION.js b/js/Linear/SUMMATION.js index 6dcc14b0..84a441a8 100644 --- a/js/Linear/SUMMATION.js +++ b/js/Linear/SUMMATION.js @@ -10,7 +10,7 @@ function SUMMATION() { this.model.out2 = new ScilabDouble([-2]); this.model.ipar = new ScilabDouble(this.sgn); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/Linear/SUMMATION.pickle b/js/Linear/SUMMATION.pickle index 0b007c13..536650a3 100644 --- a/js/Linear/SUMMATION.pickle +++ b/js/Linear/SUMMATION.pickle @@ -88,24 +88,25 @@ p27 g5 sS'model.dep_ut' p28 -g24 -sS'exprs' +S'vector_boolean' p29 +sS'exprs' +p30 g5 sS'gr_i' -p30 +p31 g24 sS'y' -p31 +p32 g24 sS'x' -p32 -NsS'model' p33 +NsS'model' +p34 g2 sS'ot' -p34 -NsS'nout' p35 +NsS'nout' +p36 g10 s.
\ No newline at end of file diff --git a/js/Linear/SUM_f.js b/js/Linear/SUM_f.js index 8db2a6cf..7cf09c90 100644 --- a/js/Linear/SUM_f.js +++ b/js/Linear/SUM_f.js @@ -6,7 +6,7 @@ function SUM_f() { this.model.in = new ScilabDouble([-1],[-1],[-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/Linear/SUM_f.pickle b/js/Linear/SUM_f.pickle index 35edcc28..6f8441b4 100644 --- a/js/Linear/SUM_f.pickle +++ b/js/Linear/SUM_f.pickle @@ -33,27 +33,28 @@ S'vector' p8 sS'model.dep_ut' p9 -g8 -sS'p' +S'vector_boolean' p10 +sS'p' +p11 g4 sS'gr_i' -p11 +p12 g8 sS'model.in' -p12 -S'matrix' p13 -sS'y' +S'matrix' p14 +sS'y' +p15 g8 sS'x' -p15 -NsS'model' p16 -S'object' +NsS'model' p17 -sS'typ' +S'object' p18 +sS'typ' +p19 g8 s.
\ No newline at end of file diff --git a/js/Linear/TCLSS.js b/js/Linear/TCLSS.js index 26b9d352..3fda1d85 100644 --- a/js/Linear/TCLSS.js +++ b/js/Linear/TCLSS.js @@ -17,7 +17,7 @@ function TCLSS() { this.model.state = new ScilabDouble([this.x0]); this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + 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); @@ -80,10 +80,10 @@ function TCLSS() { var mmm = [false,true]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = new ScilabDouble(mmm); + this.model.dep_ut = new ScilabBoolean(mmm); } } else { - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); } this.model.state = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble(rpar); diff --git a/js/Linear/TCLSS.pickle b/js/Linear/TCLSS.pickle index ae7a4f9f..c633f755 100644 --- a/js/Linear/TCLSS.pickle +++ b/js/Linear/TCLSS.pickle @@ -79,7 +79,7 @@ p20 g5 sS'mmm' p21 -S'vector' +S'vector_boolean' p22 sS'model.state' p23 @@ -95,26 +95,27 @@ p26 g8 sS'typ' p27 -g22 -sS'model.blocktype' +S'vector' p28 -S'string' +sS'model.blocktype' p29 -sS'model.dep_ut' +S'string' p30 +sS'model.dep_ut' +p31 g22 sS'exprs' -p31 +p32 g5 sS'gr_i' -p32 -g22 -sS'y' p33 -g22 -sS'x' +g28 +sS'y' p34 -NsS'model' +g28 +sS'x' p35 +NsS'model' +p36 g2 s.
\ No newline at end of file diff --git a/js/Linear/TCLSS_f.js b/js/Linear/TCLSS_f.js index 53257ece..a92c94d8 100644 --- a/js/Linear/TCLSS_f.js +++ b/js/Linear/TCLSS_f.js @@ -17,7 +17,7 @@ function TCLSS_f() { this.model.state = new ScilabDouble([this.x0]); this.model.rpar = new ScilabDouble([this.A.slice()],[this.B.slice()],[this.C.slice()],[this.D.slice()]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + 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); @@ -80,10 +80,10 @@ function TCLSS_f() { var mmm = [false,true]; } if (or(this.model.dep_ut!=mmm)) { - this.model.dep_ut = new ScilabDouble(mmm); + this.model.dep_ut = new ScilabBoolean(mmm); } } else { - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); } this.model.state = new ScilabDouble(this.x0.slice()); this.model.rpar = new ScilabDouble(rpar); diff --git a/js/Linear/TCLSS_f.pickle b/js/Linear/TCLSS_f.pickle index ae7a4f9f..c633f755 100644 --- a/js/Linear/TCLSS_f.pickle +++ b/js/Linear/TCLSS_f.pickle @@ -79,7 +79,7 @@ p20 g5 sS'mmm' p21 -S'vector' +S'vector_boolean' p22 sS'model.state' p23 @@ -95,26 +95,27 @@ p26 g8 sS'typ' p27 -g22 -sS'model.blocktype' +S'vector' p28 -S'string' +sS'model.blocktype' p29 -sS'model.dep_ut' +S'string' p30 +sS'model.dep_ut' +p31 g22 sS'exprs' -p31 +p32 g5 sS'gr_i' -p32 -g22 -sS'y' p33 -g22 -sS'x' +g28 +sS'y' p34 -NsS'model' +g28 +sS'x' p35 +NsS'model' +p36 g2 s.
\ No newline at end of file diff --git a/js/Linear/TIME_DELAY.js b/js/Linear/TIME_DELAY.js index 2686f05e..89bc8dc3 100644 --- a/js/Linear/TIME_DELAY.js +++ b/js/Linear/TIME_DELAY.js @@ -12,7 +12,7 @@ function TIME_DELAY() { this.model.rpar = new ScilabDouble([this.T,this.init]); this.model.ipar = new ScilabDouble([this.N]); this.model.blocktype = new ScilabString(["x"]); - this.model.dep_ut = new ScilabDouble([false,true]); + 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); @@ -59,7 +59,7 @@ function TIME_DELAY() { this.graphics.exprs = new ScilabDouble([this.exprs]); this.model.rpar = new ScilabDouble([this.T],[this.init]); this.model.ipar = new ScilabDouble([this.N]); - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); this.x.graphics = this.graphics; this.x.model = this.model; break; diff --git a/js/Linear/TIME_DELAY.pickle b/js/Linear/TIME_DELAY.pickle index 8a2589c0..b2bed6a4 100644 --- a/js/Linear/TIME_DELAY.pickle +++ b/js/Linear/TIME_DELAY.pickle @@ -79,20 +79,21 @@ S'string' p23 sS'model.dep_ut' p24 -g13 -sS'exprs' +S'vector_boolean' p25 -S'matrix' +sS'exprs' p26 -sS'gr_i' +S'matrix' p27 +sS'gr_i' +p28 g13 sS'y' -p28 +p29 g13 sS'x' -p29 -NsS'model' p30 +NsS'model' +p31 g2 s.
\ No newline at end of file diff --git a/js/Linear/VARIABLE_DELAY.js b/js/Linear/VARIABLE_DELAY.js index 9eade31c..d8cb881d 100644 --- a/js/Linear/VARIABLE_DELAY.js +++ b/js/Linear/VARIABLE_DELAY.js @@ -12,7 +12,7 @@ function VARIABLE_DELAY() { this.model.rpar = new ScilabDouble([this.T,this.init]); this.model.ipar = new ScilabDouble([this.N]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Linear/VARIABLE_DELAY.pickle b/js/Linear/VARIABLE_DELAY.pickle index 5b8ff7e1..77059d72 100644 --- a/js/Linear/VARIABLE_DELAY.pickle +++ b/js/Linear/VARIABLE_DELAY.pickle @@ -80,19 +80,20 @@ S'string' p24 sS'model.dep_ut' p25 -g13 -sS'exprs' +S'vector_boolean' p26 +sS'exprs' +p27 g17 sS'gr_i' -p27 +p28 g13 sS'y' -p28 +p29 g13 sS'x' -p29 -NsS'model' p30 +NsS'model' +p31 g2 s.
\ No newline at end of file diff --git a/js/MatrixOp/CUMSUM.js b/js/MatrixOp/CUMSUM.js index f2c72fc8..e2ae9582 100644 --- a/js/MatrixOp/CUMSUM.js +++ b/js/MatrixOp/CUMSUM.js @@ -19,7 +19,7 @@ function CUMSUM() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/MatrixOp/CUMSUM.pickle b/js/MatrixOp/CUMSUM.pickle index c0cb6044..70090100 100644 --- a/js/MatrixOp/CUMSUM.pickle +++ b/js/MatrixOp/CUMSUM.pickle @@ -116,20 +116,21 @@ p36 g18 sS'model.dep_ut' p37 -g2 -sS'gr_i' +S'vector_boolean' p38 +sS'gr_i' +p39 g2 sS'y' -p39 +p40 g2 sS'x' -p40 +p41 g4 sS'model' -p41 +p42 g4 sS'ot' -p42 +p43 g7 s.
\ No newline at end of file diff --git a/js/MatrixOp/EXTRACT.js b/js/MatrixOp/EXTRACT.js index 754734ad..e71d07f2 100644 --- a/js/MatrixOp/EXTRACT.js +++ b/js/MatrixOp/EXTRACT.js @@ -19,7 +19,7 @@ function EXTRACT() { this.model.ipar = new ScilabDouble([1,1,1,1]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/MatrixOp/EXTRACT.pickle b/js/MatrixOp/EXTRACT.pickle index 458bbe66..a255e41f 100644 --- a/js/MatrixOp/EXTRACT.pickle +++ b/js/MatrixOp/EXTRACT.pickle @@ -128,20 +128,21 @@ p40 g7 sS'model.dep_ut' p41 -g2 -sS'gr_i' +S'vector_boolean' p42 +sS'gr_i' +p43 g2 sS'y' -p43 +p44 g2 sS'x' -p44 +p45 g4 sS'model' -p45 +p46 g4 sS'ot' -p46 +p47 g7 s.
\ No newline at end of file diff --git a/js/MatrixOp/EXTTRI.js b/js/MatrixOp/EXTTRI.js index 39ee260c..eef761b9 100644 --- a/js/MatrixOp/EXTTRI.js +++ b/js/MatrixOp/EXTTRI.js @@ -19,7 +19,7 @@ function EXTTRI() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/MatrixOp/EXTTRI.pickle b/js/MatrixOp/EXTTRI.pickle index c0cb6044..70090100 100644 --- a/js/MatrixOp/EXTTRI.pickle +++ b/js/MatrixOp/EXTTRI.pickle @@ -116,20 +116,21 @@ p36 g18 sS'model.dep_ut' p37 -g2 -sS'gr_i' +S'vector_boolean' p38 +sS'gr_i' +p39 g2 sS'y' -p39 +p40 g2 sS'x' -p40 +p41 g4 sS'model' -p41 +p42 g4 sS'ot' -p42 +p43 g7 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATBKSL.js b/js/MatrixOp/MATBKSL.js index 00f0c105..c91090d2 100644 --- a/js/MatrixOp/MATBKSL.js +++ b/js/MatrixOp/MATBKSL.js @@ -19,7 +19,7 @@ function MATBKSL() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/MatrixOp/MATBKSL.pickle b/js/MatrixOp/MATBKSL.pickle index fa324f98..958dcb1f 100644 --- a/js/MatrixOp/MATBKSL.pickle +++ b/js/MatrixOp/MATBKSL.pickle @@ -112,20 +112,21 @@ p36 g18 sS'model.dep_ut' p37 -g2 -sS'gr_i' +S'vector_boolean' p38 +sS'gr_i' +p39 g2 sS'y' -p39 +p40 g2 sS'x' -p40 +p41 g4 sS'model' -p41 +p42 g4 sS'ot' -p42 +p43 g8 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATCATH.js b/js/MatrixOp/MATCATH.js index 69d1d3cb..a547fdef 100644 --- a/js/MatrixOp/MATCATH.js +++ b/js/MatrixOp/MATCATH.js @@ -19,7 +19,7 @@ function MATCATH() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/MatrixOp/MATCATH.pickle b/js/MatrixOp/MATCATH.pickle index 18943849..fa59704b 100644 --- a/js/MatrixOp/MATCATH.pickle +++ b/js/MatrixOp/MATCATH.pickle @@ -106,20 +106,21 @@ p33 g18 sS'model.dep_ut' p34 -g2 -sS'gr_i' +S'vector_boolean' p35 +sS'gr_i' +p36 g2 sS'y' -p36 +p37 g2 sS'x' -p37 +p38 g4 sS'model' -p38 +p39 g4 sS'ot' -p39 +p40 g7 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATCATV.js b/js/MatrixOp/MATCATV.js index 5b7a15a1..b99fc5ad 100644 --- a/js/MatrixOp/MATCATV.js +++ b/js/MatrixOp/MATCATV.js @@ -20,7 +20,7 @@ function MATCATV() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/MatrixOp/MATCATV.pickle b/js/MatrixOp/MATCATV.pickle index 7cece1f7..a52625cd 100644 --- a/js/MatrixOp/MATCATV.pickle +++ b/js/MatrixOp/MATCATV.pickle @@ -106,23 +106,24 @@ p33 g18 sS'model.dep_ut' p34 -g2 -sS'gr_i' +S'vector_boolean' p35 +sS'gr_i' +p36 g2 sS'l1' -p36 +p37 g12 sS'y' -p37 +p38 g2 sS'x' -p38 +p39 g4 sS'model' -p39 +p40 g4 sS'ot' -p40 +p41 g7 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATDET.js b/js/MatrixOp/MATDET.js index fa3ebdba..635de6a6 100644 --- a/js/MatrixOp/MATDET.js +++ b/js/MatrixOp/MATDET.js @@ -19,7 +19,7 @@ function MATDET() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/MatrixOp/MATDET.pickle b/js/MatrixOp/MATDET.pickle index 3f1e1ea3..b0b2a1e6 100644 --- a/js/MatrixOp/MATDET.pickle +++ b/js/MatrixOp/MATDET.pickle @@ -111,20 +111,21 @@ p35 g17 sS'model.dep_ut' p36 -g2 -sS'gr_i' +S'vector_boolean' p37 +sS'gr_i' +p38 g2 sS'y' -p38 +p39 g2 sS'x' -p39 +p40 g4 sS'model' -p40 +p41 g4 sS'ot' -p41 +p42 g7 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATDIAG.js b/js/MatrixOp/MATDIAG.js index cc29553a..5133d522 100644 --- a/js/MatrixOp/MATDIAG.js +++ b/js/MatrixOp/MATDIAG.js @@ -19,7 +19,7 @@ function MATDIAG() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/MatrixOp/MATDIAG.pickle b/js/MatrixOp/MATDIAG.pickle index 3f1e1ea3..b0b2a1e6 100644 --- a/js/MatrixOp/MATDIAG.pickle +++ b/js/MatrixOp/MATDIAG.pickle @@ -111,20 +111,21 @@ p35 g17 sS'model.dep_ut' p36 -g2 -sS'gr_i' +S'vector_boolean' p37 +sS'gr_i' +p38 g2 sS'y' -p38 +p39 g2 sS'x' -p39 +p40 g4 sS'model' -p40 +p41 g4 sS'ot' -p41 +p42 g7 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATDIV.js b/js/MatrixOp/MATDIV.js index 312ac726..847432e6 100644 --- a/js/MatrixOp/MATDIV.js +++ b/js/MatrixOp/MATDIV.js @@ -19,7 +19,7 @@ function MATDIV() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/MatrixOp/MATDIV.pickle b/js/MatrixOp/MATDIV.pickle index fa324f98..958dcb1f 100644 --- a/js/MatrixOp/MATDIV.pickle +++ b/js/MatrixOp/MATDIV.pickle @@ -112,20 +112,21 @@ p36 g18 sS'model.dep_ut' p37 -g2 -sS'gr_i' +S'vector_boolean' p38 +sS'gr_i' +p39 g2 sS'y' -p39 +p40 g2 sS'x' -p40 +p41 g4 sS'model' -p41 +p42 g4 sS'ot' -p42 +p43 g8 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATEIG.js b/js/MatrixOp/MATEIG.js index da493fc3..bb1eb12c 100644 --- a/js/MatrixOp/MATEIG.js +++ b/js/MatrixOp/MATEIG.js @@ -19,7 +19,7 @@ function MATEIG() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/MatrixOp/MATEIG.pickle b/js/MatrixOp/MATEIG.pickle index a5bf23fe..480fe405 100644 --- a/js/MatrixOp/MATEIG.pickle +++ b/js/MatrixOp/MATEIG.pickle @@ -115,20 +115,21 @@ p36 g18 sS'model.dep_ut' p37 -g2 -sS'gr_i' +S'vector_boolean' p38 +sS'gr_i' +p39 g2 sS'y' -p39 +p40 g2 sS'x' -p40 +p41 g4 sS'model' -p41 +p42 g4 sS'ot' -p42 +p43 g2 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATEXPM.js b/js/MatrixOp/MATEXPM.js index b691af6e..fca1a921 100644 --- a/js/MatrixOp/MATEXPM.js +++ b/js/MatrixOp/MATEXPM.js @@ -19,7 +19,7 @@ function MATEXPM() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/MatrixOp/MATEXPM.pickle b/js/MatrixOp/MATEXPM.pickle index 3f1e1ea3..b0b2a1e6 100644 --- a/js/MatrixOp/MATEXPM.pickle +++ b/js/MatrixOp/MATEXPM.pickle @@ -111,20 +111,21 @@ p35 g17 sS'model.dep_ut' p36 -g2 -sS'gr_i' +S'vector_boolean' p37 +sS'gr_i' +p38 g2 sS'y' -p38 +p39 g2 sS'x' -p39 +p40 g4 sS'model' -p40 +p41 g4 sS'ot' -p41 +p42 g7 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATINV.js b/js/MatrixOp/MATINV.js index 98e0464b..ee051754 100644 --- a/js/MatrixOp/MATINV.js +++ b/js/MatrixOp/MATINV.js @@ -19,7 +19,7 @@ function MATINV() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/MatrixOp/MATINV.pickle b/js/MatrixOp/MATINV.pickle index 3f1e1ea3..b0b2a1e6 100644 --- a/js/MatrixOp/MATINV.pickle +++ b/js/MatrixOp/MATINV.pickle @@ -111,20 +111,21 @@ p35 g17 sS'model.dep_ut' p36 -g2 -sS'gr_i' +S'vector_boolean' p37 +sS'gr_i' +p38 g2 sS'y' -p38 +p39 g2 sS'x' -p39 +p40 g4 sS'model' -p40 +p41 g4 sS'ot' -p41 +p42 g7 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATLU.js b/js/MatrixOp/MATLU.js index acef2180..c2880d3f 100644 --- a/js/MatrixOp/MATLU.js +++ b/js/MatrixOp/MATLU.js @@ -19,7 +19,7 @@ function MATLU() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/MatrixOp/MATLU.pickle b/js/MatrixOp/MATLU.pickle index 4075ed38..c3b97374 100644 --- a/js/MatrixOp/MATLU.pickle +++ b/js/MatrixOp/MATLU.pickle @@ -108,19 +108,20 @@ p34 g16 sS'model.dep_ut' p35 -g2 -sS'gr_i' +S'vector_boolean' p36 +sS'gr_i' +p37 g2 sS'y' -p37 +p38 g2 sS'x' -p38 -NsS'model' p39 +NsS'model' +p40 g4 sS'ot' -p40 +p41 g2 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATMAGPHI.js b/js/MatrixOp/MATMAGPHI.js index 27946fc7..74b002b3 100644 --- a/js/MatrixOp/MATMAGPHI.js +++ b/js/MatrixOp/MATMAGPHI.js @@ -19,7 +19,7 @@ function MATMAGPHI() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/MatrixOp/MATMAGPHI.pickle b/js/MatrixOp/MATMAGPHI.pickle index 596a3150..1cb33b61 100644 --- a/js/MatrixOp/MATMAGPHI.pickle +++ b/js/MatrixOp/MATMAGPHI.pickle @@ -113,20 +113,21 @@ p36 g18 sS'model.dep_ut' p37 -g2 -sS'gr_i' +S'vector_boolean' p38 +sS'gr_i' +p39 g2 sS'y' -p39 +p40 g2 sS'x' -p40 +p41 g4 sS'model' -p41 +p42 g4 sS'ot' -p42 +p43 g8 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATMUL.js b/js/MatrixOp/MATMUL.js index 7965155b..cade1e5a 100644 --- a/js/MatrixOp/MATMUL.js +++ b/js/MatrixOp/MATMUL.js @@ -7,7 +7,7 @@ function MATMUL() { this.model.in2 = new ScilabDouble([-2],[-3]); this.model.out = new ScilabDouble([-1]); this.model.out2 = new ScilabDouble([-3]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); 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));"]); diff --git a/js/MatrixOp/MATMUL.pickle b/js/MatrixOp/MATMUL.pickle index f103114f..7851af36 100644 --- a/js/MatrixOp/MATMUL.pickle +++ b/js/MatrixOp/MATMUL.pickle @@ -36,7 +36,7 @@ p6 g2 sS'model.dep_ut' p7 -S'vector' +S'vector_boolean' p8 sS'model.out' p9 @@ -47,79 +47,80 @@ p11 g5 sS'out' p12 -g8 -sS'model.in2' +S'vector' p13 -S'matrix' +sS'model.in2' p14 -sS'x.graphics' +S'matrix' p15 +sS'x.graphics' +p16 g2 sS'kmin' -p16 +p17 g10 sS'label' -p17 -g8 -sS'np' p18 +g13 +sS'np' +p19 g10 sS'model.sim' -p19 -S'list' p20 -sS'label[2-1]' +S'list' p21 +sS'label[2-1]' +p22 g5 sS'model.out2' -p22 +p23 g10 sS'in1' -p23 -g14 -sS'model.rpar' p24 -g14 -sS'kmax' +g15 +sS'model.rpar' p25 +g15 +sS'kmax' +p26 g10 sS'model.in' -p26 -g14 -sS'graphics' p27 +g15 +sS'graphics' +p28 g2 sS'model.ipar' -p28 +p29 g10 sS'typ' -p29 -g8 -sS'ot' p30 -NsS'ok' +g13 +sS'ot' p31 -S'boolean' +NsS'ok' p32 -sS'rule' +S'boolean' p33 +sS'rule' +p34 g10 sS'gr_i' -p34 -g8 -sS'TABMIN' p35 -g14 -sS'y' +g13 +sS'TABMIN' p36 -g8 -sS'x' +g15 +sS'y' p37 +g13 +sS'x' +p38 g2 sS'model' -p38 +p39 g2 sS'TABMAX' -p39 -g14 +p40 +g15 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATPINV.js b/js/MatrixOp/MATPINV.js index 7bc7e35c..a8825b04 100644 --- a/js/MatrixOp/MATPINV.js +++ b/js/MatrixOp/MATPINV.js @@ -19,7 +19,7 @@ function MATPINV() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/MatrixOp/MATPINV.pickle b/js/MatrixOp/MATPINV.pickle index 3f1e1ea3..b0b2a1e6 100644 --- a/js/MatrixOp/MATPINV.pickle +++ b/js/MatrixOp/MATPINV.pickle @@ -111,20 +111,21 @@ p35 g17 sS'model.dep_ut' p36 -g2 -sS'gr_i' +S'vector_boolean' p37 +sS'gr_i' +p38 g2 sS'y' -p38 +p39 g2 sS'x' -p39 +p40 g4 sS'model' -p40 +p41 g4 sS'ot' -p41 +p42 g7 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATRESH.js b/js/MatrixOp/MATRESH.js index caacf2a8..3ffb9fd6 100644 --- a/js/MatrixOp/MATRESH.js +++ b/js/MatrixOp/MATRESH.js @@ -19,7 +19,7 @@ function MATRESH() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/MatrixOp/MATRESH.pickle b/js/MatrixOp/MATRESH.pickle index b19032b1..726570e8 100644 --- a/js/MatrixOp/MATRESH.pickle +++ b/js/MatrixOp/MATRESH.pickle @@ -114,23 +114,24 @@ p35 g17 sS'model.dep_ut' p36 -g2 -sS'gr_i' +S'vector_boolean' p37 +sS'gr_i' +p38 g2 sS'y' -p38 +p39 g2 sS'x' -p39 +p40 g4 sS'model' -p40 +p41 g4 sS'ot' -p41 +p42 g7 sS'nout' -p42 +p43 g7 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATSING.js b/js/MatrixOp/MATSING.js index 72933008..6f0abe08 100644 --- a/js/MatrixOp/MATSING.js +++ b/js/MatrixOp/MATSING.js @@ -19,7 +19,7 @@ function MATSING() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/MatrixOp/MATSING.pickle b/js/MatrixOp/MATSING.pickle index a5bf23fe..480fe405 100644 --- a/js/MatrixOp/MATSING.pickle +++ b/js/MatrixOp/MATSING.pickle @@ -115,20 +115,21 @@ p36 g18 sS'model.dep_ut' p37 -g2 -sS'gr_i' +S'vector_boolean' p38 +sS'gr_i' +p39 g2 sS'y' -p39 +p40 g2 sS'x' -p40 +p41 g4 sS'model' -p41 +p42 g4 sS'ot' -p42 +p43 g2 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATSUM.js b/js/MatrixOp/MATSUM.js index 534f137b..f2f0027c 100644 --- a/js/MatrixOp/MATSUM.js +++ b/js/MatrixOp/MATSUM.js @@ -19,7 +19,7 @@ function MATSUM() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/MatrixOp/MATSUM.pickle b/js/MatrixOp/MATSUM.pickle index c0cb6044..70090100 100644 --- a/js/MatrixOp/MATSUM.pickle +++ b/js/MatrixOp/MATSUM.pickle @@ -116,20 +116,21 @@ p36 g18 sS'model.dep_ut' p37 -g2 -sS'gr_i' +S'vector_boolean' p38 +sS'gr_i' +p39 g2 sS'y' -p39 +p40 g2 sS'x' -p40 +p41 g4 sS'model' -p41 +p42 g4 sS'ot' -p42 +p43 g7 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATTRAN.js b/js/MatrixOp/MATTRAN.js index 4e9f67fd..09baf44f 100644 --- a/js/MatrixOp/MATTRAN.js +++ b/js/MatrixOp/MATTRAN.js @@ -7,7 +7,7 @@ function MATTRAN() { this.model.in2 = new ScilabDouble([-2]); this.model.out = new ScilabDouble([-2]); this.model.out2 = new ScilabDouble([-1]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/MatrixOp/MATTRAN.pickle b/js/MatrixOp/MATTRAN.pickle index ebb878d9..ea3e6ac6 100644 --- a/js/MatrixOp/MATTRAN.pickle +++ b/js/MatrixOp/MATTRAN.pickle @@ -83,20 +83,21 @@ S'boolean' p25 sS'model.dep_ut' p26 -g9 -sS'gr_i' +S'vector_boolean' p27 +sS'gr_i' +p28 g9 sS'y' -p28 +p29 g9 sS'x' -p29 +p30 g2 sS'model' -p30 +p31 g2 sS'ot' -p31 +p32 g5 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATZCONJ.js b/js/MatrixOp/MATZCONJ.js index 006ecac8..2b56c057 100644 --- a/js/MatrixOp/MATZCONJ.js +++ b/js/MatrixOp/MATZCONJ.js @@ -19,7 +19,7 @@ function MATZCONJ() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/MatrixOp/MATZCONJ.pickle b/js/MatrixOp/MATZCONJ.pickle index 4fbc246e..93781b9f 100644 --- a/js/MatrixOp/MATZCONJ.pickle +++ b/js/MatrixOp/MATZCONJ.pickle @@ -78,17 +78,18 @@ p23 g12 sS'model.dep_ut' p24 -g2 -sS'gr_i' +S'vector_boolean' p25 +sS'gr_i' +p26 g2 sS'y' -p26 +p27 g2 sS'x' -p27 -NsS'model' p28 -S'object' +NsS'model' p29 +S'object' +p30 s.
\ No newline at end of file diff --git a/js/MatrixOp/MATZREIM.js b/js/MatrixOp/MATZREIM.js index 6f3fefa2..681e6f8f 100644 --- a/js/MatrixOp/MATZREIM.js +++ b/js/MatrixOp/MATZREIM.js @@ -19,7 +19,7 @@ function MATZREIM() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/MatrixOp/MATZREIM.pickle b/js/MatrixOp/MATZREIM.pickle index f4c90683..4f289b33 100644 --- a/js/MatrixOp/MATZREIM.pickle +++ b/js/MatrixOp/MATZREIM.pickle @@ -113,20 +113,21 @@ p36 g15 sS'model.dep_ut' p37 -g2 -sS'gr_i' +S'vector_boolean' p38 +sS'gr_i' +p39 g2 sS'y' -p39 +p40 g2 sS'x' -p40 +p41 g4 sS'model' -p41 +p42 g4 sS'ot' -p42 +p43 g8 s.
\ No newline at end of file diff --git a/js/MatrixOp/RICC.js b/js/MatrixOp/RICC.js index aa1be9c2..c9a9ead0 100644 --- a/js/MatrixOp/RICC.js +++ b/js/MatrixOp/RICC.js @@ -19,7 +19,7 @@ function RICC() { this.model.ipar = new ScilabDouble([1],[1]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/MatrixOp/RICC.pickle b/js/MatrixOp/RICC.pickle index 7e6e9e48..41b5c094 100644 --- a/js/MatrixOp/RICC.pickle +++ b/js/MatrixOp/RICC.pickle @@ -110,20 +110,21 @@ p34 g18 sS'model.dep_ut' p35 -g2 -sS'gr_i' +S'vector_boolean' p36 +sS'gr_i' +p37 g2 sS'y' -p37 +p38 g2 sS'x' -p38 +p39 g4 sS'model' -p39 +p40 g4 sS'ot' -p40 +p41 g8 s.
\ No newline at end of file diff --git a/js/MatrixOp/ROOTCOEF.js b/js/MatrixOp/ROOTCOEF.js index 806a4644..f7b324dd 100644 --- a/js/MatrixOp/ROOTCOEF.js +++ b/js/MatrixOp/ROOTCOEF.js @@ -19,7 +19,7 @@ function ROOTCOEF() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/MatrixOp/ROOTCOEF.pickle b/js/MatrixOp/ROOTCOEF.pickle index 5680283a..f930a815 100644 --- a/js/MatrixOp/ROOTCOEF.pickle +++ b/js/MatrixOp/ROOTCOEF.pickle @@ -114,20 +114,21 @@ p36 g18 sS'model.dep_ut' p37 -g2 -sS'gr_i' +S'vector_boolean' p38 +sS'gr_i' +p39 g2 sS'y' -p39 +p40 g2 sS'x' -p40 +p41 g4 sS'model' -p41 +p42 g4 sS'ot' -p42 +p43 g7 s.
\ No newline at end of file diff --git a/js/MatrixOp/SQRT.js b/js/MatrixOp/SQRT.js index 2cf99b8f..d9e1d94b 100644 --- a/js/MatrixOp/SQRT.js +++ b/js/MatrixOp/SQRT.js @@ -9,7 +9,7 @@ function SQRT() { this.model.outtyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([-1]); this.model.out2 = new ScilabDouble([-2]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/MatrixOp/SQRT.pickle b/js/MatrixOp/SQRT.pickle index 71e72ba4..129282a7 100644 --- a/js/MatrixOp/SQRT.pickle +++ b/js/MatrixOp/SQRT.pickle @@ -84,20 +84,21 @@ S'boolean' p26 sS'model.dep_ut' p27 -g5 -sS'gr_i' +S'vector_boolean' p28 +sS'gr_i' +p29 g5 sS'y' -p29 +p30 g5 sS'x' -p30 +p31 g2 sS'model' -p31 +p32 g2 sS'ot' -p32 +p33 g5 s.
\ No newline at end of file diff --git a/js/MatrixOp/SUBMAT.js b/js/MatrixOp/SUBMAT.js index 1e007c40..46612834 100644 --- a/js/MatrixOp/SUBMAT.js +++ b/js/MatrixOp/SUBMAT.js @@ -19,7 +19,7 @@ function SUBMAT() { this.model.ipar = new ScilabDouble([1],[1],[1],[1]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/MatrixOp/SUBMAT.pickle b/js/MatrixOp/SUBMAT.pickle index 6fd8e2e7..3d97bb83 100644 --- a/js/MatrixOp/SUBMAT.pickle +++ b/js/MatrixOp/SUBMAT.pickle @@ -121,20 +121,21 @@ p36 g18 sS'model.dep_ut' p37 -g2 -sS'gr_i' +S'vector_boolean' p38 +sS'gr_i' +p39 g2 sS'y' -p39 +p40 g2 sS'x' -p40 +p41 g4 sS'model' -p41 +p42 g4 sS'ot' -p42 +p43 g7 s.
\ No newline at end of file diff --git a/js/Misc/AUTOMAT.js b/js/Misc/AUTOMAT.js index c6033345..11057d0f 100644 --- a/js/Misc/AUTOMAT.js +++ b/js/Misc/AUTOMAT.js @@ -20,7 +20,7 @@ function AUTOMAT() { this.model.blocktype = new ScilabString(["c"]); this.model.evtout = new ScilabDouble([1]); this.model.firing = new ScilabDouble([-1]); - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); 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));"]); diff --git a/js/Misc/AUTOMAT.pickle b/js/Misc/AUTOMAT.pickle index 9e378404..71d0c4df 100644 --- a/js/Misc/AUTOMAT.pickle +++ b/js/Misc/AUTOMAT.pickle @@ -154,27 +154,28 @@ p48 g6 sS'model.dep_ut' p49 -g9 -sS'exprs' +S'vector_boolean' p50 +sS'exprs' +p51 g4 sS'gr_i' -p51 +p52 g9 sS'ipar' -p52 +p53 g4 sS'y' -p53 +p54 g9 sS'x' -p54 -NsS'model' p55 +NsS'model' +p56 g6 sS'Minitial' -p56 +p57 g2 sS'imax' -p57 +p58 Ns.
\ No newline at end of file diff --git a/js/Misc/BACKLASH.js b/js/Misc/BACKLASH.js index 99b36d13..b2a69f86 100644 --- a/js/Misc/BACKLASH.js +++ b/js/Misc/BACKLASH.js @@ -9,7 +9,7 @@ function BACKLASH() { this.model.rpar = new ScilabDouble([0],[1]); this.model.nzcross = new ScilabDouble([2]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); return new BasicBlock(this.x); diff --git a/js/Misc/BACKLASH.pickle b/js/Misc/BACKLASH.pickle index 8954d2a4..25747638 100644 --- a/js/Misc/BACKLASH.pickle +++ b/js/Misc/BACKLASH.pickle @@ -63,26 +63,27 @@ S'vector' p18 sS'model.dep_ut' p19 -g18 -sS'model.in' +S'vector_boolean' p20 +sS'model.in' +p21 g4 sS'graphics' -p21 +p22 g8 sS'y' -p22 +p23 g18 sS'x' -p23 -NsS'model' p24 +NsS'model' +p25 g8 sS'rpar[1-1]' -p25 -NsS'typ' p26 +NsS'typ' +p27 g18 sS'rpar[2-1]' -p27 +p28 Ns.
\ No newline at end of file diff --git a/js/Misc/BOUNCE.js b/js/Misc/BOUNCE.js index f6557d8a..bf1a4a1e 100644 --- a/js/Misc/BOUNCE.js +++ b/js/Misc/BOUNCE.js @@ -32,7 +32,7 @@ function BOUNCE() { this.model.ipar = new ScilabDouble(ipar); this.model.nzcross = new ScilabDouble([n*(n-1)/2+4*n]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + 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); diff --git a/js/Misc/BOUNCE.pickle b/js/Misc/BOUNCE.pickle index b6ea4fe5..07937336 100644 --- a/js/Misc/BOUNCE.pickle +++ b/js/Misc/BOUNCE.pickle @@ -118,31 +118,32 @@ p33 g13 sS'model.dep_ut' p34 -g2 -sS'n' +S'vector_boolean' p35 +sS'n' +p36 g13 sS'exprs' -p36 +p37 g7 sS'gr_i' -p37 +p38 g2 sS'ipar' -p38 +p39 g2 sS'y' -p39 +p40 g7 sS'x' -p40 +p41 g7 sS'model' -p41 +p42 g4 sS'ipar[k-1]' -p42 -NsS'model.state' p43 +NsS'model.state' +p44 g2 s.
\ No newline at end of file diff --git a/js/Misc/BOUNCEXY.js b/js/Misc/BOUNCEXY.js index 6bb0fdba..915a51de 100644 --- a/js/Misc/BOUNCEXY.js +++ b/js/Misc/BOUNCEXY.js @@ -29,7 +29,7 @@ function BOUNCEXY() { this.model.ipar = new ScilabDouble([this.win],[this.imode],[this.clrs.slice()]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Misc/BOUNCEXY.pickle b/js/Misc/BOUNCEXY.pickle index 5edd2bdd..b470aa95 100644 --- a/js/Misc/BOUNCEXY.pickle +++ b/js/Misc/BOUNCEXY.pickle @@ -140,25 +140,26 @@ p41 g6 sS'model.dep_ut' p42 -g14 -sS'z[6*(i-1)+6-1]' +S'vector_boolean' p43 +sS'z[6*(i-1)+6-1]' +p44 g4 sS'gr_i' -p44 +p45 g14 sS'ipar' -p45 +p46 g2 sS'y' -p46 +p47 g14 sS'x' -p47 -NsS'model' p48 +NsS'model' +p49 g6 sS'z' -p49 +p50 g14 s.
\ No newline at end of file diff --git a/js/Misc/BPLATFORM.js b/js/Misc/BPLATFORM.js index 16f5a301..37b101fc 100644 --- a/js/Misc/BPLATFORM.js +++ b/js/Misc/BPLATFORM.js @@ -15,7 +15,7 @@ function BPLATFORM() { this.model.dstate = new ScilabDouble([0]); this.model.rpar = new ScilabDouble([this.plen],[this.csiz],[this.phi],[this.xmin],[this.xmax],[this.ymin],[this.ymax]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Misc/BPLATFORM.pickle b/js/Misc/BPLATFORM.pickle index 68beb7db..b9c99f67 100644 --- a/js/Misc/BPLATFORM.pickle +++ b/js/Misc/BPLATFORM.pickle @@ -102,22 +102,23 @@ S'string' p29 sS'model.dep_ut' p30 -g25 -sS'exprs' +S'vector_boolean' p31 +sS'exprs' +p32 g29 sS'gr_i' -p32 +p33 g25 sS'xmax' -p33 +p34 g2 sS'y' -p34 +p35 g25 sS'x' -p35 -NsS'model' p36 +NsS'model' +p37 g4 s.
\ No newline at end of file diff --git a/js/Misc/CBLOCK.js b/js/Misc/CBLOCK.js index b7a389d6..91a8a55a 100644 --- a/js/Misc/CBLOCK.js +++ b/js/Misc/CBLOCK.js @@ -25,7 +25,7 @@ function CBLOCK() { this.model.ipar = new ScilabDouble(this.ipar); this.model.blocktype = new ScilabString([typ]); this.model.firing = new ScilabDouble(auto); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.model.nzcross = new ScilabDouble([this.ng]); var label = list(transpose([funam,"n",sci2exp(in1),sci2exp(out),sci2exp(clkin),sci2exp(clkout),sci2exp(x0),sci2exp(0),sci2exp(z0),sci2exp(this.rpar),sci2exp(this.ipar),sci2exp(auto),"y","n"]),[]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CBLOCK\",sz(1),sz(2));"]); @@ -147,7 +147,7 @@ function CBLOCK() { this.model.rpar = new ScilabDouble(this.rpar); this.model.ipar = new ScilabDouble([this.ipar]); this.model.firing = new ScilabDouble([this.auto0]); - this.model.dep_ut = new ScilabDouble(dep_ut); + this.model.dep_ut = new ScilabBoolean(dep_ut); this.model.nzcross = new ScilabDouble([this.ng]); label[2-1] = tt; this.x.model = this.model; diff --git a/js/Misc/CBLOCK.pickle b/js/Misc/CBLOCK.pickle index 0a74c6cc..d75a6b82 100644 --- a/js/Misc/CBLOCK.pickle +++ b/js/Misc/CBLOCK.pickle @@ -73,141 +73,142 @@ p11 g2 sS'model.dep_ut' p12 -g8 -sS'funam' +S'vector_boolean' p13 -S'string' +sS'funam' p14 -sS'model.dstate' +S'string' p15 +sS'model.dstate' +p16 g8 sS'ng' -p16 +p17 g2 sS'out' -p17 +p18 g2 sS'nevin' -p18 +p19 g2 sS'clkin' -p19 +p20 g8 sS'x.graphics' -p20 +p21 g5 sS'model.nzcross' -p21 +p22 g2 sS'tt' -p22 +p23 g2 sS'label' -p23 -S'list' p24 -sS'nx' +S'list' p25 +sS'nx' +p26 g2 sS'nz' -p26 +p27 g2 sS'z0' -p27 +p28 g8 sS'model.evtin' -p28 +p29 g8 sS'model.firing' -p29 +p30 g8 sS'nevout' -p30 +p31 g2 sS'model.sim' -p31 -g24 -sS'model.evtout' p32 +g25 +sS'model.evtout' +p33 g8 sS'clkout' -p33 +p34 g8 sS'auto' -p34 +p35 g8 sS'label[2-1]' -p35 +p36 g2 sS'in1' -p36 +p37 g2 sS'model.rpar' -p37 +p38 g8 sS'model.state' -p38 +p39 g8 sS'model.in' -p39 +p40 g2 sS'graphics' -p40 +p41 g5 sS'x0' -p41 +p42 g8 sS'model.ipar' -p42 +p43 g8 sS'typ' -p43 -g14 -sS'ok' p44 -S'boolean' +g15 +sS'ok' p45 -sS'model.blocktype' +S'boolean' p46 -g14 -sS'i' +sS'model.blocktype' p47 +g15 +sS'i' +p48 g2 sS'label[1-1]' -p48 -NsS'x.model' p49 +NsS'x.model' +p50 g5 sS'o' -p50 +p51 g2 sS'depu' -p51 -g45 -sS'dept' p52 -g45 -sS'gr_i' +g46 +sS'dept' p53 +g46 +sS'gr_i' +p54 g8 sS'ipar' -p54 +p55 g8 sS'y' -p55 +p56 g8 sS'x' -p56 -NsS'model' p57 +NsS'model' +p58 g5 sS'z' -p58 +p59 g8 sS'nout' -p59 +p60 g2 sS'dep_ut' -p60 -g8 +p61 +g13 s.
\ No newline at end of file diff --git a/js/Misc/CBLOCK4.js b/js/Misc/CBLOCK4.js index 1ad467d5..915c5299 100644 --- a/js/Misc/CBLOCK4.js +++ b/js/Misc/CBLOCK4.js @@ -10,7 +10,7 @@ function CBLOCK4() { this.model.out = new ScilabDouble([1]); this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var label = list([[funam],["n"],[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),\"CBLOCK4\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([4,2]),this.model,label,this.gr_i); @@ -140,7 +140,7 @@ function CBLOCK4() { this.model.firing = new ScilabDouble([this.auto0]); this.model.nzcross = new ScilabDouble([this.nzcr]); this.model.nmode = new ScilabDouble([this.nmode]); - this.model.dep_ut = new ScilabDouble(dep_ut); + this.model.dep_ut = new ScilabBoolean(dep_ut); label[2-1] = tt; this.x.model = this.model; this.graphics.exprs = new ScilabDouble([label]); diff --git a/js/Misc/CBLOCK4.pickle b/js/Misc/CBLOCK4.pickle index 1e002ba1..68e12486 100644 --- a/js/Misc/CBLOCK4.pickle +++ b/js/Misc/CBLOCK4.pickle @@ -167,31 +167,32 @@ p43 g6 sS'model.dep_ut' p44 -g9 -sS'depu' +S'vector_boolean' p45 +sS'depu' +p46 g41 sS'dept' -p46 +p47 g41 sS'gr_i' -p47 +p48 g9 sS'ipar' -p48 +p49 g3 sS'y' -p49 +p50 g9 sS'x' -p50 -NsS'model' p51 +NsS'model' +p52 g6 sS'z' -p52 -g9 -sS'dep_ut' p53 g9 +sS'dep_ut' +p54 +g45 s.
\ No newline at end of file diff --git a/js/Misc/CONSTRAINT2_c.js b/js/Misc/CONSTRAINT2_c.js index a4363e39..07f4f1bc 100644 --- a/js/Misc/CONSTRAINT2_c.js +++ b/js/Misc/CONSTRAINT2_c.js @@ -11,7 +11,7 @@ function CONSTRAINT2_c() { this.model.state = new ScilabDouble([this.x0],[this.xd0]); this.model.ipar = new ScilabDouble(this.id); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); this.exprs = list(strcat(sci2exp(this.x0)),strcat(sci2exp(this.xd0)),strcat(sci2exp(this.id))); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONSTRAINT2_c\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); diff --git a/js/Misc/CONSTRAINT2_c.pickle b/js/Misc/CONSTRAINT2_c.pickle index eaa56c2e..01f45833 100644 --- a/js/Misc/CONSTRAINT2_c.pickle +++ b/js/Misc/CONSTRAINT2_c.pickle @@ -81,26 +81,27 @@ S'string' p24 sS'model.dep_ut' p25 -g6 -sS'exprs' +S'vector_boolean' p26 +sS'exprs' +p27 g14 sS'gr_i' -p27 +p28 g6 sS'id[i-1]' -p28 +p29 g12 sS'ask_again' -p29 -S'boolean' p30 -sS'y' +S'boolean' p31 +sS'y' +p32 g6 sS'x' -p32 -NsS'model' p33 +NsS'model' +p34 g2 s.
\ No newline at end of file diff --git a/js/Misc/CONSTRAINT_c.js b/js/Misc/CONSTRAINT_c.js index 53bdf8d2..988db1e1 100644 --- a/js/Misc/CONSTRAINT_c.js +++ b/js/Misc/CONSTRAINT_c.js @@ -9,7 +9,7 @@ function CONSTRAINT_c() { this.model.ipar = new ScilabDouble([0]); this.model.state = new ScilabDouble(this.x0); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + 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); diff --git a/js/Misc/CONSTRAINT_c.pickle b/js/Misc/CONSTRAINT_c.pickle index 988e7434..6c45778f 100644 --- a/js/Misc/CONSTRAINT_c.pickle +++ b/js/Misc/CONSTRAINT_c.pickle @@ -40,7 +40,7 @@ sS'graphics.exprs' p10 NsS'model.dep_ut' p11 -S'vector' +S'vector_boolean' p12 sS'N' p13 @@ -52,32 +52,33 @@ sS'x.model' p15 NsS'gr_i' p16 -g12 -sS'model.state' +S'vector' p17 -S'matrix' +sS'model.state' p18 -sS'model.in' +S'matrix' p19 +sS'model.in' +p20 g4 sS'graphics' -p20 +p21 g8 sS'y' -p21 -g12 -sS'x' p22 -NsS'model' +g17 +sS'x' p23 +NsS'model' +p24 g8 sS'model.ipar' -p24 +p25 g4 sS'typ' -p25 -g12 -sS'x0' p26 -g18 +g17 +sS'x0' +p27 +g19 s.
\ No newline at end of file diff --git a/js/Misc/DEADBAND.js b/js/Misc/DEADBAND.js index e1a5b693..8e044e7c 100644 --- a/js/Misc/DEADBAND.js +++ b/js/Misc/DEADBAND.js @@ -12,7 +12,7 @@ function DEADBAND() { this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/Misc/DEADBAND.pickle b/js/Misc/DEADBAND.pickle index 0326c662..ab8faf42 100644 --- a/js/Misc/DEADBAND.pickle +++ b/js/Misc/DEADBAND.pickle @@ -75,19 +75,20 @@ S'string' p22 sS'model.dep_ut' p23 -g12 -sS'exprs' +S'vector_boolean' p24 +sS'exprs' +p25 g5 sS'gr_i' -p25 +p26 g12 sS'y' -p26 +p27 g12 sS'x' -p27 -NsS'model' p28 +NsS'model' +p29 g2 s.
\ No newline at end of file diff --git a/js/Misc/DIFF_f.js b/js/Misc/DIFF_f.js index cd42cc22..722f1350 100644 --- a/js/Misc/DIFF_f.js +++ b/js/Misc/DIFF_f.js @@ -8,7 +8,7 @@ function DIFF_f() { this.model.out = new ScilabDouble([1]); this.model.state = new ScilabDouble(this.x0); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + 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); diff --git a/js/Misc/DIFF_f.pickle b/js/Misc/DIFF_f.pickle index aa75c90b..9d7579af 100644 --- a/js/Misc/DIFF_f.pickle +++ b/js/Misc/DIFF_f.pickle @@ -46,37 +46,38 @@ sS'graphics.exprs' p12 NsS'model.dep_ut' p13 -g8 -sS'exprs' +S'vector_boolean' p14 -S'matrix' +sS'exprs' p15 -sS'x.model' +S'matrix' p16 -NsS'gr_i' +sS'x.model' p17 +NsS'gr_i' +p18 g8 sS'model.state' -p18 -g15 -sS'model.in' p19 +g16 +sS'model.in' +p20 g4 sS'graphics' -p20 +p21 g10 sS'y' -p21 +p22 g8 sS'x' -p22 -NsS'model' p23 +NsS'model' +p24 g10 sS'typ' -p24 +p25 g8 sS'x0' -p25 -g15 +p26 +g16 s.
\ No newline at end of file diff --git a/js/Misc/EDGETRIGGER.js b/js/Misc/EDGETRIGGER.js index 2744411d..f0699af4 100644 --- a/js/Misc/EDGETRIGGER.js +++ b/js/Misc/EDGETRIGGER.js @@ -10,7 +10,7 @@ function EDGETRIGGER() { this.model.nzcross = new ScilabDouble([1]); this.model.ipar = new ScilabDouble([sign(this.edge)]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/Misc/EDGETRIGGER.pickle b/js/Misc/EDGETRIGGER.pickle index 4177781f..def535c9 100644 --- a/js/Misc/EDGETRIGGER.pickle +++ b/js/Misc/EDGETRIGGER.pickle @@ -43,40 +43,41 @@ sS'graphics.exprs' p11 NsS'model.dep_ut' p12 -S'vector' +S'vector_boolean' p13 sS'gr_i' p14 -g13 -sS'model.nzcross' +S'vector' p15 +sS'model.nzcross' +p16 g4 sS'exprs' -p16 -g13 -sS'x.model' p17 -NsS'edge' +g15 +sS'x.model' p18 +NsS'edge' +p19 g4 sS'model.in' -p19 +p20 g4 sS'graphics' -p20 +p21 g9 sS'y' -p21 -g13 -sS'x' p22 -NsS'model' +g15 +sS'x' p23 +NsS'model' +p24 g9 sS'model.ipar' -p24 +p25 g4 sS'typ' -p25 -g13 +p26 +g15 s.
\ No newline at end of file diff --git a/js/Misc/EXPRESSION.pickle b/js/Misc/EXPRESSION.pickle index 0e95fcb4..29756226 100644 --- a/js/Misc/EXPRESSION.pickle +++ b/js/Misc/EXPRESSION.pickle @@ -102,24 +102,25 @@ p31 g19 sS'model.dep_ut' p32 -g7 -sS'exprs' +S'vector_boolean' p33 +sS'exprs' +p34 g23 sS'gr_i' -p34 +p35 g7 sS'PREVAR_scicos_context' -p35 -NsS'ipar' p36 +NsS'ipar' +p37 g7 sS'y' -p37 +p38 g7 sS'x' -p38 -NsS'model' p39 +NsS'model' +p40 g2 s.
\ No newline at end of file diff --git a/js/Misc/HYSTHERESIS.js b/js/Misc/HYSTHERESIS.js index 444eb1ef..19e73b50 100644 --- a/js/Misc/HYSTHERESIS.js +++ b/js/Misc/HYSTHERESIS.js @@ -13,7 +13,7 @@ function HYSTHERESIS() { this.model.nzcross = new ScilabDouble([this.nzz]); this.model.nmode = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/Misc/HYSTHERESIS.pickle b/js/Misc/HYSTHERESIS.pickle index 72fa6b0d..0fe608f8 100644 --- a/js/Misc/HYSTHERESIS.pickle +++ b/js/Misc/HYSTHERESIS.pickle @@ -79,22 +79,23 @@ p22 g8 sS'model.dep_ut' p23 -g11 -sS'exprs' +S'vector_boolean' p24 +sS'exprs' +p25 g5 sS'gr_i' -p25 +p26 g11 sS'ipar' -p26 +p27 g11 sS'y' -p27 +p28 g11 sS'x' -p28 -NsS'model' p29 +NsS'model' +p30 g2 s.
\ No newline at end of file diff --git a/js/Misc/LOGICAL_OP.js b/js/Misc/LOGICAL_OP.js index e4b6fdb8..ce52871a 100644 --- a/js/Misc/LOGICAL_OP.js +++ b/js/Misc/LOGICAL_OP.js @@ -10,7 +10,7 @@ function LOGICAL_OP() { this.model.out = new ScilabDouble([-1]); this.model.ipar = new ScilabDouble(ipar); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/Misc/LOGICAL_OP.pickle b/js/Misc/LOGICAL_OP.pickle index 07820007..98da2a59 100644 --- a/js/Misc/LOGICAL_OP.pickle +++ b/js/Misc/LOGICAL_OP.pickle @@ -38,7 +38,7 @@ sS'x.model' p6 NsS'model.dep_ut' p7 -S'vector' +S'vector_boolean' p8 sS'model.out' p9 @@ -46,69 +46,70 @@ S'double' p10 sS'out' p11 -g8 -sS'graphics.style' +S'vector' p12 -g8 -sS'x.graphics' +sS'graphics.style' p13 +g12 +sS'x.graphics' +p14 g2 sS'tp' -p14 +p15 g10 sS'label' -p15 +p16 g5 sS'model.sim' -p16 -S'list' p17 -sS'nin' +S'list' p18 +sS'nin' +p19 g10 sS'in1' -p19 -S'matrix' p20 -sS'model.in' +S'matrix' p21 -g20 -sS'graphics.exprs' +sS'model.in' p22 -g20 -sS'model.ipar' +g21 +sS'graphics.exprs' p23 -g8 -sS'typ' +g21 +sS'model.ipar' p24 -g8 -sS'ok' +g12 +sS'typ' p25 -S'boolean' +g12 +sS'ok' p26 -sS'model.blocktype' +S'boolean' p27 +sS'model.blocktype' +p28 g5 sS'rule' -p28 +p29 g10 sS'exprs' -p29 -g20 -sS'gr_i' p30 -g8 -sS'ipar' +g21 +sS'gr_i' p31 -g8 -sS'y' +g12 +sS'ipar' p32 -g8 -sS'x' +g12 +sS'y' p33 -NsS'model' +g12 +sS'x' p34 +NsS'model' +p35 g2 sS'ot' -p35 +p36 Ns.
\ No newline at end of file diff --git a/js/Misc/MBLOCK.js b/js/Misc/MBLOCK.js index 7d9a0f0d..f245bcce 100644 --- a/js/Misc/MBLOCK.js +++ b/js/Misc/MBLOCK.js @@ -12,7 +12,7 @@ function MBLOCK() { this.exprs = tlist(["MBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],sci2exp(this.in1.slice()),sci2exp(this.intype.slice()),sci2exp(this.out.slice()),sci2exp(this.outtype.slice()),sci2exp(param.slice()),list(string(0.1),string(.0001)),sci2exp(this.pprop.slice()),nameF,[]); this.model = scicos_model(); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); this.model.rpar = new ScilabDouble([]); for (i=1;i<=lstsize(paramv);i+=1) { this.model.rpar = new ScilabDouble([this.model.rpar],[paramv[i-1].slice()]); diff --git a/js/Misc/MBLOCK.pickle b/js/Misc/MBLOCK.pickle index 7ee03132..513e1e22 100644 --- a/js/Misc/MBLOCK.pickle +++ b/js/Misc/MBLOCK.pickle @@ -216,31 +216,32 @@ p63 g8 sS'model.dep_ut' p64 -g29 -sS'exprs.paramv' +S'vector_boolean' p65 +sS'exprs.paramv' +p66 g13 sS'exprs' -p66 +p67 g8 sS'lab_2[$+1-1]' -p67 +p68 g2 sS'r' -p68 +p69 g57 sS'lab_txt' -p69 +p70 g2 sS'y' -p70 +p71 g29 sS'x' -p71 -NsS'model' p72 +NsS'model' +p73 g4 sS'tt' -p73 +p74 g29 s.
\ No newline at end of file diff --git a/js/Misc/MEMORY_f.js b/js/Misc/MEMORY_f.js index bbf73395..6489728b 100644 --- a/js/Misc/MEMORY_f.js +++ b/js/Misc/MEMORY_f.js @@ -12,7 +12,7 @@ function MEMORY_f() { this.model.dstate = new ScilabDouble([0]); this.model.rpar = new ScilabDouble([z]); this.model.blocktype = new ScilabString(["m"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); return new BasicBlock(this.x); diff --git a/js/Misc/MEMORY_f.pickle b/js/Misc/MEMORY_f.pickle index 612a9cf1..c9ccb17b 100644 --- a/js/Misc/MEMORY_f.pickle +++ b/js/Misc/MEMORY_f.pickle @@ -75,23 +75,24 @@ p22 g13 sS'model.dep_ut' p23 -g19 -sS'exprs' +S'vector_boolean' p24 -S'matrix' +sS'exprs' p25 -sS'gr_i' +S'matrix' p26 +sS'gr_i' +p27 g19 sS'y' -p27 +p28 g19 sS'x' -p28 -NsS'model' p29 +NsS'model' +p30 g4 sS'z' -p30 +p31 g2 s.
\ No newline at end of file diff --git a/js/Misc/MPBLOCK.js b/js/Misc/MPBLOCK.js index 05ec71a5..ddaca010 100644 --- a/js/Misc/MPBLOCK.js +++ b/js/Misc/MPBLOCK.js @@ -12,7 +12,7 @@ function MPBLOCK() { this.exprs = tlist(["MPBLOCK","in","intype","out","outtype","param","paramv","pprop","nameF","funtxt"],sci2exp(this.in1.slice()),sci2exp(this.intype.slice()),sci2exp(this.out.slice()),sci2exp(this.outtype.slice()),sci2exp(param.slice()),list(string(0.1),string(.0001)),sci2exp(pprop.slice()),nameF,[]); this.model = scicos_model(); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,true]); + this.model.dep_ut = new ScilabBoolean([true,true]); this.model.rpar = new ScilabDouble([]); for (i=1;i<=lstsize(paramv);i+=1) { this.model.rpar = new ScilabDouble([this.model.rpar],[paramv[i-1].slice()]); diff --git a/js/Misc/MPBLOCK.pickle b/js/Misc/MPBLOCK.pickle index dbcb3270..76b38fb4 100644 --- a/js/Misc/MPBLOCK.pickle +++ b/js/Misc/MPBLOCK.pickle @@ -200,31 +200,32 @@ p63 g4 sS'model.dep_ut' p64 -g30 -sS'exprs.funtxt' +S'vector_boolean' p65 +sS'exprs.funtxt' +p66 g2 sS'exprs' -p66 +p67 g4 sS'lab_2[$+1-1]' -p67 +p68 g2 sS'r' -p68 +p69 g57 sS'lab_txt' -p69 +p70 g2 sS'y' -p70 +p71 g30 sS'x' -p71 -NsS'model' p72 +NsS'model' +p73 g6 sS'exprs.paramv' -p73 +p74 g14 s.
\ No newline at end of file diff --git a/js/Misc/PAL_f.js b/js/Misc/PAL_f.js index 06317e37..8c5eca6e 100644 --- a/js/Misc/PAL_f.js +++ b/js/Misc/PAL_f.js @@ -9,7 +9,7 @@ function PAL_f() { this.model.out = new ScilabDouble([]); this.model.rpar = new ScilabDouble([scs]); this.model.blocktype = new ScilabString(["h"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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.graphics.id = scs.props.title[1-1]; diff --git a/js/Misc/PAL_f.pickle b/js/Misc/PAL_f.pickle index cdbc9270..ab8787a8 100644 --- a/js/Misc/PAL_f.pickle +++ b/js/Misc/PAL_f.pickle @@ -34,7 +34,7 @@ p7 g4 sS'model.dep_ut' p8 -S'vector' +S'vector_boolean' p9 sS'scs.props.title' p10 @@ -44,39 +44,40 @@ p11 g4 sS'model.out' p12 -g9 -sS'gr_i' +S'vector' p13 -g9 -sS'model.rpar' +sS'gr_i' p14 -S'double' +g13 +sS'model.rpar' p15 -sS'scs' +S'double' p16 +sS'scs' +p17 g4 sS'model.in' -p17 -g9 -sS'y' p18 -g9 -sS'x' +g13 +sS'y' p19 +g13 +sS'x' +p20 g4 sS'model' -p20 +p21 g4 sS'x.graphics.id' -p21 -g15 -sS'typ' p22 -g9 -sS'arg1.model.rpar' +g16 +sS'typ' p23 +g13 +sS'arg1.model.rpar' +p24 g4 sS'arg1.graphics.id' -p24 -g15 +p25 +g16 s.
\ No newline at end of file diff --git a/js/Misc/PENDULUM_ANIM.js b/js/Misc/PENDULUM_ANIM.js index a7d700fe..940c5b0f 100644 --- a/js/Misc/PENDULUM_ANIM.js +++ b/js/Misc/PENDULUM_ANIM.js @@ -15,7 +15,7 @@ function PENDULUM_ANIM() { this.model.dstate = new ScilabDouble([0]); this.model.rpar = new ScilabDouble([this.plen],[this.csiz],[this.phi],[this.xmin],[this.xmax],[this.ymin],[this.ymax]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Misc/PENDULUM_ANIM.pickle b/js/Misc/PENDULUM_ANIM.pickle index 68beb7db..b9c99f67 100644 --- a/js/Misc/PENDULUM_ANIM.pickle +++ b/js/Misc/PENDULUM_ANIM.pickle @@ -102,22 +102,23 @@ S'string' p29 sS'model.dep_ut' p30 -g25 -sS'exprs' +S'vector_boolean' p31 +sS'exprs' +p32 g29 sS'gr_i' -p32 +p33 g25 sS'xmax' -p33 +p34 g2 sS'y' -p34 +p35 g25 sS'x' -p35 -NsS'model' p36 +NsS'model' +p37 g4 s.
\ No newline at end of file diff --git a/js/Misc/RATELIMITER.js b/js/Misc/RATELIMITER.js index 6e90735c..f3a168e8 100644 --- a/js/Misc/RATELIMITER.js +++ b/js/Misc/RATELIMITER.js @@ -10,7 +10,7 @@ function RATELIMITER() { this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/Misc/RATELIMITER.pickle b/js/Misc/RATELIMITER.pickle index 4902b855..c591b933 100644 --- a/js/Misc/RATELIMITER.pickle +++ b/js/Misc/RATELIMITER.pickle @@ -64,22 +64,23 @@ S'vector' p19 sS'model.dep_ut' p20 -g19 -sS'model.in' +S'vector_boolean' p21 +sS'model.in' +p22 g4 sS'graphics' -p22 +p23 g9 sS'y' -p23 +p24 g19 sS'x' -p24 -NsS'model' p25 +NsS'model' +p26 g9 sS'typ' -p26 +p27 g19 s.
\ No newline at end of file diff --git a/js/Misc/RELATIONALOP.js b/js/Misc/RELATIONALOP.js index f4a8c7a4..ae05feb5 100644 --- a/js/Misc/RELATIONALOP.js +++ b/js/Misc/RELATIONALOP.js @@ -9,7 +9,7 @@ function RELATIONALOP() { this.model.out = new ScilabDouble([1]); this.model.ipar = new ScilabDouble(ipar); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/Misc/RELATIONALOP.pickle b/js/Misc/RELATIONALOP.pickle index 4757e6e6..502f8553 100644 --- a/js/Misc/RELATIONALOP.pickle +++ b/js/Misc/RELATIONALOP.pickle @@ -36,7 +36,7 @@ sS'x.model' p6 NsS'model.dep_ut' p7 -S'vector' +S'vector_boolean' p8 sS'zcr' p9 @@ -47,72 +47,73 @@ p11 g10 sS'out' p12 -g8 -sS'graphics.style' +S'vector' p13 -g8 -sS'x.graphics' +sS'graphics.style' p14 +g13 +sS'x.graphics' +p15 g2 sS'typ' -p15 -g8 -sS'label' p16 +g13 +sS'label' +p17 g5 sS'model.sim' -p17 -S'list' p18 -sS'model.nmode' +S'list' p19 +sS'model.nmode' +p20 g10 sS'in1' -p20 -S'matrix' p21 -sS'model.in' +S'matrix' p22 -g21 -sS'graphics.exprs' +sS'model.in' p23 -g21 -sS'x.graphics.style' +g22 +sS'graphics.exprs' p24 -g8 -sS'model.ipar' +g22 +sS'x.graphics.style' p25 -g8 -sS'model.nzcross' +g13 +sS'model.ipar' p26 +g13 +sS'model.nzcross' +p27 g10 sS'ok' -p27 -S'boolean' p28 -sS'model.blocktype' +S'boolean' p29 +sS'model.blocktype' +p30 g5 sS'rule' -p30 +p31 g10 sS'exprs' -p31 -g21 -sS'gr_i' p32 -g8 -sS'ipar' +g22 +sS'gr_i' p33 -g8 -sS'y' +g13 +sS'ipar' p34 -g8 -sS'x' +g13 +sS'y' p35 -NsS'model' +g13 +sS'x' p36 +NsS'model' +p37 g2 sS'ot' -p37 +p38 Ns.
\ No newline at end of file diff --git a/js/Misc/SPLIT_f.js b/js/Misc/SPLIT_f.js index 77d5ec8a..03991e57 100644 --- a/js/Misc/SPLIT_f.js +++ b/js/Misc/SPLIT_f.js @@ -6,7 +6,7 @@ function SPLIT_f() { this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1],[-1],[-1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.x = new standard_define(new ScilabDouble([1,1]),this.model,[],[]); return new BasicBlock(this.x); } diff --git a/js/Misc/SPLIT_f.pickle b/js/Misc/SPLIT_f.pickle index efab595a..56d46243 100644 --- a/js/Misc/SPLIT_f.pickle +++ b/js/Misc/SPLIT_f.pickle @@ -24,7 +24,7 @@ p3 g2 sS'model.dep_ut' p4 -S'vector' +S'vector_boolean' p5 sS'model.out' p6 @@ -36,14 +36,15 @@ S'double' p9 sS'y' p10 -g5 -sS'x' +S'vector' p11 -NsS'model' +sS'x' p12 -S'object' +NsS'model' p13 -sS'typ' +S'object' p14 -g5 +sS'typ' +p15 +g11 s.
\ No newline at end of file diff --git a/js/Misc/SUPER_f.js b/js/Misc/SUPER_f.js index 459fa92e..42ac935d 100644 --- a/js/Misc/SUPER_f.js +++ b/js/Misc/SUPER_f.js @@ -17,7 +17,7 @@ function SUPER_f() { this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([scs]); this.model.blocktype = new ScilabString(["h"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); return new SuperBlock(this.x); diff --git a/js/Misc/SUPER_f.pickle b/js/Misc/SUPER_f.pickle index 79df2b86..49d8a34f 100644 --- a/js/Misc/SUPER_f.pickle +++ b/js/Misc/SUPER_f.pickle @@ -72,20 +72,21 @@ p21 g6 sS'model.dep_ut' p22 -g16 -sS'out.graphics.sz' +S'vector_boolean' p23 +sS'out.graphics.sz' +p24 g16 sS'gr_i' -p24 +p25 g16 sS'y' -p25 +p26 g16 sS'x' -p26 +p27 g16 sS'model' -p27 +p28 g2 s.
\ No newline at end of file diff --git a/js/Misc/c_block.js b/js/Misc/c_block.js index b59e7773..553a7e12 100644 --- a/js/Misc/c_block.js +++ b/js/Misc/c_block.js @@ -23,7 +23,7 @@ function c_block() { this.model.ipar = new ScilabDouble([0]); this.model.blocktype = new ScilabString([typ]); this.model.firing = new ScilabDouble(auto); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); var label = list([[sci2exp(in1)],[sci2exp(out)],[strcat(sci2exp(this.rpar))],[this.funam]],list([])); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"c_block\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([3,2]),this.model,label,this.gr_i); diff --git a/js/Misc/c_block.pickle b/js/Misc/c_block.pickle index 7f3ad20d..13466587 100644 --- a/js/Misc/c_block.pickle +++ b/js/Misc/c_block.pickle @@ -50,100 +50,101 @@ p10 g5 sS'model.dep_ut' p11 -g3 -sS'funam' +S'vector_boolean' p12 -S'string' +sS'funam' p13 -sS'out' +S'string' p14 +sS'out' +p15 g9 sS'ni' -p15 +p16 g9 sS'clkin' -p16 +p17 g3 sS'x.graphics' -p17 +p18 g5 sS'z0' -p18 +p19 g3 sS'tt' -p19 +p20 g3 sS'label' -p20 -S'list' p21 -sS'model.evtin' +S'list' p22 +sS'model.evtin' +p23 g3 sS'model.firing' -p23 +p24 g3 sS'model.sim' -p24 -g21 -sS'model.evtout' p25 +g22 +sS'model.evtout' +p26 g3 sS'clkout' -p26 +p27 g3 sS'auto' -p27 +p28 g3 sS'label[2-1]' -p28 +p29 g3 sS'in1' -p29 +p30 g9 sS'model.rpar' -p30 +p31 g3 sS'model.state' -p31 +p32 g3 sS'model.in' -p32 +p33 g9 sS'graphics.exprs' -p33 -NsS'x0' p34 +NsS'x0' +p35 g3 sS'model.ipar' -p35 +p36 g9 sS'typ' -p36 -g13 -sS'model.blocktype' p37 -g13 -sS'i' +g14 +sS'model.blocktype' p38 +g14 +sS'i' +p39 g9 sS'model.sim[1-1]' -p39 -NsS'no' p40 +NsS'no' +p41 g9 sS'o' -p41 +p42 g9 sS'gr_i' -p42 +p43 g3 sS'y' -p43 +p44 g3 sS'x' -p44 -NsS'model' p45 +NsS'model' +p46 g5 s.
\ No newline at end of file diff --git a/js/Misc/fortran_block.js b/js/Misc/fortran_block.js index 967e4c44..7b7c2e6e 100644 --- a/js/Misc/fortran_block.js +++ b/js/Misc/fortran_block.js @@ -13,7 +13,7 @@ function fortran_block() { this.model.ipar = new ScilabDouble([0]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.funam = "forty"; var label = list([[sci2exp(this.model.in)],[sci2exp(this.model.out)],[strcat(sci2exp(this.model.rpar))],[this.funam]],list([])); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"fortran_block\",sz(1),sz(2));"]); diff --git a/js/Misc/fortran_block.pickle b/js/Misc/fortran_block.pickle index ae20469d..46dede38 100644 --- a/js/Misc/fortran_block.pickle +++ b/js/Misc/fortran_block.pickle @@ -50,79 +50,80 @@ p10 g5 sS'model.dep_ut' p11 -g3 -sS'model.out' +S'vector_boolean' p12 -S'double' +sS'model.out' p13 -sS'ni' +S'double' p14 -g13 -sS'x.graphics' +sS'ni' p15 +g14 +sS'x.graphics' +p16 g5 sS'tt' -p16 +p17 g3 sS'label' -p17 -S'list' p18 -sS'model.evtin' +S'list' p19 +sS'model.evtin' +p20 g3 sS'model.firing' -p20 +p21 g3 sS'model.sim' -p21 -g18 -sS'model.evtout' p22 +g19 +sS'model.evtout' +p23 g3 sS'label[2-1]' -p23 +p24 g3 sS'model.rpar' -p24 +p25 g3 sS'model.state' -p25 +p26 g3 sS'model.in' -p26 -g13 -sS'graphics.exprs' p27 -NsS'model.ipar' +g14 +sS'graphics.exprs' p28 -g13 -sS'typ' +NsS'model.ipar' p29 +g14 +sS'typ' +p30 g3 sS'model.blocktype' -p30 +p31 g9 sS'i' -p31 -g13 -sS'model.sim[1-1]' p32 -NsS'no' +g14 +sS'model.sim[1-1]' p33 -g13 -sS'o' +NsS'no' p34 -g13 -sS'gr_i' +g14 +sS'o' p35 +g14 +sS'gr_i' +p36 g3 sS'y' -p36 +p37 g3 sS'x' -p37 -NsS'model' p38 +NsS'model' +p39 g5 s.
\ No newline at end of file diff --git a/js/Misc/func_block.js b/js/Misc/func_block.js index 2f3e5b02..54bc297f 100644 --- a/js/Misc/func_block.js +++ b/js/Misc/func_block.js @@ -6,7 +6,7 @@ function func_block() { this.model.in = new ScilabDouble([1]); this.model.out = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/Misc/func_block.pickle b/js/Misc/func_block.pickle index e1643722..319aa2a4 100644 --- a/js/Misc/func_block.pickle +++ b/js/Misc/func_block.pickle @@ -37,7 +37,7 @@ sS'graphics.exprs' p9 NsS'model.dep_ut' p10 -S'vector' +S'vector_boolean' p11 sS'exprs' p12 @@ -46,23 +46,24 @@ sS'x.model' p13 NsS'gr_i' p14 -g11 -sS'model.in' +S'vector' p15 +sS'model.in' +p16 g4 sS'graphics' -p16 +p17 g7 sS'y' -p17 -g11 -sS'x' p18 +g15 +sS'x' +p19 g7 sS'model' -p19 +p20 g7 sS'typ' -p20 -g11 +p21 +g15 s.
\ No newline at end of file diff --git a/js/Misc/generic_block.js b/js/Misc/generic_block.js index 0fdb51e9..e6e9b94d 100644 --- a/js/Misc/generic_block.js +++ b/js/Misc/generic_block.js @@ -15,7 +15,7 @@ function generic_block() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -116,7 +116,7 @@ function generic_block() { this.model.rpar = new ScilabDouble(this.rpar); this.model.ipar = new ScilabDouble([this.ipar]); this.model.firing = new ScilabDouble([this.auto0]); - this.model.dep_ut = new ScilabDouble(dep_ut); + this.model.dep_ut = new ScilabBoolean(dep_ut); this.graphics.exprs = new ScilabDouble([label]); break; } diff --git a/js/Misc/generic_block.pickle b/js/Misc/generic_block.pickle index 849d6c9d..513f1e77 100644 --- a/js/Misc/generic_block.pickle +++ b/js/Misc/generic_block.pickle @@ -68,101 +68,102 @@ p10 g2 sS'model.dep_ut' p11 -g8 -sS'model.out' +S'vector_boolean' p12 +sS'model.out' +p13 g2 sS'model.dstate' -p13 +p14 g8 sS'label' -p14 -S'matrix' p15 -sS'model.evtin' +S'matrix' p16 +sS'model.evtin' +p17 g8 sS'model.firing' -p17 +p18 g8 sS'function_name' -p18 -S'string' p19 -sS'model.sim' +S'string' p20 -S'list' +sS'model.sim' p21 -sS'model.evtout' +S'list' p22 +sS'model.evtout' +p23 g8 sS'arg1.graphics' -p23 +p24 g5 sS'model.rpar' -p24 +p25 g8 sS'model.state' -p25 +p26 g8 sS'model.in' -p26 +p27 g2 sS'graphics' -p27 +p28 g5 sS'model.ipar' -p28 +p29 g8 sS'typ' -p29 +p30 g8 sS'needcompile' -p30 +p31 g2 sS'arg1.model' -p31 -NsS'label[9-1]' p32 +NsS'label[9-1]' +p33 g8 sS'ok' -p33 -S'boolean' p34 -sS'model.blocktype' +S'boolean' p35 -g19 -sS'i' +sS'model.blocktype' p36 +g20 +sS'i' +p37 g2 sS'o' -p37 +p38 g2 sS'depu' -p38 -g34 -sS'dept' p39 -g34 -sS'gr_i' +g35 +sS'dept' p40 +g35 +sS'gr_i' +p41 g8 sS'ipar' -p41 +p42 g2 sS'y' -p42 +p43 g8 sS'x' -p43 +p44 g5 sS'model' -p44 +p45 g5 sS'z' -p45 -g8 -sS'dep_ut' p46 g8 +sS'dep_ut' +p47 +g12 s.
\ No newline at end of file diff --git a/js/Misc/generic_block2.js b/js/Misc/generic_block2.js index 2c6a2465..4803ee3b 100644 --- a/js/Misc/generic_block2.js +++ b/js/Misc/generic_block2.js @@ -15,7 +15,7 @@ function generic_block2() { this.model.ipar = new ScilabDouble([]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -122,7 +122,7 @@ function generic_block2() { this.model.firing = new ScilabDouble([this.auto0]); this.model.nzcross = new ScilabDouble([this.nzcr]); this.model.nmode = new ScilabDouble([this.nmode]); - this.model.dep_ut = new ScilabDouble(dep_ut); + this.model.dep_ut = new ScilabBoolean(dep_ut); this.graphics.exprs = new ScilabDouble([label]); break; } diff --git a/js/Misc/generic_block2.pickle b/js/Misc/generic_block2.pickle index 319e7b7a..bb97a8e9 100644 --- a/js/Misc/generic_block2.pickle +++ b/js/Misc/generic_block2.pickle @@ -72,105 +72,106 @@ p10 g2 sS'model.dep_ut' p11 -g8 -sS'model.out' +S'vector_boolean' p12 +sS'model.out' +p13 g2 sS'model.dstate' -p13 +p14 g8 sS'model.nzcross' -p14 -NsS'label' p15 -S'matrix' +NsS'label' p16 -sS'model.evtin' +S'matrix' p17 +sS'model.evtin' +p18 g8 sS'model.firing' -p18 +p19 g8 sS'function_name' -p19 -S'string' p20 -sS'model.sim' +S'string' p21 -S'list' +sS'model.sim' p22 -sS'model.evtout' +S'list' p23 +sS'model.evtout' +p24 g8 sS'arg1.graphics' -p24 +p25 g5 sS'model.nmode' -p25 -NsS'model.rpar' p26 +NsS'model.rpar' +p27 g8 sS'model.state' -p27 +p28 g8 sS'model.in' -p28 +p29 g2 sS'graphics' -p29 +p30 g5 sS'model.ipar' -p30 +p31 g8 sS'typ' -p31 +p32 g8 sS'needcompile' -p32 +p33 g2 sS'arg1.model' -p33 -NsS'label[9-1]' p34 +NsS'label[9-1]' +p35 g8 sS'ok' -p35 -S'boolean' p36 -sS'model.blocktype' +S'boolean' p37 -g20 -sS'i' +sS'model.blocktype' p38 +g21 +sS'i' +p39 g2 sS'o' -p39 +p40 g2 sS'depu' -p40 -g36 -sS'dept' p41 -g36 -sS'gr_i' +g37 +sS'dept' p42 +g37 +sS'gr_i' +p43 g8 sS'ipar' -p43 +p44 g2 sS'y' -p44 +p45 g8 sS'x' -p45 +p46 g5 sS'model' -p46 +p47 g5 sS'z' -p47 -g8 -sS'dep_ut' p48 g8 +sS'dep_ut' +p49 +g12 s.
\ No newline at end of file diff --git a/js/Misc/generic_block3.js b/js/Misc/generic_block3.js index 7069e702..ce288c44 100644 --- a/js/Misc/generic_block3.js +++ b/js/Misc/generic_block3.js @@ -11,7 +11,7 @@ function generic_block3() { this.model.out = new ScilabDouble([1]); this.model.out2 = new ScilabDouble([1]); this.model.outtyp = new ScilabDouble([1]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -134,7 +134,7 @@ function generic_block3() { this.model.firing = new ScilabDouble([this.auto0]); this.model.nzcross = new ScilabDouble([this.nzcr]); this.model.nmode = new ScilabDouble([this.nmode]); - this.model.dep_ut = new ScilabDouble(dep_ut); + this.model.dep_ut = new ScilabBoolean(dep_ut); this.graphics.exprs = new ScilabDouble([label]); break; } diff --git a/js/Misc/generic_block3.pickle b/js/Misc/generic_block3.pickle index c5385ec3..fd3f0643 100644 --- a/js/Misc/generic_block3.pickle +++ b/js/Misc/generic_block3.pickle @@ -155,32 +155,33 @@ S'boolean' p39 sS'model.dep_ut' p40 -g9 -sS'depu' +S'vector_boolean' p41 +sS'depu' +p42 g39 sS'dept' -p42 +p43 g39 sS'gr_i' -p43 +p44 g9 sS'ipar' -p44 +p45 g3 sS'y' -p45 +p46 g9 sS'x' -p46 +p47 g6 sS'model' -p47 +p48 g6 sS'z' -p48 -g9 -sS'dep_ut' p49 g9 +sS'dep_ut' +p50 +g41 s.
\ No newline at end of file diff --git a/js/Misc/scifunc_block.js b/js/Misc/scifunc_block.js index 78a820fb..f3d4ae44 100644 --- a/js/Misc/scifunc_block.js +++ b/js/Misc/scifunc_block.js @@ -23,7 +23,7 @@ function scifunc_block() { this.model.opar = list(); this.model.blocktype = new ScilabString([typ]); this.model.firing = new ScilabDouble(auto); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = list([[sci2exp(in1)],[sci2exp(out)],[sci2exp(clkin)],[sci2exp(clkout)],[strcat(sci2exp(x0))],[strcat(sci2exp(z0))],[strcat(sci2exp(this.rpar))],[sci2exp(auto)]],list("y1=sin(u1)"," "," ","y1=sin(u1)"," "," "," ")); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"scifunc_block\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); diff --git a/js/Misc/scifunc_block.pickle b/js/Misc/scifunc_block.pickle index a978a296..a210afd7 100644 --- a/js/Misc/scifunc_block.pickle +++ b/js/Misc/scifunc_block.pickle @@ -60,125 +60,126 @@ p10 g9 sS'model.dep_ut' p11 -g9 -sS'model.out' +S'vector_boolean' p12 +sS'model.out' +p13 g3 sS'model.dstate' -p13 +p14 g9 sS'out' -p14 +p15 g3 sS'ni' -p15 +p16 g3 sS'model.ipar' -p16 +p17 g3 sS'clkin' -p17 +p18 g9 sS'dep_ut[2-1]' -p18 -S'boolean' p19 -sS'no' +S'boolean' p20 +sS'no' +p21 g3 sS'z0' -p21 +p22 g9 sS'auto' -p22 +p23 g9 sS'model.evtin' -p23 +p24 g9 sS'exprs[2-1]' -p24 -NsS'model.firing' p25 +NsS'model.firing' +p26 g9 sS'model.sim' -p26 -S'list' p27 -sS'model.evtout' +S'list' p28 +sS'model.evtout' +p29 g9 sS'clkout' -p29 +p30 g9 sS'exprs[1-1][9-1]' -p30 -S'string' p31 -sS'in1' +S'string' p32 +sS'in1' +p33 g3 sS'model.rpar' -p33 +p34 g9 sS'nci' -p34 +p35 g3 sS'model.state' -p35 +p36 g9 sS'model.in' -p36 +p37 g3 sS'nco' -p37 +p38 g3 sS'x0' -p38 +p39 g9 sS'nrp' -p39 +p40 g3 sS'typ' -p40 -g31 -sS'model.opar' p41 -g27 -sS'needcompile' +g32 +sS'model.opar' p42 +g28 +sS'needcompile' +p43 g3 sS'model.blocktype' -p43 -g31 -sS'i' p44 +g32 +sS'i' +p45 g3 sS'x.graphics' -p45 +p46 g6 sS'x.model' -p46 +p47 g6 sS'o' -p47 +p48 g3 sS'exprs' -p48 -g27 -sS'gr_i' p49 +g28 +sS'gr_i' +p50 g9 sS'graphics.exprs' -p50 -NsS'y' p51 +NsS'y' +p52 g9 sS'x' -p52 -NsS'model' p53 +NsS'model' +p54 g6 sS'z' -p54 +p55 g9 s.
\ No newline at end of file diff --git a/js/Misc/scifunc_block_m.js b/js/Misc/scifunc_block_m.js index 81aa97da..1933c3b0 100644 --- a/js/Misc/scifunc_block_m.js +++ b/js/Misc/scifunc_block_m.js @@ -28,7 +28,7 @@ function scifunc_block_m() { this.model.opar = list(); this.model.blocktype = new ScilabString([typ]); this.model.firing = new ScilabDouble(auto); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = list([[sci2exp([in1,in1])],[sci2exp([out,out])],[sci2exp(clkin)],[sci2exp(clkout)],[strcat(sci2exp(x0))],[strcat(sci2exp(z0))],[strcat(sci2exp(this.rpar))],[sci2exp(auto)],[sci2exp(0)]],list("y1=sin(u1)"," "," ","y1=sin(u1)"," "," "," ")); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"scifunc_block_m\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); diff --git a/js/Misc/scifunc_block_m.pickle b/js/Misc/scifunc_block_m.pickle index 4d8da05c..fcb53d49 100644 --- a/js/Misc/scifunc_block_m.pickle +++ b/js/Misc/scifunc_block_m.pickle @@ -170,24 +170,25 @@ p49 g6 sS'model.dep_ut' p50 -g10 -sS'exprs' +S'vector_boolean' p51 +sS'exprs' +p52 g27 sS'gr_i' -p52 +p53 g10 sS'graphics.exprs' -p53 -NsS'y' p54 +NsS'y' +p55 g10 sS'x' -p55 -NsS'model' p56 +NsS'model' +p57 g6 sS'ot' -p57 +p58 g3 s.
\ No newline at end of file diff --git a/js/NonLinear/ABSBLK_f.js b/js/NonLinear/ABSBLK_f.js index 5425305b..39e5984c 100644 --- a/js/NonLinear/ABSBLK_f.js +++ b/js/NonLinear/ABSBLK_f.js @@ -6,7 +6,7 @@ function ABSBLK_f() { this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); return new BasicBlock(this.x); diff --git a/js/NonLinear/ABSBLK_f.pickle b/js/NonLinear/ABSBLK_f.pickle index 71de1bca..096b22c4 100644 --- a/js/NonLinear/ABSBLK_f.pickle +++ b/js/NonLinear/ABSBLK_f.pickle @@ -25,7 +25,7 @@ S'string' p4 sS'model.dep_ut' p5 -S'vector' +S'vector_boolean' p6 sS'model.out' p7 @@ -33,20 +33,21 @@ S'double' p8 sS'gr_i' p9 -g6 -sS'model.in' +S'vector' p10 +sS'model.in' +p11 g8 sS'y' -p11 -g6 -sS'x' p12 -NsS'model' +g10 +sS'x' p13 -S'object' +NsS'model' p14 -sS'typ' +S'object' p15 -g6 +sS'typ' +p16 +g10 s.
\ No newline at end of file diff --git a/js/NonLinear/ABS_VALUE.js b/js/NonLinear/ABS_VALUE.js index 72816ca7..01c6d20c 100644 --- a/js/NonLinear/ABS_VALUE.js +++ b/js/NonLinear/ABS_VALUE.js @@ -9,7 +9,7 @@ function ABS_VALUE() { this.model.nzcross = new ScilabDouble([nu]); this.model.nmode = new ScilabDouble([nu]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/NonLinear/ABS_VALUE.pickle b/js/NonLinear/ABS_VALUE.pickle index e31d1d91..ee9bd886 100644 --- a/js/NonLinear/ABS_VALUE.pickle +++ b/js/NonLinear/ABS_VALUE.pickle @@ -43,37 +43,38 @@ p11 g4 sS'model.dep_ut' p12 -S'vector' +S'vector_boolean' p13 sS'model.nzcross' p14 g4 sS'exprs' p15 -g13 -sS'x.model' +S'vector' p16 -NsS'gr_i' +sS'x.model' p17 -g13 -sS'model.in' +NsS'gr_i' p18 +g16 +sS'model.in' +p19 g4 sS'graphics' -p19 +p20 g8 sS'y' -p20 -g13 -sS'x' p21 -NsS'model' +g16 +sS'x' p22 +NsS'model' +p23 g8 sS'typ' -p23 -g13 -sS'nu' p24 +g16 +sS'nu' +p25 g4 s.
\ No newline at end of file diff --git a/js/NonLinear/COSBLK_f.js b/js/NonLinear/COSBLK_f.js index 82d79ff8..ad166e28 100644 --- a/js/NonLinear/COSBLK_f.js +++ b/js/NonLinear/COSBLK_f.js @@ -7,7 +7,7 @@ function COSBLK_f() { this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); return new BasicBlock(this.x); diff --git a/js/NonLinear/COSBLK_f.pickle b/js/NonLinear/COSBLK_f.pickle index f0c888ff..2e1f9573 100644 --- a/js/NonLinear/COSBLK_f.pickle +++ b/js/NonLinear/COSBLK_f.pickle @@ -28,27 +28,28 @@ S'double' p5 sS'model.dep_ut' p6 -S'vector' +S'vector_boolean' p7 sS'model.out' p8 g5 sS'gr_i' p9 -g7 -sS'model.in' +S'vector' p10 +sS'model.in' +p11 g5 sS'y' -p11 -g7 -sS'x' p12 -NsS'model' +g10 +sS'x' p13 -S'object' +NsS'model' p14 -sS'typ' +S'object' p15 -g7 +sS'typ' +p16 +g10 s.
\ No newline at end of file diff --git a/js/NonLinear/DLRADAPT_f.js b/js/NonLinear/DLRADAPT_f.js index b474db34..7283dc3b 100644 --- a/js/NonLinear/DLRADAPT_f.js +++ b/js/NonLinear/DLRADAPT_f.js @@ -17,7 +17,7 @@ function DLRADAPT_f() { this.model.ipar = new ScilabDouble([0],[2],[2]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/NonLinear/DLRADAPT_f.pickle b/js/NonLinear/DLRADAPT_f.pickle index c072ce90..62e07275 100644 --- a/js/NonLinear/DLRADAPT_f.pickle +++ b/js/NonLinear/DLRADAPT_f.pickle @@ -101,22 +101,23 @@ p28 g9 sS'model.dep_ut' p29 -g14 -sS'p' +S'vector_boolean' p30 +sS'p' +p31 g2 sS'gr_i' -p31 +p32 g14 sS'ipar' -p32 +p33 g2 sS'y' -p33 +p34 g14 sS'x' -p34 -NsS'model' p35 +NsS'model' +p36 g4 s.
\ No newline at end of file diff --git a/js/NonLinear/EXPBLK_f.js b/js/NonLinear/EXPBLK_f.js index 5e0bc5b4..3cd716fa 100644 --- a/js/NonLinear/EXPBLK_f.js +++ b/js/NonLinear/EXPBLK_f.js @@ -9,7 +9,7 @@ function EXPBLK_f() { this.model.out = new ScilabDouble([-1]); this.model.rpar = new ScilabDouble([this.a]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/NonLinear/EXPBLK_f.pickle b/js/NonLinear/EXPBLK_f.pickle index 7c9a0548..1c9e152a 100644 --- a/js/NonLinear/EXPBLK_f.pickle +++ b/js/NonLinear/EXPBLK_f.pickle @@ -58,22 +58,23 @@ p16 g14 sS'model.dep_ut' p17 -g14 -sS'model.in' +S'vector_boolean' p18 +sS'model.in' +p19 g2 sS'graphics' -p19 +p20 g8 sS'y' -p20 +p21 g14 sS'x' -p21 -NsS'model' p22 +NsS'model' +p23 g8 sS'typ' -p23 +p24 g14 s.
\ No newline at end of file diff --git a/js/NonLinear/EXPBLK_m.js b/js/NonLinear/EXPBLK_m.js index 0cb66b96..55185a54 100644 --- a/js/NonLinear/EXPBLK_m.js +++ b/js/NonLinear/EXPBLK_m.js @@ -13,7 +13,7 @@ function EXPBLK_m() { this.model.outtyp = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.a]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/NonLinear/EXPBLK_m.pickle b/js/NonLinear/EXPBLK_m.pickle index 37d444a7..2294f50d 100644 --- a/js/NonLinear/EXPBLK_m.pickle +++ b/js/NonLinear/EXPBLK_m.pickle @@ -74,19 +74,20 @@ S'string' p22 sS'model.dep_ut' p23 -g16 -sS'exprs' +S'vector_boolean' p24 +sS'exprs' +p25 g16 sS'gr_i' -p25 +p26 g16 sS'model.outtyp' -p26 +p27 g6 sS'x' -p27 -NsS'model' p28 +NsS'model' +p29 g2 s.
\ No newline at end of file diff --git a/js/NonLinear/FSV_f.js b/js/NonLinear/FSV_f.js index 5a6f7046..364dd488 100644 --- a/js/NonLinear/FSV_f.js +++ b/js/NonLinear/FSV_f.js @@ -7,7 +7,7 @@ function FSV_f() { this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([in1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/NonLinear/FSV_f.pickle b/js/NonLinear/FSV_f.pickle index 60656cd6..112c3884 100644 --- a/js/NonLinear/FSV_f.pickle +++ b/js/NonLinear/FSV_f.pickle @@ -32,27 +32,28 @@ S'double' p7 sS'model.dep_ut' p8 -S'vector' +S'vector_boolean' p9 sS'model.out' p10 g7 sS'gr_i' p11 -g9 -sS'model.in' +S'vector' p12 +sS'model.in' +p13 g7 sS'y' -p13 -g9 -sS'x' p14 -NsS'model' +g12 +sS'x' p15 -S'object' +NsS'model' p16 -sS'typ' +S'object' p17 -g9 +sS'typ' +p18 +g12 s.
\ No newline at end of file diff --git a/js/NonLinear/INTRP2BLK_f.js b/js/NonLinear/INTRP2BLK_f.js index 5cb4604d..5cf1f22f 100644 --- a/js/NonLinear/INTRP2BLK_f.js +++ b/js/NonLinear/INTRP2BLK_f.js @@ -11,7 +11,7 @@ function INTRP2BLK_f() { this.model.rpar = new ScilabDouble([this.a],[this.b],[this.c.slice()]); this.model.ipar = new ScilabDouble([2],[2]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/NonLinear/INTRP2BLK_f.pickle b/js/NonLinear/INTRP2BLK_f.pickle index a21e3536..de096504 100644 --- a/js/NonLinear/INTRP2BLK_f.pickle +++ b/js/NonLinear/INTRP2BLK_f.pickle @@ -62,29 +62,30 @@ S'vector' p17 sS'model.dep_ut' p18 -g17 -sS'model.in' +S'vector_boolean' p19 +sS'model.in' +p20 g2 sS'graphics' -p20 +p21 g10 sS'y' -p21 +p22 g17 sS'x' -p22 -NsS'model' p23 +NsS'model' +p24 g10 sS'model.ipar' -p24 +p25 g2 sS'typ' -p25 +p26 g17 sS'model.out' -p26 -S'double' p27 +S'double' +p28 s.
\ No newline at end of file diff --git a/js/NonLinear/INTRPLBLK_f.js b/js/NonLinear/INTRPLBLK_f.js index a990bbb1..e9347b2c 100644 --- a/js/NonLinear/INTRPLBLK_f.js +++ b/js/NonLinear/INTRPLBLK_f.js @@ -9,7 +9,7 @@ function INTRPLBLK_f() { this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.a],[this.b]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/NonLinear/INTRPLBLK_f.pickle b/js/NonLinear/INTRPLBLK_f.pickle index e482b97d..5699e56b 100644 --- a/js/NonLinear/INTRPLBLK_f.pickle +++ b/js/NonLinear/INTRPLBLK_f.pickle @@ -60,22 +60,23 @@ S'vector' p17 sS'model.dep_ut' p18 -g17 -sS'model.in' +S'vector_boolean' p19 +sS'model.in' +p20 g6 sS'graphics' -p20 +p21 g10 sS'y' -p21 +p22 g17 sS'x' -p22 -NsS'model' p23 +NsS'model' +p24 g10 sS'typ' -p24 +p25 g17 s.
\ No newline at end of file diff --git a/js/NonLinear/INVBLK.js b/js/NonLinear/INVBLK.js index 1906beb7..a86b86d4 100644 --- a/js/NonLinear/INVBLK.js +++ b/js/NonLinear/INVBLK.js @@ -7,7 +7,7 @@ function INVBLK() { this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([in1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/NonLinear/INVBLK.pickle b/js/NonLinear/INVBLK.pickle index 60656cd6..112c3884 100644 --- a/js/NonLinear/INVBLK.pickle +++ b/js/NonLinear/INVBLK.pickle @@ -32,27 +32,28 @@ S'double' p7 sS'model.dep_ut' p8 -S'vector' +S'vector_boolean' p9 sS'model.out' p10 g7 sS'gr_i' p11 -g9 -sS'model.in' +S'vector' p12 +sS'model.in' +p13 g7 sS'y' -p13 -g9 -sS'x' p14 -NsS'model' +g12 +sS'x' p15 -S'object' +NsS'model' p16 -sS'typ' +S'object' p17 -g9 +sS'typ' +p18 +g12 s.
\ No newline at end of file diff --git a/js/NonLinear/INVBLK_f.js b/js/NonLinear/INVBLK_f.js index 6383212c..1e344ded 100644 --- a/js/NonLinear/INVBLK_f.js +++ b/js/NonLinear/INVBLK_f.js @@ -7,7 +7,7 @@ function INVBLK_f() { this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([in1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/NonLinear/INVBLK_f.pickle b/js/NonLinear/INVBLK_f.pickle index ddc91776..1e6ab305 100644 --- a/js/NonLinear/INVBLK_f.pickle +++ b/js/NonLinear/INVBLK_f.pickle @@ -31,27 +31,28 @@ S'double' p6 sS'model.dep_ut' p7 -S'vector' +S'vector_boolean' p8 sS'model.out' p9 g6 sS'gr_i' p10 -g8 -sS'model.in' +S'vector' p11 +sS'model.in' +p12 g6 sS'y' -p12 -g8 -sS'x' p13 -NsS'model' +g11 +sS'x' p14 -S'object' +NsS'model' p15 -sS'typ' +S'object' p16 -g8 +sS'typ' +p17 +g11 s.
\ No newline at end of file diff --git a/js/NonLinear/LOGBLK_f.js b/js/NonLinear/LOGBLK_f.js index 6dffed6f..e2b14f15 100644 --- a/js/NonLinear/LOGBLK_f.js +++ b/js/NonLinear/LOGBLK_f.js @@ -9,7 +9,7 @@ function LOGBLK_f() { this.model.out = new ScilabDouble([-1]); this.model.rpar = new ScilabDouble([this.a]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/NonLinear/LOGBLK_f.pickle b/js/NonLinear/LOGBLK_f.pickle index 952da34c..ebd0f47d 100644 --- a/js/NonLinear/LOGBLK_f.pickle +++ b/js/NonLinear/LOGBLK_f.pickle @@ -58,22 +58,23 @@ S'vector' p16 sS'model.dep_ut' p17 -g16 -sS'model.in' +S'vector_boolean' p18 +sS'model.in' +p19 g2 sS'graphics' -p19 +p20 g8 sS'y' -p20 +p21 g16 sS'x' -p21 -NsS'model' p22 +NsS'model' +p23 g8 sS'typ' -p23 +p24 g16 s.
\ No newline at end of file diff --git a/js/NonLinear/LOOKUP2D.js b/js/NonLinear/LOOKUP2D.js index db6d365e..a733a55b 100644 --- a/js/NonLinear/LOOKUP2D.js +++ b/js/NonLinear/LOOKUP2D.js @@ -15,7 +15,7 @@ function LOOKUP2D() { this.model.rpar = new ScilabDouble([this.xx.slice()],[this.yy.slice()],[this.zz.slice()]); this.model.ipar = new ScilabDouble([Nx],[Ny],[this.Method]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.exprs = list(strcat(sci2exp(this.xx)),strcat(sci2exp(this.yy)),strcat(sci2exp(this.zz)),sci2exp(this.Method),Graf); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOOKUP2D\",sz(1),sz(2));"]); this.x = new standard_define(new ScilabDouble([2.5,2]),this.model,this.exprs,this.gr_i); diff --git a/js/NonLinear/LOOKUP2D.pickle b/js/NonLinear/LOOKUP2D.pickle index e4356e53..d2caff95 100644 --- a/js/NonLinear/LOOKUP2D.pickle +++ b/js/NonLinear/LOOKUP2D.pickle @@ -119,27 +119,28 @@ sS'x.model' p36 NsS'model.dep_ut' p37 -g11 -sS'exprs' +S'vector_boolean' p38 +sS'exprs' +p39 g23 sS'gr_i' -p39 +p40 g11 sS'mtd' -p40 +p41 g8 sS'graphics.exprs' -p41 -NsS'y' p42 +NsS'y' +p43 g11 sS'x' -p43 -NsS'model' p44 +NsS'model' +p45 g4 sS'graf' -p45 +p46 g2 s.
\ No newline at end of file diff --git a/js/NonLinear/LOOKUP_c.js b/js/NonLinear/LOOKUP_c.js index 08f1ddb5..46efa138 100644 --- a/js/NonLinear/LOOKUP_c.js +++ b/js/NonLinear/LOOKUP_c.js @@ -17,7 +17,7 @@ function LOOKUP_c() { this.model.rpar = new ScilabDouble([this.xx.slice()],[this.yy.slice()]); this.model.ipar = new ScilabDouble([N],[this.Method],[0],[0]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.model.evtin = new ScilabDouble([]); this.model.evtout = new ScilabDouble([]); this.model.firing = new ScilabDouble([0]); diff --git a/js/NonLinear/LOOKUP_c.pickle b/js/NonLinear/LOOKUP_c.pickle index e6e522ce..3f78747d 100644 --- a/js/NonLinear/LOOKUP_c.pickle +++ b/js/NonLinear/LOOKUP_c.pickle @@ -322,555 +322,556 @@ sS'x.model' p63 NsS'model.dep_ut' p64 -g2 -sS'menu_s' +S'vector_boolean' p65 +sS'menu_s' +p66 g2 sS'Sawt1_exprs' -p66 -NsS'sample4' p67 +NsS'sample4' +p68 g2 sS'sTp2' -p68 +p69 g2 sS'x' -p69 +p70 g7 sS'x12' -p70 +p71 g4 sS'exprs[1-1]' -p71 +p72 g4 sS'points.data' -p72 +p73 g2 sS'j' -p73 +p74 g4 sS'x11' -p74 +p75 g4 sS'arg1' -p75 +p76 g19 sS'Pd3' -p76 +p77 g2 sS't3' -p77 +p78 g4 sS'ey' -p78 +p79 g7 sS'ex' -p79 +p80 g7 sS'xmn1' -p80 +p81 g7 sS'sAmp' -p81 +p82 g2 sS'a.children[2-1]' -p82 +p83 g19 sS'sample5' -p83 +p84 g2 sS'a.title.font_style' -p84 +p85 g7 sS'y2' -p85 +p86 g4 sS'orpar' -p86 +p87 g2 sS'x.graphics' -p87 +p88 g19 sS'menu_d' -p88 +p89 g2 sS'menu_e' -p89 +p90 g2 sS'A[j+1-1][i+N-1]' -p90 +p91 g7 sS'a.children[1-1]' -p91 +p92 g19 sS'y1p' -p92 +p93 g7 sS'r' -p93 +p94 g4 sS'seed4' -p94 +p95 g2 sS'seed5' -p95 +p96 g2 sS'B[j+1-1]' -p96 +p97 g7 sS'model.evtin' -p97 +p98 g2 sS'y21' -p98 +p99 g4 sS'menu_t' -p99 +p100 g2 sS'menu_r' -p100 +p101 g2 sS'PO' -p101 +p102 g7 sS'x22' -p102 +p103 g4 sS'C' -p103 +p104 g2 sS'DChange' -p104 +p105 g11 sS'Cformat' -p105 +p106 g4 sS'Q[i+N-1][i-1]' -p106 +p107 g7 sS'rep' -p107 +p108 g7 sS'model.out2' -p108 +p109 g7 sS'xy[N-1][2-1]' -p109 +p110 g7 sS'sTp' -p110 +p111 g2 sS'wp' -p111 +p112 g2 sS'New_methhod' -p112 +p113 g7 sS'PeridicOption' -p113 +p114 g7 sS'Graf' -p114 +p115 g4 sS'Q' -p115 +p116 g7 sS'ok' -p116 +p117 g11 sS'ly11' -p117 +p118 g7 sS'xy[k-1].slice()' -p118 +p119 g2 sS'Z' -p119 +p120 g2 sS'Cmenu' -p120 +p121 g4 sS'periodicoption' -p121 +p122 g7 sS'w' -p122 +p123 g4 sS'random_u_exprs2' -p123 +p124 g33 sS'model.outtyp' -p124 +p125 g7 sS'A[j+1-1][i+2*N-1]' -p125 +p126 g7 sS'YMN' -p126 +p127 g7 sS'Q[i-1][i+N-1]' -p127 +p128 g7 sS'y11' -p128 +p129 g4 sS'x2p' -p129 +p130 g7 sS'y12' -p130 +p131 g4 sS'NC' -p131 +p132 g7 sS'xyt' -p132 +p133 g2 sS'xo' -p133 +p134 g27 sS'ipar[2-1]' -p134 +p135 g7 sS'xc' -p135 +p136 g7 sS'extrapo' -p136 +p137 g7 sS'offset' -p137 +p138 g2 sS'splines.data' -p138 +p139 g2 sS'perop' -p139 +p140 g4 sS'xe' -p140 +p141 g7 sS'Y' -p141 +p142 g27 sS'xx' -p142 +p143 g27 sS'xy' -p143 +p144 g2 sS'btn' -p144 +p145 g7 sS'xye' -p145 +p146 g2 sS'SaveExit' -p146 +p147 g11 sS'xp' -p147 +p148 g7 sS'Method' -p148 +p149 g7 sS'xt' -p149 +p150 g27 sS'xyo' -p150 +p151 g2 sS'Q[i-1][i-1]' -p151 +p152 g7 sS'ystR' -p152 +p153 g7 sS'A[j-1][i+2*N-1]' -p153 +p154 g7 sS'ipar[4-1]' -p154 +p155 g7 sS'px' -p155 +p156 g7 sS'py' -p156 +p157 g7 sS'splines' -p157 -NsS'tok' p158 +NsS'tok' +p159 g11 sS'ixy' -p159 +p160 g2 sS'rect' -p160 +p161 g27 sS'NP' -p161 +p162 g7 sS'Amp' -p162 +p163 g2 sS'exprs[2-1]' -p163 +p164 g7 sS'model.firing' -p164 +p165 g7 sS'xy2' -p165 +p166 g2 sS'B' -p166 +p167 g7 sS'A' -p167 +p168 g7 sS'yenC' -p168 +p169 g4 sS'N' -p169 +p170 g7 sS'random_u_exprs' -p170 +p171 g33 sS'Sawt2_exprs' -p171 -NsS'XMX' p172 +NsS'XMX' +p173 g7 sS'a.x_ticks' -p173 +p174 g19 sS'model.in' -p174 +p175 g7 sS'graphics' -p175 +p176 g19 sS'Exitm' -p176 +p177 g4 sS'N2' -p177 +p178 g7 sS'model.ipar' -p178 +p179 g27 sS'Pw3' -p179 +p180 g2 sS'f' -p180 +p181 g7 sS'a.grid' -p181 +p182 g2 sS'y[N-1]' -p182 +p183 g7 sS'gr_i' -p183 +p184 g2 sS'ipar' -p184 +p185 g2 sS'ystC' -p185 +p186 g4 sS'mtd' -p186 +p187 g7 sS'PERIODIC' -p187 +p188 g4 sS'xmx1' -p188 +p189 g7 sS'scam' -p189 +p190 g4 sS'exprs[4-1]' -p190 +p191 g4 sS'ans0' -p191 +p192 g4 sS'ymn1' -p192 +p193 g7 sS't1' -p193 +p194 g4 sS'model.evtout' -p194 +p195 g2 sS'rpar' -p195 +p196 g2 sS'lx11' -p196 +p197 g7 sS'np5' -p197 +p198 g2 sS'Bias3' -p198 +p199 g2 sS'Tp3' -p199 +p200 g2 sS'model.out' -p200 +p201 g7 sS'np4' -p201 +p202 g2 sS'rectx' -p202 +p203 g7 sS'np1' -p203 +p204 g7 sS'Lx' -p204 +p205 g7 sS'x21' -p205 +p206 g4 sS'model.in2' -p206 +p207 g7 sS'x[k-1]' -p207 +p208 g2 sS'HIT' -p208 +p209 g11 sS'xstR' -p209 +p210 g7 sS'ymx1' -p210 +p211 g7 sS'A[j+1-1][i-1]' -p211 +p212 g7 sS'sAmp2' -p212 +p213 g2 sS'TN' -p213 +p214 g2 sS'menus' -p214 +p215 g33 sS'sdelay' -p215 +p216 g2 sS'points' -p216 -NsS'Q[i+N-1][i+N-1]' p217 +NsS'Q[i+N-1][i+N-1]' +p218 g7 sS'TA' -p218 +p219 g27 sS'Datam' -p219 +p220 g4 sS'model.sim' -p220 +p221 g33 sS'XMN' -p221 +p222 g7 sS'A[j+2-1][i+N+1-1]' -p222 +p223 g7 sS'a.data_bounds' -p223 +p224 g7 sS'menu_o' -p224 +p225 g2 sS'd' -p225 +p226 g7 sS'ye' -p226 +p227 g7 sS'X' -p227 +p228 g27 sS'y2p' -p228 +p229 g7 sS'fd' -p229 +p230 g7 sS'exprs[5-1]' -p230 +p231 g4 sS'graphics.exprs' -p231 -NsS'phase' p232 +NsS'phase' +p233 g7 sS'typ' -p233 +p234 g2 sS'min5' -p234 +p235 g2 sS'a' -p235 +p236 g19 sS'mok' -p236 +p237 g11 sS'Orderm' -p237 +p238 g4 sS'A[j+2-1][i+N-1]' -p238 +p239 g7 sS'B[j-1]' -p239 +p240 g7 sS'ly21' -p240 +p241 g7 sS'A[j+2-1][i-1]' -p241 +p242 g7 sS'max5' -p242 +p243 g2 sS'exprs' -p243 +p244 g27 sS'exprs[3-1]' -p244 +p245 g7 sS'y[k-1]' -p245 +p246 g2 sS'At' -p246 +p247 g27 sS'y' -p247 +p248 g7 sS'model' -p248 +p249 g19 sS'order' -p249 +p250 g7 s.
\ No newline at end of file diff --git a/js/NonLinear/LOOKUP_f.js b/js/NonLinear/LOOKUP_f.js index b8a60f1d..471833f3 100644 --- a/js/NonLinear/LOOKUP_f.js +++ b/js/NonLinear/LOOKUP_f.js @@ -7,7 +7,7 @@ function LOOKUP_f() { this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([-2],[-1],[1],[2],[-1],[1],[-1],[1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); return new BasicBlock(this.x); diff --git a/js/NonLinear/LOOKUP_f.pickle b/js/NonLinear/LOOKUP_f.pickle index 7e9f98a5..b166f999 100644 --- a/js/NonLinear/LOOKUP_f.pickle +++ b/js/NonLinear/LOOKUP_f.pickle @@ -60,25 +60,26 @@ p19 g16 sS'model.dep_ut' p20 -g16 -sS'model.in' +S'vector_boolean' p21 +sS'model.in' +p22 g4 sS'graphics' -p22 +p23 g9 sS'y' -p23 +p24 g16 sS'x' -p24 -NsS'model' p25 +NsS'model' +p26 g9 sS'n' -p26 +p27 g4 sS'typ' -p27 +p28 g16 s.
\ No newline at end of file diff --git a/js/NonLinear/MAXMIN.js b/js/NonLinear/MAXMIN.js index 56f8a8d3..e2e7f3ef 100644 --- a/js/NonLinear/MAXMIN.js +++ b/js/NonLinear/MAXMIN.js @@ -6,7 +6,7 @@ function MAXMIN() { this.model.out = new ScilabDouble([1]); this.model.in = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); 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));"]); diff --git a/js/NonLinear/MAXMIN.pickle b/js/NonLinear/MAXMIN.pickle index a8f6f334..faeff50d 100644 --- a/js/NonLinear/MAXMIN.pickle +++ b/js/NonLinear/MAXMIN.pickle @@ -84,19 +84,20 @@ p25 g6 sS'model.dep_ut' p26 -g12 -sS'exprs' +S'vector_boolean' p27 +sS'exprs' +p28 g12 sS'gr_i' -p28 +p29 g12 sS'y' -p29 +p30 g12 sS'x' -p30 -NsS'model' p31 +NsS'model' +p32 g2 s.
\ No newline at end of file diff --git a/js/NonLinear/MAX_f.js b/js/NonLinear/MAX_f.js index f258c935..c7a348bb 100644 --- a/js/NonLinear/MAX_f.js +++ b/js/NonLinear/MAX_f.js @@ -8,7 +8,7 @@ function MAX_f() { this.model.out = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([0],[0]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/NonLinear/MAX_f.pickle b/js/NonLinear/MAX_f.pickle index 9471b916..adc1b315 100644 --- a/js/NonLinear/MAX_f.pickle +++ b/js/NonLinear/MAX_f.pickle @@ -35,27 +35,28 @@ S'double' p8 sS'model.dep_ut' p9 -S'vector' +S'vector_boolean' p10 sS'model.out' p11 g8 sS'gr_i' p12 -g10 -sS'model.in' +S'vector' p13 +sS'model.in' +p14 g8 sS'y' -p14 -g10 -sS'x' p15 -NsS'model' +g13 +sS'x' p16 -S'object' +NsS'model' p17 -sS'typ' +S'object' p18 -g10 +sS'typ' +p19 +g13 s.
\ No newline at end of file diff --git a/js/NonLinear/MIN_f.js b/js/NonLinear/MIN_f.js index 244a414d..316e43e4 100644 --- a/js/NonLinear/MIN_f.js +++ b/js/NonLinear/MIN_f.js @@ -8,7 +8,7 @@ function MIN_f() { this.model.out = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([0],[0]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/NonLinear/MIN_f.pickle b/js/NonLinear/MIN_f.pickle index 9471b916..adc1b315 100644 --- a/js/NonLinear/MIN_f.pickle +++ b/js/NonLinear/MIN_f.pickle @@ -35,27 +35,28 @@ S'double' p8 sS'model.dep_ut' p9 -S'vector' +S'vector_boolean' p10 sS'model.out' p11 g8 sS'gr_i' p12 -g10 -sS'model.in' +S'vector' p13 +sS'model.in' +p14 g8 sS'y' -p14 -g10 -sS'x' p15 -NsS'model' +g13 +sS'x' p16 -S'object' +NsS'model' p17 -sS'typ' +S'object' p18 -g10 +sS'typ' +p19 +g13 s.
\ No newline at end of file diff --git a/js/NonLinear/POWBLK_f.js b/js/NonLinear/POWBLK_f.js index c7d70e81..a86c49a2 100644 --- a/js/NonLinear/POWBLK_f.js +++ b/js/NonLinear/POWBLK_f.js @@ -9,7 +9,7 @@ function POWBLK_f() { this.model.out = new ScilabDouble([-1]); this.model.rpar = new ScilabDouble([this.a]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/NonLinear/POWBLK_f.pickle b/js/NonLinear/POWBLK_f.pickle index 3b71ccc3..a46390ba 100644 --- a/js/NonLinear/POWBLK_f.pickle +++ b/js/NonLinear/POWBLK_f.pickle @@ -58,28 +58,29 @@ S'vector' p16 sS'model.dep_ut' p17 -g16 -sS'model.in' +S'vector_boolean' p18 +sS'model.in' +p19 g2 sS'graphics' -p19 +p20 g8 sS'y' -p20 +p21 g16 sS'x' -p21 -NsS'model' p22 +NsS'model' +p23 g8 sS'model.ipar' -p23 +p24 g16 sS'typ' -p24 +p25 g16 sS'model.firing' -p25 +p26 g16 s.
\ No newline at end of file diff --git a/js/NonLinear/PRODUCT.js b/js/NonLinear/PRODUCT.js index c01104d4..1f550e4a 100644 --- a/js/NonLinear/PRODUCT.js +++ b/js/NonLinear/PRODUCT.js @@ -8,7 +8,7 @@ function PRODUCT() { this.model.out = new ScilabDouble([-1]); this.model.ipar = new ScilabDouble(this.sgn); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/NonLinear/PRODUCT.pickle b/js/NonLinear/PRODUCT.pickle index 97be2d1c..8f36506e 100644 --- a/js/NonLinear/PRODUCT.pickle +++ b/js/NonLinear/PRODUCT.pickle @@ -48,7 +48,7 @@ p13 g4 sS'model.dep_ut' p14 -S'vector' +S'vector_boolean' p15 sS'exprs' p16 @@ -58,30 +58,31 @@ sS'x.model' p18 NsS'gr_i' p19 -g15 -sS'graphics.exprs' +S'vector' p20 -NsS'graphics' +sS'graphics.exprs' p21 +NsS'graphics' +p22 g10 sS'y' -p22 -g15 -sS'x' p23 -NsS'model' +g20 +sS'x' p24 +NsS'model' +p25 g10 sS'model.ipar' -p25 +p26 g8 sS'typ' -p26 -g15 -sS'nout' p27 +g20 +sS'nout' +p28 g4 sS'model.blocktype' -p28 +p29 g17 s.
\ No newline at end of file diff --git a/js/NonLinear/PROD_f.js b/js/NonLinear/PROD_f.js index ee3954bc..5d6903f4 100644 --- a/js/NonLinear/PROD_f.js +++ b/js/NonLinear/PROD_f.js @@ -6,7 +6,7 @@ function PROD_f() { this.model.in = new ScilabDouble([-1],[-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.x = new standard_define(new ScilabDouble([1,1]),this.model,[],[]); return new BasicBlock(this.x); } diff --git a/js/NonLinear/PROD_f.pickle b/js/NonLinear/PROD_f.pickle index cd57a97f..691cc0f1 100644 --- a/js/NonLinear/PROD_f.pickle +++ b/js/NonLinear/PROD_f.pickle @@ -29,7 +29,7 @@ S'string' p6 sS'model.dep_ut' p7 -S'vector' +S'vector_boolean' p8 sS'p' p9 @@ -40,14 +40,15 @@ S'matrix' p11 sS'y' p12 -g8 -sS'x' +S'vector' p13 -NsS'model' +sS'x' p14 -S'object' +NsS'model' p15 -sS'typ' +S'object' p16 -g8 +sS'typ' +p17 +g13 s.
\ No newline at end of file diff --git a/js/NonLinear/QUANT_f.js b/js/NonLinear/QUANT_f.js index ff846e2b..ca5cb9e4 100644 --- a/js/NonLinear/QUANT_f.js +++ b/js/NonLinear/QUANT_f.js @@ -10,7 +10,7 @@ function QUANT_f() { this.model.rpar = new ScilabDouble([this.pas]); this.model.ipar = new ScilabDouble([this.meth]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/NonLinear/QUANT_f.pickle b/js/NonLinear/QUANT_f.pickle index be4d0864..07ffc32e 100644 --- a/js/NonLinear/QUANT_f.pickle +++ b/js/NonLinear/QUANT_f.pickle @@ -59,28 +59,29 @@ S'vector' p17 sS'model.dep_ut' p18 -g17 -sS'model.in' +S'vector_boolean' p19 +sS'model.in' +p20 g4 sS'graphics' -p20 +p21 g8 sS'y' -p21 +p22 g17 sS'x' -p22 -NsS'model' p23 +NsS'model' +p24 g8 sS'model.ipar' -p24 +p25 g4 sS'typ' -p25 +p26 g17 sS'meth' -p26 +p27 g4 s.
\ No newline at end of file diff --git a/js/NonLinear/SATURATION.js b/js/NonLinear/SATURATION.js index 4a34ff87..c87c0edf 100644 --- a/js/NonLinear/SATURATION.js +++ b/js/NonLinear/SATURATION.js @@ -12,7 +12,7 @@ function SATURATION() { this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/NonLinear/SATURATION.pickle b/js/NonLinear/SATURATION.pickle index 0326c662..ab8faf42 100644 --- a/js/NonLinear/SATURATION.pickle +++ b/js/NonLinear/SATURATION.pickle @@ -75,19 +75,20 @@ S'string' p22 sS'model.dep_ut' p23 -g12 -sS'exprs' +S'vector_boolean' p24 +sS'exprs' +p25 g5 sS'gr_i' -p25 +p26 g12 sS'y' -p26 +p27 g12 sS'x' -p27 -NsS'model' p28 +NsS'model' +p29 g2 s.
\ No newline at end of file diff --git a/js/NonLinear/SAT_f.js b/js/NonLinear/SAT_f.js index 44776f9b..8a5cf3ef 100644 --- a/js/NonLinear/SAT_f.js +++ b/js/NonLinear/SAT_f.js @@ -12,7 +12,7 @@ function SAT_f() { this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.minp],[this.maxp],[slope]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/NonLinear/SAT_f.pickle b/js/NonLinear/SAT_f.pickle index ed5199b1..f64e4f77 100644 --- a/js/NonLinear/SAT_f.pickle +++ b/js/NonLinear/SAT_f.pickle @@ -78,19 +78,20 @@ S'string' p23 sS'model.dep_ut' p24 -g13 -sS'exprs' +S'vector_boolean' p25 +sS'exprs' +p26 g7 sS'gr_i' -p26 +p27 g13 sS'y' -p27 +p28 g13 sS'x' -p28 -NsS'model' p29 +NsS'model' +p30 g4 s.
\ No newline at end of file diff --git a/js/NonLinear/SIGNUM.js b/js/NonLinear/SIGNUM.js index 1649d7f7..dc5b69cf 100644 --- a/js/NonLinear/SIGNUM.js +++ b/js/NonLinear/SIGNUM.js @@ -9,7 +9,7 @@ function SIGNUM() { this.model.nzcross = new ScilabDouble([nu]); this.model.nmode = new ScilabDouble([nu]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/NonLinear/SIGNUM.pickle b/js/NonLinear/SIGNUM.pickle index e31d1d91..ee9bd886 100644 --- a/js/NonLinear/SIGNUM.pickle +++ b/js/NonLinear/SIGNUM.pickle @@ -43,37 +43,38 @@ p11 g4 sS'model.dep_ut' p12 -S'vector' +S'vector_boolean' p13 sS'model.nzcross' p14 g4 sS'exprs' p15 -g13 -sS'x.model' +S'vector' p16 -NsS'gr_i' +sS'x.model' p17 -g13 -sS'model.in' +NsS'gr_i' p18 +g16 +sS'model.in' +p19 g4 sS'graphics' -p19 +p20 g8 sS'y' -p20 -g13 -sS'x' p21 -NsS'model' +g16 +sS'x' p22 +NsS'model' +p23 g8 sS'typ' -p23 -g13 -sS'nu' p24 +g16 +sS'nu' +p25 g4 s.
\ No newline at end of file diff --git a/js/NonLinear/SINBLK_f.js b/js/NonLinear/SINBLK_f.js index 37304b71..7d850bd4 100644 --- a/js/NonLinear/SINBLK_f.js +++ b/js/NonLinear/SINBLK_f.js @@ -6,7 +6,7 @@ function SINBLK_f() { this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/NonLinear/SINBLK_f.pickle b/js/NonLinear/SINBLK_f.pickle index aac36c43..634bd203 100644 --- a/js/NonLinear/SINBLK_f.pickle +++ b/js/NonLinear/SINBLK_f.pickle @@ -27,7 +27,7 @@ p4 g2 sS'model.dep_ut' p5 -S'vector' +S'vector_boolean' p6 sS'model.out' p7 @@ -35,20 +35,21 @@ S'double' p8 sS'gr_i' p9 -g6 -sS'model.in' +S'vector' p10 +sS'model.in' +p11 g8 sS'y' -p11 -g6 -sS'x' p12 -NsS'model' +g10 +sS'x' p13 -S'object' +NsS'model' p14 -sS'typ' +S'object' p15 -g6 +sS'typ' +p16 +g10 s.
\ No newline at end of file diff --git a/js/NonLinear/TANBLK_f.js b/js/NonLinear/TANBLK_f.js index 4693fb68..288dd11f 100644 --- a/js/NonLinear/TANBLK_f.js +++ b/js/NonLinear/TANBLK_f.js @@ -7,7 +7,7 @@ function TANBLK_f() { this.model.in = new ScilabDouble([in1]); this.model.out = new ScilabDouble([in1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/NonLinear/TANBLK_f.pickle b/js/NonLinear/TANBLK_f.pickle index 378aaddd..5fa25f1b 100644 --- a/js/NonLinear/TANBLK_f.pickle +++ b/js/NonLinear/TANBLK_f.pickle @@ -35,26 +35,27 @@ S'double' p8 sS'model.dep_ut' p9 -g5 -sS'model.out' +S'vector_boolean' p10 +sS'model.out' +p11 g8 sS'gr_i' -p11 +p12 g5 sS'model.in' -p12 +p13 g8 sS'y' -p13 +p14 g5 sS'x' -p14 -NsS'model' p15 -S'object' +NsS'model' p16 -sS'typ' +S'object' p17 +sS'typ' +p18 g5 s.
\ No newline at end of file diff --git a/js/NonLinear/TrigFun.js b/js/NonLinear/TrigFun.js index 86ae4d56..2a18fff8 100644 --- a/js/NonLinear/TrigFun.js +++ b/js/NonLinear/TrigFun.js @@ -6,7 +6,7 @@ function TrigFun() { this.model.in = new ScilabDouble([-1]); this.model.out = new ScilabDouble([-1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/NonLinear/TrigFun.pickle b/js/NonLinear/TrigFun.pickle index 4911d539..9b3e3964 100644 --- a/js/NonLinear/TrigFun.pickle +++ b/js/NonLinear/TrigFun.pickle @@ -56,22 +56,23 @@ S'vector' p17 sS'model.dep_ut' p18 -g17 -sS'model.in' +S'vector_boolean' p19 +sS'model.in' +p20 g4 sS'graphics' -p20 +p21 g8 sS'y' -p21 +p22 g17 sS'x' -p22 -NsS'model' p23 +NsS'model' +p24 g8 sS'typ' -p24 +p25 g17 s.
\ No newline at end of file diff --git a/js/PDE/PDE.js b/js/PDE/PDE.js index acdad630..816eee7e 100644 --- a/js/PDE/PDE.js +++ b/js/PDE/PDE.js @@ -7,7 +7,7 @@ function PDE() { this.model.in = new ScilabDouble([1],[1],[1],[1],[1]); this.model.out = new ScilabDouble([10],[0]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); var params_pde = tlist([["paramspde"],["a"],["b"],["txt_exp"],["check_op1"],["a1"],["b1"],["check_op2"],["a2"],["b2"],["check_op3"],["a3"],["b3"],["check_op4"],["a4"],["b4"],["check_op5"],["a5"],["b5"],["check_op6"],["a6"],["b6"],["check_op7"],["a7"],["b7"],["discr_cst"],["discr_non_cst"],["signe"],["rad_automatique"],["rad_manuel"],["methode"],["ord1"],["ord2"],["ord3"],["degre"],["nnode"],["txt_pas"],["CI"],["dCI"],["CLa"],["CLa_exp"],["CLb"],["CLb_exp"],["points"]],"","","","0","","IN_EDP1(t)","0","","IN_EDP2(t)","0","","IN_EDP3(t)","0","","IN_EDP4(t)","0","","IN_EDP5(t)","0","","IN_EDP6(t)","0","","IN_EDP7(t)","0","0","0","0","0","0","","","","","","","","","0","IN_CL1(t)","0","IN_CL2(t)",""); var label = list(params_pde,[],""); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"PDE\",sz(1),sz(2));"]); diff --git a/js/PDE/PDE.pickle b/js/PDE/PDE.pickle index ce730515..5051ab11 100644 --- a/js/PDE/PDE.pickle +++ b/js/PDE/PDE.pickle @@ -102,18 +102,19 @@ p32 g2 sS'model.dep_ut' p33 -g28 -sS'gr_i' +S'vector_boolean' p34 +sS'gr_i' +p35 g28 sS'graphics.exprs' -p35 -NsS'y' p36 +NsS'y' +p37 g28 sS'x' -p37 -NsS'model' p38 +NsS'model' +p39 g6 s.
\ No newline at end of file diff --git a/js/Sinks/AFFICH_m.js b/js/Sinks/AFFICH_m.js index b0ff73fa..7f3e1884 100644 --- a/js/Sinks/AFFICH_m.js +++ b/js/Sinks/AFFICH_m.js @@ -16,7 +16,7 @@ function AFFICH_m() { this.model.ipar = new ScilabDouble([this.font],[this.fontsize],[this.colr],[1000],[this.nt],[this.nd],[this.in1[1-1][1-1]]); this.model.blocktype = new ScilabString(["c"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); 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));"]); diff --git a/js/Sinks/AFFICH_m.pickle b/js/Sinks/AFFICH_m.pickle index e5cb598b..028cca3a 100644 --- a/js/Sinks/AFFICH_m.pickle +++ b/js/Sinks/AFFICH_m.pickle @@ -105,19 +105,20 @@ p30 g18 sS'model.dep_ut' p31 -g16 -sS'exprs' +S'vector_boolean' p32 +sS'exprs' +p33 g2 sS'gr_i' -p33 +p34 g16 sS'y' -p34 +p35 g16 sS'x' -p35 -NsS'model' p36 +NsS'model' +p37 g4 s.
\ No newline at end of file diff --git a/js/Sinks/BARXY.js b/js/Sinks/BARXY.js index 36ba7645..6f930930 100644 --- a/js/Sinks/BARXY.js +++ b/js/Sinks/BARXY.js @@ -8,7 +8,7 @@ function BARXY() { this.ymax = 15; this.model.sim = list(new ScilabString(["BARXY_sim"]), new ScilabDouble([5])); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.model.in = new ScilabDouble([-1],[-1]); this.model.intyp = new ScilabDouble([1]); this.model.out = new ScilabDouble([]); diff --git a/js/Sinks/BARXY.pickle b/js/Sinks/BARXY.pickle index c9dd6830..501e43da 100644 --- a/js/Sinks/BARXY.pickle +++ b/js/Sinks/BARXY.pickle @@ -95,21 +95,22 @@ S'string' p28 sS'model.dep_ut' p29 -g5 -sS'exprs' +S'vector_boolean' p30 -NsS'x.graphics.exprs' +sS'exprs' p31 +NsS'x.graphics.exprs' +p32 g18 sS'xmax' -p32 +p33 g8 sS'y' -p33 +p34 g5 sS'x' -p34 -NsS'model' p35 +NsS'model' +p36 g2 s.
\ No newline at end of file diff --git a/js/Sinks/CANIMXY.js b/js/Sinks/CANIMXY.js index 69734b40..fe146bdb 100644 --- a/js/Sinks/CANIMXY.js +++ b/js/Sinks/CANIMXY.js @@ -22,7 +22,7 @@ function CANIMXY() { this.model.ipar = new ScilabDouble([this.win],[1],[this.N],[this.clrs],[this.siz],[0],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Sinks/CANIMXY.pickle b/js/Sinks/CANIMXY.pickle index ba9e069b..4890b7d6 100644 --- a/js/Sinks/CANIMXY.pickle +++ b/js/Sinks/CANIMXY.pickle @@ -134,25 +134,26 @@ p37 g27 sS'model.dep_ut' p38 -g21 -sS'exprs' +S'vector_boolean' p39 +sS'exprs' +p40 g4 sS'gr_i' -p40 +p41 g21 sS'ipar' -p41 +p42 g4 sS'y' -p42 +p43 g21 sS'x' -p43 -NsS'model' p44 +NsS'model' +p45 g14 sS'nbr_curves' -p45 +p46 g2 s.
\ No newline at end of file diff --git a/js/Sinks/CANIMXY3D.js b/js/Sinks/CANIMXY3D.js index 50797f91..5e4130e0 100644 --- a/js/Sinks/CANIMXY3D.js +++ b/js/Sinks/CANIMXY3D.js @@ -22,7 +22,7 @@ function CANIMXY3D() { this.model.ipar = new ScilabDouble([this.win],[8],[this.N],[this.clrs.slice()],[this.siz.slice()],[8],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Sinks/CANIMXY3D.pickle b/js/Sinks/CANIMXY3D.pickle index 6b9034e7..eb4cb122 100644 --- a/js/Sinks/CANIMXY3D.pickle +++ b/js/Sinks/CANIMXY3D.pickle @@ -137,25 +137,26 @@ p38 g2 sS'model.dep_ut' p39 -g19 -sS'exprs' +S'vector_boolean' p40 +sS'exprs' +p41 g2 sS'gr_i' -p41 +p42 g19 sS'ipar' -p42 +p43 g2 sS'y' -p43 +p44 g19 sS'x' -p44 -NsS'model' p45 +NsS'model' +p46 g12 sS'nbr_curves' -p46 +p47 g5 s.
\ No newline at end of file diff --git a/js/Sinks/CEVENTSCOPE.js b/js/Sinks/CEVENTSCOPE.js index f4c165a3..829b25f4 100644 --- a/js/Sinks/CEVENTSCOPE.js +++ b/js/Sinks/CEVENTSCOPE.js @@ -13,7 +13,7 @@ function CEVENTSCOPE() { this.model.rpar = new ScilabDouble([this.per]); this.model.ipar = new ScilabDouble([this.win],[1],[this.clrs[this.nclock-1]],[this.wpos.slice()],[this.wdim.slice()]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Sinks/CEVENTSCOPE.pickle b/js/Sinks/CEVENTSCOPE.pickle index 44dbaeb6..848fca4f 100644 --- a/js/Sinks/CEVENTSCOPE.pickle +++ b/js/Sinks/CEVENTSCOPE.pickle @@ -93,22 +93,23 @@ S'string' p27 sS'model.dep_ut' p28 -g22 -sS'exprs' +S'vector_boolean' p29 +sS'exprs' +p30 g2 sS'gr_i' -p30 +p31 g22 sS'ipar' -p31 +p32 g2 sS'y' -p32 +p33 g22 sS'x' -p33 -NsS'model' p34 +NsS'model' +p35 g5 s.
\ No newline at end of file diff --git a/js/Sinks/CFSCOPE.js b/js/Sinks/CFSCOPE.js index a4b1a91d..f4728d1b 100644 --- a/js/Sinks/CFSCOPE.js +++ b/js/Sinks/CFSCOPE.js @@ -15,7 +15,7 @@ function CFSCOPE() { this.model.rpar = new ScilabDouble([0],[this.ymin],[this.ymax],[this.per]); this.model.ipar = new ScilabDouble([this.win],[1],[this.N],[this.clrs],[this.wpos],[this.wdim],[1],[1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -105,7 +105,7 @@ function CFSCOPE() { this.model.rpar = new ScilabDouble(rpar); this.model.ipar = new ScilabDouble(ipar); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Sinks/CFSCOPE.pickle b/js/Sinks/CFSCOPE.pickle index e7fb7ed3..2995c739 100644 --- a/js/Sinks/CFSCOPE.pickle +++ b/js/Sinks/CFSCOPE.pickle @@ -112,22 +112,23 @@ p31 g10 sS'model.dep_ut' p32 -g18 -sS'exprs' +S'vector_boolean' p33 +sS'exprs' +p34 g2 sS'gr_i' -p34 +p35 g18 sS'ipar' -p35 +p36 g2 sS'y' -p36 +p37 g18 sS'x' -p37 -NsS'model' p38 +NsS'model' +p39 g5 s.
\ No newline at end of file diff --git a/js/Sinks/CLKOUTV_f.js b/js/Sinks/CLKOUTV_f.js index b1feb661..d4e24f00 100644 --- a/js/Sinks/CLKOUTV_f.js +++ b/js/Sinks/CLKOUTV_f.js @@ -8,7 +8,7 @@ function CLKOUTV_f() { this.model.ipar = new ScilabDouble([this.prt]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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," "); return new EventOutBlock(this.x); diff --git a/js/Sinks/CLKOUTV_f.pickle b/js/Sinks/CLKOUTV_f.pickle index 024022fb..4523edef 100644 --- a/js/Sinks/CLKOUTV_f.pickle +++ b/js/Sinks/CLKOUTV_f.pickle @@ -113,28 +113,29 @@ p33 g2 sS'model.dep_ut' p34 -g28 -sS'exprs' +S'vector_boolean' p35 +sS'exprs' +p36 g20 sS'gr_i' -p36 -NsS'model.firing' p37 +NsS'model.firing' +p38 g28 sS'w' -p38 +p39 g2 sS'y' -p39 +p40 g28 sS'x' -p40 +p41 g5 sS'model' -p41 +p42 g5 sS'options' -p42 +p43 g5 s.
\ No newline at end of file diff --git a/js/Sinks/CLKOUT_f.js b/js/Sinks/CLKOUT_f.js index 1a08f514..c3df65bc 100644 --- a/js/Sinks/CLKOUT_f.js +++ b/js/Sinks/CLKOUT_f.js @@ -8,7 +8,7 @@ function CLKOUT_f() { this.model.ipar = new ScilabDouble([this.prt]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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," "); return new BasicBlock(this.x); diff --git a/js/Sinks/CLKOUT_f.pickle b/js/Sinks/CLKOUT_f.pickle index a3cfaa74..8de8dad9 100644 --- a/js/Sinks/CLKOUT_f.pickle +++ b/js/Sinks/CLKOUT_f.pickle @@ -37,7 +37,7 @@ p8 g5 sS'model.dep_ut' p9 -S'vector' +S'vector_boolean' p10 sS'exprs' p11 @@ -52,22 +52,23 @@ p14 g7 sS'y' p15 -g10 -sS'x' +S'vector' p16 -NsS'model' +sS'x' p17 +NsS'model' +p18 g7 sS'model.ipar' -p18 +p19 g5 sS'typ' -p19 -g10 -sS'x.graphics' p20 +g16 +sS'x.graphics' +p21 g7 sS'model.firing' -p21 -g10 +p22 +g16 s.
\ No newline at end of file diff --git a/js/Sinks/CMAT3D.js b/js/Sinks/CMAT3D.js index 741b0896..16bf0515 100644 --- a/js/Sinks/CMAT3D.js +++ b/js/Sinks/CMAT3D.js @@ -18,7 +18,7 @@ function CMAT3D() { this.model.ipar = new ScilabDouble([this.cmin],[this.cmax],[size_c],[size_x],[size_y]); this.model.rpar = new ScilabDouble([this.colormap.slice()],[this.x],[y]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/Sinks/CMAT3D.pickle b/js/Sinks/CMAT3D.pickle index a5ce2127..4db7bf86 100644 --- a/js/Sinks/CMAT3D.pickle +++ b/js/Sinks/CMAT3D.pickle @@ -98,26 +98,27 @@ S'string' p29 sS'model.dep_ut' p30 -g25 -sS'exprs' +S'vector_boolean' p31 +sS'exprs' +p32 g18 sS'gr_i' -p32 +p33 g25 sS'ipar' -p33 +p34 g18 sS'y' -p34 +p35 g2 sS'x' -p35 +p36 g2 sS'model' -p36 +p37 g4 sS'cmax' -p37 +p38 g2 s.
\ No newline at end of file diff --git a/js/Sinks/CMATVIEW.js b/js/Sinks/CMATVIEW.js index 6bc64608..8057448d 100644 --- a/js/Sinks/CMATVIEW.js +++ b/js/Sinks/CMATVIEW.js @@ -16,7 +16,7 @@ function CMATVIEW() { this.model.ipar = new ScilabDouble([this.cmin],[this.cmax],[size_c]); this.model.rpar = new ScilabDouble([alpha_c],[beta_c],[this.colormap.slice()]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/Sinks/CMATVIEW.pickle b/js/Sinks/CMATVIEW.pickle index dc9ed8b9..06435d50 100644 --- a/js/Sinks/CMATVIEW.pickle +++ b/js/Sinks/CMATVIEW.pickle @@ -97,25 +97,26 @@ p30 g7 sS'model.dep_ut' p31 -g27 -sS'exprs' +S'vector_boolean' p32 +sS'exprs' +p33 g20 sS'gr_i' -p33 +p34 g27 sS'ipar' -p34 +p35 g20 sS'y' -p35 +p36 g27 sS'x' -p36 -NsS'model' p37 +NsS'model' +p38 g4 sS'cmax' -p38 +p39 g2 s.
\ No newline at end of file diff --git a/js/Sinks/CMSCOPE.js b/js/Sinks/CMSCOPE.js index 414fe77c..9629d0fe 100644 --- a/js/Sinks/CMSCOPE.js +++ b/js/Sinks/CMSCOPE.js @@ -21,7 +21,7 @@ function CMSCOPE() { this.model.rpar = new ScilabDouble([0],[period.slice()],[yy.slice()]); this.model.ipar = new ScilabDouble([this.win],[size(this.in1,"*")],[this.N],[this.wpos.slice()],[this.wdim.slice()],[this.in1.slice()],[this.clrs.slice(1-1,sum(this.in1))]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/Sinks/CMSCOPE.pickle b/js/Sinks/CMSCOPE.pickle index 8d063156..043924d7 100644 --- a/js/Sinks/CMSCOPE.pickle +++ b/js/Sinks/CMSCOPE.pickle @@ -141,22 +141,23 @@ S'string' p40 sS'model.dep_ut' p41 -g4 -sS'exprs' +S'vector_boolean' p42 +sS'exprs' +p43 g2 sS'gr_i' -p43 +p44 g4 sS'ipar' -p44 +p45 g2 sS'y' -p45 +p46 g4 sS'x' -p46 -NsS'model' p47 +NsS'model' +p48 g7 s.
\ No newline at end of file diff --git a/js/Sinks/CSCOPE.js b/js/Sinks/CSCOPE.js index 6206cf79..0b900290 100644 --- a/js/Sinks/CSCOPE.js +++ b/js/Sinks/CSCOPE.js @@ -17,7 +17,7 @@ function CSCOPE() { this.model.rpar = new ScilabDouble([0],[this.ymin],[this.ymax],[this.per]); this.model.ipar = new ScilabDouble([this.win],[1],[this.N],[this.clrs],[this.wpos],[this.wdim]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/Sinks/CSCOPE.pickle b/js/Sinks/CSCOPE.pickle index 780bc38d..1190c106 100644 --- a/js/Sinks/CSCOPE.pickle +++ b/js/Sinks/CSCOPE.pickle @@ -118,22 +118,23 @@ S'string' p33 sS'model.dep_ut' p34 -g29 -sS'exprs' +S'vector_boolean' p35 +sS'exprs' +p36 g2 sS'gr_i' -p36 +p37 g29 sS'ipar' -p37 +p38 g2 sS'y' -p38 +p39 g29 sS'x' -p39 -NsS'model' p40 +NsS'model' +p41 g12 s.
\ No newline at end of file diff --git a/js/Sinks/CSCOPXY.js b/js/Sinks/CSCOPXY.js index 905a8ca5..dc2de406 100644 --- a/js/Sinks/CSCOPXY.js +++ b/js/Sinks/CSCOPXY.js @@ -21,7 +21,7 @@ function CSCOPXY() { this.model.rpar = new ScilabDouble([this.xmin],[this.xmax],[this.ymin],[this.ymax]); this.model.ipar = new ScilabDouble([this.win],[1],[this.N],[this.clrs],[this.siz],[1],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Sinks/CSCOPXY.pickle b/js/Sinks/CSCOPXY.pickle index 939dc0d9..a3b31d8e 100644 --- a/js/Sinks/CSCOPXY.pickle +++ b/js/Sinks/CSCOPXY.pickle @@ -131,25 +131,26 @@ p36 g25 sS'model.dep_ut' p37 -g33 -sS'exprs' +S'vector_boolean' p38 +sS'exprs' +p39 g4 sS'gr_i' -p39 +p40 g33 sS'ipar' -p40 +p41 g4 sS'y' -p41 +p42 g33 sS'x' -p42 -NsS'model' p43 +NsS'model' +p44 g14 sS'nbr_curves' -p44 +p45 g2 s.
\ No newline at end of file diff --git a/js/Sinks/CSCOPXY3D.js b/js/Sinks/CSCOPXY3D.js index 65f428f9..17563238 100644 --- a/js/Sinks/CSCOPXY3D.js +++ b/js/Sinks/CSCOPXY3D.js @@ -21,7 +21,7 @@ function CSCOPXY3D() { this.model.rpar = new ScilabDouble([this.vec_x.slice()],[this.vec_y.slice()],[this.vec_z.slice()],[this.param3ds.slice()]); this.model.ipar = new ScilabDouble([this.win],[8],[this.N],[this.clrs.slice()],[this.siz.slice()],[8],[this.wpos.slice()],[this.wdim.slice()],[this.nbr_curves]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Sinks/CSCOPXY3D.pickle b/js/Sinks/CSCOPXY3D.pickle index c73b1b9a..8e68f9ac 100644 --- a/js/Sinks/CSCOPXY3D.pickle +++ b/js/Sinks/CSCOPXY3D.pickle @@ -134,25 +134,26 @@ p37 g2 sS'model.dep_ut' p38 -g33 -sS'exprs' +S'vector_boolean' p39 +sS'exprs' +p40 g2 sS'gr_i' -p40 +p41 g33 sS'ipar' -p41 +p42 g2 sS'y' -p42 +p43 g33 sS'x' -p43 -NsS'model' p44 +NsS'model' +p45 g12 sS'nbr_curves' -p45 +p46 g5 s.
\ No newline at end of file diff --git a/js/Sinks/OUTIMPL_f.js b/js/Sinks/OUTIMPL_f.js index 40bface7..cb0dc93b 100644 --- a/js/Sinks/OUTIMPL_f.js +++ b/js/Sinks/OUTIMPL_f.js @@ -8,7 +8,7 @@ function OUTIMPL_f() { this.model.sim = new ScilabString(["outimpl"]); this.model.ipar = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); var mo = modelica(); mo.model = "PORT"; mo.inputs = "n"; diff --git a/js/Sinks/OUTIMPL_f.pickle b/js/Sinks/OUTIMPL_f.pickle index bbe22d3b..0d1d4a26 100644 --- a/js/Sinks/OUTIMPL_f.pickle +++ b/js/Sinks/OUTIMPL_f.pickle @@ -77,19 +77,20 @@ p22 g7 sS'model.dep_ut' p23 -g10 -sS'exprs' +S'vector_boolean' p24 +sS'exprs' +p25 g5 sS'gr_i' -p25 +p26 g10 sS'y' -p26 +p27 g7 sS'x' -p27 -NsS'model' p28 +NsS'model' +p29 g2 s.
\ No newline at end of file diff --git a/js/Sinks/OUT_f.js b/js/Sinks/OUT_f.js index 279402e7..4867bf10 100644 --- a/js/Sinks/OUT_f.js +++ b/js/Sinks/OUT_f.js @@ -10,7 +10,7 @@ function OUT_f() { this.model.intyp = new ScilabDouble([-1]); this.model.ipar = new ScilabDouble([this.prt]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Sinks/OUT_f.pickle b/js/Sinks/OUT_f.pickle index 315f8c62..d59ea7cf 100644 --- a/js/Sinks/OUT_f.pickle +++ b/js/Sinks/OUT_f.pickle @@ -43,7 +43,7 @@ p10 g2 sS'model.dep_ut' p11 -S'vector' +S'vector_boolean' p12 sS'n' p13 @@ -55,28 +55,29 @@ sS'x.model' p15 NsS'gr_i' p16 -g12 -sS'model.in' +S'vector' p17 +sS'model.in' +p18 g2 sS'graphics' -p18 +p19 g9 sS'y' -p19 -g12 -sS'x' p20 -NsS'model' +g17 +sS'x' p21 +NsS'model' +p22 g9 sS'model.ipar' -p22 +p23 g2 sS'typ' -p23 -g12 -sS'x.graphics' p24 +g17 +sS'x.graphics' +p25 g9 s.
\ No newline at end of file diff --git a/js/Sinks/TOWS_c.js b/js/Sinks/TOWS_c.js index 1d69b0ee..fadd92fe 100644 --- a/js/Sinks/TOWS_c.js +++ b/js/Sinks/TOWS_c.js @@ -17,7 +17,7 @@ function TOWS_c() { this.model.ipar = new ScilabDouble([this.nz],[length(this.varnam)],[transpose(this.ascii[this.varnam-1])]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Sinks/TOWS_c.pickle b/js/Sinks/TOWS_c.pickle index 223cde63..07723464 100644 --- a/js/Sinks/TOWS_c.pickle +++ b/js/Sinks/TOWS_c.pickle @@ -102,19 +102,20 @@ p31 g10 sS'model.dep_ut' p32 -g8 -sS'exprs' +S'vector_boolean' p33 +sS'exprs' +p34 g27 sS'r' -p34 +p35 g30 sS'y' -p35 +p36 g8 sS'x' -p36 -NsS'model' p37 +NsS'model' +p38 g2 s.
\ No newline at end of file diff --git a/js/Sinks/TRASH_f.js b/js/Sinks/TRASH_f.js index 9b80381e..ba16065f 100644 --- a/js/Sinks/TRASH_f.js +++ b/js/Sinks/TRASH_f.js @@ -7,7 +7,7 @@ function TRASH_f() { this.model.in = new ScilabDouble([in1]); this.model.evtin = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Sinks/TRASH_f.pickle b/js/Sinks/TRASH_f.pickle index 1b2024f4..969fe5fc 100644 --- a/js/Sinks/TRASH_f.pickle +++ b/js/Sinks/TRASH_f.pickle @@ -31,27 +31,28 @@ S'double' p6 sS'model.dep_ut' p7 -S'vector' +S'vector_boolean' p8 sS'model.evtin' p9 g6 sS'gr_i' p10 -g8 -sS'model.in' +S'vector' p11 +sS'model.in' +p12 g6 sS'y' -p12 -g8 -sS'x' p13 -NsS'model' +g11 +sS'x' p14 -S'object' +NsS'model' p15 -sS'typ' +S'object' p16 -g8 +sS'typ' +p17 +g11 s.
\ No newline at end of file diff --git a/js/Sinks/WFILE_f.js b/js/Sinks/WFILE_f.js index a6b9a8d4..3015b1ca 100644 --- a/js/Sinks/WFILE_f.js +++ b/js/Sinks/WFILE_f.js @@ -14,7 +14,7 @@ function WFILE_f() { this.model.dstate = new ScilabDouble([-1],[lunit],[zeros((nin+1)*this.N,1)]); this.model.ipar = new ScilabDouble([length(fname)],[length(frmt)],[0],[this.N],[this._str2code[fname-1]],[this._str2code[frmt-1]]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); @@ -92,7 +92,7 @@ function WFILE_f() { this.model.in = new ScilabDouble([nin]); this.model.dstate = new ScilabDouble(dstate); this.model.ipar = new ScilabDouble(ipar); - this.model.dep_ut = new ScilabDouble([true,false]); + this.model.dep_ut = new ScilabBoolean([true,false]); this.graphics.exprs = new ScilabDouble([this.exprs]); this.x.graphics = this.graphics; this.x.model = this.model; diff --git a/js/Sinks/WFILE_f.pickle b/js/Sinks/WFILE_f.pickle index 28d5fec8..6cf01c1d 100644 --- a/js/Sinks/WFILE_f.pickle +++ b/js/Sinks/WFILE_f.pickle @@ -45,7 +45,7 @@ p7 g4 sS'model.dep_ut' p8 -S'vector' +S'vector_boolean' p9 sS'warnMessage' p10 @@ -96,39 +96,40 @@ p26 g2 sS'typ' p27 -g9 -sS'arg1.model' +S'vector' p28 +sS'arg1.model' +p29 g4 sS'ok' -p29 -S'boolean' p30 -sS'model.blocktype' +S'boolean' p31 +sS'model.blocktype' +p32 g15 sS'frmt1' -p32 +p33 g11 sS'fname1' -p33 +p34 g11 sS'exprs' -p34 +p35 g2 sS'gr_i' -p35 -g9 -sS'ipar' p36 +g28 +sS'ipar' +p37 g2 sS'y' -p37 -g9 -sS'x' p38 +g28 +sS'x' +p39 g4 sS'model' -p39 +p40 g4 s.
\ No newline at end of file diff --git a/js/Sinks/WRITEAU_f.js b/js/Sinks/WRITEAU_f.js index 272abc55..c332e0ed 100644 --- a/js/Sinks/WRITEAU_f.js +++ b/js/Sinks/WRITEAU_f.js @@ -15,7 +15,7 @@ function WRITEAU_f() { this.model.dstate = new ScilabDouble([-1],[lunit],[zeros((nin+1)*this.N,1)]); this.model.ipar = new ScilabDouble([length(fname)],[this._str2code[frmt-1]],[this.N],[this.swap],[this._str2code[fname-1]]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/Sinks/WRITEAU_f.pickle b/js/Sinks/WRITEAU_f.pickle index 720f72bf..1cbfc95a 100644 --- a/js/Sinks/WRITEAU_f.pickle +++ b/js/Sinks/WRITEAU_f.pickle @@ -42,7 +42,7 @@ p7 g4 sS'model.dep_ut' p8 -S'vector' +S'vector_boolean' p9 sS'x.graphics' p10 @@ -87,35 +87,36 @@ p25 g2 sS'typ' p26 -g9 -sS'ok' +S'vector' p27 -S'boolean' +sS'ok' p28 -sS'model.blocktype' +S'boolean' p29 +sS'model.blocktype' +p30 g15 sS'frmt1' -p30 +p31 g15 sS'fname1' -p31 +p32 g15 sS'exprs' -p32 -g9 -sS'gr_i' p33 -g9 -sS'ipar' +g27 +sS'gr_i' p34 +g27 +sS'ipar' +p35 g2 sS'y' -p35 -g9 -sS'x' p36 -NsS'model' +g27 +sS'x' p37 +NsS'model' +p38 g4 s.
\ No newline at end of file diff --git a/js/Sinks/WRITEC_f.js b/js/Sinks/WRITEC_f.js index 0a69273f..0eb100f4 100644 --- a/js/Sinks/WRITEC_f.js +++ b/js/Sinks/WRITEC_f.js @@ -15,7 +15,7 @@ function WRITEC_f() { this.model.dstate = new ScilabDouble([-1],[lunit],[zeros((nin+1)*this.N,1)]); this.model.ipar = new ScilabDouble([length(fname)],[this._str2code[frmt-1]],[this.N],[this.swap],[this._str2code[fname-1]]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/Sinks/WRITEC_f.pickle b/js/Sinks/WRITEC_f.pickle index e49258fb..e98aa87f 100644 --- a/js/Sinks/WRITEC_f.pickle +++ b/js/Sinks/WRITEC_f.pickle @@ -50,7 +50,7 @@ p7 g4 sS'model.dep_ut' p8 -S'vector' +S'vector_boolean' p9 sS'x.graphics' p10 @@ -81,52 +81,53 @@ p20 g12 sS'fmts' p21 -g9 -sS'in1' +S'vector' p22 +sS'in1' +p23 g12 sS'N' -p23 +p24 g12 sS'model.in' -p24 +p25 g12 sS'graphics.exprs' -p25 -NsS'model.ipar' p26 +NsS'model.ipar' +p27 g2 sS'typ' -p27 -g9 -sS'ok' p28 -S'boolean' +g22 +sS'ok' p29 -sS'model.blocktype' +S'boolean' p30 +sS'model.blocktype' +p31 g15 sS'frmt1' -p31 +p32 g15 sS'fname1' -p32 +p33 g12 sS'exprs' -p33 +p34 g2 sS'gr_i' -p34 -g9 -sS'ipar' p35 +g22 +sS'ipar' +p36 g2 sS'y' -p36 -g9 -sS'x' p37 -NsS'model' +g22 +sS'x' p38 +NsS'model' +p39 g4 s.
\ No newline at end of file diff --git a/js/Sources/CLKINV_f.js b/js/Sources/CLKINV_f.js index cf2a40c4..47127717 100644 --- a/js/Sources/CLKINV_f.js +++ b/js/Sources/CLKINV_f.js @@ -8,7 +8,7 @@ function CLKINV_f() { this.model.ipar = new ScilabDouble([this.prt]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Sources/CLKINV_f.pickle b/js/Sources/CLKINV_f.pickle index b7a2f895..ac287eee 100644 --- a/js/Sources/CLKINV_f.pickle +++ b/js/Sources/CLKINV_f.pickle @@ -40,7 +40,7 @@ p9 g4 sS'model.dep_ut' p10 -S'vector' +S'vector_boolean' p11 sS'exprs' p12 @@ -49,28 +49,29 @@ sS'x.model' p13 NsS'gr_i' p14 -g11 -sS'graphics' +S'vector' p15 +sS'graphics' +p16 g8 sS'y' -p16 -g11 -sS'x' p17 -NsS'model' +g15 +sS'x' p18 +NsS'model' +p19 g8 sS'model.ipar' -p19 +p20 g4 sS'typ' -p20 -g11 -sS'x.graphics' p21 +g15 +sS'x.graphics' +p22 g8 sS'model.firing' -p22 +p23 g4 s.
\ No newline at end of file diff --git a/js/Sources/CLKIN_f.js b/js/Sources/CLKIN_f.js index 4e80325c..d4829280 100644 --- a/js/Sources/CLKIN_f.js +++ b/js/Sources/CLKIN_f.js @@ -8,7 +8,7 @@ function CLKIN_f() { this.model.ipar = new ScilabDouble([this.prt]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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," "); return new BasicBlock(this.x); diff --git a/js/Sources/CLKIN_f.pickle b/js/Sources/CLKIN_f.pickle index b62f6681..04cda836 100644 --- a/js/Sources/CLKIN_f.pickle +++ b/js/Sources/CLKIN_f.pickle @@ -40,7 +40,7 @@ p9 g4 sS'model.dep_ut' p10 -S'vector' +S'vector_boolean' p11 sS'exprs' p12 @@ -52,22 +52,23 @@ p14 g8 sS'y' p15 -g11 -sS'x' +S'vector' p16 -NsS'model' +sS'x' p17 +NsS'model' +p18 g8 sS'model.ipar' -p18 +p19 g4 sS'typ' -p19 -g11 -sS'x.graphics' p20 +g16 +sS'x.graphics' +p21 g8 sS'model.firing' -p21 +p22 g4 s.
\ No newline at end of file diff --git a/js/Sources/CLOCK_c.pickle b/js/Sources/CLOCK_c.pickle index 628a2fc5..9141878c 100644 --- a/js/Sources/CLOCK_c.pickle +++ b/js/Sources/CLOCK_c.pickle @@ -119,93 +119,94 @@ p38 g2 sS'x.model.dep_ut' p39 -g19 -sS'evtdly' +S'vector_boolean' p40 +sS'evtdly' +p41 g2 sS'model.rpar' -p41 +p42 g10 sS'model_n' -p42 +p43 g2 sS'diagram' -p43 +p44 g15 sS'dt_old' -p44 +p45 g15 sS'output_port.graphics.sz' -p45 +p46 g19 sS'x.graphics.peout' -p46 +p47 g15 sS'path' -p47 -NsS'evtdly.graphics.exprs' p48 +NsS'evtdly.graphics.exprs' +p49 g10 sS'typ' -p49 +p50 g37 sS'x.model.sim' -p50 +p51 g4 sS'needcompile' -p51 +p52 g15 sS'evtdly.graphics.peout' -p52 +p53 g15 sS'arg1.model' -p53 +p54 g2 sS'ok' -p54 +p55 g8 sS'evtdly.model.firing' -p55 +p56 g15 sS'diagram.objs[2-1]' -p56 +p57 g2 sS'evtdly.graphics.orig' -p57 +p58 g19 sS'x.gui' -p58 +p59 g4 sS'arg1.model.rpar.objs[path-1]' -p59 +p60 g2 sS'x.graphics.sz' -p60 +p61 g19 sS'exprs' -p61 -NsS'gr_i' p62 +NsS'gr_i' +p63 g19 sS'output_port.graphics.orig' -p63 +p64 g19 sS'y' -p64 +p65 g15 sS'x' -p65 +p66 g15 sS'model' -p66 +p67 g2 sS'split.graphics.pein' -p67 +p68 g15 sS'arg1.model.rpar' -p68 +p69 g2 sS'split.graphics.orig' -p69 +p70 g10 s.
\ No newline at end of file diff --git a/js/Sources/CLOCK_f.pickle b/js/Sources/CLOCK_f.pickle index 0947595e..f4725772 100644 --- a/js/Sources/CLOCK_f.pickle +++ b/js/Sources/CLOCK_f.pickle @@ -119,91 +119,92 @@ p38 g2 sS'x.model.dep_ut' p39 -g19 -sS'evtdly' +S'vector_boolean' p40 +sS'evtdly' +p41 g2 sS'model.rpar' -p41 -NsS'model_n' p42 +NsS'model_n' +p43 g2 sS'diagram' -p43 +p44 g15 sS'dt_old' -p44 -NsS'output_port.graphics.sz' p45 +NsS'output_port.graphics.sz' +p46 g19 sS'x.graphics.peout' -p46 +p47 g15 sS'path' -p47 -NsS'evtdly.graphics.exprs' p48 +NsS'evtdly.graphics.exprs' +p49 g10 sS'typ' -p49 +p50 g37 sS'x.model.sim' -p50 +p51 g4 sS'needcompile' -p51 +p52 g15 sS'evtdly.graphics.peout' -p52 +p53 g15 sS'arg1.model' -p53 +p54 g2 sS'ok' -p54 +p55 g8 sS'evtdly.model.firing' -p55 +p56 g15 sS'diagram.objs[2-1]' -p56 +p57 g2 sS'evtdly.graphics.orig' -p57 +p58 g19 sS'x.gui' -p58 +p59 g4 sS'arg1.model.rpar.objs[path-1]' -p59 +p60 g2 sS'x.graphics.sz' -p60 +p61 g19 sS'exprs' -p61 -NsS'gr_i' p62 +NsS'gr_i' +p63 g19 sS'output_port.graphics.orig' -p63 +p64 g19 sS'y' -p64 +p65 g15 sS'x' -p65 +p66 g15 sS'model' -p66 +p67 g2 sS'split.graphics.pein' -p67 +p68 g15 sS'arg1.model.rpar' -p68 +p69 g2 sS'split.graphics.orig' -p69 +p70 g10 s.
\ No newline at end of file diff --git a/js/Sources/CONST.js b/js/Sources/CONST.js index bee95b39..99bbac2b 100644 --- a/js/Sources/CONST.js +++ b/js/Sources/CONST.js @@ -8,7 +8,7 @@ function CONST() { this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.C]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Sources/CONST.pickle b/js/Sources/CONST.pickle index c98ada6d..92cb5675 100644 --- a/js/Sources/CONST.pickle +++ b/js/Sources/CONST.pickle @@ -54,29 +54,30 @@ S'vector' p15 sS'model.dep_ut' p16 -g15 -sS'model.in' +S'vector_boolean' p17 +sS'model.in' +p18 g15 sS'graphics' -p18 +p19 g7 sS'y' -p19 +p20 g15 sS'x' -p20 -NsS'model' p21 +NsS'model' +p22 g7 sS'model.sim' -p22 -S'list' p23 -sS'typ' +S'list' p24 +sS'typ' +p25 g15 sS'nout' -p25 +p26 g2 s.
\ No newline at end of file diff --git a/js/Sources/CONST_f.js b/js/Sources/CONST_f.js index a10bc4ea..3ef8149c 100644 --- a/js/Sources/CONST_f.js +++ b/js/Sources/CONST_f.js @@ -8,7 +8,7 @@ function CONST_f() { this.model.out = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.C]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Sources/CONST_f.pickle b/js/Sources/CONST_f.pickle index e1a85d88..710c4d0f 100644 --- a/js/Sources/CONST_f.pickle +++ b/js/Sources/CONST_f.pickle @@ -55,25 +55,26 @@ S'vector' p16 sS'model.dep_ut' p17 -g16 -sS'model.in' +S'vector_boolean' p18 +sS'model.in' +p19 g16 sS'graphics' -p19 +p20 g8 sS'y' -p20 +p21 g16 sS'x' -p21 -NsS'model' p22 +NsS'model' +p23 g8 sS'typ' -p23 +p24 g16 sS'nout' -p24 +p25 g4 s.
\ No newline at end of file diff --git a/js/Sources/CONST_m.js b/js/Sources/CONST_m.js index ce2b3c9e..70921450 100644 --- a/js/Sources/CONST_m.js +++ b/js/Sources/CONST_m.js @@ -11,7 +11,7 @@ function CONST_m() { this.model.rpar = new ScilabDouble(this.C); this.model.opar = list(); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Sources/CONST_m.pickle b/js/Sources/CONST_m.pickle index 2bb1d54b..752c9d95 100644 --- a/js/Sources/CONST_m.pickle +++ b/js/Sources/CONST_m.pickle @@ -73,25 +73,26 @@ S'string' p22 sS'model.dep_ut' p23 -g8 -sS'exprs' +S'vector_boolean' p24 +sS'exprs' +p25 g22 sS'gr_i' -p25 +p26 g8 sS'y' -p26 +p27 g8 sS'x' -p27 -NsS'model' p28 +NsS'model' +p29 g2 sS'ot' -p29 +p30 g6 sS'nout' -p30 +p31 g6 s.
\ No newline at end of file diff --git a/js/Sources/CURVE_c.js b/js/Sources/CURVE_c.js index 6d640617..d570080d 100644 --- a/js/Sources/CURVE_c.js +++ b/js/Sources/CURVE_c.js @@ -14,7 +14,7 @@ function CURVE_c() { this.model.rpar = new ScilabDouble([this.xx.slice()],[this.yy.slice()]); this.model.ipar = new ScilabDouble([N],[this.Method],[1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + this.model.dep_ut = new ScilabBoolean([false,true]); this.model.evtin = new ScilabDouble([1]); this.model.evtout = new ScilabDouble([1]); this.model.firing = new ScilabDouble([0]); diff --git a/js/Sources/CURVE_c.pickle b/js/Sources/CURVE_c.pickle index 7db8558b..73b01a8e 100644 --- a/js/Sources/CURVE_c.pickle +++ b/js/Sources/CURVE_c.pickle @@ -319,566 +319,567 @@ sS'x.model' p61 NsS'model.dep_ut' p62 -g2 -sS'menu_s' +S'vector_boolean' p63 +sS'menu_s' +p64 g2 sS'sample5' -p64 +p65 g2 sS'sample4' -p65 +p66 g2 sS'sTp2' -p66 +p67 g2 sS'x' -p67 +p68 g7 sS'x12' -p68 +p69 g4 sS'exprs[1-1]' -p69 +p70 g4 sS'points.data' -p70 +p71 g2 sS'j' -p71 +p72 g4 sS'x11' -p72 +p73 g4 sS'arg1' -p73 -S'object' p74 -sS'Pd3' +S'object' p75 +sS'Pd3' +p76 g2 sS't3' -p76 +p77 g4 sS'ey' -p77 +p78 g7 sS'ex' -p78 +p79 g7 sS'zz' -p79 +p80 g7 sS'sAmp' -p80 +p81 g2 sS'a.children[2-1]' -p81 -g74 -sS'Sawt1_exprs' p82 -NsS'a.title.font_style' +g75 +sS'Sawt1_exprs' p83 +NsS'a.title.font_style' +p84 g7 sS'y2' -p84 +p85 g4 sS'orpar' -p85 +p86 g2 sS'x.graphics' -p86 -g74 -sS'menu_d' p87 +g75 +sS'menu_d' +p88 g2 sS'menu_e' -p88 +p89 g2 sS'ye[$+1-1]' -p89 +p90 g7 sS'A[j+1-1][i+N-1]' -p90 +p91 g7 sS'a.children[1-1]' -p91 -g74 -sS'y1p' p92 +g75 +sS'y1p' +p93 g7 sS'r' -p93 +p94 g4 sS'seed4' -p94 +p95 g2 sS'seed5' -p95 +p96 g2 sS'B[j+1-1]' -p96 +p97 g7 sS'model.evtin' -p97 +p98 g7 sS'y21' -p98 +p99 g4 sS'menu_t' -p99 +p100 g2 sS'menu_r' -p100 +p101 g2 sS'PO' -p101 +p102 g7 sS'x22' -p102 +p103 g4 sS'C' -p103 +p104 g2 sS'DChange' -p104 +p105 g11 sS'Cformat' -p105 +p106 g4 sS'Q[i+N-1][i-1]' -p106 +p107 g7 sS'rep' -p107 +p108 g7 sS'ymx1' -p108 +p109 g7 sS'xy[N-1][2-1]' -p109 +p110 g7 sS'ipar[3-1]' -p110 +p111 g7 sS'sTp' -p111 +p112 g2 sS'wp' -p112 +p113 g2 sS'New_methhod' -p113 +p114 g7 sS'PeridicOption' -p114 +p115 g7 sS'Graf' -p115 +p116 g4 sS'Q' -p116 +p117 g7 sS'ok' -p117 +p118 g11 sS'ly11' -p118 +p119 g7 sS'xy[k-1].slice()' -p119 +p120 g2 sS'Z' -p120 +p121 g2 sS'Cmenu' -p121 +p122 g4 sS'periodicoption' -p122 +p123 g7 sS'w' -p123 +p124 g4 sS'a.x_ticks' -p124 -g74 -sS'y2p' p125 +g75 +sS'y2p' +p126 g7 sS'A[j+1-1][i+2*N-1]' -p126 +p127 g7 sS'YMN' -p127 +p128 g7 sS'Q[i-1][i+N-1]' -p128 +p129 g7 sS'y11' -p129 +p130 g4 sS'x2p' -p130 +p131 g7 sS'y12' -p131 +p132 g4 sS'NC' -p132 +p133 g7 sS'xyt' -p133 +p134 g2 sS'xo' -p134 +p135 g26 sS'ipar[2-1]' -p135 +p136 g7 sS'xc' -p136 +p137 g7 sS'sok' -p137 +p138 g11 sS'offset' -p138 +p139 g2 sS'splines.data' -p139 +p140 g2 sS'perop' -p140 +p141 g4 sS'xe' -p141 +p142 g7 sS'Y' -p142 +p143 g7 sS'xx' -p143 +p144 g2 sS'xy' -p144 +p145 g2 sS'btn' -p145 +p146 g7 sS'xye' -p146 +p147 g2 sS'xe[$+1-1]' -p147 +p148 g7 sS'SaveExit' -p148 +p149 g11 sS'xp' -p149 +p150 g7 sS'Method' -p150 +p151 g7 sS'xt' -p151 +p152 g26 sS'xyo' -p152 +p153 g2 sS'Q[i-1][i-1]' -p153 +p154 g7 sS'ystR' -p154 +p155 g7 sS'A[j-1][i+2*N-1]' -p155 +p156 g7 sS'random_u_exprs2' -p156 +p157 g31 sS'px' -p157 +p158 g7 sS'py' -p158 +p159 g7 sS'tok' -p159 +p160 g11 sS'ixy' -p160 +p161 g2 sS'rect' -p161 +p162 g26 sS'NP' -p162 +p163 g7 sS'Amp' -p163 +p164 g2 sS'exprs[2-1]' -p164 +p165 g7 sS'model.firing' -p165 +p166 g7 sS'xy2' -p166 +p167 g2 sS'B' -p167 +p168 g7 sS'A' -p168 +p169 g7 sS'yenC' -p169 +p170 g4 sS'N' -p170 +p171 g7 sS'random_u_exprs' -p171 +p172 g31 sS'Sawt2_exprs' -p172 -NsS'XMX' p173 +NsS'XMX' +p174 g7 sS'model.in' -p174 +p175 g2 sS'graphics' -p175 -g74 -sS'Exitm' p176 +g75 +sS'Exitm' +p177 g4 sS'N2' -p177 +p178 g7 sS'model.ipar' -p178 +p179 g26 sS'Pw3' -p179 +p180 g2 sS'f' -p180 +p181 g7 sS'a.grid' -p181 +p182 g2 sS'y[N-1]' -p182 +p183 g7 sS'xy[zz-1].slice()' -p183 +p184 g2 sS'gr_i' -p184 +p185 g2 sS'ipar' -p185 +p186 g2 sS'ystC' -p186 +p187 g4 sS'mtd' -p187 +p188 g7 sS'PERIODIC' -p188 +p189 g4 sS'xmx1' -p189 +p190 g7 sS'scam' -p190 +p191 g4 sS'exprs[4-1]' -p191 +p192 g4 sS'ans0' -p192 +p193 g4 sS'ymn1' -p193 +p194 g7 sS't1' -p194 +p195 g4 sS'model.evtout' -p195 +p196 g7 sS'rpar' -p196 +p197 g2 sS'lx11' -p197 +p198 g7 sS'model.out' -p198 +p199 g7 sS'Bias3' -p199 +p200 g2 sS'Tp3' -p200 +p201 g2 sS'np5' -p201 +p202 g2 sS'np4' -p202 +p203 g2 sS'rectx' -p203 +p204 g7 sS'np1' -p204 +p205 g7 sS'Lx' -p205 +p206 g7 sS'x21' -p206 +p207 g4 sS'x[k-1]' -p207 +p208 g2 sS'HIT' -p208 +p209 g11 sS'xstR' -p209 +p210 g7 sS'xe[zz-1]' -p210 +p211 g2 sS'A[j+1-1][i-1]' -p211 +p212 g7 sS'sAmp2' -p212 +p213 g2 sS'TN' -p213 +p214 g2 sS'menus' -p214 +p215 g31 sS'sdelay' -p215 +p216 g2 sS'points' -p216 -NsS'Q[i+N-1][i+N-1]' p217 +NsS'Q[i+N-1][i+N-1]' +p218 g7 sS'TA' -p218 +p219 g26 sS'Datam' -p219 +p220 g4 sS'model.sim' -p220 +p221 g31 sS'XMN' -p221 +p222 g7 sS'A[j+2-1][i+N+1-1]' -p222 +p223 g7 sS'a.data_bounds' -p223 +p224 g7 sS'menu_o' -p224 +p225 g2 sS'd' -p225 +p226 g7 sS'ye' -p226 +p227 g7 sS'X' -p227 +p228 g26 sS'Zt' -p228 +p229 g26 sS'fd' -p229 +p230 g7 sS'exprs[5-1]' -p230 +p231 g4 sS'graphics.exprs' -p231 -NsS'phase' p232 +NsS'phase' +p233 g7 sS'ZERO_POINT' -p233 +p234 g11 sS'typ' -p234 +p235 g2 sS'min5' -p235 +p236 g2 sS'a' -p236 -g74 -sS'mok' p237 +g75 +sS'mok' +p238 g11 sS'Orderm' -p238 +p239 g4 sS'A[j+2-1][i+N-1]' -p239 +p240 g7 sS'B[j-1]' -p240 +p241 g7 sS'ly21' -p241 +p242 g7 sS'y[zz-1]' -p242 +p243 g2 sS'A[j+2-1][i-1]' -p243 +p244 g7 sS'max5' -p244 +p245 g2 sS'exprs' -p245 +p246 g26 sS'exprs[3-1]' -p246 +p247 g7 sS'y[k-1]' -p247 +p248 g2 sS'At' -p248 +p249 g26 sS'y' -p249 +p250 g7 sS'model' -p250 -g74 -sS'order' p251 +g75 +sS'order' +p252 g7 s.
\ No newline at end of file diff --git a/js/Sources/CURV_f.js b/js/Sources/CURV_f.js index f55c24b3..1c694d99 100644 --- a/js/Sources/CURV_f.js +++ b/js/Sources/CURV_f.js @@ -14,7 +14,7 @@ function CURV_f() { this.model.rpar = new ScilabDouble([xx],[yy],[rect.slice()]); this.model.ipar = new ScilabDouble([size(xx,1)],[axisdata.slice()]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + 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); return new BasicBlock(this.x); diff --git a/js/Sources/CURV_f.pickle b/js/Sources/CURV_f.pickle index b35b21af..1b556535 100644 --- a/js/Sources/CURV_f.pickle +++ b/js/Sources/CURV_f.pickle @@ -79,22 +79,23 @@ p26 g4 sS'model.dep_ut' p27 -g12 -sS'n' +S'vector_boolean' p28 +sS'n' +p29 g9 sS'gr_i' -p29 +p30 g12 sS'ipar' -p30 +p31 g4 sS'y' -p31 +p32 g12 sS'x' -p32 -NsS'model' p33 +NsS'model' +p34 g2 s.
\ No newline at end of file diff --git a/js/Sources/Counter.js b/js/Sources/Counter.js index 9e08e0d8..804b9666 100644 --- a/js/Sources/Counter.js +++ b/js/Sources/Counter.js @@ -12,7 +12,7 @@ function Counter() { this.model.dstate = new ScilabDouble([0]); this.model.ipar = new ScilabDouble([this.rule],[this.maxim],[this.minim]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Sources/Counter.pickle b/js/Sources/Counter.pickle index edfb85ef..5ef7d0ee 100644 --- a/js/Sources/Counter.pickle +++ b/js/Sources/Counter.pickle @@ -39,7 +39,7 @@ sS'x.model' p7 NsS'model.dep_ut' p8 -S'vector' +S'vector_boolean' p9 sS'model.out' p10 @@ -65,29 +65,30 @@ S'matrix' p18 sS'typ' p19 -g9 -sS'model.blocktype' +S'vector' p20 -S'string' +sS'model.blocktype' p21 -sS'x.graphics' +S'string' p22 +sS'x.graphics' +p23 g4 sS'rule' -p23 +p24 g2 sS'exprs' -p24 +p25 g18 sS'gr_i' -p25 -g9 -sS'y' p26 -g9 -sS'x' +g20 +sS'y' p27 -NsS'model' +g20 +sS'x' p28 +NsS'model' +p29 g4 s.
\ No newline at end of file diff --git a/js/Sources/FROMWS_c.js b/js/Sources/FROMWS_c.js index 04bec587..2e7844d2 100644 --- a/js/Sources/FROMWS_c.js +++ b/js/Sources/FROMWS_c.js @@ -15,7 +15,7 @@ function FROMWS_c() { this.model.evtout = new ScilabDouble([1]); this.model.firing = new ScilabDouble([0]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,true]); + 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); diff --git a/js/Sources/FROMWS_c.pickle b/js/Sources/FROMWS_c.pickle index d8f82919..4fcf93b0 100644 --- a/js/Sources/FROMWS_c.pickle +++ b/js/Sources/FROMWS_c.pickle @@ -98,19 +98,20 @@ p29 g11 sS'model.dep_ut' p30 -g14 -sS'exprs' +S'vector_boolean' p31 +sS'exprs' +p32 g25 sS'r' -p32 +p33 g28 sS'model.outtyp' -p33 +p34 g5 sS'x' -p34 -NsS'model' p35 +NsS'model' +p36 g2 s.
\ No newline at end of file diff --git a/js/Sources/GENSIN_f.js b/js/Sources/GENSIN_f.js index 18cd6623..18dfd652 100644 --- a/js/Sources/GENSIN_f.js +++ b/js/Sources/GENSIN_f.js @@ -10,7 +10,7 @@ function GENSIN_f() { this.model.outtyp = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([1],[1],[0]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + 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); diff --git a/js/Sources/GENSIN_f.pickle b/js/Sources/GENSIN_f.pickle index be7ae81b..eec74ca4 100644 --- a/js/Sources/GENSIN_f.pickle +++ b/js/Sources/GENSIN_f.pickle @@ -64,27 +64,28 @@ p18 g8 sS'model.dep_ut' p19 -g8 -sS'graphics.exprs' +S'vector_boolean' p20 -NsS'graphics' +sS'graphics.exprs' p21 +NsS'graphics' +p22 g10 sS'y' -p22 +p23 g8 sS'x' -p23 -NsS'model' p24 +NsS'model' +p25 g10 sS'typ' -p25 +p26 g8 sS'model.outtyp' -p26 +p27 g4 sS'model.blocktype' -p27 +p28 g2 s.
\ No newline at end of file diff --git a/js/Sources/GENSQR_f.js b/js/Sources/GENSQR_f.js index 3525e9f9..0fbb44b9 100644 --- a/js/Sources/GENSQR_f.js +++ b/js/Sources/GENSQR_f.js @@ -10,7 +10,7 @@ function GENSQR_f() { this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([this.Amplitude]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Sources/GENSQR_f.pickle b/js/Sources/GENSQR_f.pickle index 63864dbd..d57cb644 100644 --- a/js/Sources/GENSQR_f.pickle +++ b/js/Sources/GENSQR_f.pickle @@ -46,7 +46,7 @@ p11 g4 sS'model.dep_ut' p12 -S'vector' +S'vector_boolean' p13 sS'exprs' p14 @@ -55,28 +55,29 @@ sS'x.model' p15 NsS'gr_i' p16 -g13 -sS'Amplitude' +S'vector' p17 +sS'Amplitude' +p18 g4 sS'graphics' -p18 +p19 g9 sS'y' -p19 -g13 -sS'x' p20 -NsS'model' +g17 +sS'x' p21 +NsS'model' +p22 g9 sS'typ' -p22 -g13 -sS'model.outtyp' p23 +g17 +sS'model.outtyp' +p24 g4 sS'model.blocktype' -p24 +p25 g2 s.
\ No newline at end of file diff --git a/js/Sources/GEN_SQR.js b/js/Sources/GEN_SQR.js index 9baa8ad6..01b23731 100644 --- a/js/Sources/GEN_SQR.js +++ b/js/Sources/GEN_SQR.js @@ -36,7 +36,7 @@ function GEN_SQR() { this.model.opar = list(); this.model.blocktype = new ScilabString(["h"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); this.model.label = new ScilabString([""]); this.model.nzcross = new ScilabDouble([0]); this.model.nmode = new ScilabDouble([0]); diff --git a/js/Sources/GEN_SQR.pickle b/js/Sources/GEN_SQR.pickle index 6ecc8603..235a1dc3 100644 --- a/js/Sources/GEN_SQR.pickle +++ b/js/Sources/GEN_SQR.pickle @@ -199,28 +199,29 @@ p62 g4 sS'model.dep_ut' p63 -g7 -sS'exprs' +S'vector_boolean' p64 +sS'exprs' +p65 g7 sS'x.graphics.exprs' -p65 -NsS'PREVAR_scicos_context' p66 +NsS'PREVAR_scicos_context' +p67 g4 sS'model.firing' -p67 +p68 g7 sS'y' -p68 +p69 g4 sS'x' -p69 +p70 g9 sS'model' -p70 +p71 g9 sS'model.state' -p71 +p72 g7 s.
\ No newline at end of file diff --git a/js/Sources/Ground_g.js b/js/Sources/Ground_g.js index 49e69a58..6dbf9bf3 100644 --- a/js/Sources/Ground_g.js +++ b/js/Sources/Ground_g.js @@ -12,7 +12,7 @@ function Ground_g() { this.model.rpar = new ScilabDouble([]); this.model.opar = list(C); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Sources/Ground_g.pickle b/js/Sources/Ground_g.pickle index 31b70cc4..dd054cc0 100644 --- a/js/Sources/Ground_g.pickle +++ b/js/Sources/Ground_g.pickle @@ -51,23 +51,24 @@ p14 g4 sS'model.dep_ut' p15 -g4 -sS'model.in' +S'vector_boolean' p16 +sS'model.in' +p17 g4 sS'y' -p17 +p18 g4 sS'x' -p18 -NsS'model' p19 -S'object' +NsS'model' p20 -sS'typ' +S'object' p21 +sS'typ' +p22 g4 sS'model.outtyp' -p22 +p23 g10 s.
\ No newline at end of file diff --git a/js/Sources/INIMPL_f.js b/js/Sources/INIMPL_f.js index 68194d33..c6b8133c 100644 --- a/js/Sources/INIMPL_f.js +++ b/js/Sources/INIMPL_f.js @@ -6,7 +6,7 @@ function INIMPL_f() { this.model.out = new ScilabDouble([-1]); this.model.out2 = new ScilabDouble([1]); this.model.ipar = new ScilabDouble([1]); - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); this.model.blocktype = new ScilabString(["c"]); var mo = modelica(); mo.model = "PORT"; diff --git a/js/Sources/INIMPL_f.pickle b/js/Sources/INIMPL_f.pickle index dab0db7c..64edf93d 100644 --- a/js/Sources/INIMPL_f.pickle +++ b/js/Sources/INIMPL_f.pickle @@ -77,19 +77,20 @@ p22 g7 sS'model.dep_ut' p23 -g10 -sS'exprs' +S'vector_boolean' p24 +sS'exprs' +p25 g5 sS'gr_i' -p25 +p26 g10 sS'y' -p26 +p27 g7 sS'x' -p27 -NsS'model' p28 +NsS'model' +p29 g2 s.
\ No newline at end of file diff --git a/js/Sources/IN_f.js b/js/Sources/IN_f.js index e41a4589..2d293530 100644 --- a/js/Sources/IN_f.js +++ b/js/Sources/IN_f.js @@ -9,7 +9,7 @@ function IN_f() { this.model.outtyp = new ScilabDouble([-1]); this.model.ipar = new ScilabDouble([prt]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Sources/IN_f.pickle b/js/Sources/IN_f.pickle index 17c25508..9d61a54d 100644 --- a/js/Sources/IN_f.pickle +++ b/js/Sources/IN_f.pickle @@ -54,32 +54,33 @@ S'vector' p15 sS'model.dep_ut' p16 -g15 -sS'graphics.exprs' +S'vector_boolean' p17 -S'matrix' +sS'graphics.exprs' p18 -sS'graphics' +S'matrix' p19 +sS'graphics' +p20 g9 sS'y' -p20 +p21 g2 sS'x' -p21 -NsS'model' p22 +NsS'model' +p23 g9 sS'model.ipar' -p23 +p24 g2 sS'typ' -p24 +p25 g15 sS'model.outtyp' -p25 +p26 g2 sS'model.firing' -p26 +p27 g15 s.
\ No newline at end of file diff --git a/js/Sources/Modulo_Count.js b/js/Sources/Modulo_Count.js index 39d78ead..da9413fb 100644 --- a/js/Sources/Modulo_Count.js +++ b/js/Sources/Modulo_Count.js @@ -10,7 +10,7 @@ function Modulo_Count() { this.model.dstate = new ScilabDouble([this.ini_c]); this.model.ipar = new ScilabDouble([this.base]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Sources/Modulo_Count.pickle b/js/Sources/Modulo_Count.pickle index e2d59cc5..b8a493b5 100644 --- a/js/Sources/Modulo_Count.pickle +++ b/js/Sources/Modulo_Count.pickle @@ -44,42 +44,43 @@ sS'graphics.exprs' p10 NsS'model.dep_ut' p11 -S'vector' +S'vector_boolean' p12 sS'gr_i' p13 -g12 -sS'exprs' +S'vector' p14 -S'matrix' +sS'exprs' p15 -sS'x.model' +S'matrix' p16 -NsS'base' +sS'x.model' p17 +NsS'base' +p18 g4 sS'graphics' -p18 +p19 g9 sS'y' -p19 -g12 -sS'x' p20 -NsS'model' +g14 +sS'x' p21 +NsS'model' +p22 g9 sS'model.ipar' -p22 +p23 g4 sS'typ' -p23 -g12 -sS'x.graphics' p24 +g14 +sS'x.graphics' +p25 g9 sS'model.blocktype' -p25 -S'string' p26 +S'string' +p27 s.
\ No newline at end of file diff --git a/js/Sources/PULSE_SC.js b/js/Sources/PULSE_SC.js index 211419ba..e59c3a36 100644 --- a/js/Sources/PULSE_SC.js +++ b/js/Sources/PULSE_SC.js @@ -31,7 +31,7 @@ function PULSE_SC() { this.model.opar = list(); this.model.blocktype = new ScilabString(["h"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([false,false]); + this.model.dep_ut = new ScilabBoolean([false,false]); this.model.label = new ScilabString([""]); this.model.nzcross = new ScilabDouble([0]); this.model.nmode = new ScilabDouble([0]); diff --git a/js/Sources/PULSE_SC.pickle b/js/Sources/PULSE_SC.pickle index 3ae2c2c9..db951a70 100644 --- a/js/Sources/PULSE_SC.pickle +++ b/js/Sources/PULSE_SC.pickle @@ -184,28 +184,29 @@ p57 g4 sS'model.dep_ut' p58 -g7 -sS'exprs' +S'vector_boolean' p59 +sS'exprs' +p60 g7 sS'x.graphics.exprs' -p60 -NsS'PREVAR_scicos_context' p61 +NsS'PREVAR_scicos_context' +p62 g4 sS'model.firing' -p62 +p63 g7 sS'y' -p63 +p64 g4 sS'x' -p64 +p65 g10 sS'model' -p65 +p66 g10 sS'model.state' -p66 +p67 g7 s.
\ No newline at end of file diff --git a/js/Sources/RAMP.js b/js/Sources/RAMP.js index 7bfaa4f7..a50b550b 100644 --- a/js/Sources/RAMP.js +++ b/js/Sources/RAMP.js @@ -13,7 +13,7 @@ function RAMP() { this.model.blocktype = new ScilabString(["c"]); this.model.nmode = new ScilabDouble([1]); this.model.nzcross = new ScilabDouble([1]); - this.model.dep_ut = new ScilabDouble([false,true]); + 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); diff --git a/js/Sources/RAMP.pickle b/js/Sources/RAMP.pickle index 12e16900..2b7c7b79 100644 --- a/js/Sources/RAMP.pickle +++ b/js/Sources/RAMP.pickle @@ -75,22 +75,23 @@ p22 g2 sS'model.dep_ut' p23 -g17 -sS'stt' +S'vector_boolean' p24 +sS'stt' +p25 g2 sS'exprs' -p25 +p26 g17 sS'gr_i' -p26 +p27 g17 sS'y' -p27 +p28 g17 sS'x' -p28 -NsS'model' p29 +NsS'model' +p30 g4 s.
\ No newline at end of file diff --git a/js/Sources/RAND_f.js b/js/Sources/RAND_f.js index 4ce8a189..072839b4 100644 --- a/js/Sources/RAND_f.js +++ b/js/Sources/RAND_f.js @@ -14,7 +14,7 @@ function RAND_f() { this.model.rpar = new ScilabDouble([this.a.slice()],[this.b.slice()]); this.model.ipar = new ScilabDouble([this.flag]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Sources/RAND_f.pickle b/js/Sources/RAND_f.pickle index d08c467e..3f839704 100644 --- a/js/Sources/RAND_f.pickle +++ b/js/Sources/RAND_f.pickle @@ -84,22 +84,23 @@ p23 g13 sS'model.dep_ut' p24 -g20 -sS'exprs' +S'vector_boolean' p25 +sS'exprs' +p26 g2 sS'gr_i' -p26 +p27 g20 sS'y' -p27 +p28 g20 sS'x' -p28 -NsS'model' p29 +NsS'model' +p30 g4 sS'nout' -p30 +p31 g8 s.
\ No newline at end of file diff --git a/js/Sources/RAND_m.js b/js/Sources/RAND_m.js index 43c8e648..af6c26bb 100644 --- a/js/Sources/RAND_m.js +++ b/js/Sources/RAND_m.js @@ -23,7 +23,7 @@ function RAND_m() { this.model.ipar = new ScilabDouble([this.flag]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Sources/RAND_m.pickle b/js/Sources/RAND_m.pickle index af80c403..d4f91cd6 100644 --- a/js/Sources/RAND_m.pickle +++ b/js/Sources/RAND_m.pickle @@ -122,22 +122,23 @@ p37 g19 sS'model.dep_ut' p38 -g12 -sS'exprs' +S'vector_boolean' p39 +sS'exprs' +p40 g2 sS'gr_i' -p40 +p41 g12 sS'y' -p41 +p42 g12 sS'x' -p42 -NsS'model' p43 +NsS'model' +p44 g4 sS'ot' -p44 +p45 g8 s.
\ No newline at end of file diff --git a/js/Sources/READAU_f.js b/js/Sources/READAU_f.js index dca0220c..499d61dc 100644 --- a/js/Sources/READAU_f.js +++ b/js/Sources/READAU_f.js @@ -19,7 +19,7 @@ function READAU_f() { this.model.dstate = new ScilabDouble([1],[1],[lunit],[zeros(this.N*M,1)]); this.model.ipar = new ScilabDouble([length(fname)],[this._str2code[frmt-1]],[ievt],[this.N],[M],[this.swap],[offset],[this._str2code[fname-1]],[tmask],[outmask]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Sources/READAU_f.pickle b/js/Sources/READAU_f.pickle index be5d9571..ccddd1bf 100644 --- a/js/Sources/READAU_f.pickle +++ b/js/Sources/READAU_f.pickle @@ -48,92 +48,93 @@ p9 g6 sS'model.dep_ut' p10 -g2 -sS'model.out' +S'vector_boolean' p11 -S'double' +sS'model.out' p12 -sS'out' +S'double' p13 -NsS'x.graphics' +sS'out' p14 +NsS'x.graphics' +p15 g6 sS'lunit' -p15 -g12 -sS'swap' p16 -g12 -sS'fname' +g13 +sS'swap' p17 -S'string' +g13 +sS'fname' p18 -sS'frmt' +S'string' p19 -g18 -sS'model.evtin' +sS'frmt' p20 -g12 -sS'tmask1' +g19 +sS'model.evtin' p21 +g13 +sS'tmask1' +p22 g2 sS'graphics.exprs' -p22 -NsS'model.sim' p23 -S'list' +NsS'model.sim' p24 -sS'M' +S'list' p25 -g12 -sS'N' +sS'M' p26 -g12 -sS'offset' +g13 +sS'N' p27 -g12 -sS'model.ipar' +g13 +sS'offset' p28 +g13 +sS'model.ipar' +p29 g4 sS'typ' -p29 +p30 g2 sS'imask' -p30 -g12 -sS'model.blocktype' p31 -g18 -sS'outmask' +g13 +sS'model.blocktype' p32 -g12 -sS'frmt1' +g19 +sS'outmask' p33 -g18 -sS'fname1' +g13 +sS'frmt1' p34 -g12 -sS'exprs' +g19 +sS'fname1' p35 +g13 +sS'exprs' +p36 g4 sS'gr_i' -p36 +p37 g2 sS'ievt' -p37 -g12 -sS'ipar' p38 +g13 +sS'ipar' +p39 g4 sS'y' -p39 +p40 g2 sS'x' -p40 -NsS'model' p41 +NsS'model' +p42 g6 sS'nout' -p42 -g12 +p43 +g13 s.
\ No newline at end of file diff --git a/js/Sources/READC_f.js b/js/Sources/READC_f.js index cef7c487..e00c0d90 100644 --- a/js/Sources/READC_f.js +++ b/js/Sources/READC_f.js @@ -23,7 +23,7 @@ function READC_f() { this.model.ipar = new ScilabDouble([length(fname)],[this._str2code[frmt-1]],[ievt],[this.N],[this.M],[this.swap],[this.offset],[this._str2code[fname-1]],[tmask],[this.outmask]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Sources/READC_f.pickle b/js/Sources/READC_f.pickle index a860907f..dfdb10b1 100644 --- a/js/Sources/READC_f.pickle +++ b/js/Sources/READC_f.pickle @@ -61,106 +61,107 @@ p11 g6 sS'model.dep_ut' p12 -g10 -sS'model.out' +S'vector_boolean' p13 +sS'model.out' +p14 g2 sS'outpt' -p14 +p15 g2 sS'out' -p15 +p16 g2 sS'x.graphics' -p16 +p17 g6 sS'lunit' -p17 +p18 g2 sS'offset' -p18 +p19 g2 sS'swap' -p19 +p20 g2 sS'fname' -p20 -S'string' p21 -sS'frmt' +S'string' p22 -g21 -sS'model.evtin' +sS'frmt' p23 +g22 +sS'model.evtin' +p24 g2 sS'tmask1' -p24 +p25 g2 sS'model.firing' -p25 +p26 g2 sS'model.sim' -p26 -S'list' p27 -sS'model.evtout' +S'list' p28 +sS'model.evtout' +p29 g10 sS'M' -p29 +p30 g2 sS'fmts' -p30 +p31 g10 sS'N' -p31 +p32 g2 sS'graphics' -p32 +p33 g6 sS'model.ipar' -p33 +p34 g4 sS'typ' -p34 +p35 g10 sS'imask' -p35 +p36 g2 sS'model.blocktype' -p36 -g21 -sS'outmask' p37 +g22 +sS'outmask' +p38 g2 sS'frmt1' -p38 -g21 -sS'fname1' p39 +g22 +sS'fname1' +p40 g2 sS'exprs' -p40 +p41 g4 sS'gr_i' -p41 +p42 g10 sS'ievt' -p42 +p43 g2 sS'ipar' -p43 +p44 g4 sS'y' -p44 +p45 g10 sS'x' -p45 +p46 g6 sS'model' -p46 +p47 g6 sS'nout' -p47 +p48 g2 s.
\ No newline at end of file diff --git a/js/Sources/RFILE_f.js b/js/Sources/RFILE_f.js index b04875bd..4e7e4653 100644 --- a/js/Sources/RFILE_f.js +++ b/js/Sources/RFILE_f.js @@ -19,7 +19,7 @@ function RFILE_f() { this.model.dstate = new ScilabDouble(dstate); this.model.ipar = new ScilabDouble([length(fname)],[length(frmt)],[0],[this.N],[this._str2code[fname-1]],[this._str2code[frmt-1]],[tmask],[this.outmask]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Sources/RFILE_f.pickle b/js/Sources/RFILE_f.pickle index e41c7ec9..02baeec7 100644 --- a/js/Sources/RFILE_f.pickle +++ b/js/Sources/RFILE_f.pickle @@ -60,85 +60,86 @@ p14 g9 sS'model.dep_ut' p15 -g13 -sS'model.out' +S'vector_boolean' p16 +sS'model.out' +p17 g2 sS'out' -p17 +p18 g2 sS'x.graphics' -p18 +p19 g9 sS'lunit' -p19 +p20 g2 sS'fname' -p20 +p21 g7 sS'frmt' -p21 +p22 g7 sS'model.evtin' -p22 +p23 g2 sS'tmask1' -p23 +p24 g2 sS'model.firing' -p24 +p25 g2 sS'exprs[6-1]' -p25 +p26 g13 sS'N' -p26 +p27 g2 sS'graphics' -p27 +p28 g9 sS'model.ipar' -p28 +p29 g4 sS'typ' -p29 +p30 g13 sS'imask' -p30 +p31 g2 sS'model.blocktype' -p31 +p32 g7 sS'outmask' -p32 +p33 g2 sS'frmt1' -p33 +p34 g2 sS'fname1' -p34 +p35 g2 sS'exprs' -p35 +p36 g4 sS'gr_i' -p36 +p37 g13 sS'ievt' -p37 +p38 g2 sS'ipar' -p38 +p39 g4 sS'y' -p39 +p40 g13 sS'x' -p40 -NsS'model' p41 +NsS'model' +p42 g9 sS'nout' -p42 +p43 g2 s.
\ No newline at end of file diff --git a/js/Sources/SAWTOOTH_f.js b/js/Sources/SAWTOOTH_f.js index 6703c8db..89e6d378 100644 --- a/js/Sources/SAWTOOTH_f.js +++ b/js/Sources/SAWTOOTH_f.js @@ -7,7 +7,7 @@ function SAWTOOTH_f() { this.model.evtin = new ScilabDouble([1]); this.model.dstate = new ScilabDouble([0]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + 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); diff --git a/js/Sources/SAWTOOTH_f.pickle b/js/Sources/SAWTOOTH_f.pickle index a0c6791b..789aac5c 100644 --- a/js/Sources/SAWTOOTH_f.pickle +++ b/js/Sources/SAWTOOTH_f.pickle @@ -34,24 +34,25 @@ p7 g4 sS'model.dep_ut' p8 -S'vector' +S'vector_boolean' p9 sS'model.out' p10 g4 sS'gr_i' p11 -g9 -sS'y' +S'vector' p12 -g9 -sS'x' +sS'y' p13 -NsS'model' +g12 +sS'x' p14 -S'object' +NsS'model' p15 -sS'typ' +S'object' p16 -g9 +sS'typ' +p17 +g12 s.
\ No newline at end of file diff --git a/js/Sources/STEP.js b/js/Sources/STEP.js index c63e5823..21b9f45e 100644 --- a/js/Sources/STEP.js +++ b/js/Sources/STEP.js @@ -12,7 +12,7 @@ function STEP() { this.model.firing = new ScilabDouble([1]); this.model.rpar = new ScilabDouble(rpar); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Sources/STEP.pickle b/js/Sources/STEP.pickle index 30de5d1a..3c8db3c5 100644 --- a/js/Sources/STEP.pickle +++ b/js/Sources/STEP.pickle @@ -85,19 +85,20 @@ p26 g17 sS'model.dep_ut' p27 -g23 -sS'exprs' +S'vector_boolean' p28 +sS'exprs' +p29 g5 sS'gr_i' -p29 +p30 g23 sS'y' -p30 +p31 g23 sS'x' -p31 -NsS'model' p32 +NsS'model' +p33 g2 s.
\ No newline at end of file diff --git a/js/Sources/SampleCLK.js b/js/Sources/SampleCLK.js index 7a00c63d..9595688c 100644 --- a/js/Sources/SampleCLK.js +++ b/js/Sources/SampleCLK.js @@ -7,7 +7,7 @@ function SampleCLK() { this.model.rpar = new ScilabDouble([1,0]); this.model.blocktype = new ScilabString(["d"]); this.model.firing = new ScilabDouble([-1]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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," "); return new BasicBlock(this.x); diff --git a/js/Sources/SampleCLK.pickle b/js/Sources/SampleCLK.pickle index 4cace608..de51428e 100644 --- a/js/Sources/SampleCLK.pickle +++ b/js/Sources/SampleCLK.pickle @@ -59,22 +59,23 @@ p17 g10 sS'model.dep_ut' p18 -g14 -sS'graphics' +S'vector_boolean' p19 +sS'graphics' +p20 g10 sS'y' -p20 +p21 g2 sS'x' -p21 -NsS'model' p22 +NsS'model' +p23 g10 sS'typ' -p23 +p24 g14 sS'model.firing' -p24 +p25 g2 s.
\ No newline at end of file diff --git a/js/Sources/TIME_f.js b/js/Sources/TIME_f.js index 97bb2cdc..23feae55 100644 --- a/js/Sources/TIME_f.js +++ b/js/Sources/TIME_f.js @@ -5,7 +5,7 @@ function TIME_f() { this.model.sim = new ScilabString(["timblk"]); this.model.out = new ScilabDouble([1]); this.model.blocktype = new ScilabString(["c"]); - this.model.dep_ut = new ScilabDouble([false,true]); + 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); return new BasicBlock(this.x); diff --git a/js/Sources/TIME_f.pickle b/js/Sources/TIME_f.pickle index 1cf71889..cd43824b 100644 --- a/js/Sources/TIME_f.pickle +++ b/js/Sources/TIME_f.pickle @@ -24,7 +24,7 @@ p3 g2 sS'model.dep_ut' p4 -S'vector' +S'vector_boolean' p5 sS'model.out' p6 @@ -32,17 +32,18 @@ S'double' p7 sS'gr_i' p8 -g5 -sS'y' +S'vector' p9 -g5 -sS'x' +sS'y' p10 -NsS'model' +g9 +sS'x' p11 -S'object' +NsS'model' p12 -sS'typ' +S'object' p13 -g5 +sS'typ' +p14 +g9 s.
\ No newline at end of file diff --git a/js/Sources/TKSCALE.js b/js/Sources/TKSCALE.js index 581686c4..bd1b757c 100644 --- a/js/Sources/TKSCALE.js +++ b/js/Sources/TKSCALE.js @@ -10,7 +10,7 @@ function TKSCALE() { this.model.evtin = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([this.a],[this.b],[this.f]); this.model.blocktype = new ScilabString(["d"]); - this.model.dep_ut = new ScilabDouble([false,false]); + 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); diff --git a/js/Sources/TKSCALE.pickle b/js/Sources/TKSCALE.pickle index 6a055e52..e5bfa5a5 100644 --- a/js/Sources/TKSCALE.pickle +++ b/js/Sources/TKSCALE.pickle @@ -65,23 +65,24 @@ S'vector' p18 sS'model.dep_ut' p19 -g18 -sS'graphics' +S'vector_boolean' p20 +sS'graphics' +p21 g10 sS'y' -p21 +p22 g18 sS'x' -p22 -NsS'model' p23 +NsS'model' +p24 g10 sS'typ' -p24 +p25 g18 sS'model.blocktype' -p25 -S'string' p26 +S'string' +p27 s.
\ No newline at end of file diff --git a/js/Threshold/GENERAL_f.js b/js/Threshold/GENERAL_f.js index 9c9c75b0..60c2ac11 100644 --- a/js/Threshold/GENERAL_f.js +++ b/js/Threshold/GENERAL_f.js @@ -12,7 +12,7 @@ function GENERAL_f() { this.model.rpar = new ScilabDouble([0],[0],[0],[0]); this.model.blocktype = new ScilabString(["z"]); this.model.firing = new ScilabDouble([-ones(this.out,1)]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/Threshold/GENERAL_f.pickle b/js/Threshold/GENERAL_f.pickle index 2c84e44a..678deb91 100644 --- a/js/Threshold/GENERAL_f.pickle +++ b/js/Threshold/GENERAL_f.pickle @@ -90,25 +90,26 @@ S'string' p28 sS'model.dep_ut' p29 -g14 -sS'n' +S'vector_boolean' p30 +sS'n' +p31 g8 sS'exprs' -p31 +p32 g5 sS'gr_i' -p32 +p33 g14 sS'y' -p33 +p34 g14 sS'x' -p34 -NsS'model' p35 +NsS'model' +p36 g2 sS'nout' -p36 +p37 g8 s.
\ No newline at end of file diff --git a/js/Threshold/NEGTOPOS_f.js b/js/Threshold/NEGTOPOS_f.js index 01615bf8..6c140a45 100644 --- a/js/Threshold/NEGTOPOS_f.js +++ b/js/Threshold/NEGTOPOS_f.js @@ -9,7 +9,7 @@ function NEGTOPOS_f() { this.model.rpar = new ScilabDouble([-1],[-1],[0],[-1]); this.model.blocktype = new ScilabString(["z"]); this.model.firing = new ScilabDouble([-1]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); return new BasicBlock(this.x); diff --git a/js/Threshold/NEGTOPOS_f.pickle b/js/Threshold/NEGTOPOS_f.pickle index 25a489a1..9ec9e406 100644 --- a/js/Threshold/NEGTOPOS_f.pickle +++ b/js/Threshold/NEGTOPOS_f.pickle @@ -43,23 +43,24 @@ S'vector' p12 sS'model.dep_ut' p13 -g12 -sS'model.in' +S'vector_boolean' p14 +sS'model.in' +p15 g4 sS'y' -p15 +p16 g12 sS'x' -p16 -NsS'model' p17 -S'object' +NsS'model' p18 -sS'typ' +S'object' p19 +sS'typ' +p20 g12 sS'model.firing' -p20 +p21 g4 s.
\ No newline at end of file diff --git a/js/Threshold/POSTONEG_f.js b/js/Threshold/POSTONEG_f.js index aa370d13..1ea900af 100644 --- a/js/Threshold/POSTONEG_f.js +++ b/js/Threshold/POSTONEG_f.js @@ -9,7 +9,7 @@ function POSTONEG_f() { this.model.evtout = new ScilabDouble([1]); this.model.rpar = new ScilabDouble([-1],[-1],[-1],[0]); this.model.blocktype = new ScilabString(["z"]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/Threshold/POSTONEG_f.pickle b/js/Threshold/POSTONEG_f.pickle index a46b9221..47d2f4e3 100644 --- a/js/Threshold/POSTONEG_f.pickle +++ b/js/Threshold/POSTONEG_f.pickle @@ -46,23 +46,24 @@ p13 g8 sS'model.dep_ut' p14 -g8 -sS'model.in' +S'vector_boolean' p15 +sS'model.in' +p16 g4 sS'y' -p16 +p17 g8 sS'x' -p17 -NsS'model' p18 -S'object' +NsS'model' p19 -sS'typ' +S'object' p20 +sS'typ' +p21 g8 sS'model.firing' -p21 +p22 g8 s.
\ No newline at end of file diff --git a/js/Threshold/ZCROSS_f.js b/js/Threshold/ZCROSS_f.js index 5ebd8928..ec218c09 100644 --- a/js/Threshold/ZCROSS_f.js +++ b/js/Threshold/ZCROSS_f.js @@ -11,7 +11,7 @@ function ZCROSS_f() { this.model.rpar = new ScilabDouble([-1],[-1],[0],[0]); this.model.blocktype = new ScilabString(["z"]); this.model.firing = new ScilabDouble([-1]); - this.model.dep_ut = new ScilabDouble([true,false]); + 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); diff --git a/js/Threshold/ZCROSS_f.pickle b/js/Threshold/ZCROSS_f.pickle index 36c5e933..30afed6c 100644 --- a/js/Threshold/ZCROSS_f.pickle +++ b/js/Threshold/ZCROSS_f.pickle @@ -71,19 +71,20 @@ p22 g21 sS'model.dep_ut' p23 -g9 -sS'exprs' +S'vector_boolean' p24 +sS'exprs' +p25 g11 sS'gr_i' -p25 +p26 g9 sS'y' -p26 +p27 g9 sS'x' -p27 -NsS'model' p28 +NsS'model' +p29 g2 s.
\ No newline at end of file diff --git a/sci2jslex.py b/sci2jslex.py index ad184e5c..7da541e9 100755 --- a/sci2jslex.py +++ b/sci2jslex.py @@ -271,6 +271,10 @@ VECTOR_TYPE = 'vector' VECTOR_FUNCTION_NAMES = { } +VECTOR_BOOLEAN_TYPE = 'vector_boolean' +VECTOR_BOOLEAN_FUNCTION_NAMES = { +} + FUNCTION_NAMES = { } FUNCTION_NAMES.update(dict.fromkeys(BOOLEAN_FUNCTION_NAMES, BOOLEAN_TYPE)) FUNCTION_NAMES.update(dict.fromkeys(DOUBLE_FUNCTION_NAMES, DOUBLE_TYPE)) @@ -282,6 +286,7 @@ FUNCTION_NAMES.update(dict.fromkeys(OBJECT_FUNCTION_NAMES, OBJECT_TYPE)) FUNCTION_NAMES.update(dict.fromkeys(SCICOS_BLOCKS, OBJECT_TYPE)) FUNCTION_NAMES.update(dict.fromkeys(STRING_FUNCTION_NAMES, STRING_TYPE)) FUNCTION_NAMES.update(dict.fromkeys(VECTOR_FUNCTION_NAMES, VECTOR_TYPE)) +FUNCTION_NAMES.update(dict.fromkeys(VECTOR_BOOLEAN_FUNCTION_NAMES, VECTOR_BOOLEAN_TYPE)) OBJECTS = { # 'PREVAR_scicos_context': 'PREVAR_SCICOS_CONTEXT', diff --git a/sci2jsyacc.py b/sci2jsyacc.py index 78881230..33a8eaf2 100755 --- a/sci2jsyacc.py +++ b/sci2jsyacc.py @@ -15,7 +15,8 @@ import sys import pickle import ply.yacc as yacc -from sci2jslex import tokens, JOBTYPES, BOOLEAN_TYPE, DOUBLE_TYPE, LIST_TYPE, MATRIX_TYPE, NULL_TYPE, OBJECT_TYPE, STRING_TYPE, VECTOR_TYPE +from sci2jslex import tokens, JOBTYPES +from sci2jslex import BOOLEAN_TYPE, DOUBLE_TYPE, LIST_TYPE, MATRIX_TYPE, NULL_TYPE, OBJECT_TYPE, STRING_TYPE, VECTOR_TYPE, VECTOR_BOOLEAN_TYPE precedence = ( ('left', 'COLON'), @@ -589,6 +590,13 @@ def p_assignment_model_modelvar_assignment_modelexpression(p): p[0] = '%*s%s = new %s(%s);\n' % (INDENT_LEVEL * INDENT_SIZE, ' ', var, vartype, value) else: p[0] = '%*s%s = %s;\n' % (INDENT_LEVEL * INDENT_SIZE, ' ', var, value) + elif vartype == VECTOR_BOOLEAN_TYPE: + vartype = BOOLEAN_TYPE + vartype = MODEL_MAP.get(vartype, 'ScilabDouble') + if vartype != '': + p[0] = '%*s%s = new %s(%s);\n' % (INDENT_LEVEL * INDENT_SIZE, ' ', var, vartype, value) + else: + p[0] = '%*s%s = %s;\n' % (INDENT_LEVEL * INDENT_SIZE, ' ', var, value) elif vartype == VECTOR_TYPE: vartype = DOUBLE_TYPE vartype = MODEL_MAP.get(vartype, 'ScilabDouble') @@ -817,7 +825,11 @@ def p_termarrayarraylist_termarraylist_semicolon(p): def p_termarraylist_termarraylist_comma_expression(p): '''termarraylist : termarraylist COMMA expression | termarraylist SPACE expression''' - p[0] = ('%s,%s' % (p[1][0], p[3][0]), p[1][1]) + if p[1][1] == p[3][1]: + vartype = p[1][1] + else: + vartype = DOUBLE_TYPE + p[0] = ('%s,%s' % (p[1][0], p[3][0]), vartype) def p_termarraylist_expression(p): 'termarraylist : expression' @@ -894,7 +906,11 @@ def p_expression_termarraylist(p): '''expression : OPENSQBRACKET termarraylist CLOSESQBRACKET | OPENSQBRACKET termarraylist COMMA CLOSESQBRACKET | OPENSQBRACKET termarraylist SPACE CLOSESQBRACKET''' - p[0] = ('[%s]' % (p[2][0]), VECTOR_TYPE) + if p[2][1] == BOOLEAN_TYPE: + vartype = VECTOR_BOOLEAN_TYPE + else: + vartype = VECTOR_TYPE + p[0] = ('[%s]' % (p[2][0]), vartype) # [] def p_expression_empty(p): |