diff options
Diffstat (limited to 'js')
234 files changed, 623 insertions, 623 deletions
diff --git a/js/Branching/CLKFROM.js b/js/Branching/CLKFROM.js index 8cd0688f..5444fce6 100644 --- a/js/Branching/CLKFROM.js +++ b/js/Branching/CLKFROM.js @@ -33,7 +33,7 @@ model.evtout=1; model.opar=list("A"); model.blocktype="d"; model.firing=-1; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs="A"; x=standard_define([2,1],model,exprs," "); x.graphics.id="From"; diff --git a/js/Branching/CLKGOTO.js b/js/Branching/CLKGOTO.js index a8cff8bd..6a06ade7 100644 --- a/js/Branching/CLKGOTO.js +++ b/js/Branching/CLKGOTO.js @@ -14,7 +14,7 @@ break } if (((tagvis<1)||(tagvis>3))) { message("Tag Visibility must be between 1 and 3"); -ok=None; +ok=false; } tagvis=int(tagvis); if (ok) { @@ -42,7 +42,7 @@ model.opar=list("A"); model.ipar=int(1); model.blocktype="d"; model.firing=-1; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=["A",sci2exp(1)]; x=standard_define([2,1],model,exprs," "); x.graphics.id="Goto"; diff --git a/js/Branching/CLKGotoTagVisibility.js b/js/Branching/CLKGotoTagVisibility.js index b92fc17a..8d5fd114 100644 --- a/js/Branching/CLKGotoTagVisibility.js +++ b/js/Branching/CLKGotoTagVisibility.js @@ -38,8 +38,8 @@ model.intyp=1; model.outtyp=1; model.opar=list("A"); model.blocktype="c"; -model.firing=None; -model.dep_ut=[None,None]; +model.firing=false; +model.dep_ut=[false,false]; exprs="A"; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Branching/ESELECT_f.js b/js/Branching/ESELECT_f.js index 33d1799b..d62843f7 100644 --- a/js/Branching/ESELECT_f.js +++ b/js/Branching/ESELECT_f.js @@ -55,7 +55,7 @@ model.evtin=1; model.evtout=ones(out,1); model.blocktype="l"; model.firing=-ones(out,1); -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; model.nmode=0; model.nzcross=0; gr_i=[]; diff --git a/js/Branching/EXTRACTOR.js b/js/Branching/EXTRACTOR.js index 30dfdac8..02064576 100644 --- a/js/Branching/EXTRACTOR.js +++ b/js/Branching/EXTRACTOR.js @@ -31,7 +31,7 @@ model.sim=list("extractor",4); model.in1=-1; model.out=1; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; model.ipar=ind; exprs=[sci2exp(ind)]; gr_i=[]; diff --git a/js/Branching/FROM.js b/js/Branching/FROM.js index 1d30488e..169d9763 100644 --- a/js/Branching/FROM.js +++ b/js/Branching/FROM.js @@ -38,7 +38,7 @@ model.outtyp=-1; model.ipar=[]; model.opar=list("A"); model.blocktype="c"; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=["A"]; gr_i=[]; x=standard_define([2,1],model,exprs,gr_i); diff --git a/js/Branching/FROMMO.js b/js/Branching/FROMMO.js index 4d05df90..94b27c46 100644 --- a/js/Branching/FROMMO.js +++ b/js/Branching/FROMMO.js @@ -38,7 +38,7 @@ model.outtyp=-1; model.ipar=[]; model.opar=list("A"); model.blocktype="c"; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; mo=modelica(); mo.model="frommo"; mo.outputs="n"; diff --git a/js/Branching/GOTO.js b/js/Branching/GOTO.js index 46623668..6e890a94 100644 --- a/js/Branching/GOTO.js +++ b/js/Branching/GOTO.js @@ -15,7 +15,7 @@ break tagvis=int(tagvis); if (((tagvis<1)||(tagvis>3))) { message("Tag Visibility must be between 1 and 3"); -ok=None; +ok=false; } if (ok) { if (((model.ipar!=tagvis)||(model.opar!=list(tag)))) { @@ -45,7 +45,7 @@ model.outtyp=1; model.ipar=int(1); model.opar=list("A"); model.blocktype="c"; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=["A",sci2exp(1)]; gr_i=[]; x=standard_define([2,1],model,exprs,gr_i); diff --git a/js/Branching/GOTOMO.js b/js/Branching/GOTOMO.js index 2b0f59bb..02db5d83 100644 --- a/js/Branching/GOTOMO.js +++ b/js/Branching/GOTOMO.js @@ -15,7 +15,7 @@ break tagvis=int(tagvis); if (((tagvis<1)||(tagvis>3))) { message("Tag Visibility must be between 1 and 3"); -ok=None; +ok=false; } if (ok) { if (((model.ipar!=tagvis)||(model.opar!=list(tag)))) { @@ -45,7 +45,7 @@ model.outtyp=1; model.ipar=int(1); model.opar=list("A"); model.blocktype="c"; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; mo=modelica(); mo.model="gotomo"; mo.inputs="p"; diff --git a/js/Branching/GotoTagVisibility.js b/js/Branching/GotoTagVisibility.js index 67e57ee9..81ad7c6e 100644 --- a/js/Branching/GotoTagVisibility.js +++ b/js/Branching/GotoTagVisibility.js @@ -38,8 +38,8 @@ model.intyp=1; model.outtyp=1; model.opar=list("A"); model.blocktype="c"; -model.firing=None; -model.dep_ut=[None,None]; +model.firing=false; +model.dep_ut=[false,false]; exprs="A"; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Branching/GotoTagVisibilityMO.js b/js/Branching/GotoTagVisibilityMO.js index a6ba4fd4..893c3497 100644 --- a/js/Branching/GotoTagVisibilityMO.js +++ b/js/Branching/GotoTagVisibilityMO.js @@ -38,8 +38,8 @@ model.intyp=1; model.outtyp=1; model.opar=list("A"); model.blocktype="c"; -model.firing=None; -model.dep_ut=[None,None]; +model.firing=false; +model.dep_ut=[false,false]; exprs="A"; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Branching/ISELECT_f.js b/js/Branching/ISELECT_f.js index b8b47b51..aed81d8f 100644 --- a/js/Branching/ISELECT_f.js +++ b/js/Branching/ISELECT_f.js @@ -37,7 +37,7 @@ model.out=out; model.evtin=ones(out); model.dstate=z0; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[string(nout),string(z0+1)]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Branching/ISELECT_m.js b/js/Branching/ISELECT_m.js index 6a2a2d6e..daa5ab8a 100644 --- a/js/Branching/ISELECT_m.js +++ b/js/Branching/ISELECT_m.js @@ -16,7 +16,7 @@ if (z0>nout||z0<=0) { message("initial connected input is not a valid input port number"); } else if (((typ<1)||(typ>8))) { message("Datatype is not supported"); -ok=None; +ok=false; } else { it=typ; ot=typ*ones(1,nout); @@ -54,7 +54,7 @@ model.firing=[]; model.evtin=ones(nout,1); model.dstate=z0; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[sci2exp(1),sci2exp(nout),sci2exp(z0)]; gr_i=[]; x=standard_define([3,2],model,exprs,gr_i); diff --git a/js/Branching/M_SWITCH.js b/js/Branching/M_SWITCH.js index 6d129024..36928974 100644 --- a/js/Branching/M_SWITCH.js +++ b/js/Branching/M_SWITCH.js @@ -53,7 +53,7 @@ model.in1=in1; model.out=-1; model.ipar=ipar; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[string(nin),string(ipar)]; gr_i=[]; x=standard_define([2.5,2],model,exprs,gr_i); diff --git a/js/Branching/NRMSOM_f.js b/js/Branching/NRMSOM_f.js index f5ddf6c1..86b0fca5 100644 --- a/js/Branching/NRMSOM_f.js +++ b/js/Branching/NRMSOM_f.js @@ -29,7 +29,7 @@ model.sim="junk"; model.in1=in1; model.out=-1; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[string(nin)]; gr_i=[]; x=standard_define([.2,2],model,exprs,gr_i); diff --git a/js/Branching/SCALAR2VECTOR.js b/js/Branching/SCALAR2VECTOR.js index c4d421d9..728acbb2 100644 --- a/js/Branching/SCALAR2VECTOR.js +++ b/js/Branching/SCALAR2VECTOR.js @@ -15,7 +15,7 @@ break nout=int(nout); if ((nout!=-1&&(nout<=0))) { message("size of output must be -1 or >0"); -ok=None; +ok=false; } if (ok) { [model,graphics,ok]=check_io(model,graphics,[1],nout,[],[]); @@ -35,7 +35,7 @@ model.sim=list("scalar2vector",4); model.out=nout; model.in1=1; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[string([nout])]; gr_i=[]; x=standard_define([3,2],model,exprs,gr_i); diff --git a/js/Branching/SELECT_f.js b/js/Branching/SELECT_f.js index 7e1ffccb..daa817a0 100644 --- a/js/Branching/SELECT_f.js +++ b/js/Branching/SELECT_f.js @@ -37,7 +37,7 @@ model.out=-1; model.evtin=ones(in1); model.dstate=z0; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[string(nin),string(z0+1)]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Branching/SELECT_m.js b/js/Branching/SELECT_m.js index 0506ed35..ad5b2133 100644 --- a/js/Branching/SELECT_m.js +++ b/js/Branching/SELECT_m.js @@ -16,7 +16,7 @@ if (z0>nin||z0<=0) { message("initial connected input is not a valid input port number"); } else if (((typ<1)||(typ>8))&&(typ!=-1)) { message("Datatype is not supported"); -ok=None; +ok=false; } else { it=typ*ones(1,nin); ot=typ; @@ -54,7 +54,7 @@ model.firing=[]; model.evtin=ones(nin,1); model.dstate=z0; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[sci2exp(1),sci2exp(nin),sci2exp(z0)]; gr_i=[]; x=standard_define([3,2],model,exprs,gr_i); diff --git a/js/Branching/SWITCH2.js b/js/Branching/SWITCH2.js index c959e941..aec3c67d 100644 --- a/js/Branching/SWITCH2.js +++ b/js/Branching/SWITCH2.js @@ -48,7 +48,7 @@ model.rpar=rpar; model.nzcross=nzz; model.nmode=1; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[string(ipar),string(rpar),string(nzz)]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Branching/SWITCH2_m.js b/js/Branching/SWITCH2_m.js index 56adcfd6..d6574925 100644 --- a/js/Branching/SWITCH2_m.js +++ b/js/Branching/SWITCH2_m.js @@ -31,7 +31,7 @@ model.nzcross=0; } if (((ot<1)||(ot>8))&&(ot!=-1)) { message("Datatype is not supported"); -ok=None; +ok=false; } if (ok) { it[1-1]=ot; @@ -65,7 +65,7 @@ model.rpar=rpar; model.nzcross=nzz; model.nmode=1; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[sci2exp(1),string(ipar),string(rpar),string(nzz)]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Electrical/CCS.js b/js/Electrical/CCS.js index 05beb332..b8417224 100644 --- a/js/Electrical/CCS.js +++ b/js/Electrical/CCS.js @@ -48,7 +48,7 @@ mo.parameters=list(ParametersName,PrametersValue,zeros(ParametersName)); exprs=[]; gr_i=[]; model.blocktype="c"; -model.dep_ut=[None,true]; +model.dep_ut=[false,true]; mo.model=ModelName; model.equations=mo; model.in1=ones(size(MI,"*"),1); diff --git a/js/Electrical/CVS.js b/js/Electrical/CVS.js index f775ee36..39ebf54d 100644 --- a/js/Electrical/CVS.js +++ b/js/Electrical/CVS.js @@ -48,7 +48,7 @@ mo.parameters=list(ParametersName,PrametersValue,zeros(ParametersName)); exprs=[]; gr_i=[]; model.blocktype="c"; -model.dep_ut=[None,true]; +model.dep_ut=[false,true]; mo.model=ModelName; model.equations=mo; model.in1=ones(size(MI,"*"),1); diff --git a/js/Electrical/Capacitor.js b/js/Electrical/Capacitor.js index dd90810a..cf40e97c 100644 --- a/js/Electrical/Capacitor.js +++ b/js/Electrical/Capacitor.js @@ -27,7 +27,7 @@ v=0; model.rpar=[C,v]; model.sim="Capacitor"; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; mo=modelica(); mo.model="Capacitor"; mo.inputs="p"; diff --git a/js/Electrical/ConstantVoltage.js b/js/Electrical/ConstantVoltage.js index f5382cec..9bec7626 100644 --- a/js/Electrical/ConstantVoltage.js +++ b/js/Electrical/ConstantVoltage.js @@ -28,7 +28,7 @@ model.in1=1; model.out=1; model.sim="ConstantVoltage"; model.blocktype="c"; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; mo=modelica(); mo.model="ConstantVoltage"; mo.inputs="p"; diff --git a/js/Electrical/CurrentSensor.js b/js/Electrical/CurrentSensor.js index 8d21b7fc..ac6ea132 100644 --- a/js/Electrical/CurrentSensor.js +++ b/js/Electrical/CurrentSensor.js @@ -11,7 +11,7 @@ model.in1=1; model.out=[1,1]; model.sim="CurrentSensor"; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; mo=modelica(); mo.model="CurrentSensor"; mo.inputs="p"; diff --git a/js/Electrical/Diode.js b/js/Electrical/Diode.js index fe93a706..bb024526 100644 --- a/js/Electrical/Diode.js +++ b/js/Electrical/Diode.js @@ -31,7 +31,7 @@ model.in1=1; model.out=1; model.sim="Diode"; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; mo=modelica(); mo.model="Diode"; mo.inputs="p"; diff --git a/js/Electrical/Ground.js b/js/Electrical/Ground.js index e0c3d1c7..04d30bda 100644 --- a/js/Electrical/Ground.js +++ b/js/Electrical/Ground.js @@ -11,7 +11,7 @@ model.in1=[1]; model.out=[]; model.sim="Ground"; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; mo=modelica(); mo.model="Ground"; mo.inputs="p"; diff --git a/js/Electrical/Gyrator.js b/js/Electrical/Gyrator.js index 4b5c01c9..f7890c6d 100644 --- a/js/Electrical/Gyrator.js +++ b/js/Electrical/Gyrator.js @@ -58,7 +58,7 @@ mo.parameters=list(ParametersName,PrametersValue,zeros(ParametersName)); exprs=["1","1"]; gr_i=[]; model.blocktype="c"; -model.dep_ut=[None,true]; +model.dep_ut=[false,true]; mo.model=ModelName; model.equations=mo; model.in1=ones(size(MI,"*"),1); diff --git a/js/Electrical/IdealTransformer.js b/js/Electrical/IdealTransformer.js index 52631f73..3d99588b 100644 --- a/js/Electrical/IdealTransformer.js +++ b/js/Electrical/IdealTransformer.js @@ -58,7 +58,7 @@ mo.parameters=list(ParametersName,PrametersValue,zeros(ParametersName)); exprs=["1"]; gr_i=[]; model.blocktype="c"; -model.dep_ut=[None,true]; +model.dep_ut=[false,true]; mo.model=ModelName; model.equations=mo; model.in1=ones(size(MI,"*"),1); diff --git a/js/Electrical/Inductor.js b/js/Electrical/Inductor.js index bbd0e95c..a928c4c9 100644 --- a/js/Electrical/Inductor.js +++ b/js/Electrical/Inductor.js @@ -28,7 +28,7 @@ L=1.e-5; model.rpar=L; model.sim="Inductor"; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; mo=modelica(); mo.model="Inductor"; mo.inputs="p"; diff --git a/js/Electrical/MOTOR.js b/js/Electrical/MOTOR.js index c8e0ae1c..794262aa 100644 --- a/js/Electrical/MOTOR.js +++ b/js/Electrical/MOTOR.js @@ -11,7 +11,7 @@ model.out=[1,1]; model.in1=[1]; model.sim="motor"; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; gr_i=[]; exprs=""; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Electrical/NMOS.js b/js/Electrical/NMOS.js index 5a260d3c..636cc9d6 100644 --- a/js/Electrical/NMOS.js +++ b/js/Electrical/NMOS.js @@ -32,7 +32,7 @@ dL=-1.5e-6; RDS=1.e+7; model.sim="NMOS"; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; mo=modelica(); mo.model="NMOS"; mo.outputs=["D","B","S"]; diff --git a/js/Electrical/NPN.js b/js/Electrical/NPN.js index af20e840..a7598f46 100644 --- a/js/Electrical/NPN.js +++ b/js/Electrical/NPN.js @@ -58,7 +58,7 @@ mo.parameters=list(ParametersName,PrametersValue,zeros(ParametersName)); 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"]; gr_i=[]; model.blocktype="c"; -model.dep_ut=[None,true]; +model.dep_ut=[false,true]; mo.model=ModelName; model.equations=mo; model.in1=ones(size(MI,"*"),1); diff --git a/js/Electrical/OpAmp.js b/js/Electrical/OpAmp.js index 7f9ae819..4ec8f9dd 100644 --- a/js/Electrical/OpAmp.js +++ b/js/Electrical/OpAmp.js @@ -7,7 +7,7 @@ x=arg1; graphics=arg1.graphics; exprs=graphics.exprs; model=arg1.model; -while (None) { +while (false) { [ok,OLGain,SatH,SatL,exprs]=scicos_getvalue("Set the Operational Amplifier parameters",["Open Loop Gain","Positive saturation voltage","Negative saturation voltage"],list("vec",1,"vec",1,"vec",1),exprs); if (!ok) { break @@ -25,7 +25,7 @@ Z=[]; model=scicos_model(); model.sim="OpAmp"; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; mo=modelica(); mo.model=model.sim; mo.inputs=["in_p","in_n"]; diff --git a/js/Electrical/PMOS.js b/js/Electrical/PMOS.js index 935faf35..6ebcb4c0 100644 --- a/js/Electrical/PMOS.js +++ b/js/Electrical/PMOS.js @@ -32,7 +32,7 @@ dL=-2.1e-6; RDS=1.e+7; model.sim="PMOS"; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; mo=modelica(); mo.model="PMOS"; mo.outputs=["D","B","S"]; diff --git a/js/Electrical/PNP.js b/js/Electrical/PNP.js index 9f5c916c..cf26f0e7 100644 --- a/js/Electrical/PNP.js +++ b/js/Electrical/PNP.js @@ -58,7 +58,7 @@ mo.parameters=list(ParametersName,PrametersValue,zeros(ParametersName)); 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"]; gr_i=[]; model.blocktype="c"; -model.dep_ut=[None,true]; +model.dep_ut=[false,true]; mo.model=ModelName; model.equations=mo; model.in1=ones(size(MI,"*"),1); diff --git a/js/Electrical/PotentialSensor.js b/js/Electrical/PotentialSensor.js index 4e6158e6..2676d657 100644 --- a/js/Electrical/PotentialSensor.js +++ b/js/Electrical/PotentialSensor.js @@ -12,7 +12,7 @@ model.out=[1]; model.rpar=[]; model.sim="PotentialSensor"; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; mo=modelica(); mo.model="PotentialSensor"; mo.inputs="p"; diff --git a/js/Electrical/Resistor.js b/js/Electrical/Resistor.js index b796d2fc..402732ca 100644 --- a/js/Electrical/Resistor.js +++ b/js/Electrical/Resistor.js @@ -26,7 +26,7 @@ R=0.01; model.rpar=R; model.sim="resistor"; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; mo=modelica(); mo.model="Resistor"; mo.inputs="p"; diff --git a/js/Electrical/SineVoltage.js b/js/Electrical/SineVoltage.js index b98414de..539c503e 100644 --- a/js/Electrical/SineVoltage.js +++ b/js/Electrical/SineVoltage.js @@ -32,7 +32,7 @@ start=0; model.rpar=[V,ph,frq,offset,start]; model.sim="SineVoltage"; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; mo=modelica(); mo.model="SineVoltage"; mo.inputs="p"; diff --git a/js/Electrical/Switch.js b/js/Electrical/Switch.js index b3f769f8..221c795f 100644 --- a/js/Electrical/Switch.js +++ b/js/Electrical/Switch.js @@ -27,7 +27,7 @@ S=["Ron","Roff"]; Z=eval(S); model.sim="Switch"; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; mo=modelica(); mo.model=model.sim; mo.inputs=["p","inp"]; diff --git a/js/Electrical/VVsourceAC.js b/js/Electrical/VVsourceAC.js index eb46d55f..24cc91d2 100644 --- a/js/Electrical/VVsourceAC.js +++ b/js/Electrical/VVsourceAC.js @@ -29,7 +29,7 @@ FR=50; model.rpar=[FR]; model.sim="VVsourceAC"; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; mo=modelica(); mo.model="VVsourceAC"; mo.inputs=["p","VA"]; diff --git a/js/Electrical/VariableResistor.js b/js/Electrical/VariableResistor.js index 962caa62..3648ec5b 100644 --- a/js/Electrical/VariableResistor.js +++ b/js/Electrical/VariableResistor.js @@ -9,7 +9,7 @@ VariableResistor.prototype.define = function VariableResistor() { model=scicos_model(); model.sim="VariableResistor"; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; mo=modelica(); mo.model="VariableResistor"; mo.inputs=["p","R"]; diff --git a/js/Electrical/VoltageSensor.js b/js/Electrical/VoltageSensor.js index a50dac25..314386cf 100644 --- a/js/Electrical/VoltageSensor.js +++ b/js/Electrical/VoltageSensor.js @@ -11,7 +11,7 @@ model.in1=1; model.out=[1,1]; model.sim="VoltageSensor"; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; mo=modelica(); mo.model="VoltageSensor"; mo.inputs="p"; diff --git a/js/Electrical/VsourceAC.js b/js/Electrical/VsourceAC.js index e3b8b8c4..3fb38abf 100644 --- a/js/Electrical/VsourceAC.js +++ b/js/Electrical/VsourceAC.js @@ -29,7 +29,7 @@ FR=50; model.rpar=[VA,FR]; model.sim="VsourceAC"; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; mo=modelica(); mo.model="VsourceAC"; mo.inputs="p"; diff --git a/js/Events/ANDBLK.js b/js/Events/ANDBLK.js index f6fe020e..8fba581e 100644 --- a/js/Events/ANDBLK.js +++ b/js/Events/ANDBLK.js @@ -67,8 +67,8 @@ x.model.sim="csuper"; x.model.evtin=[1,1]; x.model.evtout=1; x.model.blocktype="h"; -x.model.firing=None; -x.model.dep_ut=[None,None]; +x.model.firing=false; +x.model.dep_ut=[false,false]; x.model.rpar=diagram; } ANDBLK.prototype.details = function ANDBLK() { diff --git a/js/Events/ANDLOG_f.js b/js/Events/ANDLOG_f.js index 341f53c9..f98df291 100644 --- a/js/Events/ANDLOG_f.js +++ b/js/Events/ANDLOG_f.js @@ -12,7 +12,7 @@ model.out=1; model.evtin=[1,1]; model.blocktype="d"; model.firing=[]; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; gr_i=[]; x=standard_define([3,3],model,[],gr_i); } diff --git a/js/Events/CLKSOMV_f.js b/js/Events/CLKSOMV_f.js index 270a2159..551ffe41 100644 --- a/js/Events/CLKSOMV_f.js +++ b/js/Events/CLKSOMV_f.js @@ -12,7 +12,7 @@ model.evtin=[1,1,1]; model.evtout=1; model.blocktype="d"; model.firing=-1; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; gr_i=[]; x=standard_define([2,2],model,[],gr_i); } diff --git a/js/Events/CLKSOM_f.js b/js/Events/CLKSOM_f.js index bf22fa42..6cd50908 100644 --- a/js/Events/CLKSOM_f.js +++ b/js/Events/CLKSOM_f.js @@ -12,7 +12,7 @@ model.evtin=[1,1,1]; model.evtout=1; model.blocktype="d"; model.firing=-1; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; gr_i=[]; x=standard_define([1,1]/1.2,model,[],gr_i); } diff --git a/js/Events/CLKSPLIT_f.js b/js/Events/CLKSPLIT_f.js index ad1bdb66..4281057d 100644 --- a/js/Events/CLKSPLIT_f.js +++ b/js/Events/CLKSPLIT_f.js @@ -11,8 +11,8 @@ model.sim="split"; model.evtin=1; model.evtout=[1,1]; model.blocktype="d"; -model.firing=[None,None,None]; -model.dep_ut=[None,None]; +model.firing=[false,false,false]; +model.dep_ut=[false,false]; x=standard_define([1,1]/3,model,[],[]); } CLKSPLIT_f.prototype.details = function CLKSPLIT_f() { diff --git a/js/Events/END_c.js b/js/Events/END_c.js index cd2d7808..8dda488a 100644 --- a/js/Events/END_c.js +++ b/js/Events/END_c.js @@ -29,7 +29,7 @@ model.evtin=1; model.evtout=1; model.firing=tf; model.blocktype="d"; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=string(tf); gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Events/EVTDLY_c.js b/js/Events/EVTDLY_c.js index b8a763d2..a993fef0 100644 --- a/js/Events/EVTDLY_c.js +++ b/js/Events/EVTDLY_c.js @@ -14,7 +14,7 @@ break } if (dt<=0) { message("Delay must be positive"); -ok=None; +ok=false; } if (ok) { graphics.exprs=exprs; @@ -36,7 +36,7 @@ model.evtout=1; model.rpar=[dt,ff]; model.blocktype="d"; model.firing=ff; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=[string(dt),sci2exp(ff)]; gr_i=[]; x=standard_define([3,2],model,exprs,gr_i); diff --git a/js/Events/EVTDLY_f.js b/js/Events/EVTDLY_f.js index 420da63a..c6d9af25 100644 --- a/js/Events/EVTDLY_f.js +++ b/js/Events/EVTDLY_f.js @@ -14,7 +14,7 @@ break } if (dt<=0) { message("Delay must be positive"); -ok=None; +ok=false; } if (ok) { graphics.exprs=exprs; @@ -36,7 +36,7 @@ model.evtout=1; model.rpar=dt; model.blocktype="d"; model.firing=ff; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=[string(dt),sci2exp(ff)]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Events/EVTGEN_f.js b/js/Events/EVTGEN_f.js index a3a2488f..7d185057 100644 --- a/js/Events/EVTGEN_f.js +++ b/js/Events/EVTGEN_f.js @@ -28,7 +28,7 @@ model.sim="trash"; model.evtout=1; model.blocktype="d"; model.firing=tt; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=string(tt); gr_i=[]; x=standard_define([3,2],model,exprs,gr_i); diff --git a/js/Events/EVTVARDLY.js b/js/Events/EVTVARDLY.js index 428c04d8..cc17041a 100644 --- a/js/Events/EVTVARDLY.js +++ b/js/Events/EVTVARDLY.js @@ -28,7 +28,7 @@ model.evtout=1; model.blocktype="d"; model.firing=-1; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=string(model.firing); gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Events/HALT_f.js b/js/Events/HALT_f.js index d28b3486..988f2cdc 100644 --- a/js/Events/HALT_f.js +++ b/js/Events/HALT_f.js @@ -29,7 +29,7 @@ model.evtin=1; model.dstate=0; model.ipar=0; model.blocktype="d"; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=string(n); gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Events/IFTHEL_f.js b/js/Events/IFTHEL_f.js index 402b8d77..4e44c01f 100644 --- a/js/Events/IFTHEL_f.js +++ b/js/Events/IFTHEL_f.js @@ -18,7 +18,7 @@ while (true) { if (!ok) { break } -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; if (nmod!=0) { nmod=1; } @@ -48,7 +48,7 @@ model.evtin=1; model.evtout=[1,1]; model.blocktype="l"; model.firing=[-1,-1]; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; model.nmode=1; model.nzcross=1; gr_i=[]; diff --git a/js/Events/MFCLCK_f.js b/js/Events/MFCLCK_f.js index ba118054..fdc2d25e 100644 --- a/js/Events/MFCLCK_f.js +++ b/js/Events/MFCLCK_f.js @@ -31,7 +31,7 @@ model.rpar=dt; model.ipar=nn; model.blocktype="d"; model.firing=[-1,0]; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=[string(dt),string(nn)]; gr_i=[]; x=standard_define([3,2],model,exprs,gr_i); diff --git a/js/Events/VirtualCLK0.js b/js/Events/VirtualCLK0.js index d3fe2b3f..22122bc2 100644 --- a/js/Events/VirtualCLK0.js +++ b/js/Events/VirtualCLK0.js @@ -13,7 +13,7 @@ model.opar=list(); model.ipar=[]; model.blocktype="d"; model.firing=-1; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=[]; x=standard_define([2,2],model,exprs," "); } diff --git a/js/Hydraulics/Bache.js b/js/Hydraulics/Bache.js index c184f939..da1506e2 100644 --- a/js/Hydraulics/Bache.js +++ b/js/Hydraulics/Bache.js @@ -38,7 +38,7 @@ p_rho=0; model.rpar=[Patm,A,ze1,ze2,zs1,zs2,z0,T0,p_rho]; model.sim="Bache"; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; mo=modelica(); mo.model="Bache"; mo.inputs=["Ce1","Ce2"]; diff --git a/js/Hydraulics/Flowmeter.js b/js/Hydraulics/Flowmeter.js index 65143545..0af6226d 100644 --- a/js/Hydraulics/Flowmeter.js +++ b/js/Hydraulics/Flowmeter.js @@ -9,7 +9,7 @@ exprs=graphics.exprs; model=arg1.model; x=arg1; exprs=x.graphics.exprs; -while (None) { +while (false) { [ok,Qini,exprs]=scicos_getvalue(["Set Flowmeter block parameters:","","Qini: "],"Qini",list("vec",1),exprs); if (!ok) { break @@ -58,7 +58,7 @@ mo.parameters=list(ParametersName,PrametersValue,zeros(ParametersName)); exprs="1"; gr_i=[]; model.blocktype="c"; -model.dep_ut=[None,true]; +model.dep_ut=[false,true]; mo.model=ModelName; model.equations=mo; model.in1=ones(size(MI,"*"),1); diff --git a/js/Hydraulics/PerteDP.js b/js/Hydraulics/PerteDP.js index ac6a1eb7..9d1c12b5 100644 --- a/js/Hydraulics/PerteDP.js +++ b/js/Hydraulics/PerteDP.js @@ -33,7 +33,7 @@ p_rho=0; model.rpar=[L,D,lambda,z1,z2,p_rho]; model.sim="PerteDP"; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; mo=modelica(); mo.model="PerteDP"; mo.inputs="C1"; diff --git a/js/Hydraulics/PuitsP.js b/js/Hydraulics/PuitsP.js index 30c6bc5c..af19b6bd 100644 --- a/js/Hydraulics/PuitsP.js +++ b/js/Hydraulics/PuitsP.js @@ -29,7 +29,7 @@ option_temperature=1; model.rpar=[P0,T0,H0,option_temperature]; model.sim="Puits"; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; mo=modelica(); mo.model="Puits"; mo.inputs=["C"]; diff --git a/js/Hydraulics/SourceP.js b/js/Hydraulics/SourceP.js index 0dcf58c4..882d3183 100644 --- a/js/Hydraulics/SourceP.js +++ b/js/Hydraulics/SourceP.js @@ -29,7 +29,7 @@ option_temperature=1; model.rpar=[P0,T0,H0,option_temperature]; model.sim="Source"; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; mo=modelica(); mo.model="Source"; mo.inputs=[]; diff --git a/js/Hydraulics/VanneReglante.js b/js/Hydraulics/VanneReglante.js index cc7b1f9c..4ce72db6 100644 --- a/js/Hydraulics/VanneReglante.js +++ b/js/Hydraulics/VanneReglante.js @@ -29,7 +29,7 @@ p_rho=0; model.rpar=[Cvmax,p_rho]; model.sim="VanneReglante"; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; mo=modelica(); mo.model="VanneReglante"; mo.inputs=["C1","Ouv"]; diff --git a/js/IntegerOp/BITCLEAR.js b/js/IntegerOp/BITCLEAR.js index b6df40d7..72cb52e1 100644 --- a/js/IntegerOp/BITCLEAR.js +++ b/js/IntegerOp/BITCLEAR.js @@ -15,11 +15,11 @@ break in1=[model.in1,model.in2]; if (floor(bit)!=bit) { block_parameter_error(msprintf(gettext("Wrong type for \'%s\' parameter: %5.1f."),gettext("Index of Bit"),bit),gettext("Must be integer.")); -ok=None; +ok=false; } else if ((Datatype==3)||(Datatype==6)) { if (bit>31||bit<0) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Index of Bit"),bit),msprintf(gettext("Must be in the interval %s."),"[0, 31]")); -ok=None; +ok=false; } else { bit=uint32(bit); n=(2^32-1)-2^bit; @@ -29,7 +29,7 @@ model.sim=list("bit_clear_32",4); } else if ((Datatype==4)||(Datatype==7)) { if (bit>15||bit<0) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Index of Bit"),bit),msprintf(gettext("Must be in the interval %s."),"[0, 15]")); -ok=None; +ok=false; } else { bit=uint16(bit); n=(2^16-1)-2^bit; @@ -39,7 +39,7 @@ model.sim=list("bit_clear_16",4); } else if ((Datatype==5)||(Datatype==8)) { if (bit>7||bit<0) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Index of Bit"),bit),msprintf(gettext("Must be in the interval %s."),"[0, 7]")); -ok=None; +ok=false; } else { bit=uint8(bit); n=(2^8-1)-2^bit; @@ -48,7 +48,7 @@ model.sim=list("bit_clear_8",4); } } else { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Data Type"),Datatype),msprintf(gettext("Must be in the interval %s."),"[3, 8]")); -ok=None; +ok=false; } if (ok) { it=Datatype; @@ -76,7 +76,7 @@ model.intyp=3; model.outtyp=3; model.opar=list(int32(0)); model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[sci2exp(3),sci2exp(0)]; gr_i=[]; x=standard_define([4,2],model,exprs,gr_i); diff --git a/js/IntegerOp/BITSET.js b/js/IntegerOp/BITSET.js index 75932e1c..0093f90e 100644 --- a/js/IntegerOp/BITSET.js +++ b/js/IntegerOp/BITSET.js @@ -15,12 +15,12 @@ break in1=[model.in1,model.in2]; if (floor(bit)!=bit) { block_parameter_error(msprintf(gettext("Wrong type for \'%s\' parameter: %5.1f."),gettext("Index of Bit"),bit),gettext("Must be integer.")); -ok=None; +ok=false; } if ((Datatype==3)||(Datatype==6)) { if (bit>31||bit<0) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Index of Bit"),bit),msprintf(gettext("Must be in the interval %s."),"[0, 31]")); -ok=None; +ok=false; } bit=uint32(bit); n=2^bit; @@ -29,7 +29,7 @@ model.sim=list("bit_set_32",4); } else if ((Datatype==4)||(Datatype==7)) { if (bit>15||bit<0) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Index of Bit"),bit),msprintf(gettext("Must be in the interval %s."),"[0, 15]")); -ok=None; +ok=false; } bit=uint16(bit); n=2^bit; @@ -38,7 +38,7 @@ model.sim=list("bit_set_16",4); } else if ((Datatype==5)||(Datatype==8)) { if (bit>7||bit<0) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Index of Bit"),bit),msprintf(gettext("Must be in the interval %s."),"[0, 7]")); -ok=None; +ok=false; } bit=uint8(bit); n=2^bit; @@ -46,7 +46,7 @@ n=uint8(n); model.sim=list("bit_set_8",4); } else { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Data Type"),Datatype),msprintf(gettext("Must be in the interval %s."),"[3, 8]")); -ok=None; +ok=false; } if (ok) { it=Datatype; @@ -74,7 +74,7 @@ model.intyp=3; model.outtyp=3; model.opar=list(uint32(0)); model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[sci2exp(3),sci2exp(0)]; gr_i=[]; x=standard_define([4,2],model,exprs,gr_i); diff --git a/js/IntegerOp/CONVERT.js b/js/IntegerOp/CONVERT.js index efd20a83..38711c97 100644 --- a/js/IntegerOp/CONVERT.js +++ b/js/IntegerOp/CONVERT.js @@ -20,13 +20,13 @@ ot=1; } if ((np!=0&&np!=1&&np!=2)) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Do on Overflow"),np),msprintf(gettext("Must be in the interval %s."),"[0, 2]")); -ok=None; +ok=false; } else if ((it>8||it<1)) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Input Type"),it),msprintf(gettext("Must be in the interval %s."),"[1, 8]")); -ok=None; +ok=false; } else if ((ot>8||ot<1)) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Output Type"),ot),msprintf(gettext("Must be in the interval %s."),"[1, 8]")); -ok=None; +ok=false; } model.sim=list("convert",4); if ((it==ot)) { @@ -360,7 +360,7 @@ model.outtyp=3; model.rpar=[]; model.ipar=sgn; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[sci2exp(1),sci2exp(3),sci2exp(0)]; gr_i=[]; x=standard_define([3,2],model,exprs,gr_i); diff --git a/js/IntegerOp/DFLIPFLOP.js b/js/IntegerOp/DFLIPFLOP.js index a3af0686..d4b11eb5 100644 --- a/js/IntegerOp/DFLIPFLOP.js +++ b/js/IntegerOp/DFLIPFLOP.js @@ -7,77 +7,77 @@ x=arg1; } DFLIPFLOP.prototype.define = function DFLIPFLOP() { scs_m=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["DFLIPFLOP"],tol=[0.0001,0.000001,1.000e-10,100001,0,0],tf=100000,context=" ",void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(true,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list())); -scs_m.objs[1-1]=scicos_block(gui="CONST_m",graphics=scicos_graphics(orig=[109.62561,263.44465],sz=[20,20],flip=true,theta=0,exprs="int8(0)",pin=[],pout=6,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim=list("cstblk4_m",4),in1=[],in2=[],intyp=1,out=1,out2=1,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(int8(0)),blocktype="d",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); -scs_m.objs[2-1]=scicos_block(gui="IFTHEL_f",graphics=scicos_graphics(orig=[239.98293,378.2166],sz=[60,60],flip=true,theta=0,exprs=["1","1"],pin=29,pout=[],pein=22,peout=[16,44],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim=list("ifthel",-1),in1=1,in2=1,intyp=-1,out=[],out2=[],outtyp=1,evtin=1,evtout=[1,1],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="l",firing=[-1,-1],dep_ut=[true,None],label="",nzcross=1,nmode=1,equations=list()),doc=list()); -scs_m.objs[3-1]=scicos_block(gui="LOGICAL_OP",graphics=scicos_graphics(orig=[152.88902,260.24498],sz=[60,40],flip=true,theta=0,exprs=["2","1","5","0"],pin=[11,39],pout=5,pein=[],peout=[],gr_i=[],id="",in_implicit=["E","E"],out_implicit="E"),model=scicos_model(sim=list("logicalop_i8",4),in1=[-1,-1],in2=[-2,-2],intyp=[5,5],out=-1,out2=-2,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[1,0],opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); -scs_m.objs[4-1]=scicos_block(gui="SAMPHOLD_m",graphics=scicos_graphics(orig=[233.72156,260.24498],sz=[40,40],flip=true,theta=0,exprs="5",pin=5,pout=33,pein=42,peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("samphold4_m",4),in1=-1,in2=-2,intyp=5,out=-1,out2=-2,outtyp=5,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[1-1]=scicos_block(gui="CONST_m",graphics=scicos_graphics(orig=[109.62561,263.44465],sz=[20,20],flip=true,theta=0,exprs="int8(0)",pin=[],pout=6,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim=list("cstblk4_m",4),in1=[],in2=[],intyp=1,out=1,out2=1,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(int8(0)),blocktype="d",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[2-1]=scicos_block(gui="IFTHEL_f",graphics=scicos_graphics(orig=[239.98293,378.2166],sz=[60,60],flip=true,theta=0,exprs=["1","1"],pin=29,pout=[],pein=22,peout=[16,44],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim=list("ifthel",-1),in1=1,in2=1,intyp=-1,out=[],out2=[],outtyp=1,evtin=1,evtout=[1,1],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="l",firing=[-1,-1],dep_ut=[true,false],label="",nzcross=1,nmode=1,equations=list()),doc=list()); +scs_m.objs[3-1]=scicos_block(gui="LOGICAL_OP",graphics=scicos_graphics(orig=[152.88902,260.24498],sz=[60,40],flip=true,theta=0,exprs=["2","1","5","0"],pin=[11,39],pout=5,pein=[],peout=[],gr_i=[],id="",in_implicit=["E","E"],out_implicit="E"),model=scicos_model(sim=list("logicalop_i8",4),in1=[-1,-1],in2=[-2,-2],intyp=[5,5],out=-1,out2=-2,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[1,0],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[4-1]=scicos_block(gui="SAMPHOLD_m",graphics=scicos_graphics(orig=[233.72156,260.24498],sz=[40,40],flip=true,theta=0,exprs="5",pin=5,pout=33,pein=42,peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("samphold4_m",4),in1=-1,in2=-2,intyp=5,out=-1,out2=-2,outtyp=5,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[5-1]=scicos_link(xx=[221.46044,225.15013],yy=[280.24498,280.24498],id="drawlink",thick=[0,0],ct=[1,1],from=[3,1,0],to=[4,1,1]); scs_m.objs[6-1]=scicos_link(xx=[138.19704,140.34523],yy=[273.44465,273.49157],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[38,1,1]); -scs_m.objs[7-1]=scicos_block(gui="LOGICAL_OP",graphics=scicos_graphics(orig=[373.24106,309.46812],sz=[60,40],flip=true,theta=0,exprs=["1","5","5","0"],pin=36,pout=13,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("logicalop_i8",4),in1=-1,in2=-2,intyp=5,out=-1,out2=-2,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[5,0],opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); -scs_m.objs[8-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[199.48466,398.2166],sz=[20,20],flip=true,theta=0,exprs="3",pin=[],pout=9,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=3,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[7-1]=scicos_block(gui="LOGICAL_OP",graphics=scicos_graphics(orig=[373.24106,309.46812],sz=[60,40],flip=true,theta=0,exprs=["1","5","5","0"],pin=36,pout=13,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("logicalop_i8",4),in1=-1,in2=-2,intyp=5,out=-1,out2=-2,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[5,0],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[8-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[199.48466,398.2166],sz=[20,20],flip=true,theta=0,exprs="3",pin=[],pout=9,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=3,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[9-1]=scicos_link(xx=[219.48466,222.54128],yy=[408.2166,408.2166],id="drawlink",thick=[0,0],ct=[1,1],from=[8,1,0],to=[28,1,1]); -scs_m.objs[10-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[104.31759,276.91165],sz=[20,20],flip=true,theta=0,exprs="1",pin=[],pout=11,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[10-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[104.31759,276.91165],sz=[20,20],flip=true,theta=0,exprs="1",pin=[],pout=11,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[11-1]=scicos_link(xx=[124.31759,144.31759],yy=[286.91165,286.91165],id="drawlink",thick=[0,0],ct=[1,1],from=[10,1,0],to=[3,1,1]); -scs_m.objs[12-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[457.40928,320.20131],sz=[20,20],flip=true,theta=0,exprs="2",pin=13,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[12-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[457.40928,320.20131],sz=[20,20],flip=true,theta=0,exprs="2",pin=13,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[13-1]=scicos_link(xx=[441.81249,457.40928],yy=[329.46812,330.20131],id="drawlink",thick=[0,0],ct=[1,1],from=[7,1,0],to=[12,1,1]); -scs_m.objs[14-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[376.4669,270.83282],sz=[20,20],flip=true,theta=0,exprs="1",pin=37,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[14-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[376.4669,270.83282],sz=[20,20],flip=true,theta=0,exprs="1",pin=37,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m_1=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title="Untitled",tol=[0.0001,0.000001,1.000e-10,100001,0,0],tf=100000,context=[],void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(true,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list())); -scs_m_1.objs[1-1]=scicos_block(gui="ANDLOG_f",graphics=scicos_graphics(orig=[194,133],sz=[60,60],flip=true,theta=0,exprs=[],pin=[],pout=9,pein=[4,11],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="andlog",in1=[],in2=[],intyp=1,out=1,out2=[],outtyp=1,evtin=[1,1],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); -scs_m_1.objs[2-1]=scicos_block(gui="CLKIN_f",graphics=scicos_graphics(orig=[149,287],sz=[20,20],flip=true,theta=0,exprs="1",pin=[],pout=[],pein=[],peout=4,gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=1,state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="d",firing=-1,dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); -scs_m_1.objs[3-1]=scicos_block(gui="CLKOUT_f",graphics=scicos_graphics(orig=[450,83],sz=[20,20],flip=true,theta=0,exprs="1",pin=[],pout=[],pein=8,peout=[],gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="output",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="d",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m_1.objs[1-1]=scicos_block(gui="ANDLOG_f",graphics=scicos_graphics(orig=[194,133],sz=[60,60],flip=true,theta=0,exprs=[],pin=[],pout=9,pein=[4,11],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="andlog",in1=[],in2=[],intyp=1,out=1,out2=[],outtyp=1,evtin=[1,1],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m_1.objs[2-1]=scicos_block(gui="CLKIN_f",graphics=scicos_graphics(orig=[149,287],sz=[20,20],flip=true,theta=0,exprs="1",pin=[],pout=[],pein=[],peout=4,gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=1,state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="d",firing=-1,dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m_1.objs[3-1]=scicos_block(gui="CLKOUT_f",graphics=scicos_graphics(orig=[450,83],sz=[20,20],flip=true,theta=0,exprs="1",pin=[],pout=[],pein=8,peout=[],gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="output",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="d",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m_1.objs[4-1]=scicos_link(xx=[169,214,214],yy=[297,297,198.71],id="drawlink",thick=[0,0],ct=[5,-1],from=[2,1],to=[1,1]); -scs_m_1.objs[5-1]=scicos_block(gui="CLKIN_f",graphics=scicos_graphics(orig=[141,330],sz=[20,20],flip=true,theta=0,exprs="2",pin=[],pout=[],pein=[],peout=6,gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=1,state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="d",firing=-1,dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m_1.objs[5-1]=scicos_block(gui="CLKIN_f",graphics=scicos_graphics(orig=[141,330],sz=[20,20],flip=true,theta=0,exprs="2",pin=[],pout=[],pein=[],peout=6,gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=1,state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="d",firing=-1,dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m_1.objs[6-1]=scicos_link(xx=[161,234,234],yy=[340,340,275.78],id="drawlink",thick=[0,0],ct=[5,-1],from=[5,1],to=[10,1]); -scs_m_1.objs[7-1]=scicos_block(gui="IFTHEL_f",graphics=scicos_graphics(orig=[331,137],sz=[60,60],flip=true,theta=0,exprs=["1","1"],pin=9,pout=[],pein=12,peout=[8,0],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim=list("ifthel",-1),in1=1,in2=1,intyp=-1,out=[],out2=[],outtyp=1,evtin=1,evtout=[1,1],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="l",firing=[-1,-1],dep_ut=[true,None],label="",nzcross=1,nmode=1,equations=list()),doc=list()); +scs_m_1.objs[7-1]=scicos_block(gui="IFTHEL_f",graphics=scicos_graphics(orig=[331,137],sz=[60,60],flip=true,theta=0,exprs=["1","1"],pin=9,pout=[],pein=12,peout=[8,0],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim=list("ifthel",-1),in1=1,in2=1,intyp=-1,out=[],out2=[],outtyp=1,evtin=1,evtout=[1,1],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="l",firing=[-1,-1],dep_ut=[true,false],label="",nzcross=1,nmode=1,equations=list()),doc=list()); scs_m_1.objs[8-1]=scicos_link(xx=[351,351,450],yy=[131.29,93,93],id="drawlink",thick=[0,0],ct=[5,-1],from=[7,1],to=[3,1]); scs_m_1.objs[9-1]=scicos_link(xx=[262.57,322.43],yy=[163,167],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1],to=[7,1]); -scs_m_1.objs[10-1]=scicos_block(gui="CLKSPLIT_f",graphics=scicos_graphics(orig=[234,275.78348],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=[],pout=[],pein=6,peout=[11,12],gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="split",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=[1,1],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[None,None,None],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m_1.objs[10-1]=scicos_block(gui="CLKSPLIT_f",graphics=scicos_graphics(orig=[234,275.78348],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=[],pout=[],pein=6,peout=[11,12],gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="split",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=[1,1],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[false,false,false],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m_1.objs[11-1]=scicos_link(xx=[234,234],yy=[275.78,198.71],id="drawlink",thick=[0,0],ct=[5,-1],from=[10,1],to=[1,2]); scs_m_1.objs[12-1]=scicos_link(xx=[234,361,361],yy=[275.78,275.78,202.71],id="drawlink",thick=[0,0],ct=[5,-1],from=[10,2],to=[7,1]); -scs_m.objs[15-1]=scicos_block(gui="ANDBLK",graphics=scicos_graphics(orig=[233.73039,318.74407],sz=[40,40],flip=true,theta=0,exprs=[],pin=[],pout=[],pein=[19,16],peout=17,gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[1,1],evtout=1,state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=None,dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[15-1]=scicos_block(gui="ANDBLK",graphics=scicos_graphics(orig=[233.73039,318.74407],sz=[40,40],flip=true,theta=0,exprs=[],pin=[],pout=[],pein=[19,16],peout=17,gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[1,1],evtout=1,state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=false,dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[16-1]=scicos_link(xx=[259.98293,260.39705],yy=[372.50232,364.45835],id="drawlink",thick=[0,0],ct=[5,-1],from=[2,1,0],to=[15,2,1]); scs_m.objs[17-1]=scicos_link(xx=[253.73039,253.72572],yy=[313.02978,309.29537],id="drawlink",thick=[0,0],ct=[5,-1],from=[15,1,0],to=[41,1,1]); scs_m_1=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["EDGE_TRIGGER","./"],tol=[0.0001,0.000001,1.000e-10,100001,0,0,0],tf=30,context=" ",void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(true,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list())); -scs_m_1.objs[1-1]=scicos_block(gui="EDGETRIGGER",graphics=scicos_graphics(orig=[288.58631,257.1131],sz=[60,40],flip=true,theta=0,exprs="1",pin=5,pout=3,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("edgetrig",4),in1=1,in2=[],intyp=1,out=1,out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=0,odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=1,nmode=0,equations=list()),doc=list()); -scs_m_1.objs[2-1]=scicos_block(gui="IFTHEL_f",graphics=scicos_graphics(orig=[388.28869,247.1131],sz=[60,60],flip=true,theta=0,exprs=["0","0"],pin=3,pout=[],pein=[],peout=[7,0],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim=list("ifthel",-1),in1=1,in2=[],intyp=1,out=[],out2=1,outtyp=[],evtin=[],evtout=[1,1],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="l",firing=[-1,-1],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m_1.objs[1-1]=scicos_block(gui="EDGETRIGGER",graphics=scicos_graphics(orig=[288.58631,257.1131],sz=[60,40],flip=true,theta=0,exprs="1",pin=5,pout=3,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("edgetrig",4),in1=1,in2=[],intyp=1,out=1,out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=0,odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=1,nmode=0,equations=list()),doc=list()); +scs_m_1.objs[2-1]=scicos_block(gui="IFTHEL_f",graphics=scicos_graphics(orig=[388.28869,247.1131],sz=[60,60],flip=true,theta=0,exprs=["0","0"],pin=3,pout=[],pein=[],peout=[7,0],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim=list("ifthel",-1),in1=1,in2=[],intyp=1,out=[],out2=1,outtyp=[],evtin=[],evtout=[1,1],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="l",firing=[-1,-1],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m_1.objs[3-1]=scicos_link(xx=[357.15774,362.99107,379.71726],yy=[277.1131,277.1131,277.1131],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[2,1,1]); -scs_m_1.objs[4-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[240.01488,267.1131],sz=[20,20],flip=true,theta=0,exprs="1",pin=[],pout=5,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=-1,out=-1,out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m_1.objs[4-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[240.01488,267.1131],sz=[20,20],flip=true,theta=0,exprs="1",pin=[],pout=5,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=-1,out=-1,out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m_1.objs[5-1]=scicos_link(xx=[260.01488,280.01488],yy=[277.1131,277.1131],id="drawlink",thick=[0,0],ct=[1,1],from=[4,1,0],to=[1,1,1]); -scs_m_1.objs[6-1]=scicos_block(gui="CLKOUTV_f",graphics=scicos_graphics(orig=[398.28869,181.39881],sz=[20,30],flip=true,theta=0,exprs="1",pin=[],pout=[],pein=7,peout=[],gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="output",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="d",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m_1.objs[6-1]=scicos_block(gui="CLKOUTV_f",graphics=scicos_graphics(orig=[398.28869,181.39881],sz=[20,30],flip=true,theta=0,exprs="1",pin=[],pout=[],pein=7,peout=[],gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="output",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="d",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m_1.objs[7-1]=scicos_link(xx=[408.28869,408.28869],yy=[241.39881,211.39881],id="drawlink",thick=[0,0],ct=[5,-1],from=[2,1,0],to=[6,1,1]); -scs_m.objs[18-1]=scicos_block(gui="EDGE_TRIGGER",graphics=scicos_graphics(orig=[133.90637,385.342],sz=[60,40],flip=true,theta=0,exprs=[],pin=26,pout=[],pein=[],peout=19,gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="csuper",in1=-1,in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=1,state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[18-1]=scicos_block(gui="EDGE_TRIGGER",graphics=scicos_graphics(orig=[133.90637,385.342],sz=[60,40],flip=true,theta=0,exprs=[],pin=26,pout=[],pein=[],peout=19,gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="csuper",in1=-1,in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=1,state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[19-1]=scicos_link(xx=[163.90637,163.90637,247.06372],yy=[379.62771,364.45835,364.45835],id="drawlink",thick=[0,0],ct=[5,-1],from=[18,1,0],to=[15,1,1]); -scs_m.objs[20-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[79.594811,395.47647],sz=[20,20],flip=true,theta=0,exprs="2",pin=[],pout=23,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[20-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[79.594811,395.47647],sz=[20,20],flip=true,theta=0,exprs="2",pin=[],pout=23,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m_1=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["Extract_Activation","./"],tol=[0.0001,0.000001,1.000e-10,100001,0,0,0],tf=30,context=" ",void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(true,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list())); -scs_m_1.objs[1-1]=scicos_block(gui="IFTHEL_f",graphics=scicos_graphics(orig=[150.65045,143.82208],sz=[60,60],flip=true,theta=0,exprs=["0","0"],pin=6,pout=[],pein=[],peout=[3,4],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim=list("ifthel",-1),in1=1,in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=[1,1],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="l",firing=[-1,-1],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); -scs_m_1.objs[2-1]=scicos_block(gui="CLKSOMV_f",graphics=scicos_graphics(orig=[169.82143,96.146231],sz=[16.666667,16.666667],flip=true,theta=0,exprs=[],pin=[],pout=[],pein=[3,4,0],peout=8,gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="sum",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[1,1,1],evtout=1,state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=-1,dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m_1.objs[1-1]=scicos_block(gui="IFTHEL_f",graphics=scicos_graphics(orig=[150.65045,143.82208],sz=[60,60],flip=true,theta=0,exprs=["0","0"],pin=6,pout=[],pein=[],peout=[3,4],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim=list("ifthel",-1),in1=1,in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=[1,1],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="l",firing=[-1,-1],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m_1.objs[2-1]=scicos_block(gui="CLKSOMV_f",graphics=scicos_graphics(orig=[169.82143,96.146231],sz=[16.666667,16.666667],flip=true,theta=0,exprs=[],pin=[],pout=[],pein=[3,4,0],peout=8,gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="sum",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[1,1,1],evtout=1,state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=-1,dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m_1.objs[3-1]=scicos_link(xx=[170.65045,170.65045,150.04302,150.04302,169.82143],yy=[138.10779,128.235,128.235,104.47956,104.47956],id="drawlink",thick=[0,0],ct=[5,-1],from=[1,1,0],to=[2,1,1]); scs_m_1.objs[4-1]=scicos_link(xx=[190.65045,190.65045,178.15476],yy=[138.10779,111.55729,112.8129],id="drawlink",thick=[0,0],ct=[5,-1],from=[1,2,0],to=[2,2,1]); -scs_m_1.objs[5-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[102.07902,163.82208],sz=[20,20],flip=true,theta=0,exprs="1",pin=[],pout=6,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=-1,out=-1,out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m_1.objs[5-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[102.07902,163.82208],sz=[20,20],flip=true,theta=0,exprs="1",pin=[],pout=6,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=-1,out=-1,out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m_1.objs[6-1]=scicos_link(xx=[122.07902,142.07902],yy=[173.82208,173.82208],id="drawlink",thick=[0,0],ct=[1,1],from=[5,1,0],to=[1,1,1]); -scs_m_1.objs[7-1]=scicos_block(gui="CLKOUTV_f",graphics=scicos_graphics(orig=[168.15476,38.527183],sz=[20,30],flip=true,theta=0,exprs="1",pin=[],pout=[],pein=8,peout=[],gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="output",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="d",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m_1.objs[7-1]=scicos_block(gui="CLKOUTV_f",graphics=scicos_graphics(orig=[168.15476,38.527183],sz=[20,30],flip=true,theta=0,exprs="1",pin=[],pout=[],pein=8,peout=[],gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="output",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="d",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m_1.objs[8-1]=scicos_link(xx=[178.15476,178.15476],yy=[98.527183,68.527183],id="drawlink",thick=[0,0],ct=[5,-1],from=[2,1,0],to=[7,1,1]); -scs_m.objs[21-1]=scicos_block(gui="Extract_Activation",graphics=scicos_graphics(orig=[239.82193,456.57677],sz=[60,40],flip=true,theta=0,exprs=[],pin=31,pout=[],pein=[],peout=22,gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="csuper",in1=-1,in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=1,state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[21-1]=scicos_block(gui="Extract_Activation",graphics=scicos_graphics(orig=[239.82193,456.57677],sz=[60,40],flip=true,theta=0,exprs=[],pin=31,pout=[],pein=[],peout=22,gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="csuper",in1=-1,in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=1,state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[22-1]=scicos_link(xx=[269.82193,269.98293],yy=[450.86248,443.93089],id="drawlink",thick=[0,0],ct=[5,-1],from=[21,1,0],to=[2,1,1]); scs_m.objs[23-1]=scicos_link(xx=[99.594811,110.25582],yy=[405.47647,405.42077],id="drawlink",thick=[0,0],ct=[1,1],from=[20,1,0],to=[25,1,1]); -scs_m.objs[24-1]=scicos_block(gui="SUM_f",graphics=scicos_graphics(orig=[200.5252,469.13173],sz=[16.666667,16.666667],flip=true,theta=0,exprs=[],pin=[27,0,30],pout=31,pein=[],peout=[],gr_i=[],id="",in_implicit=["E","E","E"],out_implicit="E"),model=scicos_model(sim=list("plusblk",2),in1=[-1,-1,-1],in2=[],intyp=1,out=-1,out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); -scs_m.objs[25-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[110.25582,405.42077],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=23,pout=[26,27],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[24-1]=scicos_block(gui="SUM_f",graphics=scicos_graphics(orig=[200.5252,469.13173],sz=[16.666667,16.666667],flip=true,theta=0,exprs=[],pin=[27,0,30],pout=31,pein=[],peout=[],gr_i=[],id="",in_implicit=["E","E","E"],out_implicit="E"),model=scicos_model(sim=list("plusblk",2),in1=[-1,-1,-1],in2=[],intyp=1,out=-1,out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[25-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[110.25582,405.42077],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=23,pout=[26,27],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[26-1]=scicos_link(xx=[110.25582,114.33667,125.33494],yy=[405.42077,405.39945,405.342],id="drawlink",thick=[0,0],ct=[1,1],from=[25,1,0],to=[18,1,1]); scs_m.objs[27-1]=scicos_link(xx=[110.25582,110.25582,208.85853],yy=[405.42077,469.13173,469.13173],id="drawlink",thick=[0,0],ct=[1,1],from=[25,2,0],to=[24,1,1]); -scs_m.objs[28-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[222.54128,408.2166],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=9,pout=[29,30],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[28-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[222.54128,408.2166],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=9,pout=[29,30],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[29-1]=scicos_link(xx=[222.54128,231.4115],yy=[408.2166,408.2166],id="drawlink",thick=[0,0],ct=[1,1],from=[28,1,0],to=[2,1,1]); scs_m.objs[30-1]=scicos_link(xx=[222.54128,222.54128,208.85853,208.85853],yy=[408.2166,453.0015,453.0015,485.7984],id="drawlink",thick=[0,0],ct=[1,1],from=[28,2,0],to=[24,3,1]); scs_m.objs[31-1]=scicos_link(xx=[219.57282,231.2505],yy=[477.46506,476.57677],id="drawlink",thick=[0,0],ct=[1,1],from=[24,1,0],to=[21,1,1]); -scs_m.objs[32-1]=scicos_block(gui="SELECT_m",graphics=scicos_graphics(orig=[298.86371,253.57321],sz=[40,40],flip=true,theta=0,exprs=["5","2","1"],pin=[33,40],pout=34,pein=[43,44],peout=[],gr_i=[],id="",in_implicit=["E","E"],out_implicit="E"),model=scicos_model(sim=list("selector_m",4),in1=[-1,-1],in2=[-2,-2],intyp=[5,5],out=-1,out2=-2,outtyp=5,evtin=[1,1],evtout=[],state=[],dstate=1,odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[32-1]=scicos_block(gui="SELECT_m",graphics=scicos_graphics(orig=[298.86371,253.57321],sz=[40,40],flip=true,theta=0,exprs=["5","2","1"],pin=[33,40],pout=34,pein=[43,44],peout=[],gr_i=[],id="",in_implicit=["E","E"],out_implicit="E"),model=scicos_model(sim=list("selector_m",4),in1=[-1,-1],in2=[-2,-2],intyp=[5,5],out=-1,out2=-2,outtyp=5,evtin=[1,1],evtout=[],state=[],dstate=1,odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[33-1]=scicos_link(xx=[282.29299,290.29229],yy=[280.24498,280.23987],id="drawlink",thick=[0,0],ct=[1,1],from=[4,1,0],to=[32,1,1]); scs_m.objs[34-1]=scicos_link(xx=[347.43514,357.57328,357.57328],yy=[273.57321,273.57321,280.83282],id="drawlink",thick=[0,0],ct=[1,1],from=[32,1,0],to=[35,1,1]); -scs_m.objs[35-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[357.57328,280.83282],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=34,pout=[36,37],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[35-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[357.57328,280.83282],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=34,pout=[36,37],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[36-1]=scicos_link(xx=[357.57328,357.57328,364.66964],yy=[280.83282,329.46812,329.46812],id="drawlink",thick=[0,0],ct=[1,1],from=[35,1,0],to=[7,1,1]); scs_m.objs[37-1]=scicos_link(xx=[357.57328,376.4669],yy=[280.83282,280.83282],id="drawlink",thick=[0,0],ct=[1,1],from=[35,2,0],to=[14,1,1]); -scs_m.objs[38-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[140.34523,273.49157],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=6,pout=[39,40],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[38-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[140.34523,273.49157],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=6,pout=[39,40],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[39-1]=scicos_link(xx=[140.34523,144.31759],yy=[273.49157,273.57832],id="drawlink",thick=[0,0],ct=[1,1],from=[38,1,0],to=[3,2,1]); scs_m.objs[40-1]=scicos_link(xx=[140.34523,140.34523,290.29229,290.29229],yy=[273.49157,247.70767,247.70767,266.90654],id="drawlink",thick=[0,0],ct=[1,1],from=[38,2,0],to=[32,2,1]); -scs_m.objs[41-1]=scicos_block(gui="CLKSPLIT_f",graphics=scicos_graphics(orig=[253.72572,309.29537],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=[],pout=[],pein=17,peout=[42,43],gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="split",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=[1,1],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[None,None,None],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[41-1]=scicos_block(gui="CLKSPLIT_f",graphics=scicos_graphics(orig=[253.72572,309.29537],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=[],pout=[],pein=17,peout=[42,43],gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="split",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=[1,1],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[false,false,false],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[42-1]=scicos_link(xx=[253.72572,253.72156],yy=[309.29537,305.95927],id="drawlink",thick=[0,0],ct=[5,-1],from=[41,1,0],to=[4,1,1]); scs_m.objs[43-1]=scicos_link(xx=[253.72572,312.19705,312.19705],yy=[309.29537,309.29537,299.28749],id="drawlink",thick=[0,0],ct=[5,-1],from=[41,2,0],to=[32,1,1]); scs_m.objs[44-1]=scicos_link(xx=[279.98293,279.98293,325.53038,325.53038],yy=[372.50232,315.89455,315.89455,299.28749],id="drawlink",thick=[0,0],ct=[5,-1],from=[2,2,0],to=[32,2,1]); @@ -90,8 +90,8 @@ model.out2=[1,1]; model.intyp=[5,1,1]; model.outtyp=[5,5]; model.blocktype="h"; -model.firing=None; -model.dep_ut=[true,None]; +model.firing=false; +model.dep_ut=[true,false]; model.rpar=scs_m; gr_i=[]; x=standard_define([2,3],model,[],gr_i); diff --git a/js/IntegerOp/DLATCH.js b/js/IntegerOp/DLATCH.js index f0ecdbfc..54ada8ae 100644 --- a/js/IntegerOp/DLATCH.js +++ b/js/IntegerOp/DLATCH.js @@ -7,24 +7,24 @@ x=arg1; } DLATCH.prototype.define = function DLATCH() { scs_m=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["DLATCH"],tol=[0.0001,0.000001,1.000e-10,100001,0,0],tf=100000,context=" ",void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(true,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list())); -scs_m.objs[1-1]=scicos_block(gui="CONST_m",graphics=scicos_graphics(orig=[109.62561,263.44465],sz=[20,20],flip=true,theta=0,exprs="int8(0)",pin=[],pout=7,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim=list("cstblk4_m",4),in1=[],in2=[],intyp=1,out=1,out2=1,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(int8(0)),blocktype="d",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); -scs_m.objs[2-1]=scicos_block(gui="IFTHEL_f",graphics=scicos_graphics(orig=[233.37693,320.30536],sz=[60,60],flip=true,theta=0,exprs=["0","1"],pin=13,pout=[],pein=[],peout=[6,0],gr_i=list(["txt=[\'If in>0\';\' \';\' then else\'];","xstringb(orig(1),orig(2),txt,sz(1),sz(2),\'fill\');"],8),id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim=list("ifthel",-1),in1=1,in2=1,intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[1,1],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="l",firing=[-1,-1],dep_ut=[true,None],label="",nzcross=1,nmode=1,equations=list()),doc=list()); -scs_m.objs[3-1]=scicos_block(gui="LOGICAL_OP",graphics=scicos_graphics(orig=[152.88902,260.24498],sz=[60,40],flip=true,theta=0,exprs=["2","1","5","0"],pin=[15,7],pout=5,pein=[],peout=[],gr_i=list("xstringb(orig(1),orig(2),[\'Logical Op \';OPER],sz(1),sz(2),\'fill\');",8),id="",in_implicit=["E","E"],out_implicit="E"),model=scicos_model(sim=list("logicalop_i8",4),in1=[-1,-1],in2=[-2,-2],intyp=[5,5],out=-1,out2=-2,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[1,0],opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); -scs_m.objs[4-1]=scicos_block(gui="SAMPHOLD_m",graphics=scicos_graphics(orig=[233.72156,260.24498],sz=[40,40],flip=true,theta=0,exprs="5",pin=5,pout=9,pein=6,peout=[],gr_i=list("xstringb(orig(1),orig(2),\'S/H\',sz(1),sz(2),\'fill\')",8),id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("samphold4_m",4),in1=-1,in2=-2,intyp=5,out=-1,out2=-2,outtyp=5,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[1-1]=scicos_block(gui="CONST_m",graphics=scicos_graphics(orig=[109.62561,263.44465],sz=[20,20],flip=true,theta=0,exprs="int8(0)",pin=[],pout=7,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim=list("cstblk4_m",4),in1=[],in2=[],intyp=1,out=1,out2=1,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(int8(0)),blocktype="d",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[2-1]=scicos_block(gui="IFTHEL_f",graphics=scicos_graphics(orig=[233.37693,320.30536],sz=[60,60],flip=true,theta=0,exprs=["0","1"],pin=13,pout=[],pein=[],peout=[6,0],gr_i=list(["txt=[\'If in>0\';\' \';\' then else\'];","xstringb(orig(1),orig(2),txt,sz(1),sz(2),\'fill\');"],8),id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim=list("ifthel",-1),in1=1,in2=1,intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[1,1],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="l",firing=[-1,-1],dep_ut=[true,false],label="",nzcross=1,nmode=1,equations=list()),doc=list()); +scs_m.objs[3-1]=scicos_block(gui="LOGICAL_OP",graphics=scicos_graphics(orig=[152.88902,260.24498],sz=[60,40],flip=true,theta=0,exprs=["2","1","5","0"],pin=[15,7],pout=5,pein=[],peout=[],gr_i=list("xstringb(orig(1),orig(2),[\'Logical Op \';OPER],sz(1),sz(2),\'fill\');",8),id="",in_implicit=["E","E"],out_implicit="E"),model=scicos_model(sim=list("logicalop_i8",4),in1=[-1,-1],in2=[-2,-2],intyp=[5,5],out=-1,out2=-2,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[1,0],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[4-1]=scicos_block(gui="SAMPHOLD_m",graphics=scicos_graphics(orig=[233.72156,260.24498],sz=[40,40],flip=true,theta=0,exprs="5",pin=5,pout=9,pein=6,peout=[],gr_i=list("xstringb(orig(1),orig(2),\'S/H\',sz(1),sz(2),\'fill\')",8),id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("samphold4_m",4),in1=-1,in2=-2,intyp=5,out=-1,out2=-2,outtyp=5,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[5-1]=scicos_link(xx=[221.46044,225.15013],yy=[280.24498,280.24498],id="drawlink",thick=[0,0],ct=[1,1],from=[3,1,0],to=[4,1,1]); scs_m.objs[6-1]=scicos_link(xx=[253.37693,253.72156],yy=[314.59108,305.95927],id="drawlink",thick=[0,0],ct=[5,-1],from=[2,1,0],to=[4,1,1]); scs_m.objs[7-1]=scicos_link(xx=[138.19704,144.31759],yy=[273.44465,273.57832],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[3,2,1]); -scs_m.objs[8-1]=scicos_block(gui="LOGICAL_OP",graphics=scicos_graphics(orig=[317.46698,309.46812],sz=[60,40],flip=true,theta=0,exprs=["1","5","5","0"],pin=11,pout=17,pein=[],peout=[],gr_i=list("xstringb(orig(1),orig(2),[\'Logical Op \';OPER],sz(1),sz(2),\'fill\');",8),id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("logicalop_i8",4),in1=-1,in2=-2,intyp=5,out=-1,out2=-2,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[5,0],opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[8-1]=scicos_block(gui="LOGICAL_OP",graphics=scicos_graphics(orig=[317.46698,309.46812],sz=[60,40],flip=true,theta=0,exprs=["1","5","5","0"],pin=11,pout=17,pein=[],peout=[],gr_i=list("xstringb(orig(1),orig(2),[\'Logical Op \';OPER],sz(1),sz(2),\'fill\');",8),id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("logicalop_i8",4),in1=-1,in2=-2,intyp=5,out=-1,out2=-2,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[5,0],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[9-1]=scicos_link(xx=[282.29299,305.09603,305.09603],yy=[280.24498,280.52797,280.83282],id="drawlink",thick=[0,0],ct=[1,1],from=[4,1,0],to=[10,1,1]); -scs_m.objs[10-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[305.09603,280.83282],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=9,pout=[11,19],pein=[],peout=[],gr_i=list([],8),id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[10-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[305.09603,280.83282],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=9,pout=[11,19],pein=[],peout=[],gr_i=list([],8),id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[11-1]=scicos_link(xx=[305.09603,305.09603,308.89555],yy=[280.83282,329.46812,329.46812],id="drawlink",thick=[0,0],ct=[1,1],from=[10,1,0],to=[8,1,1]); -scs_m.objs[12-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[184.8055,340.30536],sz=[20,20],flip=true,theta=0,exprs="2",pin=[],pout=13,pein=[],peout=[],gr_i=list(" ",8),id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[12-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[184.8055,340.30536],sz=[20,20],flip=true,theta=0,exprs="2",pin=[],pout=13,pein=[],peout=[],gr_i=list(" ",8),id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[13-1]=scicos_link(xx=[204.8055,224.8055],yy=[350.30536,350.30536],id="drawlink",thick=[0,0],ct=[1,1],from=[12,1,0],to=[2,1,1]); -scs_m.objs[14-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[104.31759,276.91165],sz=[20,20],flip=true,theta=0,exprs="1",pin=[],pout=15,pein=[],peout=[],gr_i=list(" ",8),id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[14-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[104.31759,276.91165],sz=[20,20],flip=true,theta=0,exprs="1",pin=[],pout=15,pein=[],peout=[],gr_i=list(" ",8),id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[15-1]=scicos_link(xx=[124.31759,144.31759],yy=[286.91165,286.91165],id="drawlink",thick=[0,0],ct=[1,1],from=[14,1,0],to=[3,1,1]); -scs_m.objs[16-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[406.03841,319.46812],sz=[20,20],flip=true,theta=0,exprs="2",pin=17,pout=[],pein=[],peout=[],gr_i=list(" ",8),id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[16-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[406.03841,319.46812],sz=[20,20],flip=true,theta=0,exprs="2",pin=17,pout=[],pein=[],peout=[],gr_i=list(" ",8),id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[17-1]=scicos_link(xx=[386.03841,406.03841],yy=[329.46812,329.46812],id="drawlink",thick=[0,0],ct=[1,1],from=[8,1,0],to=[16,1,1]); -scs_m.objs[18-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[325.09603,270.83282],sz=[20,20],flip=true,theta=0,exprs="1",pin=19,pout=[],pein=[],peout=[],gr_i=list(" ",8),id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[18-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[325.09603,270.83282],sz=[20,20],flip=true,theta=0,exprs="1",pin=19,pout=[],pein=[],peout=[],gr_i=list(" ",8),id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[19-1]=scicos_link(xx=[305.09603,325.09603],yy=[280.83282,280.83282],id="drawlink",thick=[0,0],ct=[1,1],from=[10,2,0],to=[18,1,1]); model=scicos_model(); model.sim="csuper"; @@ -35,8 +35,8 @@ model.out2=[1,1]; model.intyp=[5,-1]; model.outtyp=[5,5]; model.blocktype="h"; -model.firing=None; -model.dep_ut=[true,None]; +model.firing=false; +model.dep_ut=[true,false]; model.rpar=scs_m; gr_i=[]; x=standard_define([2,3],model,[],gr_i); diff --git a/js/IntegerOp/EXTRACTBITS.js b/js/IntegerOp/EXTRACTBITS.js index 2d93c8e2..cfceb49a 100644 --- a/js/IntegerOp/EXTRACTBITS.js +++ b/js/IntegerOp/EXTRACTBITS.js @@ -15,10 +15,10 @@ break bitstr=strcat(string(bit.slice())," "); if ((rule<1)||(rule>5)) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Bits to Extract"),rule),msprintf(gettext("Must be in the interval %s."),"[1, 5]")); -ok=None; +ok=false; } else if (scal<0||scal>1) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Treat Bit Field as an Integer"),scal),msprintf(gettext("Must be in the interval %s."),"[0, 1]")); -ok=None; +ok=false; } else { in1=[model.in1,model.in2]; bit=int(bit); @@ -26,17 +26,17 @@ rule=int(rule); if ((rule==3)||(rule==4)) { if ((size(bit,"*")!=1)) { block_parameter_error(msprintf(gettext("Wrong size for \'%s\' parameter: %s."),gettext("Number of Bits or Index of Bit"),bitstr),gettext("Must be a single value.")); -ok=None; +ok=false; } else { numb=bit; } } else if ((rule==5)) { if ((size(bit,"*")!=2)) { block_parameter_error(msprintf(gettext("Wrong size for \'%s\' parameter: %s."),gettext("Number of Bits or Index of Bit"),bitstr),gettext("Must have this form: [Start, End].")); -ok=None; +ok=false; } else if (bit(1)>bit(2)) { block_parameter_error(msprintf(gettext("Wrong values for \'%s\' parameter: %s."),gettext("Number of Bits or Index of Bit"),bitstr),msprintf(gettext("\'Start\' must be less than \'End\'."))); -ok=None; +ok=false; } else { numb=bit(2)-bit(1); } @@ -49,7 +49,7 @@ if (ok) { if ((Datatype==3||Datatype==6)) { if (or(bit.slice()>31)||or(bit.slice()<0)) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %s."),gettext("Number of Bits or Index of Bit"),bitstr),msprintf(gettext("Indexes must be in the interval %s."),"[0, 31]")); -ok=None; +ok=false; } switch (rule) { case 1: @@ -96,7 +96,7 @@ model.sim=list("extract_bit_u32_RB1",4); } else if ((Datatype==4||Datatype==7)) { if (or(bit.slice()>15)||or(bit.slice()<0)) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %s."),gettext("Number of Bits or Index of Bit"),bitstr),msprintf(gettext("Indexes must be in the interval %s."),"[0, 15]")); -ok=None; +ok=false; } switch (rule) { case 1: @@ -143,7 +143,7 @@ model.sim=list("extract_bit_u16_RB1",4); } else if ((Datatype==5||Datatype==8)) { if (or(bit.slice()>7)||or(bit.slice()<0)) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %s."),gettext("Number of Bits or Index of Bit"),bitstr),msprintf(gettext("Indexes must be in the interval %s."),"[0, 7]")); -ok=None; +ok=false; } switch (rule) { case 1: @@ -189,7 +189,7 @@ model.sim=list("extract_bit_u8_RB1",4); } } else { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Data Type"),Datatype),msprintf(gettext("Must be in the interval %s."),"[3, 8]")); -ok=None; +ok=false; } } if (ok) { @@ -219,7 +219,7 @@ model.intyp=3; model.outtyp=3; model.ipar=[0,numb]; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[sci2exp(3),sci2exp(1),sci2exp(0),sci2exp(0)]; gr_i=[]; x=standard_define([4,2],model,exprs,gr_i); diff --git a/js/IntegerOp/INTMUL.js b/js/IntegerOp/INTMUL.js index cb401856..23ebfbae 100644 --- a/js/IntegerOp/INTMUL.js +++ b/js/IntegerOp/INTMUL.js @@ -16,7 +16,7 @@ it=Datatype*ones(1,2); ot=Datatype; if ((np!=0&&np!=1&&np!=2)) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Do on Overflow"),np),msprintf(gettext("Must be in the interval %s."),"[0, 2]")); -ok=None; +ok=false; } else if (Datatype==3) { if (np==0) { model.sim=list("matmul_i32n",4); @@ -67,7 +67,7 @@ model.sim=list("matmul_ui8e",4); } } else { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Data Type"),ot),msprintf(gettext("Must be in the interval %s."),"[3, 8]")); -ok=None; +ok=false; } in1=[model.in1,model.in2]; out=[model.out,model.out2]; @@ -96,7 +96,7 @@ model.outtyp=3; model.rpar=[]; model.ipar=sgn; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[sci2exp(3),sci2exp(0)]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/IntegerOp/JKFLIPFLOP.js b/js/IntegerOp/JKFLIPFLOP.js index 14641c09..311198a0 100644 --- a/js/IntegerOp/JKFLIPFLOP.js +++ b/js/IntegerOp/JKFLIPFLOP.js @@ -44,35 +44,35 @@ typ=newpar; } JKFLIPFLOP.prototype.define = function JKFLIPFLOP() { scs_m=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["JKFLIPFLOP"],tol=[0.0001,0.000001,1.000e-10,100001,0,0,0],tf=60,context=" ",void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(true,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list())); -scs_m.objs[1-1]=scicos_block(gui="DOLLAR_m",graphics=scicos_graphics(orig=[299.96961,261.584],sz=[40,40],flip=None,theta=0,exprs=["int8(0)","1"],pin=7,pout=5,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("dollar4_m",4),in1=1,in2=1,intyp=5,out=1,out2=1,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(int8(0)),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[1-1]=scicos_block(gui="DOLLAR_m",graphics=scicos_graphics(orig=[299.96961,261.584],sz=[40,40],flip=false,theta=0,exprs=["int8(0)","1"],pin=7,pout=5,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("dollar4_m",4),in1=1,in2=1,intyp=5,out=1,out2=1,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(int8(0)),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m_1=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["EDGE_TRIGGER","./"],tol=[0.0001,0.000001,1.000e-10,100001,0,0,0],tf=30,context=" ",void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(true,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list())); -scs_m_1.objs[1-1]=scicos_block(gui="EDGETRIGGER",graphics=scicos_graphics(orig=[288.58631,257.1131],sz=[60,40],flip=true,theta=0,exprs="-1",pin=5,pout=3,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("edgetrig",4),in1=1,in2=[],intyp=1,out=1,out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=0,odstate=list(),rpar=[],ipar=-1,opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=1,nmode=0,equations=list()),doc=list()); -scs_m_1.objs[2-1]=scicos_block(gui="IFTHEL_f",graphics=scicos_graphics(orig=[388.28869,247.1131],sz=[60,60],flip=true,theta=0,exprs=["0","0"],pin=3,pout=[],pein=[],peout=[7,0],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim=list("ifthel",-1),in1=1,in2=[],intyp=1,out=[],out2=1,outtyp=[],evtin=[],evtout=[1,1],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="l",firing=[-1,-1],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m_1.objs[1-1]=scicos_block(gui="EDGETRIGGER",graphics=scicos_graphics(orig=[288.58631,257.1131],sz=[60,40],flip=true,theta=0,exprs="-1",pin=5,pout=3,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("edgetrig",4),in1=1,in2=[],intyp=1,out=1,out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=0,odstate=list(),rpar=[],ipar=-1,opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=1,nmode=0,equations=list()),doc=list()); +scs_m_1.objs[2-1]=scicos_block(gui="IFTHEL_f",graphics=scicos_graphics(orig=[388.28869,247.1131],sz=[60,60],flip=true,theta=0,exprs=["0","0"],pin=3,pout=[],pein=[],peout=[7,0],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim=list("ifthel",-1),in1=1,in2=[],intyp=1,out=[],out2=1,outtyp=[],evtin=[],evtout=[1,1],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="l",firing=[-1,-1],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m_1.objs[3-1]=scicos_link(xx=[357.15774,362.99107,379.71726],yy=[277.1131,277.1131,277.1131],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[2,1,1]); -scs_m_1.objs[4-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[240.01488,267.1131],sz=[20,20],flip=true,theta=0,exprs="1",pin=[],pout=5,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m_1.objs[4-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[240.01488,267.1131],sz=[20,20],flip=true,theta=0,exprs="1",pin=[],pout=5,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m_1.objs[5-1]=scicos_link(xx=[260.01488,280.01488],yy=[277.1131,277.1131],id="drawlink",thick=[0,0],ct=[1,1],from=[4,1,0],to=[1,1,1]); -scs_m_1.objs[6-1]=scicos_block(gui="CLKOUTV_f",graphics=scicos_graphics(orig=[398.28869,181.39881],sz=[20,30],flip=true,theta=0,exprs="1",pin=[],pout=[],pein=7,peout=[],gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="output",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="d",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m_1.objs[6-1]=scicos_block(gui="CLKOUTV_f",graphics=scicos_graphics(orig=[398.28869,181.39881],sz=[20,30],flip=true,theta=0,exprs="1",pin=[],pout=[],pein=7,peout=[],gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim="output",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="d",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m_1.objs[7-1]=scicos_link(xx=[408.28869,408.28869],yy=[241.39881,211.39881],id="drawlink",thick=[0,0],ct=[5,-1],from=[2,1,0],to=[6,1,1]); -scs_m.objs[2-1]=scicos_block(gui="EDGE_TRIGGER",graphics=scicos_graphics(orig=[292.52452,323.54888],sz=[60,40],flip=true,theta=0,exprs=[],pin=14,pout=[],pein=[],peout=8,gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="csuper",in1=-1,in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=1,state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); -scs_m.objs[3-1]=scicos_block(gui="LOGIC",graphics=scicos_graphics(orig=[302.79613,202.52782],sz=[40,40],flip=true,theta=0,exprs=["[0;1;1;1;0;0;1;0]","0"],pin=[5,16,18],pout=4,pein=8,peout=[],gr_i=[],id="",in_implicit=["E","E","E"],out_implicit="E"),model=scicos_model(sim=list("logic",4),in1=[1,1,1],in2=[1,1,1],intyp=[5,5,5],out=1,out2=1,outtyp=5,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(int8([0,1,1,1,0,0,1,0])),blocktype="c",firing=None,dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[2-1]=scicos_block(gui="EDGE_TRIGGER",graphics=scicos_graphics(orig=[292.52452,323.54888],sz=[60,40],flip=true,theta=0,exprs=[],pin=14,pout=[],pein=[],peout=8,gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="csuper",in1=-1,in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=1,state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[3-1]=scicos_block(gui="LOGIC",graphics=scicos_graphics(orig=[302.79613,202.52782],sz=[40,40],flip=true,theta=0,exprs=["[0;1;1;1;0;0;1;0]","0"],pin=[5,16,18],pout=4,pein=8,peout=[],gr_i=[],id="",in_implicit=["E","E","E"],out_implicit="E"),model=scicos_model(sim=list("logic",4),in1=[1,1,1],in2=[1,1,1],intyp=[5,5,5],out=1,out2=1,outtyp=5,evtin=1,evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(int8([0,1,1,1,0,0,1,0])),blocktype="c",firing=false,dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[4-1]=scicos_link(xx=[351.36756,368.82793,368.82793],yy=[222.52782,222.52782,223.06473],id="drawlink",thick=[0,0],ct=[1,1],from=[3,1,0],to=[10,1,1]); scs_m.objs[5-1]=scicos_link(xx=[291.39818,274.18235,274.18235,294.2247],yy=[281.584,281.584,232.52782,232.52782],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[3,1,1]); -scs_m.objs[6-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[368.82793,243.45067],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=11,pout=[7,20],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[6-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[368.82793,243.45067],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=11,pout=[7,20],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[7-1]=scicos_link(xx=[368.82793,368.82793,345.68389],yy=[243.45067,281.584,281.584],id="drawlink",thick=[0,0],ct=[1,1],from=[6,1,0],to=[1,1,1]); scs_m.objs[8-1]=scicos_link(xx=[322.52452,374.69743,374.69743,322.79613],yy=[317.8346,317.8346,248.24211,248.24211],id="drawlink",thick=[0,0],ct=[5,-1],from=[2,1,0],to=[3,1,1]); -scs_m.objs[9-1]=scicos_block(gui="LOGICAL_OP",graphics=scicos_graphics(orig=[377.63217,159.25363],sz=[60,40],flip=true,theta=0,exprs=["1","5","5","0"],pin=12,pout=22,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("logicalop_i8",4),in1=-1,in2=-2,intyp=5,out=-1,out2=-2,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[5,0],opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); -scs_m.objs[10-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[368.82793,223.06473],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=4,pout=[11,12],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[9-1]=scicos_block(gui="LOGICAL_OP",graphics=scicos_graphics(orig=[377.63217,159.25363],sz=[60,40],flip=true,theta=0,exprs=["1","5","5","0"],pin=12,pout=22,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("logicalop_i8",4),in1=-1,in2=-2,intyp=5,out=-1,out2=-2,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[5,0],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[10-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[368.82793,223.06473],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=4,pout=[11,12],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[11-1]=scicos_link(xx=[368.82793,368.82793],yy=[223.06473,243.45067],id="drawlink",thick=[0,0],ct=[1,1],from=[10,1,0],to=[6,1,1]); scs_m.objs[12-1]=scicos_link(xx=[368.82793,368.82793,369.06074],yy=[223.06473,177.7867,179.25363],id="drawlink",thick=[0,0],ct=[1,1],from=[10,2,0],to=[9,1,1]); -scs_m.objs[13-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[243.95309,333.54888],sz=[20,20],flip=true,theta=0,exprs="2",pin=[],pout=14,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[13-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[243.95309,333.54888],sz=[20,20],flip=true,theta=0,exprs="2",pin=[],pout=14,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[14-1]=scicos_link(xx=[263.95309,283.95309],yy=[343.54888,343.54888],id="drawlink",thick=[0,0],ct=[1,1],from=[13,1,0],to=[2,1,1]); -scs_m.objs[15-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[254.2247,212.52782],sz=[20,20],flip=true,theta=0,exprs="1",pin=[],pout=16,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[15-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[254.2247,212.52782],sz=[20,20],flip=true,theta=0,exprs="1",pin=[],pout=16,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[16-1]=scicos_link(xx=[274.2247,294.2247],yy=[222.52782,222.52782],id="drawlink",thick=[0,0],ct=[1,1],from=[15,1,0],to=[3,2,1]); -scs_m.objs[17-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[254.2247,202.52782],sz=[20,20],flip=true,theta=0,exprs="3",pin=[],pout=18,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=3,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[17-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[254.2247,202.52782],sz=[20,20],flip=true,theta=0,exprs="3",pin=[],pout=18,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=3,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[18-1]=scicos_link(xx=[274.2247,294.2247],yy=[212.52782,212.52782],id="drawlink",thick=[0,0],ct=[1,1],from=[17,1,0],to=[3,3,1]); -scs_m.objs[19-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[388.82793,233.45067],sz=[20,20],flip=true,theta=0,exprs="1",pin=20,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[19-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[388.82793,233.45067],sz=[20,20],flip=true,theta=0,exprs="1",pin=20,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[20-1]=scicos_link(xx=[368.82793,388.82793],yy=[243.45067,243.45067],id="drawlink",thick=[0,0],ct=[1,1],from=[6,2,0],to=[19,1,1]); -scs_m.objs[21-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[466.2036,169.25363],sz=[20,20],flip=true,theta=0,exprs="2",pin=22,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[21-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[466.2036,169.25363],sz=[20,20],flip=true,theta=0,exprs="2",pin=22,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[22-1]=scicos_link(xx=[446.2036,466.2036],yy=[179.25363,179.25363],id="drawlink",thick=[0,0],ct=[1,1],from=[9,1,0],to=[21,1,1]); model=scicos_model(); model.sim="csuper"; @@ -83,8 +83,8 @@ model.out2=[1,1]; model.intyp=[5,1,5]; model.outtyp=[5,5]; model.blocktype="h"; -model.firing=None; -model.dep_ut=[true,None]; +model.firing=false; +model.dep_ut=[true,false]; model.rpar=scs_m; gr_i=[]; x=standard_define([2,3],model,[],gr_i); diff --git a/js/IntegerOp/LOGIC.js b/js/IntegerOp/LOGIC.js index 88c2d598..d75902f8 100644 --- a/js/IntegerOp/LOGIC.js +++ b/js/IntegerOp/LOGIC.js @@ -17,13 +17,13 @@ nin=(log(size(mat,1))/log(2)); u1=floor(nin); if ((u1!=nin)) { block_parameter_error(msprintf(gettext("Wrong size for \'%s\' parameter: %d."),gettext("Truth Table"),size(mat,1)),gettext("Number of rows must be a power of two.")); -ok=None; +ok=false; } else if ((find(mat.slice()!=0&&mat.slice()!=1)!=[])) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter."),gettext("Truth Table")),msprintf(gettext("Elements must be in the interval %s."),"[0, 1]")); -ok=None; +ok=false; } else if (herit<0||herit>1) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Accepts Inherited Events"),herit),msprintf(gettext("Must be in the interval %s."),"[0, 1]")); -ok=None; +ok=false; } if (ok) { in1=[ones(nin,1),ones(nin,1)]; @@ -55,8 +55,8 @@ model.intyp=[5,5]; model.outtyp=5; model.opar=list(int8(mat)); model.blocktype="c"; -model.firing=None; -model.dep_ut=[true,None]; +model.firing=false; +model.dep_ut=[true,false]; exprs=[sci2exp(mat),sci2exp(0)]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/IntegerOp/SHIFT.js b/js/IntegerOp/SHIFT.js index 99b33134..3500c007 100644 --- a/js/IntegerOp/SHIFT.js +++ b/js/IntegerOp/SHIFT.js @@ -14,7 +14,7 @@ break } if ((np!=0&&np!=1)) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Shift Type"),np),msprintf(gettext("Must be in the interval %s."),"[0, 1]")); -ok=None; +ok=false; } it=Datatype; ot=Datatype; @@ -83,7 +83,7 @@ model.sim=list("shift_8_RC",4); } } else { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Data Type"),Datatype),msprintf(gettext("Must be in the interval %s."),"[3, 8]")); -ok=None; +ok=false; } if (ok) { [model,graphics,ok]=set_io(model,graphics,list([-1,-2],it),list([-1,-2],ot),[],[]); @@ -111,7 +111,7 @@ model.outtyp=3; model.rpar=[]; model.ipar=sgn; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[sci2exp(3),sci2exp(0),sci2exp(0)]; gr_i=[]; x=standard_define([3,2],model,exprs,gr_i); diff --git a/js/IntegerOp/SRFLIPFLOP.js b/js/IntegerOp/SRFLIPFLOP.js index 33c1dcfa..e258f3e9 100644 --- a/js/IntegerOp/SRFLIPFLOP.js +++ b/js/IntegerOp/SRFLIPFLOP.js @@ -44,19 +44,19 @@ typ=newpar; } SRFLIPFLOP.prototype.define = function SRFLIPFLOP() { scs_m=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["SRFLIPFLOP"],tol=[0.0001,0.000001,1.000e-10,100001,0,0,0],tf=60,context=" ",void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(true,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list())); -scs_m.objs[1-1]=scicos_block(gui="LOGIC",graphics=scicos_graphics(orig=[298.504,201.45067],sz=[40,40],flip=true,theta=0,exprs=["[0 1;1 0;1 0;1 0;0 1;0 1;0 0;0 0]","1"],pin=[4,10,12],pout=[3,8],pein=[],peout=[],gr_i=[],id="",in_implicit=["E","E","E"],out_implicit=["E","E"]),model=scicos_model(sim=list("logic",4),in1=[1,1,1],in2=[1,1,1],intyp=[5,5,5],out=[1,1],out2=[1,1],outtyp=[5,5],evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(int8([0,1,1,0,1,0,1,0,0,1,0,1,0,0,0,0])),blocktype="c",firing=None,dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); -scs_m.objs[2-1]=scicos_block(gui="DOLLAR_m",graphics=scicos_graphics(orig=[299.23733,254.25067],sz=[40,40],flip=None,theta=0,exprs=["int8(0)","1"],pin=6,pout=4,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("dollar4_m",4),in1=1,in2=1,intyp=5,out=1,out2=1,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(int8(0)),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[1-1]=scicos_block(gui="LOGIC",graphics=scicos_graphics(orig=[298.504,201.45067],sz=[40,40],flip=true,theta=0,exprs=["[0 1;1 0;1 0;1 0;0 1;0 1;0 0;0 0]","1"],pin=[4,10,12],pout=[3,8],pein=[],peout=[],gr_i=[],id="",in_implicit=["E","E","E"],out_implicit=["E","E"]),model=scicos_model(sim=list("logic",4),in1=[1,1,1],in2=[1,1,1],intyp=[5,5,5],out=[1,1],out2=[1,1],outtyp=[5,5],evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(int8([0,1,1,0,1,0,1,0,0,1,0,1,0,0,0,0])),blocktype="c",firing=false,dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[2-1]=scicos_block(gui="DOLLAR_m",graphics=scicos_graphics(orig=[299.23733,254.25067],sz=[40,40],flip=false,theta=0,exprs=["int8(0)","1"],pin=6,pout=4,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("dollar4_m",4),in1=1,in2=1,intyp=5,out=1,out2=1,outtyp=5,evtin=[],evtout=[],state=[],dstate=[],odstate=list(int8(0)),rpar=[],ipar=[],opar=list(),blocktype="d",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[3-1]=scicos_link(xx=[347.07543,363.03733,363.03733],yy=[228.11733,228.11733,248.584],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[5,1,1]); scs_m.objs[4-1]=scicos_link(xx=[290.6659,272.104,272.104,289.93257],yy=[274.25067,274.25067,231.45067,231.45067],id="drawlink",thick=[0,0],ct=[1,1],from=[2,1,0],to=[1,1,1]); -scs_m.objs[5-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[363.03733,248.584],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=3,pout=[6,14],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[5-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[363.03733,248.584],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=3,pout=[6,14],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[6-1]=scicos_link(xx=[363.03733,363.03733,344.95162],yy=[248.584,274.25067,274.25067],id="drawlink",thick=[0,0],ct=[1,1],from=[5,1,0],to=[2,1,1]); -scs_m.objs[7-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[367.07543,204.784],sz=[20,20],flip=true,theta=0,exprs="2",pin=8,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[7-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[367.07543,204.784],sz=[20,20],flip=true,theta=0,exprs="2",pin=8,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[8-1]=scicos_link(xx=[347.07543,367.07543],yy=[214.784,214.784],id="drawlink",thick=[0,0],ct=[1,1],from=[1,2,0],to=[7,1,1]); -scs_m.objs[9-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[249.93257,211.45067],sz=[20,20],flip=true,theta=0,exprs="1",pin=[],pout=10,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[9-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[249.93257,211.45067],sz=[20,20],flip=true,theta=0,exprs="1",pin=[],pout=10,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[10-1]=scicos_link(xx=[269.93257,289.93257],yy=[221.45067,221.45067],id="drawlink",thick=[0,0],ct=[1,1],from=[9,1,0],to=[1,2,1]); -scs_m.objs[11-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[249.93257,201.45067],sz=[20,20],flip=true,theta=0,exprs="2",pin=[],pout=12,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[11-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[249.93257,201.45067],sz=[20,20],flip=true,theta=0,exprs="2",pin=[],pout=12,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=2,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[12-1]=scicos_link(xx=[269.93257,289.93257],yy=[211.45067,211.45067],id="drawlink",thick=[0,0],ct=[1,1],from=[11,1,0],to=[1,3,1]); -scs_m.objs[13-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[383.03733,238.584],sz=[20,20],flip=true,theta=0,exprs="1",pin=14,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[13-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[383.03733,238.584],sz=[20,20],flip=true,theta=0,exprs="1",pin=14,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[14-1]=scicos_link(xx=[363.03733,383.03733],yy=[248.584,248.584],id="drawlink",thick=[0,0],ct=[1,1],from=[5,2,0],to=[13,1,1]); model=scicos_model(); model.sim="csuper"; @@ -67,8 +67,8 @@ model.out2=[1,1]; model.intyp=[5,5]; model.outtyp=[5,5]; model.blocktype="h"; -model.firing=None; -model.dep_ut=[true,None]; +model.firing=false; +model.dep_ut=[true,false]; model.rpar=scs_m; gr_i=[]; x=standard_define([2,3],model,[],gr_i); diff --git a/js/Linear/BIGSOM_f.js b/js/Linear/BIGSOM_f.js index 8ecf506c..5fae8670 100644 --- a/js/Linear/BIGSOM_f.js +++ b/js/Linear/BIGSOM_f.js @@ -31,7 +31,7 @@ model.in1=[-1,-1]; model.out=-1; model.rpar=sgn; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=sci2exp(sgn); gr_i=[]; x=standard_define([2,3],model,exprs,gr_i); diff --git a/js/Linear/CLINDUMMY_f.js b/js/Linear/CLINDUMMY_f.js index 26dd1d3d..742ce52d 100644 --- a/js/Linear/CLINDUMMY_f.js +++ b/js/Linear/CLINDUMMY_f.js @@ -12,7 +12,7 @@ model.sim=list("cdummy",4); model.state=x0; model.blocktype="c"; model.firing=[]; -model.dep_ut=[None,true]; +model.dep_ut=[false,true]; gr_i=[]; x=standard_define([3,2],model,[],gr_i); } diff --git a/js/Linear/CLSS.js b/js/Linear/CLSS.js index 6901dbef..f726b890 100644 --- a/js/Linear/CLSS.js +++ b/js/Linear/CLSS.js @@ -31,7 +31,7 @@ D=D*ones(C*B); } else if (size(D,"*")==0) { D=zeros(C*B); } else { -okD=None; +okD=false; } } if (ms!=ns||!okD) { @@ -45,13 +45,13 @@ if (D!=[]) { if (norm(D,1)!=0) { mmm=[true,true]; } else { -mmm=[None,true]; +mmm=[false,true]; } if (or(model.dep_ut!=mmm)) { model.dep_ut=mmm; } } else { -model.dep_ut=[None,true]; +model.dep_ut=[false,true]; } model.state=x0.slice(); model.rpar=rpar; @@ -77,7 +77,7 @@ model.out=out; model.state=x0; model.rpar=[A.slice(),B.slice(),C.slice(),D.slice()]; model.blocktype="c"; -model.dep_ut=[None,true]; +model.dep_ut=[false,true]; exprs=[strcat(sci2exp(A)),strcat(sci2exp(B)),strcat(sci2exp(C)),strcat(sci2exp(D)),strcat(sci2exp(x0))]; gr_i=[]; x=standard_define([4,2],model,exprs,gr_i); diff --git a/js/Linear/CLSS_f.js b/js/Linear/CLSS_f.js index 2c6eed25..380497e0 100644 --- a/js/Linear/CLSS_f.js +++ b/js/Linear/CLSS_f.js @@ -35,13 +35,13 @@ if (D!=[]) { if (norm(D,1)!=0) { mmm=[true,true]; } else { -mmm=[None,true]; +mmm=[false,true]; } if (or(model.dep_ut!=mmm)) { model.dep_ut=mmm; } } else { -model.dep_ut=[None,true]; +model.dep_ut=[false,true]; } model.state=x0.slice(); model.rpar=rpar; @@ -67,7 +67,7 @@ model.out=out; model.state=x0; model.rpar=[A.slice(),B.slice(),C.slice(),D.slice()]; model.blocktype="c"; -model.dep_ut=[None,true]; +model.dep_ut=[false,true]; exprs=[strcat(sci2exp(A)),strcat(sci2exp(B)),strcat(sci2exp(C)),strcat(sci2exp(D)),strcat(sci2exp(x0))]; gr_i=[]; x=standard_define([4,2],model,exprs,gr_i); diff --git a/js/Linear/DELAYV_f.js b/js/Linear/DELAYV_f.js index 8479afa7..759e0191 100644 --- a/js/Linear/DELAYV_f.js +++ b/js/Linear/DELAYV_f.js @@ -18,11 +18,11 @@ break } if (size(zz0,"*")<2) { message("Register length must be at least 2"); -ok=None; +ok=false; } if (T<=0) { message("Delay must be positive"); -ok=None; +ok=false; } if (ok) { [model,graphics,ok]=check_io(model,graphics,[nin,1],nin,1,[1,1]); @@ -52,7 +52,7 @@ model.dstate=z0; model.rpar=T/(size(zz0,"*")); model.blocktype="d"; model.firing=[0,-1]; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[string(nin),strcat(string(z0.slice(1-1,$-1)),";"),string(T)]; gr_i=[]; x=standard_define([3,2],model,exprs,gr_i); diff --git a/js/Linear/DELAY_f.js b/js/Linear/DELAY_f.js index 5b3b20da..5de31493 100644 --- a/js/Linear/DELAY_f.js +++ b/js/Linear/DELAY_f.js @@ -31,11 +31,11 @@ break mess=[]; if (prod(size(z0))<1) { mess=[mess,"Register length must be at least 1"," "]; -ok=None; +ok=false; } if (dt<=0) { mess=[mess,"Discretization time step must be positive"," "]; -ok=None; +ok=false; } if (!ok) { message(mess); @@ -116,7 +116,7 @@ x.model.sim="csuper"; x.model.in1=1; x.model.out=1; x.model.blocktype="h"; -x.model.dep_ut=[None,None]; +x.model.dep_ut=[false,false]; x.model.rpar=diagram; x.graphics.in_implicit=["E"]; x.graphics.in_style=""; diff --git a/js/Linear/DERIV.js b/js/Linear/DERIV.js index 13107bf8..7cb03905 100644 --- a/js/Linear/DERIV.js +++ b/js/Linear/DERIV.js @@ -11,7 +11,7 @@ model.sim=list("deriv",4); model.in1=-1; model.out=-1; model.blocktype="x"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Linear/DIFF_c.js b/js/Linear/DIFF_c.js index 3f2877af..b15404fc 100644 --- a/js/Linear/DIFF_c.js +++ b/js/Linear/DIFF_c.js @@ -8,7 +8,7 @@ graphics=arg1.graphics; exprs=graphics.exprs; model=arg1.model; while (true) { -ask_again=None; +ask_again=false; [ok,x0,xd0,exprs]=scicos_getvalue("Set continuous linear system parameters",["Initial state","Initial Derivative"],list("vec",-1,"vec",-1),exprs); if (!ok) { break @@ -45,7 +45,7 @@ model.in1=1; model.out=1; model.state=x0; model.blocktype="c"; -model.dep_ut=[None,true]; +model.dep_ut=[false,true]; exprs=[strcat(sci2exp(x0(1))),strcat(sci2exp(x0(2)))]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Linear/DLSS.js b/js/Linear/DLSS.js index 7cdb4587..931a89be 100644 --- a/js/Linear/DLSS.js +++ b/js/Linear/DLSS.js @@ -31,7 +31,7 @@ D=D*ones(C*B); } else if (size(D,"*")==0) { D=zeros(C*B); } else { -okD=None; +okD=false; } } if (ms!=ns||!okD) { @@ -43,15 +43,15 @@ graphics.exprs=exprs; rpar=[A.slice(),B.slice(),C.slice(),D.slice()]; if (D!=[]) { if (norm(D,1)!=0) { -mmm=[true,None]; +mmm=[true,false]; } else { -mmm=[None,None]; +mmm=[false,false]; } if (or(model.dep_ut!=mmm)) { model.dep_ut=mmm; } } else { -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; } model.dstate=x0.slice(); model.rpar=rpar; @@ -76,7 +76,7 @@ model.evtin=1; model.dstate=x0.slice(); model.rpar=[A.slice(),B.slice(),C.slice(),D.slice()]; model.blocktype="d"; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=[strcat(sci2exp(A)),strcat(sci2exp(B)),strcat(sci2exp(C)),strcat(sci2exp(D)),strcat(sci2exp(x0))]; gr_i=[]; x=standard_define([4,2],model,exprs,gr_i); diff --git a/js/Linear/DLSS_f.js b/js/Linear/DLSS_f.js index ff1a8ba5..55c89860 100644 --- a/js/Linear/DLSS_f.js +++ b/js/Linear/DLSS_f.js @@ -33,15 +33,15 @@ graphics.exprs=exprs; rpar=[A.slice(),B.slice(),C.slice(),D.slice()]; if (D!=[]) { if (norm(D,1)!=0) { -mmm=[true,None]; +mmm=[true,false]; } else { -mmm=[None,None]; +mmm=[false,false]; } if (or(model.dep_ut!=mmm)) { model.dep_ut=mmm; } } else { -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; } model.dstate=x0.slice(); model.rpar=rpar; @@ -66,7 +66,7 @@ model.evtin=1; model.dstate=x0.slice(); model.rpar=[A.slice(),B.slice(),C.slice(),D.slice()]; model.blocktype="d"; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=[strcat(sci2exp(A)),strcat(sci2exp(B)),strcat(sci2exp(C)),strcat(sci2exp(D)),strcat(sci2exp(x0))]; gr_i=[]; x=standard_define([4,2],model,exprs,gr_i); diff --git a/js/Linear/DOLLAR.js b/js/Linear/DOLLAR.js index bf5ca2b8..d1598dae 100644 --- a/js/Linear/DOLLAR.js +++ b/js/Linear/DOLLAR.js @@ -56,7 +56,7 @@ it=8; ot=8; } else { message("type is not recognized"); -ok=None; +ok=false; } if (ok) { [model,graphics,ok]=set_io(model,graphics,list(in1,it),list(out,ot),ones(1-inh,1),[]); @@ -81,7 +81,7 @@ model.out=in1; model.evtin=1-inh; model.dstate=z; model.blocktype="d"; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); } diff --git a/js/Linear/DOLLAR_f.js b/js/Linear/DOLLAR_f.js index 18b2a5d9..d42706da 100644 --- a/js/Linear/DOLLAR_f.js +++ b/js/Linear/DOLLAR_f.js @@ -46,7 +46,7 @@ model.out=in1; model.evtin=1-inh; model.dstate=z; model.blocktype="d"; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); } diff --git a/js/Linear/DOLLAR_m.js b/js/Linear/DOLLAR_m.js index fa3c85c7..af8ad200 100644 --- a/js/Linear/DOLLAR_m.js +++ b/js/Linear/DOLLAR_m.js @@ -56,7 +56,7 @@ it=8; ot=8; } else { message("type is not recognized"); -ok=None; +ok=false; } if (ok) { [model,graphics,ok]=set_io(model,graphics,list(in1,it),list(out,ot),ones(1-inh,1),[]); @@ -81,7 +81,7 @@ model.out=in1; model.evtin=1-inh; model.dstate=z; model.blocktype="d"; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); } diff --git a/js/Linear/GAINBLK.js b/js/Linear/GAINBLK.js index 5901ff74..cc7f207a 100644 --- a/js/Linear/GAINBLK.js +++ b/js/Linear/GAINBLK.js @@ -27,7 +27,7 @@ model.rpar=gain.slice(); model.opar=list(); } else { message("type is not supported"); -ok=None; +ok=false; } } else { if ((over==0)) { @@ -51,7 +51,7 @@ ot=8; model.sim=list("gainblk_ui8n",4); } else { message("type is not supported."); -ok=None; +ok=false; } } else if ((over==1)) { if ((typeof(gain)=="int32")) { @@ -74,7 +74,7 @@ ot=8; model.sim=list("gainblk_ui8s",4); } else { message("type is not supported."); -ok=None; +ok=false; } } else if ((over==2)) { if ((typeof(gain)=="int32")) { @@ -97,11 +97,11 @@ ot=8; model.sim=list("gainblk_ui8e",4); } else { message("type is not an integer."); -ok=None; +ok=false; } } else { message("Do on Overflow must be 0,1,2"); -ok=None; +ok=false; } model.rpar=[]; model.opar=list(gain.slice()); @@ -137,7 +137,7 @@ model.in2=in2; model.out2=out2; model.rpar=gain; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[strcat(sci2exp(gain))]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Linear/GAINBLK_f.js b/js/Linear/GAINBLK_f.js index 71b2ce6f..642b8f1d 100644 --- a/js/Linear/GAINBLK_f.js +++ b/js/Linear/GAINBLK_f.js @@ -37,7 +37,7 @@ model.in1=in1; model.out=out; model.rpar=gain; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[strcat(sci2exp(gain))]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Linear/GAIN_f.js b/js/Linear/GAIN_f.js index 8ded9ef0..3515345d 100644 --- a/js/Linear/GAIN_f.js +++ b/js/Linear/GAIN_f.js @@ -37,7 +37,7 @@ model.in1=1; model.out=1; model.rpar=gain; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[strcat(sci2exp(gain)),strcat(sci2exp(in1)),strcat(sci2exp(out))]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Linear/INTEGRAL.js b/js/Linear/INTEGRAL.js index 55039721..e1edd2fa 100644 --- a/js/Linear/INTEGRAL.js +++ b/js/Linear/INTEGRAL.js @@ -28,13 +28,13 @@ lowp=lowp*ones(x0); } if ((size(x0,1)!=size(maxp,1)||size(x0,1)!=size(lowp,1))) { message("x0 and Upper limit and Lower limit must have same size"); -ok=None; +ok=false; } else if (or(maxp<=lowp)) { message("Upper limits must be > Lower limits"); -ok=None; +ok=false; } else if (or(x0>maxp)||or(x0<lowp)) { message("Initial condition x0 should be inside the limits"); -ok=None; +ok=false; } else { rpar=[maxp,lowp]; model.nzcross=size(x0,1); @@ -69,7 +69,7 @@ model.in1=1; model.out=1; model.rpar=rpar; model.blocktype="c"; -model.dep_ut=[None,true]; +model.dep_ut=[false,true]; exprs=string([0,0,0,maxp,minp]); gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Linear/INTEGRAL_f.js b/js/Linear/INTEGRAL_f.js index b2c23f69..cf19d39d 100644 --- a/js/Linear/INTEGRAL_f.js +++ b/js/Linear/INTEGRAL_f.js @@ -28,7 +28,7 @@ model.in1=1; model.out=1; model.state=x0; model.blocktype="c"; -model.dep_ut=[None,true]; +model.dep_ut=[false,true]; exprs=strcat(sci2exp(x0)); gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Linear/INTEGRAL_m.js b/js/Linear/INTEGRAL_m.js index 52e65658..8bf50dee 100644 --- a/js/Linear/INTEGRAL_m.js +++ b/js/Linear/INTEGRAL_m.js @@ -31,13 +31,13 @@ lowp=lowp*ones(x0); } if ((size(x0)!=size(maxp)||size(x0)!=size(lowp))) { message("x0 and Upper limit and Lower limit must have same size"); -ok=None; +ok=false; } else if (or(maxp<=lowp)) { message("Upper limits must be > Lower limits"); -ok=None; +ok=false; } else if (or(x0>maxp)||or(x0<lowp)) { message("Initial condition x0 should be inside the limits"); -ok=None; +ok=false; } else { rpar=[real(maxp.slice()),real(lowp.slice())]; model.nzcross=size(x0,"*"); @@ -52,13 +52,13 @@ lowp=math.complex(lowp*ones(x0),(lowp*ones(x0))); } if ((size(x0)!=size(maxp)||size(x0)!=size(lowp))) { message("x0 and Upper limit and Lower limit must have same size"); -ok=None; +ok=false; } else if (or(real(maxp)<=real(lowp))||or(imag(maxp)<=imag(lowp))) { message("Upper limits must be > Lower limits"); -ok=None; +ok=false; } else if (or(real(x0)>real(maxp))||or(real(x0)<real(lowp))||or(imag(x0)>imag(maxp))||or(imag(x0)<imag(lowp))) { message("Initial condition x0 should be inside the limits"); -ok=None; +ok=false; } else { rpar=[real(maxp.slice()),real(lowp.slice()),imag(maxp.slice()),imag(lowp.slice())]; model.nzcross=2*size(x0,"*"); @@ -84,7 +84,7 @@ it=[2,2*ones(reinit,1)]; ot=2; } else { message("Datatype is not supported"); -ok=None; +ok=false; } if (ok) { in1=[size(x0,1)*[1,ones(reinit,1)],size(x0,2)*[1,ones(reinit,1)]]; @@ -113,7 +113,7 @@ model.in2=1; model.out2=1; model.rpar=rpar; model.blocktype="c"; -model.dep_ut=[None,true]; +model.dep_ut=[false,true]; exprs=string([0,0,0,maxp,minp]); gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Linear/PID.js b/js/Linear/PID.js index d54409e2..bed7cf4d 100644 --- a/js/Linear/PID.js +++ b/js/Linear/PID.js @@ -75,26 +75,26 @@ typ=newpar; } PID.prototype.define = function PID() { scs_m=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[600,450,0,0,600,450],Title=["PID"],tol=[0.0001,0.000001,1.000e-10,100001,0,0],tf=100000,context=" ",void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(true,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list())); -scs_m.objs[1-1]=scicos_block(gui="INTEGRAL_m",graphics=scicos_graphics(orig=[318.304,183.11733],sz=[40,40],flip=true,theta=0,exprs=["0","0","0","1","-1"],pin=7,pout=9,pein=[],peout=[],gr_i=[],id="1/s",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("integral_func",4),in1=1,in2=1,intyp=1,out=1,out2=1,outtyp=1,evtin=[],evtout=[],state=0,dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[None,true],label="",nzcross=0,nmode=0,equations=list()),doc=list()); -scs_m.objs[2-1]=scicos_block(gui="SUMMATION",graphics=scicos_graphics(orig=[387.97067,172.85067],sz=[40,60],flip=true,theta=0,exprs=["1","[1;1;1]"],pin=[10,9,11],pout=19,pein=[],peout=[],gr_i=[],id="",in_implicit=["E","E","E"],out_implicit="E"),model=scicos_model(sim=list("summation",4),in1=[-1,-1,-1],in2=[-2,-2,-2],intyp=[1,1,1],out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[1,1,1],opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); -scs_m.objs[3-1]=scicos_block(gui="GAINBLK",graphics=scicos_graphics(orig=[321.23733,235.91733],sz=[40,40],flip=true,theta=0,exprs="1",pin=17,pout=10,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("gainblk",4),in1=-1,in2=-2,intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=1,ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); -scs_m.objs[4-1]=scicos_block(gui="DERIV",graphics=scicos_graphics(orig=[319.03733,135.45067],sz=[40,40],flip=true,theta=0,exprs=[],pin=8,pout=11,pein=[],peout=[],gr_i=[],id="s",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("deriv",4),in1=-1,in2=-2,intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="x",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); -scs_m.objs[5-1]=scicos_block(gui="GAINBLK",graphics=scicos_graphics(orig=[255.23733,183.11733],sz=[40,40],flip=true,theta=0,exprs="1",pin=13,pout=7,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("gainblk",4),in1=-1,in2=-2,intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=1,ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); -scs_m.objs[6-1]=scicos_block(gui="GAINBLK",graphics=scicos_graphics(orig=[255.23733,135.45067],sz=[40,40],flip=true,theta=0,exprs="1",pin=14,pout=8,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("gainblk",4),in1=-1,in2=-2,intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=1,ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[1-1]=scicos_block(gui="INTEGRAL_m",graphics=scicos_graphics(orig=[318.304,183.11733],sz=[40,40],flip=true,theta=0,exprs=["0","0","0","1","-1"],pin=7,pout=9,pein=[],peout=[],gr_i=[],id="1/s",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("integral_func",4),in1=1,in2=1,intyp=1,out=1,out2=1,outtyp=1,evtin=[],evtout=[],state=0,dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[false,true],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[2-1]=scicos_block(gui="SUMMATION",graphics=scicos_graphics(orig=[387.97067,172.85067],sz=[40,60],flip=true,theta=0,exprs=["1","[1;1;1]"],pin=[10,9,11],pout=19,pein=[],peout=[],gr_i=[],id="",in_implicit=["E","E","E"],out_implicit="E"),model=scicos_model(sim=list("summation",4),in1=[-1,-1,-1],in2=[-2,-2,-2],intyp=[1,1,1],out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[1,1,1],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[3-1]=scicos_block(gui="GAINBLK",graphics=scicos_graphics(orig=[321.23733,235.91733],sz=[40,40],flip=true,theta=0,exprs="1",pin=17,pout=10,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("gainblk",4),in1=-1,in2=-2,intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=1,ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[4-1]=scicos_block(gui="DERIV",graphics=scicos_graphics(orig=[319.03733,135.45067],sz=[40,40],flip=true,theta=0,exprs=[],pin=8,pout=11,pein=[],peout=[],gr_i=[],id="s",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("deriv",4),in1=-1,in2=-2,intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="x",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[5-1]=scicos_block(gui="GAINBLK",graphics=scicos_graphics(orig=[255.23733,183.11733],sz=[40,40],flip=true,theta=0,exprs="1",pin=13,pout=7,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("gainblk",4),in1=-1,in2=-2,intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=1,ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[6-1]=scicos_block(gui="GAINBLK",graphics=scicos_graphics(orig=[255.23733,135.45067],sz=[40,40],flip=true,theta=0,exprs="1",pin=14,pout=8,pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit="E"),model=scicos_model(sim=list("gainblk",4),in1=-1,in2=-2,intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=1,ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[7-1]=scicos_link(xx=[303.80876,309.73257],yy=[203.11733,203.11733],id="drawlink",thick=[0,0],ct=[1,1],from=[5,1,0],to=[1,1,1]); scs_m.objs[8-1]=scicos_link(xx=[303.80876,310.4659],yy=[155.45067,155.45067],id="drawlink",thick=[0,0],ct=[1,1],from=[6,1,0],to=[4,1,1]); scs_m.objs[9-1]=scicos_link(xx=[366.87543,379.39924],yy=[203.11733,202.85067],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[2,2,1]); scs_m.objs[10-1]=scicos_link(xx=[369.80876,379.39924,379.39924],yy=[255.91733,255.91733,217.85067],id="drawlink",thick=[0,0],ct=[1,1],from=[3,1,0],to=[2,1,1]); scs_m.objs[11-1]=scicos_link(xx=[367.60876,379.39924,379.39924],yy=[155.45067,155.45067,187.85067],id="drawlink",thick=[0,0],ct=[1,1],from=[4,1,0],to=[2,3,1]); -scs_m.objs[12-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[234.704,203.11733],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=16,pout=[13,14],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[12-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[234.704,203.11733],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=16,pout=[13,14],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[13-1]=scicos_link(xx=[234.704,246.6659],yy=[203.11733,203.11733],id="drawlink",thick=[0,0],ct=[1,1],from=[12,1,0],to=[5,1,1]); scs_m.objs[14-1]=scicos_link(xx=[234.704,234.704,246.6659],yy=[203.11733,155.45067,155.45067],id="drawlink",thick=[0,0],ct=[1,1],from=[12,2,0],to=[6,1,1]); -scs_m.objs[15-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[233.97067,203.11733],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=21,pout=[16,17],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[15-1]=scicos_block(gui="SPLIT_f",graphics=scicos_graphics(orig=[233.97067,203.11733],sz=[0.3333333,0.3333333],flip=true,theta=0,exprs=[],pin=21,pout=[16,17],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=["E","E","E"]),model=scicos_model(sim="lsplit",in1=-1,in2=[],intyp=1,out=[-1,-1,-1],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="c",firing=[],dep_ut=[true,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[16-1]=scicos_link(xx=[233.97067,234.704],yy=[203.11733,203.11733],id="drawlink",thick=[0,0],ct=[1,1],from=[15,1,0],to=[12,1,1]); scs_m.objs[17-1]=scicos_link(xx=[233.97067,233.97067,312.6659],yy=[203.11733,255.91733,255.91733],id="drawlink",thick=[0,0],ct=[1,1],from=[15,2,0],to=[3,1,1]); -scs_m.objs[18-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[456.5421,192.85067],sz=[20,20],flip=true,theta=0,exprs="1",pin=19,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[18-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[456.5421,192.85067],sz=[20,20],flip=true,theta=0,exprs="1",pin=19,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=[],intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[19-1]=scicos_link(xx=[436.5421,456.5421],yy=[202.85067,202.85067],id="drawlink",thick=[0,0],ct=[1,1],from=[2,1,0],to=[18,1,1]); -scs_m.objs[20-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[193.97067,193.11733],sz=[20,20],flip=true,theta=0,exprs="1",pin=[],pout=21,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m.objs[20-1]=scicos_block(gui="IN_f",graphics=scicos_graphics(orig=[193.97067,193.11733],sz=[20,20],flip=true,theta=0,exprs="1",pin=[],pout=21,pein=[],peout=[],gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim="input",in1=[],in2=[],intyp=1,out=-1,out2=[],outtyp=-1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m.objs[21-1]=scicos_link(xx=[213.97067,233.97067],yy=[203.11733,203.11733],id="drawlink",thick=[0,0],ct=[1,1],from=[20,1,0],to=[15,1,1]); model=scicos_model(); model.sim="csuper"; @@ -105,8 +105,8 @@ model.out2=-2; model.intyp=1; model.outtyp=1; model.blocktype="h"; -model.firing=None; -model.dep_ut=[None,None]; +model.firing=false; +model.dep_ut=[false,false]; model.rpar=scs_m; gr_i=[]; x=standard_define([2,2],model,[],gr_i); diff --git a/js/Linear/REGISTER.js b/js/Linear/REGISTER.js index 7f2f02cb..966dfb60 100644 --- a/js/Linear/REGISTER.js +++ b/js/Linear/REGISTER.js @@ -17,7 +17,7 @@ break } if (prod(size(z0))<1) { message("Register length must be at least 1"); -ok=None; +ok=false; } if (it==1) { model.sim=list("delay4",4); @@ -45,7 +45,7 @@ model.sim=list("delay4_ui8",4); z0=uint8(z0); } else { message("Datatype is not supported"); -ok=None; +ok=false; } model.odstate=list(z0); model.dstate=[]; @@ -71,7 +71,7 @@ model.out=1; model.evtin=1; model.dstate=z0; model.blocktype="d"; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=strcat(string(z0),";"); gr_i=[]; x=standard_define([3,2],model,exprs,gr_i); diff --git a/js/Linear/REGISTER_f.js b/js/Linear/REGISTER_f.js index 825260ed..5148ec31 100644 --- a/js/Linear/REGISTER_f.js +++ b/js/Linear/REGISTER_f.js @@ -14,7 +14,7 @@ break } if (prod(size(z0))<1) { message("Register length must be at least 1"); -ok=None; +ok=false; } if (ok) { graphics.exprs=exprs; @@ -34,7 +34,7 @@ model.out=1; model.evtin=1; model.dstate=z0; model.blocktype="d"; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=strcat(string(z0),";"); gr_i=[]; x=standard_define([2.5,2.5],model,exprs,gr_i); diff --git a/js/Linear/SAMPHOLD.js b/js/Linear/SAMPHOLD.js index d7be3438..f284d7e4 100644 --- a/js/Linear/SAMPHOLD.js +++ b/js/Linear/SAMPHOLD.js @@ -14,7 +14,7 @@ model.in1=-1; model.out=-1; model.evtin=1; model.blocktype="d"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; gr_i=[]; x=standard_define([2,2],model," ",gr_i); } diff --git a/js/Linear/SAMPHOLD_m.js b/js/Linear/SAMPHOLD_m.js index 9f491a3e..869130bd 100644 --- a/js/Linear/SAMPHOLD_m.js +++ b/js/Linear/SAMPHOLD_m.js @@ -15,7 +15,7 @@ break } if (((it<1)||(it>8))) { message("Datatype is not supported"); -ok=None; +ok=false; } if (ok) { in1=[model.in1,model.in2]; @@ -41,7 +41,7 @@ model.out=-1; model.out2=-2; model.evtin=1; model.blocktype="d"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; label=[sci2exp(1)]; gr_i=[]; x=standard_define([2,2],model,label,gr_i); diff --git a/js/Linear/SAMPLEHOLD_f.js b/js/Linear/SAMPLEHOLD_f.js index c3e83bd3..6492650e 100644 --- a/js/Linear/SAMPLEHOLD_f.js +++ b/js/Linear/SAMPLEHOLD_f.js @@ -14,7 +14,7 @@ model.in1=-1; model.out=-1; model.evtin=1; model.blocktype="d"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; gr_i=[]; x=standard_define([2,2],model," ",gr_i); } diff --git a/js/Linear/SOM_f.js b/js/Linear/SOM_f.js index 4a8b18f3..5f1a028d 100644 --- a/js/Linear/SOM_f.js +++ b/js/Linear/SOM_f.js @@ -30,7 +30,7 @@ model.in1=[-1,-1,-1]; model.out=-1; model.rpar=sgn; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[sci2exp(1),sci2exp(sgn)]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Linear/SUMMATION.js b/js/Linear/SUMMATION.js index 1accf905..6374fc1e 100644 --- a/js/Linear/SUMMATION.js +++ b/js/Linear/SUMMATION.js @@ -20,12 +20,12 @@ break sgn=sgn.slice(); if ((satur!=0&&satur!=1&&satur!=2)) { message("Do on overflow must be 0,1,2"); -ok=None; +ok=false; } if (size(sgn,1)==1) { if (sgn<1) { message("Number of inputs must be > 0"); -ok=None; +ok=false; } else if (sgn==1) { in1=-1; in2=-2; @@ -42,7 +42,7 @@ nout2=-2; } else { if (!and(abs(sgn)==1)) { message("Signs can only be +1 or -1"); -ok=None; +ok=false; } else { in1=-ones(size(sgn,1),1); in2=2*in1; @@ -58,7 +58,7 @@ model.sim=list("summation",4); model.sim=list("summation_z",4); } else if (((Datatype<1)||(Datatype>8))) { message("Datatype is not supported"); -ok=None; +ok=false; } else { if (satur==0) { if (Datatype==3) { @@ -127,7 +127,7 @@ model.in2=[-2,-2]; model.out2=-2; model.ipar=sgn; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=sci2exp(sgn); gr_i=[]; x=standard_define([2,3],model,exprs,gr_i); diff --git a/js/Linear/SUM_f.js b/js/Linear/SUM_f.js index 4aa657a5..7ad7c78e 100644 --- a/js/Linear/SUM_f.js +++ b/js/Linear/SUM_f.js @@ -11,7 +11,7 @@ model.sim=list("plusblk",2); model.in1=[-1,-1,-1]; model.out=-1; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; gr_i=[]; exprs=[]; x=standard_define([1,1],model,exprs,gr_i); diff --git a/js/Linear/TCLSS.js b/js/Linear/TCLSS.js index e5d0f08e..6c79aeb7 100644 --- a/js/Linear/TCLSS.js +++ b/js/Linear/TCLSS.js @@ -35,13 +35,13 @@ if (D!=[]) { if (norm(D,1)!=0) { mmm=[true,true]; } else { -mmm=[None,true]; +mmm=[false,true]; } if (or(model.dep_ut!=mmm)) { model.dep_ut=mmm; } } else { -model.dep_ut=[None,true]; +model.dep_ut=[false,true]; } model.state=x0.slice(); model.rpar=rpar; @@ -74,7 +74,7 @@ model.evtin=1; model.state=x0; model.rpar=[A.slice(),B.slice(),C.slice(),D.slice()]; model.blocktype="c"; -model.dep_ut=[None,true]; +model.dep_ut=[false,true]; exprs=[strcat(sci2exp(A)),strcat(sci2exp(B)),strcat(sci2exp(C)),strcat(sci2exp(D)),strcat(sci2exp(x0))]; gr_i=[]; x=standard_define([3,2],model,exprs,gr_i); diff --git a/js/Linear/TCLSS_f.js b/js/Linear/TCLSS_f.js index 33d55861..22935fe6 100644 --- a/js/Linear/TCLSS_f.js +++ b/js/Linear/TCLSS_f.js @@ -35,13 +35,13 @@ if (D!=[]) { if (norm(D,1)!=0) { mmm=[true,true]; } else { -mmm=[None,true]; +mmm=[false,true]; } if (or(model.dep_ut!=mmm)) { model.dep_ut=mmm; } } else { -model.dep_ut=[None,true]; +model.dep_ut=[false,true]; } model.state=x0.slice(); model.rpar=rpar; @@ -74,7 +74,7 @@ model.evtin=1; model.state=x0; model.rpar=[A.slice(),B.slice(),C.slice(),D.slice()]; model.blocktype="c"; -model.dep_ut=[None,true]; +model.dep_ut=[false,true]; exprs=[strcat(sci2exp(A)),strcat(sci2exp(B)),strcat(sci2exp(C)),strcat(sci2exp(D)),strcat(sci2exp(x0))]; gr_i=[]; x=standard_define([3,2],model,exprs,gr_i); diff --git a/js/Linear/TIME_DELAY.js b/js/Linear/TIME_DELAY.js index eac5285d..37f09d25 100644 --- a/js/Linear/TIME_DELAY.js +++ b/js/Linear/TIME_DELAY.js @@ -15,11 +15,11 @@ break } if (N<2) { message("Buffer must be larger than 2"); -ok=None; +ok=false; } if (T<=0) { message("Delay must be positive"); -ok=None; +ok=false; } if (ok) { [model,graphics,ok]=check_io(model,graphics,[-1],-1,[],[]); @@ -28,7 +28,7 @@ if (ok) { graphics.exprs=exprs; model.rpar=[T,init]; model.ipar=N; -model.dep_ut=[None,true]; +model.dep_ut=[false,true]; x.graphics=graphics; x.model=model; break @@ -47,7 +47,7 @@ model.out=nin; model.rpar=[T,init]; model.ipar=N; model.blocktype="x"; -model.dep_ut=[None,true]; +model.dep_ut=[false,true]; exprs=[string(T),string(init),string(N)]; gr_i=[]; x=standard_define([3.5,2],model,exprs,gr_i); diff --git a/js/Linear/VARIABLE_DELAY.js b/js/Linear/VARIABLE_DELAY.js index 380a890c..32cf250d 100644 --- a/js/Linear/VARIABLE_DELAY.js +++ b/js/Linear/VARIABLE_DELAY.js @@ -15,11 +15,11 @@ break } if (N<2) { message("Buffer must be larger than 2"); -ok=None; +ok=false; } if (T<=0) { message("Delay must be positive"); -ok=None; +ok=false; } if (ok) { [model,graphics,ok]=check_io(model,graphics,[-1,1],-1,[],[]); @@ -46,7 +46,7 @@ model.out=nin; model.rpar=[T,init]; model.ipar=N; model.blocktype="d"; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=[string(T),string(init),string(N)]; gr_i=[]; x=standard_define([3,2],model,exprs,gr_i); diff --git a/js/MatrixOp/CUMSUM.js b/js/MatrixOp/CUMSUM.js index be176108..d7bfd393 100644 --- a/js/MatrixOp/CUMSUM.js +++ b/js/MatrixOp/CUMSUM.js @@ -28,7 +28,7 @@ function_name="cumsum_c"; out=[1,-2]; } else { message("decomposition type is not supported"); -ok=None; +ok=false; } it=1; ot=1; @@ -41,13 +41,13 @@ function_name="cumsumz_r"; function_name="cumsumz_c"; } else { message("decomposition type is not supported"); -ok=None; +ok=false; } it=2; ot=2; } else { message("Datatype is not supported"); -ok=None; +ok=false; } in1=[model.in1,model.in2]; out=[model.out,model.out2]; @@ -84,7 +84,7 @@ model.rpar=[]; model.ipar=[]; model.blocktype="c"; model.firing=[]; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; label=[sci2exp(1),sci2exp(0)]; gr_i=[]; x=standard_define([3,2],model,label,gr_i); diff --git a/js/MatrixOp/EXTRACT.js b/js/MatrixOp/EXTRACT.js index 6bd3ad1c..47322575 100644 --- a/js/MatrixOp/EXTRACT.js +++ b/js/MatrixOp/EXTRACT.js @@ -27,24 +27,24 @@ ot=2; it=2; } else { message("Datatype is not supported"); -ok=None; +ok=false; } ma=size(a,1); mb=size(b,1); if ((ma==0||mb==0)) { message("empty field"); -ok=None; +ok=false; } for (i=1;i<=ma;i+=1) { if ((a(i)<=0)) { message("invalid index"); -ok=None; +ok=false; } } for (j=1;j<=mb;j+=1) { if ((b(j)<=0)) { message("invalid index"); -ok=None; +ok=false; } } model.ipar=[a,b,ma,mb]; @@ -82,7 +82,7 @@ model.rpar=[]; model.ipar=[1,1,1,1]; model.blocktype="c"; model.firing=[]; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; label=[sci2exp(1),sci2exp([1]),sci2exp([1])]; gr_i=[]; x=standard_define([3,2],model,label,gr_i); diff --git a/js/MatrixOp/EXTTRI.js b/js/MatrixOp/EXTTRI.js index 091a673f..3678eda5 100644 --- a/js/MatrixOp/EXTTRI.js +++ b/js/MatrixOp/EXTTRI.js @@ -25,7 +25,7 @@ function_name="exttriu"; function_name="extdiag"; } else { message("decomposition type is not supported"); -ok=None; +ok=false; } it=1; ot=1; @@ -38,13 +38,13 @@ function_name="exttriuz"; function_name="extdiagz"; } else { message("decomposition type is not supported"); -ok=None; +ok=false; } it=2; ot=2; } else { message("Datatype is not supported"); -ok=None; +ok=false; } in1=[model.in1,model.in2]; out=[model.out,model.out2]; @@ -81,7 +81,7 @@ model.rpar=[]; model.ipar=[]; model.blocktype="c"; model.firing=[]; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; label=[sci2exp(1),sci2exp(1)]; gr_i=[]; x=standard_define([3,2],model,label,gr_i); diff --git a/js/MatrixOp/MATBKSL.js b/js/MatrixOp/MATBKSL.js index 10032568..d98ef69e 100644 --- a/js/MatrixOp/MATBKSL.js +++ b/js/MatrixOp/MATBKSL.js @@ -25,7 +25,7 @@ ot=2; it=[2,2]; } else { message("Datatype is not supported"); -ok=None; +ok=false; } in1=[model.in1,model.in2]; out=[model.out,model.out2]; @@ -61,7 +61,7 @@ model.rpar=[]; model.ipar=[]; model.blocktype="c"; model.firing=[]; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; label=[sci2exp(1)]; gr_i=[]; x=standard_define([2,2],model,label,gr_i); diff --git a/js/MatrixOp/MATDET.js b/js/MatrixOp/MATDET.js index cf408e8e..d175ed9d 100644 --- a/js/MatrixOp/MATDET.js +++ b/js/MatrixOp/MATDET.js @@ -25,7 +25,7 @@ ot=2; it=2; } else { message("Datatype is not supported"); -ok=None; +ok=false; } in1=[model.in1,model.in2]; out=[model.out,model.out2]; @@ -61,7 +61,7 @@ model.rpar=[]; model.ipar=[]; model.blocktype="c"; model.firing=[]; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; label=[sci2exp(1)]; gr_i=[]; x=standard_define([2,2],model,label,gr_i); diff --git a/js/MatrixOp/MATDIAG.js b/js/MatrixOp/MATDIAG.js index 0c6db943..0607d5ce 100644 --- a/js/MatrixOp/MATDIAG.js +++ b/js/MatrixOp/MATDIAG.js @@ -25,7 +25,7 @@ ot=2; it=2; } else { message("Datatype is not supported"); -ok=None; +ok=false; } in1=[model.in1,model.in2]; out=[model.out,model.out2]; @@ -61,7 +61,7 @@ model.rpar=[]; model.ipar=[]; model.blocktype="c"; model.firing=[]; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; label=[sci2exp(1)]; gr_i=[]; x=standard_define([2,2],model,label,gr_i); diff --git a/js/MatrixOp/MATDIV.js b/js/MatrixOp/MATDIV.js index 927537fd..03cbcf4f 100644 --- a/js/MatrixOp/MATDIV.js +++ b/js/MatrixOp/MATDIV.js @@ -25,7 +25,7 @@ ot=2; it=[2,2]; } else { message("Datatype is not supported"); -ok=None; +ok=false; } in1=[model.in1,model.in2]; out=[model.out,model.out2]; @@ -61,7 +61,7 @@ model.rpar=[]; model.ipar=[]; model.blocktype="c"; model.firing=[]; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; label=[sci2exp(1)]; gr_i=[]; x=standard_define([2,2],model,label,gr_i); diff --git a/js/MatrixOp/MATEIG.js b/js/MatrixOp/MATEIG.js index 64df3fd7..1cc90f01 100644 --- a/js/MatrixOp/MATEIG.js +++ b/js/MatrixOp/MATEIG.js @@ -27,7 +27,7 @@ out=[-1,-1,-1,-1]; ot=[2,2]; } else { message("decomposition type is not supported"); -ok=None; +ok=false; } it=1; } else if ((typ==2)) { @@ -41,12 +41,12 @@ out=[-1,-1,-1,-1]; ot=[2,2]; } else { message("decomposition type is not supported"); -ok=None; +ok=false; } it=2; } else { message("Datatype is not supported"); -ok=None; +ok=false; } in1=[-1,-1]; funtyp=4; @@ -82,7 +82,7 @@ model.rpar=[]; model.ipar=[]; model.blocktype="c"; model.firing=[]; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; label=[sci2exp(1),sci2exp(1)]; gr_i=[]; x=standard_define([2,2],model,label,gr_i); diff --git a/js/MatrixOp/MATEXPM.js b/js/MatrixOp/MATEXPM.js index 07ca0bc8..da0311a1 100644 --- a/js/MatrixOp/MATEXPM.js +++ b/js/MatrixOp/MATEXPM.js @@ -25,7 +25,7 @@ ot=2; it=2; } else { message("Datatype is not supported"); -ok=None; +ok=false; } in1=[model.in1,model.in2]; out=[model.out,model.out2]; @@ -61,7 +61,7 @@ model.rpar=[]; model.ipar=[]; model.blocktype="c"; model.firing=[]; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; label=[sci2exp(1)]; gr_i=[]; x=standard_define([2,2],model,label,gr_i); diff --git a/js/MatrixOp/MATINV.js b/js/MatrixOp/MATINV.js index 3d5e26ab..f1e35efd 100644 --- a/js/MatrixOp/MATINV.js +++ b/js/MatrixOp/MATINV.js @@ -25,7 +25,7 @@ ot=2; it=2; } else { message("Datatype is not supported"); -ok=None; +ok=false; } in1=[model.in1,model.in2]; out=[model.out,model.out2]; @@ -61,7 +61,7 @@ model.rpar=[]; model.ipar=[]; model.blocktype="c"; model.firing=[]; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; label=[sci2exp(1)]; gr_i=[]; x=standard_define([2,2],model,label,gr_i); diff --git a/js/MatrixOp/MATLU.js b/js/MatrixOp/MATLU.js index 9587bbfa..b5550760 100644 --- a/js/MatrixOp/MATLU.js +++ b/js/MatrixOp/MATLU.js @@ -25,7 +25,7 @@ ot=[2,2]; it=2; } else { message("Datatype is not supported"); -ok=None; +ok=false; } if (ok) { [model,graphics,ok]=set_io(model,graphics,list([model.in1,model.in2],it),list([model.out,model.out2],ot),[],[]); @@ -59,7 +59,7 @@ model.rpar=[]; model.ipar=[]; model.blocktype="c"; model.firing=[]; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; label=sci2exp(1); gr_i=[]; x=standard_define([2,2],model,label,gr_i); diff --git a/js/MatrixOp/MATMAGPHI.js b/js/MatrixOp/MATMAGPHI.js index cf01de2b..efa28feb 100644 --- a/js/MatrixOp/MATMAGPHI.js +++ b/js/MatrixOp/MATMAGPHI.js @@ -30,7 +30,7 @@ out=[-1,-2]; ot=2; } else { message("decomposition type is not supported"); -ok=None; +ok=false; } funtyp=4; if (ok) { @@ -65,7 +65,7 @@ model.rpar=[]; model.ipar=[]; model.blocktype="c"; model.firing=[]; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; label=[sci2exp(1)]; gr_i=[]; x=standard_define([3,2],model,label,gr_i); diff --git a/js/MatrixOp/MATMUL.js b/js/MatrixOp/MATMUL.js index 62fb14df..f38e0dd5 100644 --- a/js/MatrixOp/MATMUL.js +++ b/js/MatrixOp/MATMUL.js @@ -24,11 +24,11 @@ break rule=int(rule); if ((dtype<1||dtype>8)) { message("type is not supported"); -ok=None; +ok=false; } if ((rule<1||rule>3)) { message("Multiplication rule must be only 1,2 or 3"); -ok=None; +ok=false; } if ((dtype==1||dtype==2)) { np=0; @@ -140,7 +140,7 @@ model.in1=[-1,-2]; model.in2=[-2,-3]; model.out=-1; model.out2=-3; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; model.ipar=1; label=[sci2exp(model.ipar)]; gr_i=[]; diff --git a/js/MatrixOp/MATPINV.js b/js/MatrixOp/MATPINV.js index aeeefd53..14df007b 100644 --- a/js/MatrixOp/MATPINV.js +++ b/js/MatrixOp/MATPINV.js @@ -25,7 +25,7 @@ ot=2; it=2; } else { message("Datatype is not supported"); -ok=None; +ok=false; } in1=[model.in1,model.in2]; out=[model.out,model.out2]; @@ -61,7 +61,7 @@ model.rpar=[]; model.ipar=[]; model.blocktype="c"; model.firing=[]; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; label=[sci2exp(1)]; gr_i=[]; x=standard_define([2,2],model,label,gr_i); diff --git a/js/MatrixOp/MATRESH.js b/js/MatrixOp/MATRESH.js index 3cdf2c00..77fb5bbb 100644 --- a/js/MatrixOp/MATRESH.js +++ b/js/MatrixOp/MATRESH.js @@ -19,24 +19,24 @@ nout=size(out); nin=size(l1); if (nout==0) { message("output must have at least one element"); -ok=None; +ok=false; } if (nin==0) { message("input must have at least one element"); -ok=None; +ok=false; } if (ok) { if (((out(1)>(l1(1)*l1(2))))) { message("the first dimension of the output is too big"); -ok=None; +ok=false; } if (((out(2)>(l1(1)*l1(2))))) { message("the second dimension of the output is too big"); -ok=None; +ok=false; } if ((((out(2)*out(1))>(l1(1)*l1(2))))) { message("the dimensions of the output are too big"); -ok=None; +ok=false; } } if ((typ==1)) { @@ -49,7 +49,7 @@ ot=2; it=2; } else { message("Datatype is not supported"); -ok=None; +ok=false; } if (ok) { label=lab; @@ -86,7 +86,7 @@ model.rpar=[]; model.ipar=[]; model.blocktype="c"; model.firing=[]; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; label=[sci2exp(1),sci2exp([1,1]),sci2exp([1,1])]; gr_i=[]; x=standard_define([3,2],model,label,gr_i); diff --git a/js/MatrixOp/MATSING.js b/js/MatrixOp/MATSING.js index af7ed201..f03be1a8 100644 --- a/js/MatrixOp/MATSING.js +++ b/js/MatrixOp/MATSING.js @@ -29,7 +29,7 @@ out=[-1,-1,-1,-2,-2,-2]; ot=[1,1,1]; } else { message("decomposition type is not supported"); -ok=None; +ok=false; } it=1; } else if ((typ==2)) { @@ -45,12 +45,12 @@ out=[-1,-1,-1,-2,-2,-2]; ot=[2,1,2]; } else { message("decomposition type is not supported"); -ok=None; +ok=false; } it=2; } else { message("Datatype is not supported"); -ok=None; +ok=false; } funtyp=4; if (ok) { @@ -85,7 +85,7 @@ model.rpar=[]; model.ipar=[]; model.blocktype="c"; model.firing=[]; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; label=[sci2exp(1),sci2exp(1)]; gr_i=[]; x=standard_define([2,2],model,label,gr_i); diff --git a/js/MatrixOp/MATSUM.js b/js/MatrixOp/MATSUM.js index 58522aa3..357c4669 100644 --- a/js/MatrixOp/MATSUM.js +++ b/js/MatrixOp/MATSUM.js @@ -28,7 +28,7 @@ function_name="mat_sumc"; out=[1,-2]; } else { message("decomposition type is not supported"); -ok=None; +ok=false; } it=1; ot=1; @@ -44,13 +44,13 @@ function_name="matz_sumc"; out=[1,-2]; } else { message("decomposition type is not supported"); -ok=None; +ok=false; } it=2; ot=2; } else { message("Datatype is not supported"); -ok=None; +ok=false; } in1=[model.in1,model.in2]; funtyp=4; @@ -86,7 +86,7 @@ model.rpar=[]; model.ipar=[]; model.blocktype="c"; model.firing=[]; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; label=[sci2exp(1),sci2exp(0)]; gr_i=[]; x=standard_define([3,2],model,label,gr_i); diff --git a/js/MatrixOp/MATTRAN.js b/js/MatrixOp/MATTRAN.js index dec912fc..eb4c876a 100644 --- a/js/MatrixOp/MATTRAN.js +++ b/js/MatrixOp/MATTRAN.js @@ -29,7 +29,7 @@ ot=2; it=2; } else { message("Datatype is not supported"); -ok=None; +ok=false; } in1=[model.in1,model.in2]; out=[model.out,model.out2]; @@ -53,7 +53,7 @@ model.in1=-1; model.in2=-2; model.out=-2; model.out2=-1; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; label=[sci2exp(1)]; gr_i=[]; x=standard_define([3,2],model,label,gr_i); diff --git a/js/MatrixOp/MATZCONJ.js b/js/MatrixOp/MATZCONJ.js index 8186c3dc..fa566a17 100644 --- a/js/MatrixOp/MATZCONJ.js +++ b/js/MatrixOp/MATZCONJ.js @@ -24,7 +24,7 @@ model.rpar=[]; model.ipar=[]; model.blocktype="c"; model.firing=[]; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; label=[]; gr_i=[]; x=standard_define([2,2],model,label,gr_i); diff --git a/js/MatrixOp/MATZREIM.js b/js/MatrixOp/MATZREIM.js index 8ec90ce8..2d346af2 100644 --- a/js/MatrixOp/MATZREIM.js +++ b/js/MatrixOp/MATZREIM.js @@ -30,7 +30,7 @@ out=[-1,-2]; ot=2; } else { message("decomposition type is not supported"); -ok=None; +ok=false; } funtyp=4; if (ok) { @@ -65,7 +65,7 @@ model.rpar=[]; model.ipar=[]; model.blocktype="c"; model.firing=[]; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; label=sci2exp(1); gr_i=[]; x=standard_define([3,2],model,label,gr_i); diff --git a/js/MatrixOp/RICC.js b/js/MatrixOp/RICC.js index 243b407b..c8497b9a 100644 --- a/js/MatrixOp/RICC.js +++ b/js/MatrixOp/RICC.js @@ -50,7 +50,7 @@ model.rpar=[]; model.ipar=[1,1]; model.blocktype="c"; model.firing=[]; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; label=[sci2exp(1),sci2exp(1)]; gr_i=[]; x=standard_define([2,2],model,label,gr_i); diff --git a/js/MatrixOp/ROOTCOEF.js b/js/MatrixOp/ROOTCOEF.js index 9487ba00..94701457 100644 --- a/js/MatrixOp/ROOTCOEF.js +++ b/js/MatrixOp/ROOTCOEF.js @@ -25,7 +25,7 @@ ot=2; it=2; } else { message("Datatype is not supported"); -ok=None; +ok=false; } in1=[inp,model.in2]; out=[inp+1,model.out2]; @@ -61,7 +61,7 @@ model.rpar=[]; model.ipar=[]; model.blocktype="c"; model.firing=[]; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; label=[sci2exp(1),sci2exp(1)]; gr_i=[]; x=standard_define([3,2],model,label,gr_i); diff --git a/js/MatrixOp/SQRT.js b/js/MatrixOp/SQRT.js index d63b0385..d5308162 100644 --- a/js/MatrixOp/SQRT.js +++ b/js/MatrixOp/SQRT.js @@ -18,7 +18,7 @@ function_name="mat_sqrt"; function_name="matz_sqrt"; } else { message("type is not supported"); -ok=None; +ok=false; } it=typ; ot=typ; @@ -46,7 +46,7 @@ model.intyp=1; model.outtyp=1; model.out=-1; model.out2=-2; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; label=[sci2exp(1)]; gr_i=[]; x=standard_define([2,2],model,label,gr_i); diff --git a/js/MatrixOp/SUBMAT.js b/js/MatrixOp/SUBMAT.js index 31b92337..76be0254 100644 --- a/js/MatrixOp/SUBMAT.js +++ b/js/MatrixOp/SUBMAT.js @@ -25,27 +25,27 @@ ot=2; it=2; } else { message("Datatype is not supported"); -ok=None; +ok=false; } if ((a<=0)||(b<=0)||(c<=0)||(d<=0)) { message("invalid index"); -ok=None; +ok=false; } if (b<a) { message("ending row must be greater than starting row"); -ok=None; +ok=false; } if (d<c) { message("ending column must be greater than starting column"); -ok=None; +ok=false; } if (b>inp(1)) { message("index of ending row is out of range"); -ok=None; +ok=false; } if (d>inp(2)) { message("index of ending column is out of range"); -ok=None; +ok=false; } model.ipar=[a,b,c,d]; in1=[inp(1),inp(2)]; @@ -82,7 +82,7 @@ model.rpar=[]; model.ipar=[1,1,1,1]; model.blocktype="c"; model.firing=[]; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; label=[sci2exp(1),sci2exp(1),sci2exp(1),sci2exp(1),sci2exp(1)]; gr_i=[]; x=standard_define([2.5,2],model,label,gr_i); diff --git a/js/Misc/BACKLASH.js b/js/Misc/BACKLASH.js index 8dc9a676..cc86f0e4 100644 --- a/js/Misc/BACKLASH.js +++ b/js/Misc/BACKLASH.js @@ -38,7 +38,7 @@ model.out=1; model.rpar=[0,1]; model.nzcross=2; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; gr_i=[]; x=standard_define([3,2],model,exprs,gr_i); } diff --git a/js/Misc/BOUNCE.js b/js/Misc/BOUNCE.js index 8c3ba2b5..7bf7f4bb 100644 --- a/js/Misc/BOUNCE.js +++ b/js/Misc/BOUNCE.js @@ -32,10 +32,10 @@ walls=walls([3,4]); } if (n!=size(y,"*")||n!=size(rpar1,"*")||n!=size(rpar2,"*")||n!=size(xd,"*")||n!=size(yd,"*")) { message("All vectors must have equal size"); -ok=None; +ok=false; } else if (!(min([rpar1,rpar2])>0)) { message("Mass and radius must be >0"); -ok=None; +ok=false; } if (!ok) { break @@ -97,7 +97,7 @@ model.rpar=[rpar1,rpar2,walls,g,C]; model.ipar=ipar; model.nzcross=n*(n-1)/2+4*n; model.blocktype="c"; -model.dep_ut=[None,true]; +model.dep_ut=[false,true]; exprs=[strcat(sci2exp(rpar1)),strcat(sci2exp(rpar2)),strcat(sci2exp(walls)),strcat(sci2exp(x)),strcat(sci2exp(xd)),strcat(sci2exp(y)),strcat(sci2exp(yd))]; gr_i=[]; x=standard_define([3,2],model,exprs,gr_i); diff --git a/js/Misc/BOUNCEXY.js b/js/Misc/BOUNCEXY.js index 0fe9c488..eb75117d 100644 --- a/js/Misc/BOUNCEXY.js +++ b/js/Misc/BOUNCEXY.js @@ -16,19 +16,19 @@ break mess=[]; if (size(clrs,"*")!=size(siz,"*")) { mess=[mess,"colors and radii must have equal size (number of balls)"," "]; -ok=None; +ok=false; } if (win<-1) { mess=[mess,"Window number cannot be inferior than -1"," "]; -ok=None; +ok=false; } if (ymin>=ymax) { mess=[mess,"Ymax must be greater than Ymin"," "]; -ok=None; +ok=false; } if (xmin>=xmax) { mess=[mess,"Xmax must be greater than Xmin"," "]; -ok=None; +ok=false; } if (!ok) { message(mess); @@ -83,7 +83,7 @@ model.rpar=[xmin,xmax,ymin,ymax]; model.ipar=[win,imode,clrs.slice()]; model.blocktype="d"; model.firing=[]; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=[strcat(sci2exp(clrs)),strcat(sci2exp(siz)),strcat(sci2exp(win)),strcat(sci2exp(1)),strcat(sci2exp(xmin)),strcat(sci2exp(xmax)),strcat(sci2exp(ymin)),strcat(sci2exp(ymax))]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Misc/BPLATFORM.js b/js/Misc/BPLATFORM.js index 6dfa1a0b..5e23a15e 100644 --- a/js/Misc/BPLATFORM.js +++ b/js/Misc/BPLATFORM.js @@ -16,15 +16,15 @@ break mess=[]; if (plen<=0||csiz<=0) { mess=[mess,"Pendulum length and cart size must be positive."," "]; -ok=None; +ok=false; } if (ymin>=ymax) { mess=[mess,"Ymax must be greater than Ymin"," "]; -ok=None; +ok=false; } if (xmin>=xmax) { mess=[mess,"Xmax must be greater than Xmin"," "]; -ok=None; +ok=false; } if (!ok) { message(mess); @@ -53,7 +53,7 @@ model.evtin=1; model.dstate=0; model.rpar=[plen,csiz,phi,xmin,xmax,ymin,ymax]; model.blocktype="d"; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=string(model.rpar); gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Misc/CBLOCK4.js b/js/Misc/CBLOCK4.js index 8b981a0b..19dc040c 100644 --- a/js/Misc/CBLOCK4.js +++ b/js/Misc/CBLOCK4.js @@ -32,7 +32,7 @@ funtyp=2004; if ([ci,co]!=[]) { if (max([ci,co])>1) { message("vector event links not supported"); -ok=None; +ok=false; } } if (ok) { @@ -40,13 +40,13 @@ depu=stripblanks(depu); if (part(depu,1)=="y") { depu=true; } else { -depu=None; +depu=false; } dept=stripblanks(dept); if (part(dept,1)=="y") { dept=true; } else { -dept=None; +dept=false; } dep_ut=[depu,dept]; if (funam==" ") { @@ -100,7 +100,7 @@ model.intyp=1; model.out=1; model.out2=1; model.outtyp=1; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; label=list([funam,"n",sci2exp([model.in1,model.in2]),sci2exp(model.intyp),sci2exp([model.out,model.out2]),sci2exp(model.outtyp),sci2exp(model.evtin),sci2exp(model.evtout),sci2exp(model.state),sci2exp(model.dstate),sci2exp(model.odstate),sci2exp(model.rpar),sci2exp(model.ipar),sci2exp(model.opar),sci2exp(model.nmode),sci2exp(model.nzcross),sci2exp(model.firing),"y","n"],[]); gr_i=[]; x=standard_define([4,2],model,label,gr_i); diff --git a/js/Misc/CONSTRAINT2_c.js b/js/Misc/CONSTRAINT2_c.js index e4c460ef..a96b98b8 100644 --- a/js/Misc/CONSTRAINT2_c.js +++ b/js/Misc/CONSTRAINT2_c.js @@ -8,7 +8,7 @@ graphics=arg1.graphics; exprs=graphics.exprs; model=arg1.model; while (true) { -ask_again=None; +ask_again=false; [ok,x0,xd0,id,exprs]=scicos_getvalue("Set Constraint block parameters",["Initial guess values of states x","Initial guess values of derivative x\'","Id(i)=1: if x\'(i) is present in the feedback, else Id(i)=0"],list("vec",-1,"vec",-1,"vec",-1),exprs); if (!ok) { break @@ -62,7 +62,7 @@ model.out=[1,1]; model.state=[x0,xd0]; model.ipar=id; model.blocktype="c"; -model.dep_ut=[None,true]; +model.dep_ut=[false,true]; exprs=list(strcat(sci2exp(x0)),strcat(sci2exp(xd0)),strcat(sci2exp(id))); gr_i=[]; x=standard_define([3,2],model,exprs,gr_i); diff --git a/js/Misc/CONSTRAINT_c.js b/js/Misc/CONSTRAINT_c.js index 2cef945f..23580014 100644 --- a/js/Misc/CONSTRAINT_c.js +++ b/js/Misc/CONSTRAINT_c.js @@ -40,7 +40,7 @@ model.out=1; model.ipar=0; model.state=x0; model.blocktype="c"; -model.dep_ut=[None,true]; +model.dep_ut=[false,true]; exprs="0"; gr_i=[]; x=standard_define([3,2],model,exprs,gr_i); diff --git a/js/Misc/DEADBAND.js b/js/Misc/DEADBAND.js index a116b1eb..9b68f603 100644 --- a/js/Misc/DEADBAND.js +++ b/js/Misc/DEADBAND.js @@ -43,7 +43,7 @@ model.nmode=1; model.out=1; model.rpar=rpar; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[string(maxp),string(minp),string(model.nmode)]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Misc/DEBUG.js b/js/Misc/DEBUG.js index 7a36654c..98e7e2e2 100644 --- a/js/Misc/DEBUG.js +++ b/js/Misc/DEBUG.js @@ -26,7 +26,7 @@ break message(["Error in the instructions",lasterror()]); } } else { -ok=None; +ok=false; break } } diff --git a/js/Misc/DIFF_f.js b/js/Misc/DIFF_f.js index 0301949e..4f49b4d9 100644 --- a/js/Misc/DIFF_f.js +++ b/js/Misc/DIFF_f.js @@ -28,7 +28,7 @@ model.in1=1; model.out=1; model.state=x0; model.blocktype="c"; -model.dep_ut=[None,true]; +model.dep_ut=[false,true]; exprs=[strcat(sci2exp(x0(1))),strcat(sci2exp(x0(2)))]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Misc/EDGETRIGGER.js b/js/Misc/EDGETRIGGER.js index 616a2fee..223e53aa 100644 --- a/js/Misc/EDGETRIGGER.js +++ b/js/Misc/EDGETRIGGER.js @@ -29,7 +29,7 @@ model.dstate=0; model.nzcross=1; model.ipar=sign(edge); model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[string(edge)]; gr_i=[]; x=standard_define([3,2],model,exprs,gr_i); diff --git a/js/Misc/ENDBLK.js b/js/Misc/ENDBLK.js index ecc38460..550739a2 100644 --- a/js/Misc/ENDBLK.js +++ b/js/Misc/ENDBLK.js @@ -73,9 +73,9 @@ typ=newpar; } ENDBLK.prototype.define = function ENDBLK() { scs_m_1=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[-159.096,811.104,-121.216,617.984,1323,1008,331,284,630,480,0,7,1.4],Title="ENDBLK",tol=[0.0001,0.000001,1.000e-10,100001,0,0],tf=100000,context=" ",void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(true,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list())); -scs_m_1.objs[1-1]=scicos_block(gui="END_c",graphics=scicos_graphics(orig=[272.104,249.11733],sz=[40,40],flip=true,theta=0,exprs="1.000E+08",pin=[],pout=[],pein=2,peout=2,gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim=list("scicosexit",4),in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=1,state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=1.000e+08,dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m_1.objs[1-1]=scicos_block(gui="END_c",graphics=scicos_graphics(orig=[272.104,249.11733],sz=[40,40],flip=true,theta=0,exprs="1.000E+08",pin=[],pout=[],pein=2,peout=2,gr_i=[],id="",in_implicit=[],out_implicit=[]),model=scicos_model(sim=list("scicosexit",4),in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=1,evtout=1,state=[],dstate=[],odstate=list(),rpar=[],ipar=[],opar=list(),blocktype="d",firing=1.000e+08,dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m_1.objs[2-1]=scicos_link(xx=[292.104,292.104,261.83733,261.83733,292.104,292.104],yy=[243.40305,234.45067,234.45067,305.584,305.584,294.83162],id="drawlink",thick=[0,0],ct=[5,-1],from=[1,1,0],to=[1,1,1]); -model=scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()); +model=scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()); gr_i=[]; x=standard_define([2,2],model,[],gr_i); } diff --git a/js/Misc/LOGICAL_OP.js b/js/Misc/LOGICAL_OP.js index ec4fd20d..86829951 100644 --- a/js/Misc/LOGICAL_OP.js +++ b/js/Misc/LOGICAL_OP.js @@ -20,16 +20,16 @@ rule=int(rule); tp=int(tp); if (nin<1) { message("Number of inputs must be >=1 "); -ok=None; +ok=false; } else if ((rule<0)||(rule>5)) { message("Incorrect operator "+string(rule)+" ; must be 0 to 5."); -ok=None; +ok=false; } else if ((rule==5)&&(nin>1)) { message("Only one input allowed for NOT operation"); nin=1; } else if (((Datatype==1)&&(tp!=0))) { message("Bitwise Rule is only activated when Data type is integer"); -ok=None; +ok=false; } if (ok) { if ((tp!=0)) { @@ -53,7 +53,7 @@ model.sim=list("logicalop_ui16",4); model.sim=list("logicalop_ui8",4); } else { message("Datatype is not supported"); -ok=None; +ok=false; } model.ipar=[rule,tp]; } @@ -102,7 +102,7 @@ model.in1=in1; model.out=-1; model.ipar=ipar; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[string(nin),string(ipar)]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Misc/MEMORY_f.js b/js/Misc/MEMORY_f.js index d03347a1..dffdebb9 100644 --- a/js/Misc/MEMORY_f.js +++ b/js/Misc/MEMORY_f.js @@ -20,7 +20,7 @@ inh=1; [model,graphics,ok]=check_io(model,graphics,-1,-1,inh,[]); out=size(a,"*"); if (out==0) { -ok=None; +ok=false; messagebox("Initial condition empty","modal","error"); } in1=out; @@ -47,7 +47,7 @@ model.evtin=1; model.dstate=0; model.rpar=z; model.blocktype="m"; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); } diff --git a/js/Misc/PENDULUM_ANIM.js b/js/Misc/PENDULUM_ANIM.js index 5074d0c3..88c623fe 100644 --- a/js/Misc/PENDULUM_ANIM.js +++ b/js/Misc/PENDULUM_ANIM.js @@ -16,15 +16,15 @@ break mess=[]; if (plen<=0||csiz<=0) { mess=[mess,"Pendulum length and cart size must be positive."," "]; -ok=None; +ok=false; } if (ymin>=ymax) { mess=[mess,"Ymax must be greater than Ymin"," "]; -ok=None; +ok=false; } if (xmin>=xmax) { mess=[mess,"Xmax must be greater than Xmin"," "]; -ok=None; +ok=false; } if (!ok) { message(mess); @@ -53,7 +53,7 @@ model.evtin=1; model.dstate=0; model.rpar=[plen,csiz,phi,xmin,xmax,ymin,ymax]; model.blocktype="d"; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=string(model.rpar); gr_i=[]; x=standard_define([3,3],model,exprs,gr_i); diff --git a/js/Misc/RATELIMITER.js b/js/Misc/RATELIMITER.js index 8bbbe562..c515e370 100644 --- a/js/Misc/RATELIMITER.js +++ b/js/Misc/RATELIMITER.js @@ -34,7 +34,7 @@ model.in1=1; model.out=1; model.rpar=rpar; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[string(maxp),string(minp)]; gr_i=[]; x=standard_define([3.5,2],model,exprs,gr_i); diff --git a/js/Misc/RELATIONALOP.js b/js/Misc/RELATIONALOP.js index bb6b8848..596fe660 100644 --- a/js/Misc/RELATIONALOP.js +++ b/js/Misc/RELATIONALOP.js @@ -21,7 +21,7 @@ zcr=1; } if ((rule<0)||(rule>5)) { message("Incorrect operator "+string(rule)+" ; must be 0 to 5."); -ok=None; +ok=false; } if ((Datatype==1)) { model.sim=list("relational_op",4); @@ -39,7 +39,7 @@ model.sim=list("relational_op_ui16",4); model.sim=list("relational_op_ui8",4); } else { message("Datatype is not supported"); -ok=None; +ok=false; } if (ok) { it=Datatype*ones(1,2); @@ -82,7 +82,7 @@ model.in1=[1,1]; model.out=1; model.ipar=ipar; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[string(ipar),string(0)]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Misc/SPLIT_f.js b/js/Misc/SPLIT_f.js index 6d826381..adc0bf19 100644 --- a/js/Misc/SPLIT_f.js +++ b/js/Misc/SPLIT_f.js @@ -11,7 +11,7 @@ model.sim="lsplit"; model.in1=-1; model.out=[-1,-1,-1]; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; x=standard_define([1,1]/3,model,[],[]); } SPLIT_f.prototype.details = function SPLIT_f() { diff --git a/js/Misc/SUPER_f.js b/js/Misc/SUPER_f.js index af391b2c..7ae3e3b7 100644 --- a/js/Misc/SUPER_f.js +++ b/js/Misc/SUPER_f.js @@ -22,7 +22,7 @@ model.in1=1; model.out=1; model.rpar=scs; model.blocktype="h"; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; gr_i=[]; x=standard_define([2,2],model,[],gr_i); } diff --git a/js/Misc/TEXT_f.js b/js/Misc/TEXT_f.js index 99eac7bb..cb8f9ed0 100644 --- a/js/Misc/TEXT_f.js +++ b/js/Misc/TEXT_f.js @@ -18,11 +18,11 @@ break } if (font<=0||font>6) { message("Font number must be greater than 0 and less than 7"); -ok=None; +ok=false; } if (siz<0) { message("Font size must be positive"); -ok=None; +ok=false; } if (ok) { graphics.exprs=exprs; diff --git a/js/Misc/c_block.js b/js/Misc/c_block.js index 9585e456..f43cf4e7 100644 --- a/js/Misc/c_block.js +++ b/js/Misc/c_block.js @@ -64,7 +64,7 @@ model.rpar=rpar; model.ipar=0; model.blocktype=typ; model.firing=auto; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; label=list([sci2exp(in1),sci2exp(out),strcat(sci2exp(rpar)),funam],list([])); gr_i=[]; x=standard_define([3,2],model,label,gr_i); diff --git a/js/Misc/fortran_block.js b/js/Misc/fortran_block.js index f1d7374f..0343cfff 100644 --- a/js/Misc/fortran_block.js +++ b/js/Misc/fortran_block.js @@ -54,7 +54,7 @@ model.rpar=[]; model.ipar=0; model.blocktype="c"; model.firing=[]; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; funam="forty"; label=list([sci2exp(model.in1),sci2exp(model.out),strcat(sci2exp(model.rpar)),funam],list([])); gr_i=[]; diff --git a/js/Misc/func_block.js b/js/Misc/func_block.js index 38fad25e..ba6b62aa 100644 --- a/js/Misc/func_block.js +++ b/js/Misc/func_block.js @@ -22,7 +22,7 @@ model.sim=" "; model.in1=1; model.out=1; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs="v=sin(u);y=u*v"; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Misc/generic_block.js b/js/Misc/generic_block.js index e705ee28..3d58f215 100644 --- a/js/Misc/generic_block.js +++ b/js/Misc/generic_block.js @@ -28,25 +28,25 @@ co=int(co.slice()); funtyp=int(funtyp); if (funtyp<0) { message("function type cannot be negative"); -ok=None; +ok=false; } if ([ci,co]!=[]) { if (max([ci,co])>1) { message("vector event links not supported"); -ok=None; +ok=false; } } depu=stripblanks(depu); if (part(depu,1)=="y") { depu=true; } else { -depu=None; +depu=false; } dept=stripblanks(dept); if (part(dept,1)=="y") { dept=true; } else { -dept=None; +dept=false; } dep_ut=[depu,dept]; if (ok) { @@ -87,7 +87,7 @@ model.rpar=[]; model.ipar=[]; model.blocktype="c"; model.firing=[]; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; label=[function_name,sci2exp(funtyp),sci2exp(model.in1),sci2exp(model.out),sci2exp(model.evtin),sci2exp(model.evtout),sci2exp(model.state),sci2exp(model.dstate),sci2exp(model.rpar),sci2exp(model.ipar),sci2exp(model.firing),"y","n"]; gr_i=[]; x=standard_define([2,2],model,label,gr_i); diff --git a/js/Misc/generic_block2.js b/js/Misc/generic_block2.js index c3b03890..56220a66 100644 --- a/js/Misc/generic_block2.js +++ b/js/Misc/generic_block2.js @@ -28,25 +28,25 @@ co=int(co.slice()); funtyp=int(funtyp); if (funtyp<0) { message("function type cannot be negative"); -ok=None; +ok=false; } if ([ci,co]!=[]) { if (max([ci,co])>1) { message("vector event links not supported"); -ok=None; +ok=false; } } depu=stripblanks(depu); if (part(depu,1)=="y") { depu=true; } else { -depu=None; +depu=false; } dept=stripblanks(dept); if (part(dept,1)=="y") { dept=true; } else { -dept=None; +dept=false; } dep_ut=[depu,dept]; if (ok) { @@ -89,7 +89,7 @@ model.rpar=[]; model.ipar=[]; model.blocktype="c"; model.firing=[]; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; label=[function_name,sci2exp(funtyp),sci2exp(model.in1),sci2exp(model.out),sci2exp(model.evtin),sci2exp(model.evtout),sci2exp(model.state),sci2exp(model.dstate),sci2exp(model.rpar),sci2exp(model.ipar),sci2exp(model.nmode),sci2exp(model.nzcross),sci2exp(model.firing),"y","n"]; gr_i=[]; x=standard_define([2,2],model,label,gr_i); diff --git a/js/Misc/generic_block3.js b/js/Misc/generic_block3.js index 43748af9..7d71fb21 100644 --- a/js/Misc/generic_block3.js +++ b/js/Misc/generic_block3.js @@ -26,33 +26,33 @@ co=int(co.slice()); funtyp=funtyp; if (funtyp<0) { message("function type cannot be negative"); -ok=None; +ok=false; } if ([ci,co]!=[]) { if (max([ci,co])>1) { message("vector event links not supported"); -ok=None; +ok=false; } } if (type(opar)!=15) { message("object parameter must be a list"); -ok=None; +ok=false; } if (type(oz)!=15) { message("discrete object state must be a list"); -ok=None; +ok=false; } depu=stripblanks(depu); if (part(depu,1)=="y") { depu=true; } else { -depu=None; +depu=false; } dept=stripblanks(dept); if (part(dept,1)=="y") { dept=true; } else { -dept=None; +dept=false; } dep_ut=[depu,dept]; if (ok) { @@ -93,7 +93,7 @@ model.intyp=1; model.out=1; model.out2=1; model.outtyp=1; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; label=[function_name,sci2exp(funtyp),sci2exp([model.in1,model.in2]),sci2exp(model.intyp),sci2exp([model.out,model.out2]),sci2exp(model.outtyp),sci2exp(model.evtin),sci2exp(model.evtout),sci2exp(model.state),sci2exp(model.dstate),sci2exp(model.odstate),sci2exp(model.rpar),sci2exp(model.ipar),sci2exp(model.opar),sci2exp(model.nmode),sci2exp(model.nzcross),sci2exp(model.firing),"y","n"]; gr_i=[]; x=standard_define([4,2],model,label,gr_i); diff --git a/js/Misc/scifunc_block_m.js b/js/Misc/scifunc_block_m.js index 18ee889b..37a0799a 100644 --- a/js/Misc/scifunc_block_m.js +++ b/js/Misc/scifunc_block_m.js @@ -84,7 +84,7 @@ model.ipar=0; model.opar=list(); model.blocktype=typ; model.firing=auto; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=list([sci2exp([in1,in1]),sci2exp([out,out]),sci2exp(clkin),sci2exp(clkout),strcat(sci2exp(x0)),strcat(sci2exp(z0)),strcat(sci2exp(rpar)),sci2exp(auto),sci2exp(0)],list("y1=sin(u1)"," "," ","y1=sin(u1)"," "," "," ")); gr_i=[]; x=standard_define([4,2],model,exprs,gr_i); diff --git a/js/NonLinear/ABSBLK_f.js b/js/NonLinear/ABSBLK_f.js index 55753cc7..dcc94175 100644 --- a/js/NonLinear/ABSBLK_f.js +++ b/js/NonLinear/ABSBLK_f.js @@ -11,7 +11,7 @@ model.sim=list("absblk",1); model.in1=-1; model.out=-1; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; gr_i=[]; x=standard_define([2,2],model,[],gr_i); } diff --git a/js/NonLinear/ABS_VALUE.js b/js/NonLinear/ABS_VALUE.js index d44676b9..29ad5d6c 100644 --- a/js/NonLinear/ABS_VALUE.js +++ b/js/NonLinear/ABS_VALUE.js @@ -36,7 +36,7 @@ model.out=nu; model.nzcross=nu; model.nmode=nu; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[string([1])]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/NonLinear/COSBLK_f.js b/js/NonLinear/COSBLK_f.js index 28037303..ec2b1ca8 100644 --- a/js/NonLinear/COSBLK_f.js +++ b/js/NonLinear/COSBLK_f.js @@ -12,7 +12,7 @@ model.sim="cosblk"; model.in1=-1; model.out=-1; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; gr_i=[]; x=standard_define([2,2],model,[],gr_i); } diff --git a/js/NonLinear/DLRADAPT_f.js b/js/NonLinear/DLRADAPT_f.js index 44569967..a60cfc0a 100644 --- a/js/NonLinear/DLRADAPT_f.js +++ b/js/NonLinear/DLRADAPT_f.js @@ -48,7 +48,7 @@ model.rpar=[p.slice(),real(rn.slice()),imag(rn.slice()),real(rd.slice()),imag(rd model.ipar=[0,2,2]; model.blocktype="d"; model.firing=[]; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[sci2exp(p),sci2exp(rn),sci2exp(rd,0),sci2exp(g),sci2exp(last_u),sci2exp(last_y)]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/NonLinear/EXPBLK_f.js b/js/NonLinear/EXPBLK_f.js index 13e4471d..dcb5acd5 100644 --- a/js/NonLinear/EXPBLK_f.js +++ b/js/NonLinear/EXPBLK_f.js @@ -35,7 +35,7 @@ model.in1=-1; model.out=-1; model.rpar=a; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=["%e"]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/NonLinear/EXPBLK_m.js b/js/NonLinear/EXPBLK_m.js index 587c7617..c46e07b8 100644 --- a/js/NonLinear/EXPBLK_m.js +++ b/js/NonLinear/EXPBLK_m.js @@ -39,7 +39,7 @@ model.intyp=1; model.outtyp=1; model.rpar=a; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=["%e"]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/NonLinear/FSV_f.js b/js/NonLinear/FSV_f.js index d1bbe59a..84dc35d6 100644 --- a/js/NonLinear/FSV_f.js +++ b/js/NonLinear/FSV_f.js @@ -12,7 +12,7 @@ model.sim=list("fsv",1); model.in1=in1; model.out=in1; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=" "; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/NonLinear/INTRP2BLK_f.js b/js/NonLinear/INTRP2BLK_f.js index 8a814864..f37934d5 100644 --- a/js/NonLinear/INTRP2BLK_f.js +++ b/js/NonLinear/INTRP2BLK_f.js @@ -39,7 +39,7 @@ model.out=1; model.rpar=[a,b,c.slice()]; model.ipar=[2,2]; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[strcat(sci2exp(a)),strcat(sci2exp(b)),strcat(sci2exp(c,0))]; gr_i=[]; x=standard_define([3,2],model,exprs,gr_i); diff --git a/js/NonLinear/INTRPLBLK_f.js b/js/NonLinear/INTRPLBLK_f.js index 07f6dbc7..9d766fc0 100644 --- a/js/NonLinear/INTRPLBLK_f.js +++ b/js/NonLinear/INTRPLBLK_f.js @@ -36,7 +36,7 @@ model.in1=1; model.out=1; model.rpar=[a,b]; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[strcat(sci2exp(a)),strcat(sci2exp(b))]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/NonLinear/INVBLK.js b/js/NonLinear/INVBLK.js index 0ef6f9ab..9bddbbba 100644 --- a/js/NonLinear/INVBLK.js +++ b/js/NonLinear/INVBLK.js @@ -12,7 +12,7 @@ model.sim=list("invblk4",4); model.in1=in1; model.out=in1; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=" "; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/NonLinear/INVBLK_f.js b/js/NonLinear/INVBLK_f.js index 12047939..e0f55c5a 100644 --- a/js/NonLinear/INVBLK_f.js +++ b/js/NonLinear/INVBLK_f.js @@ -12,7 +12,7 @@ model.sim="invblk"; model.in1=in1; model.out=in1; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=" "; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/NonLinear/LOGBLK_f.js b/js/NonLinear/LOGBLK_f.js index debd12f6..ce6a47d2 100644 --- a/js/NonLinear/LOGBLK_f.js +++ b/js/NonLinear/LOGBLK_f.js @@ -37,7 +37,7 @@ model.in1=-1; model.out=-1; model.rpar=a; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs="%e"; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/NonLinear/LOOKUP_f.js b/js/NonLinear/LOOKUP_f.js index 06e69196..86816ddc 100644 --- a/js/NonLinear/LOOKUP_f.js +++ b/js/NonLinear/LOOKUP_f.js @@ -24,7 +24,7 @@ break n=size(xx,"*"); if (or(xx.slice(2-1,n)-xx.slice(1-1,n-1)<=0)) { message("You have not defined a function"); -ok=None; +ok=false; } if (ok) { model.rpar=[xx.slice(),yy.slice()]; @@ -41,7 +41,7 @@ model.in1=1; model.out=1; model.rpar=[-2,-1,1,2,-1,1,-1,1]; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; gr_i=[]; x=standard_define([2,2],model,[],gr_i); } diff --git a/js/NonLinear/MAX_f.js b/js/NonLinear/MAX_f.js index 7e3ebb7f..f774e2a5 100644 --- a/js/NonLinear/MAX_f.js +++ b/js/NonLinear/MAX_f.js @@ -13,7 +13,7 @@ model.in1=in1; model.out=1; model.dstate=[0,0]; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=" "; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/NonLinear/MIN_f.js b/js/NonLinear/MIN_f.js index fc234b78..d25fa771 100644 --- a/js/NonLinear/MIN_f.js +++ b/js/NonLinear/MIN_f.js @@ -13,7 +13,7 @@ model.in1=in1; model.out=1; model.dstate=[0,0]; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=sci2exp(in1); gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/NonLinear/POWBLK_f.js b/js/NonLinear/POWBLK_f.js index 8570682c..939decb4 100644 --- a/js/NonLinear/POWBLK_f.js +++ b/js/NonLinear/POWBLK_f.js @@ -38,7 +38,7 @@ model.in1=-1; model.out=-1; model.rpar=a; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=string(a); gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/NonLinear/PRODUCT.js b/js/NonLinear/PRODUCT.js index 4cfb8dc2..6e03bfb9 100644 --- a/js/NonLinear/PRODUCT.js +++ b/js/NonLinear/PRODUCT.js @@ -16,7 +16,7 @@ sgn=sgn.slice(); if (size(sgn,1)==1) { if (sgn<1) { message("Number of inputs must be > 0"); -ok=None; +ok=false; } else if (sgn==1) { in1=-1; sgn=[]; @@ -29,7 +29,7 @@ nout=-1; } else { if (!and(abs(sgn)==1)) { message("Signs can only be +1 or -1"); -ok=None; +ok=false; } else { in1=-ones(size(sgn,1),1); nout=-1; @@ -55,7 +55,7 @@ model.in1=[-1,-1]; model.out=-1; model.ipar=sgn; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=sci2exp(sgn); gr_i=[]; x=standard_define([2,3],model,exprs,gr_i); diff --git a/js/NonLinear/PROD_f.js b/js/NonLinear/PROD_f.js index 9382d703..fadb14e9 100644 --- a/js/NonLinear/PROD_f.js +++ b/js/NonLinear/PROD_f.js @@ -11,7 +11,7 @@ model.sim=list("prod",2); model.in1=[-1,-1]; model.out=-1; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; x=standard_define([1,1],model,[],[]); } PROD_f.prototype.details = function PROD_f() { diff --git a/js/NonLinear/QUANT_f.js b/js/NonLinear/QUANT_f.js index 38c6061a..e7c99640 100644 --- a/js/NonLinear/QUANT_f.js +++ b/js/NonLinear/QUANT_f.js @@ -45,7 +45,7 @@ model.out=-1; model.rpar=pas; model.ipar=meth; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[string(pas),string(meth)]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/NonLinear/SATURATION.js b/js/NonLinear/SATURATION.js index 9379d579..19c2390a 100644 --- a/js/NonLinear/SATURATION.js +++ b/js/NonLinear/SATURATION.js @@ -43,7 +43,7 @@ model.nmode=1; model.out=1; model.rpar=rpar; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[string(maxp),string(minp),string(model.nmode)]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/NonLinear/SAT_f.js b/js/NonLinear/SAT_f.js index ba22108c..fe8ead9c 100644 --- a/js/NonLinear/SAT_f.js +++ b/js/NonLinear/SAT_f.js @@ -39,7 +39,7 @@ model.nzcross=2; model.out=1; model.rpar=[minp,maxp,slope]; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[string(minp),string(maxp),string(slope)]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/NonLinear/SIGNUM.js b/js/NonLinear/SIGNUM.js index a4c5056b..4fab41aa 100644 --- a/js/NonLinear/SIGNUM.js +++ b/js/NonLinear/SIGNUM.js @@ -36,7 +36,7 @@ model.out=nu; model.nzcross=nu; model.nmode=nu; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[string([1])]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/NonLinear/SINBLK_f.js b/js/NonLinear/SINBLK_f.js index 6f500ffa..5a3f206a 100644 --- a/js/NonLinear/SINBLK_f.js +++ b/js/NonLinear/SINBLK_f.js @@ -11,7 +11,7 @@ model.sim="sinblk"; model.in1=-1; model.out=-1; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=" "; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/NonLinear/TANBLK_f.js b/js/NonLinear/TANBLK_f.js index 21ded3b4..4ea8dede 100644 --- a/js/NonLinear/TANBLK_f.js +++ b/js/NonLinear/TANBLK_f.js @@ -13,7 +13,7 @@ model.sim="tanblk"; model.in1=in1; model.out=in1; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=sci2exp(in1); gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Sinks/AFFICH_m.js b/js/Sinks/AFFICH_m.js index acab657e..972f2c4e 100644 --- a/js/Sinks/AFFICH_m.js +++ b/js/Sinks/AFFICH_m.js @@ -15,26 +15,26 @@ break mess=[]; if (font<=0) { mess=[mess,"Font number must be positive"," "]; -ok=None; +ok=false; } if (fontsize<=0) { mess=[mess,"Font size must be positive"," "]; -ok=None; +ok=false; } if (nt<=3) { mess=[mess,"Total number of digits must be greater than 3"," "]; -ok=None; +ok=false; } if (nd<0) { mess=[mess,"Number of rational part digits must be ","greater or equal 0"," "]; -ok=None; +ok=false; } if (!ok) { message(["Some specified values are inconsistent:"," ",mess]); } if (!or(herit==[0,1])) { mess=[mess,"Accept inherited values are 0 and 1"," "]; -ok=None; +ok=false; } if (!ok) { message(["Some specified values are inconsistent:"," ",mess]); @@ -69,7 +69,7 @@ model.dstate=[-1,0,0,1,1,0,zeros(in1(1,1)*in1(1,2),1)]; model.ipar=[font,fontsize,colr,1000,nt,nd,in1(1,1)]; model.blocktype="c"; model.firing=[]; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; model.label=""; exprs=[sci2exp([model.in1,model.in2]),string(font),string(fontsize),string(colr),string(nt),string(nd),string(0)]; gr_i=[]; diff --git a/js/Sinks/BARXY.js b/js/Sinks/BARXY.js index 6e8f6e5e..806afce7 100644 --- a/js/Sinks/BARXY.js +++ b/js/Sinks/BARXY.js @@ -15,15 +15,15 @@ break mess=[]; if (ymin>=ymax) { mess=[mess,"Ymax must be greater than Ymin"," "]; -ok=None; +ok=false; } if (xmin>=xmax) { mess=[mess,"Xmax must be greater than Xmin"," "]; -ok=None; +ok=false; } if (thickness<=0) { mess=[mess,"Thickness must be strictly positive."]; -ok=None; +ok=false; } if (!ok) { message(mess); @@ -45,7 +45,7 @@ ymin=-15; ymax=15; model.sim=list("BARXY_sim",5); model.blocktype="d"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; model.in1=[-1,-1]; model.intyp=[1]; model.out=[]; diff --git a/js/Sinks/CANIMXY.js b/js/Sinks/CANIMXY.js index f74f7a51..4004cbcf 100644 --- a/js/Sinks/CANIMXY.js +++ b/js/Sinks/CANIMXY.js @@ -15,35 +15,35 @@ break mess=[]; if (size(wpos,"*")!=0&&size(wpos,"*")!=2) { mess=[mess,"Window position must be [] or a 2 vector"," "]; -ok=None; +ok=false; } if (size(wdim,"*")!=0&&size(wdim,"*")!=2) { mess=[mess,"Window dim must be [] or a 2 vector"," "]; -ok=None; +ok=false; } if (win<-1) { mess=[mess,"Window number cannot be inferior than -1"," "]; -ok=None; +ok=false; } if (nbr_curves<=0) { mess=[mess,"Number of curves cannot be negative or null"," "]; -ok=None; +ok=false; } if (N<1) { mess=[mess,"Buffer size must be at least 1"," "]; -ok=None; +ok=false; } if (N==1&&clrs>0) { mess=[mess,"Buffer size must be at least 2"," "]; -ok=None; +ok=false; } if (ymin>=ymax) { mess=[mess,"Ymax must be greater than Ymin"," "]; -ok=None; +ok=false; } if (xmin>=xmax) { mess=[mess,"Xmax must be greater than Xmin"," "]; -ok=None; +ok=false; } if (!ok) { message(mess); @@ -90,7 +90,7 @@ model.rpar=[xmin,xmax,ymin,ymax]; model.ipar=[win,1,N,clrs,siz,0,wpos.slice(),wdim.slice(),nbr_curves]; model.blocktype="d"; model.firing=[]; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=[string(nbr_curves),string(clrs),string(siz),string(win),"[]","[]",string(xmin),string(xmax),string(ymin),string(ymax),string(N)]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Sinks/CANIMXY3D.js b/js/Sinks/CANIMXY3D.js index 4e31e07b..b7310730 100644 --- a/js/Sinks/CANIMXY3D.js +++ b/js/Sinks/CANIMXY3D.js @@ -15,51 +15,51 @@ break mess=[]; if (size(wpos,"*")!=0&&size(wpos,"*")!=2) { mess=[mess,"Window position must be [] or a 2 vector"," "]; -ok=None; +ok=false; } if (size(wdim,"*")!=0&&size(wdim,"*")!=2) { mess=[mess,"Window dim must be [] or a 2 vector"," "]; -ok=None; +ok=false; } if (win<-1) { mess=[mess,"Window number cannot be inferior than -1"," "]; -ok=None; +ok=false; } if (size(clrs,"*")!=size(siz,"*")) { mess=[mess,"Colors and Size must have same size"," "]; -ok=None; +ok=false; } if (nbr_curves<=0) { mess=[mess,"Number of curves cannot be negative or null"," "]; -ok=None; +ok=false; } if (size(clrs,"*")<nbr_curves) { mess=[mess,"You must have at least same size for clrs and the number of curves"," "]; -ok=None; +ok=false; } if (N<1) { mess=[mess,"Buffer size must be at least 1"," "]; -ok=None; +ok=false; } if (N<2) { for (i=1;i<=nbr_curves;i+=1) { if (clrs(i)>0) { mess=[mess,"Buffer size must be at least 2 or Change a color (must be <0)"," "]; -ok=None; +ok=false; } } } if (vec_y(1)>=vec_y(2)) { mess=[mess,"Ymax must be higher than Ymin"," "]; -ok=None; +ok=false; } if (vec_x(1)>=vec_x(2)) { mess=[mess,"Xmax must be higher than Xmin"," "]; -ok=None; +ok=false; } if (vec_z(1)>=vec_z(2)) { mess=[mess,"Zmax must be higher than Zmin"," "]; -ok=None; +ok=false; } if (!ok) { message(mess); @@ -107,7 +107,7 @@ model.rpar=[vec_x.slice(),vec_y.slice(),vec_z.slice(),param3ds.slice()]; model.ipar=[win,8,N,clrs.slice(),siz.slice(),8,wpos.slice(),wdim.slice(),nbr_curves]; model.blocktype="d"; model.firing=[]; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=[string(nbr_curves),strcat(string(clrs)," "),strcat(string(siz)," "),string(win),"[]","[]",strcat(string(vec_x)," "),strcat(string(vec_y)," "),strcat(string(vec_z)," "),strcat(string(param3ds)," "),string(N)]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Sinks/CEVENTSCOPE.js b/js/Sinks/CEVENTSCOPE.js index 82197c06..1d7fea48 100644 --- a/js/Sinks/CEVENTSCOPE.js +++ b/js/Sinks/CEVENTSCOPE.js @@ -18,27 +18,27 @@ break mess=[]; if (size(wpos,"*")!=0&&size(wpos,"*")!=2) { mess=[mess,"Window position must be [] or a 2 vector"," "]; -ok=None; +ok=false; } if (size(wdim,"*")!=0&&size(wdim,"*")!=2) { mess=[mess,"Window dim must be [] or a 2 vector"," "]; -ok=None; +ok=false; } if (nclock<=0) { mess=[mess,"Block must have at least one input event"," "]; -ok=None; +ok=false; } if (size(clrs,"*")!=nclock) { mess=[mess,"Inputs color c size must be equal to Number of inputs"," "]; -ok=None; +ok=false; } if (win<-1) { mess=[mess,"Window number cannot be inferior than -1"," "]; -ok=None; +ok=false; } if (per<=0) { mess=[mess,"Refresh period must be positive"," "]; -ok=None; +ok=false; } if (ok) { [model,graphics,ok]=set_io(model,graphics,list(),list(),ones(nclock,1),[]); @@ -76,7 +76,7 @@ model.evtin=1; model.rpar=per; model.ipar=[win,1,clrs(nclock),wpos.slice(),wdim.slice()]; model.blocktype="d"; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=[sci2exp(nclock),strcat(sci2exp(clrs(nclock))," "),string(win),sci2exp([]),sci2exp(wdim),string(per)]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Sinks/CFSCOPE.js b/js/Sinks/CFSCOPE.js index eb0a23d6..45f7fc92 100644 --- a/js/Sinks/CFSCOPE.js +++ b/js/Sinks/CFSCOPE.js @@ -15,31 +15,31 @@ break mess=[]; if (size(wpos,"*")!=0&&size(wpos,"*")!=2) { mess=[mess,"Window position must be [] or a 2 vector"," "]; -ok=None; +ok=false; } if (size(wdim,"*")!=0&&size(wdim,"*")!=2) { mess=[mess,"Window dim must be [] or a 2 vector"," "]; -ok=None; +ok=false; } if (win<-1) { mess=[mess,"Window number cannot be inferior than -1"," "]; -ok=None; +ok=false; } if (per<=0) { mess=[mess,"Refresh period must be positive"," "]; -ok=None; +ok=false; } if (N<2) { mess=[mess,"Buffer size must be at least 2"," "]; -ok=None; +ok=false; } if (ymin>=ymax) { mess=[mess,"Ymax must be greater than Ymin"," "]; -ok=None; +ok=false; } if (wu<0) { mess=[mess,"Link to view must be positive"," "]; -ok=None; +ok=false; } if (!ok) { message(["Some specified values are inconsistent:"," ",mess]); @@ -62,7 +62,7 @@ ipar=[win,1,N,clrs.slice(),wpos.slice(),wdim.slice(),size(wu,"*"),wu.slice()]; model.rpar=rpar; model.ipar=ipar; model.firing=[]; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; graphics.exprs=exprs; x.graphics=graphics; x.model=model; @@ -85,7 +85,7 @@ model.evtin=1; model.rpar=[0,ymin,ymax,per]; model.ipar=[win,1,N,clrs,wpos,wdim,1,1]; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[strcat(string(clrs)," "),string(win),sci2exp([]),sci2exp(wdim),string(ymin),string(ymax),string(per),string(N),string([1])]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Sinks/CLKOUTV_f.js b/js/Sinks/CLKOUTV_f.js index a9ab9144..b8541da3 100644 --- a/js/Sinks/CLKOUTV_f.js +++ b/js/Sinks/CLKOUTV_f.js @@ -33,7 +33,7 @@ model.evtin=1; model.ipar=prt; model.blocktype="d"; model.firing=[]; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=string(prt); x=standard_define([1,1],model,exprs," "); } diff --git a/js/Sinks/CLKOUT_f.js b/js/Sinks/CLKOUT_f.js index f97d4c48..466461c3 100644 --- a/js/Sinks/CLKOUT_f.js +++ b/js/Sinks/CLKOUT_f.js @@ -35,7 +35,7 @@ model.evtin=1; model.ipar=prt; model.blocktype="d"; model.firing=[]; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=string(prt); x=standard_define([1,1],model,exprs," "); } diff --git a/js/Sinks/CMAT3D.js b/js/Sinks/CMAT3D.js index 0d0d3501..b04ee9f5 100644 --- a/js/Sinks/CMAT3D.js +++ b/js/Sinks/CMAT3D.js @@ -15,11 +15,11 @@ break mess=[]; if (size(vec_x,"*")!=size(vec_y,"*")) { mess=[mess,"Vector X and Vector Y must have the same size"," "]; -ok=None; +ok=false; } if (cmax<=cmin) { mess=[mess,"Error with minimum and maximum value"," "]; -ok=None; +ok=false; } if (!ok) { message(["Some specified values are inconsistent:"," ",mess]); @@ -56,7 +56,7 @@ model.evtin=1; model.ipar=[cmin,cmax,size_c,size_x,size_y]; model.rpar=[colormap.slice(),x,y]; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[strcat(string(x)," "),strcat(string(y)," "),string("jetcolormap(25)"),string(cmin),string(cmax)]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Sinks/CMATVIEW.js b/js/Sinks/CMATVIEW.js index 21a69763..e9428ea8 100644 --- a/js/Sinks/CMATVIEW.js +++ b/js/Sinks/CMATVIEW.js @@ -15,7 +15,7 @@ break mess=[]; if (cmax<=cmin) { mess=[mess,"Error with minimum and maximum value"," "]; -ok=None; +ok=false; } if (!ok) { message(["Some specified values are inconsistent:"," ",mess]); @@ -52,7 +52,7 @@ model.evtin=1; model.ipar=[cmin,cmax,size_c]; model.rpar=[alpha_c,beta_c,colormap.slice()]; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[string("jetcolormap(25)"),string(cmin),string(cmax)]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Sinks/CMSCOPE.js b/js/Sinks/CMSCOPE.js index c2f36d23..38f4fcd1 100644 --- a/js/Sinks/CMSCOPE.js +++ b/js/Sinks/CMSCOPE.js @@ -15,49 +15,49 @@ break mess=[]; if (size(in1,"*")<=0) { mess=[mess,"Block must have at least one input port"," "]; -ok=None; +ok=false; } if (min(in1)<=0) { mess=[mess,"Port sizes must be positive"," "]; -ok=None; +ok=false; } if (size(clrs,"*")<sum(in1)) { mess=[mess,"Not enough colors defined (at least "+string(sum(in1))+")"," "]; -ok=None; +ok=false; } if (size(wpos,"*")!=0&&size(wpos,"*")!=2) { mess=[mess,"Window position must be [] or a 2 vector"," "]; -ok=None; +ok=false; } if (size(wdim,"*")!=0&&size(wdim,"*")!=2) { mess=[mess,"Window dim must be [] or a 2 vector"," "]; -ok=None; +ok=false; } if (win<-1) { mess=[mess,"Window number can\'t be < -1"," "]; -ok=None; +ok=false; } if (size(per,"*")!=size(ymin,"*")) { mess=[mess,"Size of Refresh Period must equal size of Ymin/Ymax vector"," "]; -ok=None; +ok=false; } for (i=1;i<=size(per,"*");i+=1) { if ((per(i)<=0)) { mess=[mess,"Refresh Period must be positive"," "]; -ok=None; +ok=false; } } if (N<2) { mess=[mess,"Buffer size must be at least 2"," "]; -ok=None; +ok=false; } if (or(ymin>=ymax)) { mess=[mess,"Ymax must be greater than Ymin"," "]; -ok=None; +ok=false; } if (!or(heritance==[0,1])) { mess=[mess,"Accept herited events must be 0 or 1"," "]; -ok=None; +ok=false; } if (!ok) { message(["Some specified values are inconsistent:"," ",mess]); @@ -116,7 +116,7 @@ model.evtin=1; model.rpar=[0,period.slice(),yy.slice()]; model.ipar=[win,size(in1,"*"),N,wpos.slice(),wdim.slice(),in1.slice(),clrs.slice(1-1,sum(in1))]; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[strcat(string(in1)," "),strcat(string(clrs)," "),string(win),sci2exp([]),sci2exp([]),strcat(string(ymin)," "),strcat(string(ymax)," "),strcat(string(per)," "),string(N),string(0),emptystr()]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Sinks/CSCOPE.js b/js/Sinks/CSCOPE.js index 05f09246..3bf3cc03 100644 --- a/js/Sinks/CSCOPE.js +++ b/js/Sinks/CSCOPE.js @@ -15,31 +15,31 @@ break mess=[]; if (size(wpos,"*")!=0&&size(wpos,"*")!=2) { mess=[mess,"Window position must be [] or a 2 vector"," "]; -ok=None; +ok=false; } if (size(wdim,"*")!=0&&size(wdim,"*")!=2) { mess=[mess,"Window dim must be [] or a 2 vector"," "]; -ok=None; +ok=false; } if (win<-1) { mess=[mess,"Window number can\'t be < -1"," "]; -ok=None; +ok=false; } if (per<=0) { mess=[mess,"Refresh period must be positive"," "]; -ok=None; +ok=false; } if (N<2) { mess=[mess,"Buffer size must be at least 2"," "]; -ok=None; +ok=false; } if (ymin>=ymax) { mess=[mess,"Ymax must be greater than Ymin"," "]; -ok=None; +ok=false; } if (!or(heritance==[0,1])) { mess=[mess,"Accept herited events must be 0 or 1"," "]; -ok=None; +ok=false; } if (!ok) { message(["Some specified values are inconsistent:"," ",mess]); @@ -85,7 +85,7 @@ model.evtin=1; model.rpar=[0,ymin,ymax,per]; model.ipar=[win,1,N,clrs,wpos,wdim]; model.blocktype="c"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[strcat(string(clrs)," "),string(win),sci2exp([]),sci2exp(wdim),string(ymin),string(ymax),string(per),string(N),transpose(string(0)),emptystr()]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Sinks/CSCOPXY.js b/js/Sinks/CSCOPXY.js index c252f25e..ecf168b9 100644 --- a/js/Sinks/CSCOPXY.js +++ b/js/Sinks/CSCOPXY.js @@ -15,35 +15,35 @@ break mess=[]; if (size(wpos,"*")!=0&&size(wpos,"*")!=2) { mess=[mess,"Window position must be [] or a 2 vector"," "]; -ok=None; +ok=false; } if (size(wdim,"*")!=0&&size(wdim,"*")!=2) { mess=[mess,"Window dim must be [] or a 2 vector"," "]; -ok=None; +ok=false; } if (nbr_curves<=0) { mess=[mess,"Number of Curves cannot be negative or null"," "]; -ok=None; +ok=false; } if (win<-1) { mess=[mess,"Window number cannot be inferior than -1"," "]; -ok=None; +ok=false; } if (N<1) { mess=[mess,"Buffer size must be at least 1"," "]; -ok=None; +ok=false; } if (N==1&&clrs>0) { mess=[mess,"Buffer size must be at least 2"," "]; -ok=None; +ok=false; } if (ymin>=ymax) { mess=[mess,"Ymax must be greater than Ymin"," "]; -ok=None; +ok=false; } if (xmin>=xmax) { mess=[mess,"Xmax must be greater than Xmin"," "]; -ok=None; +ok=false; } if (!ok) { message(mess); @@ -89,7 +89,7 @@ model.evtin=1; model.rpar=[xmin,xmax,ymin,ymax]; model.ipar=[win,1,N,clrs,siz,1,wpos.slice(),wdim.slice(),nbr_curves]; model.blocktype="d"; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=[string(nbr_curves),sci2exp(clrs),sci2exp(siz),string(win),sci2exp([]),sci2exp(wdim),string(xmin),string(xmax),string(ymin),string(ymax),string(N)]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Sinks/CSCOPXY3D.js b/js/Sinks/CSCOPXY3D.js index f77ab34a..fec5ad0c 100644 --- a/js/Sinks/CSCOPXY3D.js +++ b/js/Sinks/CSCOPXY3D.js @@ -15,47 +15,47 @@ break mess=[]; if (size(wpos,"*")!=0&&size(wpos,"*")!=2) { mess=[mess,"Window position must be [] or a 2 vector"," "]; -ok=None; +ok=false; } if (size(wdim,"*")!=0&&size(wdim,"*")!=2) { mess=[mess,"Window dim must be [] or a 2 vector"," "]; -ok=None; +ok=false; } if (size(clrs,"*")!=size(siz,"*")) { mess=[mess,"Colors and Size must have same size"," "]; -ok=None; +ok=false; } if (nbr_curves<=0) { mess=[mess,"Number of curves cannot be negative or null"," "]; -ok=None; +ok=false; } if (win<-1) { mess=[mess,"Window number cannot be inferior than -1"," "]; -ok=None; +ok=false; } if (N<1) { mess=[mess,"Buffer size must be at least 1"," "]; -ok=None; +ok=false; } if (N<2) { for (i=1;i<=size(clrs,"*");i+=1) { if (clrs(i)>0) { mess=[mess,"Buffer size must be at least 2 or Change a color (must be >0)"," "]; -ok=None; +ok=false; } } } if (vec_y(1)>=vec_y(2)) { mess=[mess,"Ymax must be higher than Ymin"," "]; -ok=None; +ok=false; } if (vec_x(1)>=vec_x(2)) { mess=[mess,"Xmax must be higher than Xmin"," "]; -ok=None; +ok=false; } if (vec_z(1)>=vec_z(2)) { mess=[mess,"Zmax must be higher than Zmin"," "]; -ok=None; +ok=false; } if (ok) { in1=nbr_curves*ones(3,1); @@ -102,7 +102,7 @@ model.evtin=1; model.rpar=[vec_x.slice(),vec_y.slice(),vec_z.slice(),param3ds.slice()]; model.ipar=[win,8,N,clrs.slice(),siz.slice(),8,wpos.slice(),wdim.slice(),nbr_curves]; model.blocktype="d"; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=[string(nbr_curves),strcat(string(clrs)," "),strcat(string(siz)," "),string(win),sci2exp([]),sci2exp(wdim),strcat(string(vec_x)," "),strcat(string(vec_y)," "),strcat(string(vec_z)," "),strcat(string(param3ds)," "),string(N)]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Sinks/OUTIMPL_f.js b/js/Sinks/OUTIMPL_f.js index 490f1e07..eacd248e 100644 --- a/js/Sinks/OUTIMPL_f.js +++ b/js/Sinks/OUTIMPL_f.js @@ -39,7 +39,7 @@ prt=1; model.sim="outimpl"; model.ipar=[1]; model.blocktype="c"; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; mo=modelica(); mo.model="PORT"; mo.inputs="n"; diff --git a/js/Sinks/OUT_f.js b/js/Sinks/OUT_f.js index a8eddb21..6f1ad615 100644 --- a/js/Sinks/OUT_f.js +++ b/js/Sinks/OUT_f.js @@ -37,7 +37,7 @@ model.in2=-2; model.intyp=-1; model.ipar=prt; model.blocktype="c"; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=string(prt); gr_i=[]; x=standard_define([1,1],model,exprs,gr_i); diff --git a/js/Sinks/TOWS_c.js b/js/Sinks/TOWS_c.js index e6bd549a..2dcc6b55 100644 --- a/js/Sinks/TOWS_c.js +++ b/js/Sinks/TOWS_c.js @@ -14,13 +14,13 @@ break } if ((nz<=0)) { message("Size of buffer must be positive"); -ok=None; +ok=false; } -r=None; +r=false; ierr=execstr("r = validvar(varnam)","errcatch"); if (!r||ierr!=0||length(varnam)>19) { message(["Invalid variable name.","Please choose another variable name."]); -ok=None; +ok=false; } execstr("if type("+varnam+") <> 17 | or(fieldnames("+varnam+") <> [\"values\"; \"time\"]) then"+" message([\"Protected variable name.\"; \"Please choose another variable name.\"]);"+" ok = %f;"+" end","errcatch"); if (ok) { @@ -55,7 +55,7 @@ model.rpar=[]; model.ipar=[nz,length(varnam),transpose(ascii(varnam))]; model.blocktype="d"; model.firing=[]; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; gr_i=[]; exprs=[string(nz),string(varnam),string(herit)]; x=standard_define([4,2],model,exprs,gr_i); diff --git a/js/Sinks/TRASH_f.js b/js/Sinks/TRASH_f.js index 3b950c21..1ab5bc39 100644 --- a/js/Sinks/TRASH_f.js +++ b/js/Sinks/TRASH_f.js @@ -12,7 +12,7 @@ model.sim="trash"; model.in1=in1; model.evtin=1; model.blocktype="d"; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=" "; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Sinks/WFILE_f.js b/js/Sinks/WFILE_f.js index d78784af..520bea5f 100644 --- a/js/Sinks/WFILE_f.js +++ b/js/Sinks/WFILE_f.js @@ -23,32 +23,32 @@ break } in1=int(in1); nin=in1; -fname1=pathconvert(stripblanks(fname1),None,true); +fname1=pathconvert(stripblanks(fname1),false,true); frmt1=stripblanks(frmt1); if (lunit>0&&min(length(frmt),1)!=min(length(frmt1),1)) { block_parameter_error(gettext("Simulation running !!! You cannot switch<br />between formatted and unformatted when running"),gettext("End current simulation first.")); -ok=None; +ok=false; } else if (lunit>0&&fname1!=fname) { block_parameter_error(gettext("You cannot modify \'Output File Name\' when running."),gettext("End current simulation first.")); -ok=None; +ok=false; } else if (fname1=="") { block_parameter_error(gettext("Wrong value for \'Output File Name\' parameter"),gettext("You must provide a filename.")); -ok=None; +ok=false; } else if (fileparts(fname1)!="") { [pa,fn,ex]=fileparts(fname1); if (!isdir(pa)) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter."),gettext("Output File Name")),msprintf(gettext("Directory \'%s\' does not exist"),pa)); -ok=None; +ok=false; } } else if (frmt1!=""&&(part(frmt1,1)!="("||part(frmt1,length(frmt1))!=")")) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %s."),gettext("Input Format"),frmt1),gettext("You must enclose the format\'s string between parentheses.")); -ok=None; +ok=false; } else if (N<2) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Buffer Size"),N),gettext("Must be greater than 1.")); -ok=None; +ok=false; } else if (in1<=0) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Input Size"),in1),gettext("Strictly positive integer expected.")); -ok=None; +ok=false; } if (ok) { ipar=[length(fname1),length(frmt1),0,N,_str2code(fname1),_str2code(frmt1)]; @@ -58,7 +58,7 @@ dstate=[-1,lunit,zeros((nin+1)*N,1)]; model.in1=nin; model.dstate=dstate; model.ipar=ipar; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; graphics.exprs=exprs; x.graphics=graphics; x.model=model; @@ -80,7 +80,7 @@ model.evtin=1; model.dstate=[-1,lunit,zeros((nin+1)*N,1)]; model.ipar=[length(fname),length(frmt),0,N,_str2code(fname),_str2code(frmt)]; model.blocktype="d"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[sci2exp(in1),fname,frmt,string(N)]; gr_i=[]; x=standard_define([3,2],model,exprs,gr_i); diff --git a/js/Sinks/WRITEAU_f.js b/js/Sinks/WRITEAU_f.js index e3045356..114709dd 100644 --- a/js/Sinks/WRITEAU_f.js +++ b/js/Sinks/WRITEAU_f.js @@ -20,14 +20,14 @@ fname1="/dev/audio"; frmt1="uc "; if (alreadyran&&(N!=ipar(5))) { block_parameter_error(msprintf(gettext("You cannot modify \'%s\' when running."),gettext("Buffer Size")),gettext("End current simulation first")); -ok=None; +ok=false; } else if (N<1) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Buffer Size"),N),gettext("Strictly positive integer expected.")); -ok=None; +ok=false; } if (swap!=0&&swap!=1) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Swap Mode"),swap),msprintf(gettext("Must be in the interval %s."),"[0, 1]")); -ok=None; +ok=false; } if (ok) { ipar=[length(fname1),_str2code(frmt1),N,swap,_str2code(fname1)]; @@ -59,7 +59,7 @@ model.evtin=1; model.dstate=[-1,lunit,zeros((nin+1)*N,1)]; model.ipar=[length(fname),_str2code(frmt),N,swap,_str2code(fname)]; model.blocktype="d"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[string(N),string(swap)]; gr_i=[]; x=standard_define([4,2],model,exprs,gr_i); diff --git a/js/Sinks/WRITEC_f.js b/js/Sinks/WRITEC_f.js index b101a91e..7383c7a7 100644 --- a/js/Sinks/WRITEC_f.js +++ b/js/Sinks/WRITEC_f.js @@ -19,35 +19,35 @@ break } in1=int(in1); nin=in1; -fname1=pathconvert(stripblanks(fname1),None,true); +fname1=pathconvert(stripblanks(fname1),false,true); frmt1=stripblanks(frmt1); fmts=["s","l","d","f","c","us","ul","uc","ull","uls","ubl","ubs","dl","fl","ll","sl","db","fb","lb","sb"]; if (and(frmt1!=fmts)) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %s."),gettext("Input Format"),frmt1),gettext("Valid formats are: "+strcat(fmts,", "))); -ok=None; +ok=false; } else if (alreadyran&&fname1!=fname) { block_parameter_error(msprintf(gettext("You cannot modify \'%s\' when running"),gettext("Input Format")),gettext("End current simulation first.")); -ok=None; +ok=false; } else if (alreadyran&&N!=ipar(5)) { block_parameter_error(msprintf(gettext("You cannot modify \'Buffer Size\' when running."),gettext("Buffer Size")),gettext("End current simulation first")); -ok=None; +ok=false; } else if (fname1=="") { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter."),gettext("Output File Name")),gettext("You must provide a filename.")); } else if (fileparts(fname1)!="") { [pa,fn,ex]=fileparts(fname1); if (!isdir(pa)) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter."),gettext("Output File Name")),msprintf(gettext("Directory \'%s\' does not exist"),pa)); -ok=None; +ok=false; } } else if (N<1) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Buffer Size"),N),gettext("Strictly positive integer expected.")); -ok=None; +ok=false; } else if (in1<=0) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Input Size"),in1),gettext("Strictly positive integer expected.")); -ok=None; +ok=false; } else if (swap!=0&&swap!=1) { block_parameter_error(msprintf(gettext("Wrong value for \'%s\' parameter: %d."),gettext("Swap Mode"),swap),msprintf(gettext("Must be in the interval %s."),"[0, 1]")); -ok=None; +ok=false; } frmt1=part(frmt1,1,3); if (ok) { @@ -80,7 +80,7 @@ model.evtin=1; model.dstate=[-1,lunit,zeros((nin+1)*N,1)]; model.ipar=[length(fname),_str2code(frmt),N,swap,_str2code(fname)]; model.blocktype="d"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=[sci2exp(in1),fname,frmt,string(N),string(swap)]; gr_i=[]; x=standard_define([4,2],model,exprs,gr_i); diff --git a/js/Sources/CLKINV_f.js b/js/Sources/CLKINV_f.js index b6ef32a8..3f87d7f3 100644 --- a/js/Sources/CLKINV_f.js +++ b/js/Sources/CLKINV_f.js @@ -35,7 +35,7 @@ model.evtout=1; model.ipar=prt; model.blocktype="d"; model.firing=-1; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=string(prt); gr_i=[]; x=standard_define([1,1],model,exprs,gr_i); diff --git a/js/Sources/CLKIN_f.js b/js/Sources/CLKIN_f.js index 274772ad..d2760304 100644 --- a/js/Sources/CLKIN_f.js +++ b/js/Sources/CLKIN_f.js @@ -35,7 +35,7 @@ model.evtout=1; model.ipar=prt; model.blocktype="d"; model.firing=-1; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=string(prt); x=standard_define([1,1],model,exprs," "); } diff --git a/js/Sources/CLOCK_c.js b/js/Sources/CLOCK_c.js index 876c27be..19870a5f 100644 --- a/js/Sources/CLOCK_c.js +++ b/js/Sources/CLOCK_c.js @@ -24,7 +24,7 @@ break } if (dt<=0) { block_parameter_error(msprintf(gettext("Wrong values for \'%s\' parameter: %5.1e."),gettext("Period"),dt),gettext("Strictly positive number expected.")); -ok=None; +ok=false; } if (ok) { xx.graphics.exprs=exprs0; @@ -84,8 +84,8 @@ x.graphics.peout=0; x.model.sim="csuper"; x.model.evtout=1; x.model.blocktype="h"; -x.model.firing=None; -x.model.dep_ut=[None,None]; +x.model.firing=false; +x.model.dep_ut=[false,false]; x.model.rpar=diagram; } CLOCK_c.prototype.details = function CLOCK_c() { diff --git a/js/Sources/CLOCK_f.js b/js/Sources/CLOCK_f.js index cac1c8a5..2595e3a1 100644 --- a/js/Sources/CLOCK_f.js +++ b/js/Sources/CLOCK_f.js @@ -24,7 +24,7 @@ break } if (dt<=0) { message("period must be positive"); -ok=None; +ok=false; } if (ok) { xx.graphics.exprs=exprs0; @@ -84,8 +84,8 @@ x.graphics.peout=0; x.model.sim="csuper"; x.model.evtout=1; x.model.blocktype="h"; -x.model.firing=None; -x.model.dep_ut=[None,None]; +x.model.firing=false; +x.model.dep_ut=[false,false]; x.model.rpar=diagram; } CLOCK_f.prototype.details = function CLOCK_f() { diff --git a/js/Sources/CONST.js b/js/Sources/CONST.js index 6da9a9b0..91f34189 100644 --- a/js/Sources/CONST.js +++ b/js/Sources/CONST.js @@ -36,7 +36,7 @@ model.in1=[]; model.out=1; model.rpar=C; model.blocktype="d"; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=strcat(sci2exp(C)); gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Sources/CONST_f.js b/js/Sources/CONST_f.js index eb78ecdc..2fe2b632 100644 --- a/js/Sources/CONST_f.js +++ b/js/Sources/CONST_f.js @@ -33,7 +33,7 @@ model.in1=[]; model.out=1; model.rpar=C; model.blocktype="d"; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=strcat(sci2exp(C)); gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Sources/CONST_m.js b/js/Sources/CONST_m.js index 09a70e53..579e9867 100644 --- a/js/Sources/CONST_m.js +++ b/js/Sources/CONST_m.js @@ -38,7 +38,7 @@ ot=7; ot=8; } else { block_parameter_error(msprintf(gettext("Wrong type for \'%s\' parameter"),gettext("Constant Value")),gettext("Value type must be a numeric type (double, complex, int, int8, ...).")); -ok=None; +ok=false; } if (ok) { model.rpar=[]; @@ -62,7 +62,7 @@ model.out2=size(C,2); model.rpar=C; model.opar=list(); model.blocktype="d"; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=sci2exp(C); gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Sources/CURV_f.js b/js/Sources/CURV_f.js index 77e041f8..25d6c83f 100644 --- a/js/Sources/CURV_f.js +++ b/js/Sources/CURV_f.js @@ -25,7 +25,7 @@ break n=size(xx,"*"); if (or(xx.slice(2-1,n)-xx.slice(1-1,n-1)<0)) { message("You have not defined a function"); -ok=None; +ok=false; } if (ok) { model.sim="intplt"; @@ -54,7 +54,7 @@ model.out=1; model.rpar=[xx,yy,rect.slice()]; model.ipar=[size(xx,1),axisdata.slice()]; model.blocktype="c"; -model.dep_ut=[None,true]; +model.dep_ut=[false,true]; gr_i=[]; x=standard_define([2,2],model,[],gr_i); } diff --git a/js/Sources/Counter.js b/js/Sources/Counter.js index 167d0809..d43b02cf 100644 --- a/js/Sources/Counter.js +++ b/js/Sources/Counter.js @@ -40,7 +40,7 @@ model.out2=1; model.dstate=0; model.ipar=[rule,maxim,minim]; model.blocktype="c"; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=[string(minim),string(maxim),string(rule)]; gr_i=[]; x=standard_define([3,2],model,exprs,gr_i); diff --git a/js/Sources/FROMWSB.js b/js/Sources/FROMWSB.js index f6858549..35cccad4 100644 --- a/js/Sources/FROMWSB.js +++ b/js/Sources/FROMWSB.js @@ -73,11 +73,11 @@ typ=newpar; } FROMWSB.prototype.define = function FROMWSB() { scs_m_1=scicos_diagram(version="scicos4.2",props=scicos_params(wpar=[-159.096,811.104,-121.216,617.984,1323,1008,331,284,630,480,1426,231,1.4],Title="FROMWSB",tol=[0.0001,0.000001,1.000e-10,100001,0,0],tf=100000,context=" ",void1=[],options=tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(true,33),[8,1],[1,5],list([5,1],[4,1]),[0.8,0.8,0.8]),void2=[],void3=[],doc=list())); -scs_m_1.objs[1-1]=scicos_block(gui="FROMWS_c",graphics=scicos_graphics(orig=[260.37067,261.584],sz=[70,40],flip=true,theta=0,exprs=["V","1","1","0"],pin=[],pout=4,pein=2,peout=2,gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim=list("fromws_c",4),in1=[],in2=[],intyp=1,out=-1,out2=-2,outtyp=-1,evtin=1,evtout=1,state=[],dstate=[],odstate=list(),rpar=[],ipar=[1,-31,1,1,0],opar=list(),blocktype="d",firing=0,dep_ut=[None,true],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m_1.objs[1-1]=scicos_block(gui="FROMWS_c",graphics=scicos_graphics(orig=[260.37067,261.584],sz=[70,40],flip=true,theta=0,exprs=["V","1","1","0"],pin=[],pout=4,pein=2,peout=2,gr_i=[],id="",in_implicit=[],out_implicit="E"),model=scicos_model(sim=list("fromws_c",4),in1=[],in2=[],intyp=1,out=-1,out2=-2,outtyp=-1,evtin=1,evtout=1,state=[],dstate=[],odstate=list(),rpar=[],ipar=[1,-31,1,1,0],opar=list(),blocktype="d",firing=0,dep_ut=[false,true],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m_1.objs[2-1]=scicos_link(xx=[295.37067,295.37067,233.23733,233.23733,295.37067,295.37067],yy=[255.86971,223.45067,223.45067,337.85067,337.85067,307.29829],id="drawlink",thick=[0,0],ct=[5,-1],from=[1,1,0],to=[1,1,1]); -scs_m_1.objs[3-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[358.9421,271.584],sz=[20,20],flip=true,theta=0,exprs="1",pin=4,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=-2,intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()),doc=list()); +scs_m_1.objs[3-1]=scicos_block(gui="OUT_f",graphics=scicos_graphics(orig=[358.9421,271.584],sz=[20,20],flip=true,theta=0,exprs="1",pin=4,pout=[],pein=[],peout=[],gr_i=[],id="",in_implicit="E",out_implicit=[]),model=scicos_model(sim="output",in1=-1,in2=-2,intyp=-1,out=[],out2=[],outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=[],ipar=1,opar=list(),blocktype="c",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()),doc=list()); scs_m_1.objs[4-1]=scicos_link(xx=[338.9421,358.9421],yy=[281.584,281.584],id="drawlink",thick=[0,0],ct=[1,1],from=[1,1,0],to=[3,1,1]); -model=scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[None,None],label="",nzcross=0,nmode=0,equations=list()); +model=scicos_model(sim="csuper",in1=[],in2=[],intyp=1,out=-1,out2=-2,outtyp=1,evtin=[],evtout=[],state=[],dstate=[],odstate=list(),rpar=scs_m_1,ipar=[],opar=list(),blocktype="h",firing=[],dep_ut=[false,false],label="",nzcross=0,nmode=0,equations=list()); gr_i=[]; x=standard_define([5,2],model,[],gr_i); } diff --git a/js/Sources/FROMWS_c.js b/js/Sources/FROMWS_c.js index e58682d3..f8bb87af 100644 --- a/js/Sources/FROMWS_c.js +++ b/js/Sources/FROMWS_c.js @@ -14,21 +14,21 @@ break } if (!(Method==0||Method==1||Method==2||Method==3)) { message("Interpolation method should be chosen in [0,1,2,3]"); -ok=None; +ok=false; } if (!(ZC==0||ZC==1)) { message("Zero crossing should be either 0 or 1"); -ok=None; +ok=false; } if (!(OutEnd==0||OutEnd==1||OutEnd==2)) { message("Output at end option should be either 0 or 1"); -ok=None; +ok=false; } -r=None; +r=false; ierr=execstr("r=validvar(varnam)","errcatch"); if (!r) { message(["Invalid variable name.","Please choose another variable name."]); -ok=None; +ok=false; } if (ok) { model.ipar=[length(varnam),_str2code(varnam),Method,ZC,OutEnd]; @@ -57,7 +57,7 @@ model.evtin=[1]; model.evtout=[1]; model.firing=[0]; model.blocktype="d"; -model.dep_ut=[None,true]; +model.dep_ut=[false,true]; gr_i=[]; exprs=[string(varnam),string(Method),string(ZC),string(OutEnd)]; x=standard_define([3.5,2],model,exprs,gr_i); diff --git a/js/Sources/GENSIN_f.js b/js/Sources/GENSIN_f.js index 237f62f4..c6c2cb0f 100644 --- a/js/Sources/GENSIN_f.js +++ b/js/Sources/GENSIN_f.js @@ -14,7 +14,7 @@ break } if (F<0) { block_parameter_error(msprintf(gettext("Wrong value for \'Frequency\' parameter: %e."),F),gettext("Strictly positive integer expected.")); -ok=None; +ok=false; } if (ok) { [model,graphics,ok]=check_io(model,graphics,[],1,[],[]); @@ -38,7 +38,7 @@ model.out2=1; model.outtyp=1; model.rpar=[1,1,0]; model.blocktype="c"; -model.dep_ut=[None,true]; +model.dep_ut=[false,true]; exprs=[string(rpar(1)),string(rpar(2)),string(rpar(3))]; gr_i=[]; x=standard_define([3,2],model,exprs,gr_i); diff --git a/js/Sources/GENSQR_f.js b/js/Sources/GENSQR_f.js index 3766c73b..1680500e 100644 --- a/js/Sources/GENSQR_f.js +++ b/js/Sources/GENSQR_f.js @@ -34,7 +34,7 @@ model.outtyp=1; model.evtin=1; model.dstate=Amplitude; model.blocktype="d"; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=string(Amplitude); gr_i=[]; x=standard_define([3,2],model,exprs,gr_i); diff --git a/js/Sources/Ground_g.js b/js/Sources/Ground_g.js index 59447522..46f8ddcf 100644 --- a/js/Sources/Ground_g.js +++ b/js/Sources/Ground_g.js @@ -17,7 +17,7 @@ model.outtyp=-1; model.rpar=[]; model.opar=list(C); model.blocktype="d"; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=[]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Sources/INIMPL_f.js b/js/Sources/INIMPL_f.js index 26990047..80c82318 100644 --- a/js/Sources/INIMPL_f.js +++ b/js/Sources/INIMPL_f.js @@ -37,7 +37,7 @@ model.sim="inimpl"; model.out=[-1]; model.out2=[1]; model.ipar=[1]; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; model.blocktype="c"; mo=modelica(); mo.model="PORT"; diff --git a/js/Sources/IN_f.js b/js/Sources/IN_f.js index 2099e960..c599908a 100644 --- a/js/Sources/IN_f.js +++ b/js/Sources/IN_f.js @@ -51,7 +51,7 @@ model.out2=-2; model.outtyp=-1; model.ipar=prt; model.blocktype="c"; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=sci2exp(prt); gr_i=[]; x=standard_define([1,1],model,exprs,gr_i); diff --git a/js/Sources/Modulo_Count.js b/js/Sources/Modulo_Count.js index 9e028db0..87f89d5b 100644 --- a/js/Sources/Modulo_Count.js +++ b/js/Sources/Modulo_Count.js @@ -38,7 +38,7 @@ model.out=1; model.dstate=ini_c; model.ipar=base; model.blocktype="c"; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=[string(ini_c),string(base)]; gr_i=[]; x=standard_define([3,2],model,exprs,gr_i); diff --git a/js/Sources/RAMP.js b/js/Sources/RAMP.js index f21eeeff..ead3978c 100644 --- a/js/Sources/RAMP.js +++ b/js/Sources/RAMP.js @@ -36,7 +36,7 @@ model.rpar=rpar; model.blocktype="c"; model.nmode=1; model.nzcross=1; -model.dep_ut=[None,true]; +model.dep_ut=[false,true]; exprs=[string(rpar)]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Sources/RAND_f.js b/js/Sources/RAND_f.js index fdb6843d..539e7568 100644 --- a/js/Sources/RAND_f.js +++ b/js/Sources/RAND_f.js @@ -47,7 +47,7 @@ model.dstate=[int(rand()*(10^7-1)),0*a.slice()]; model.rpar=[a.slice(),b.slice()]; model.ipar=flag; model.blocktype="d"; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=[string(flag),sci2exp(a.slice()),sci2exp(b.slice()),string(model.dstate(1))]; gr_i=[]; x=standard_define([3,2],model,exprs,gr_i); diff --git a/js/Sources/RAND_m.js b/js/Sources/RAND_m.js index 1ee2aa76..d70d54f9 100644 --- a/js/Sources/RAND_m.js +++ b/js/Sources/RAND_m.js @@ -31,7 +31,7 @@ model.rpar=[real(a.slice()),imag(a.slice()),real(b.slice()),imag(b.slice())]; model.dstate=[seed_c.slice(),0*[real(a.slice()),imag(a.slice())]]; } else { message("Datatype is not supported"); -ok=None; +ok=false; } if (ok) { [model,graphics,ok]=set_io(model,graphics,list([],[]),list(out,ot),1,[]); @@ -70,7 +70,7 @@ model.rpar=[a.slice(),b.slice()]; model.ipar=flag; model.blocktype="d"; model.firing=[]; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=[sci2exp(1),string(flag),sci2exp([a]),sci2exp([b]),sci2exp([model.dstate(1),int(rand()*(10^7-1))])]; gr_i=[]; x=standard_define([3,2],model,exprs,gr_i); diff --git a/js/Sources/READAU_f.js b/js/Sources/READAU_f.js index 0cfdba51..a6e792c9 100644 --- a/js/Sources/READAU_f.js +++ b/js/Sources/READAU_f.js @@ -73,7 +73,7 @@ model.evtin=1; model.dstate=[1,1,lunit,zeros(N*M,1)]; model.ipar=[length(fname),_str2code(frmt),ievt,N,M,swap,offset,_str2code(fname),tmask,outmask]; model.blocktype="d"; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=[fname,string(N),string(swap)]; gr_i=[]; x=standard_define([5,2],model,exprs,gr_i); diff --git a/js/Sources/READC_f.js b/js/Sources/READC_f.js index a5524672..a3e6dad6 100644 --- a/js/Sources/READC_f.js +++ b/js/Sources/READC_f.js @@ -20,7 +20,7 @@ while (true) { if (!ok) { break } -fname1=pathconvert(stripblanks(fname1),None,true); +fname1=pathconvert(stripblanks(fname1),false,true); frmt1=stripblanks(frmt1); fmts=["s","l","d","f","c","us","ul","uc","ull","uls","ubl","ubs","dl","fl","ll","sl","db","fb","lb","sb"]; nout=size(outmask,"*"); @@ -107,7 +107,7 @@ model.dstate=[1,1,lunit,zeros(N*M,1)]; model.ipar=[length(fname),_str2code(frmt),ievt,N,M,swap,offset,_str2code(fname),tmask,outmask]; model.blocktype="d"; model.firing=-1; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=["[]",sci2exp(outmask),fname,frmt,string(M),string(N),string(offset),string(swap)]; gr_i=[]; x=standard_define([4,2],model,exprs,gr_i); diff --git a/js/Sources/SAWTOOTH_f.js b/js/Sources/SAWTOOTH_f.js index 70648b65..5292e5b9 100644 --- a/js/Sources/SAWTOOTH_f.js +++ b/js/Sources/SAWTOOTH_f.js @@ -12,7 +12,7 @@ model.out=1; model.evtin=1; model.dstate=0; model.blocktype="c"; -model.dep_ut=[None,true]; +model.dep_ut=[false,true]; exprs=" "; gr_i=[]; x=standard_define([3,2],model,exprs,gr_i); diff --git a/js/Sources/STEP.js b/js/Sources/STEP.js index 8ffd10e8..0841a09d 100644 --- a/js/Sources/STEP.js +++ b/js/Sources/STEP.js @@ -21,7 +21,7 @@ in1=in1*ones(fi); fi=fi*ones(in1); } else { block_parameter_error(msprintf(gettext("\'Initial Value\' and \'Final Value\': incompatible sizes: %d and %d."),size(in1,"*"),size(fi,"*")),gettext("Same sizes expected.")); -ok=None; +ok=false; } } if (ok) { @@ -56,7 +56,7 @@ model.outtyp=1; model.firing=1; model.rpar=rpar; model.blocktype="c"; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=[string(1),string(rpar)]; gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); diff --git a/js/Sources/SampleCLK.js b/js/Sources/SampleCLK.js index 25640754..20211f16 100644 --- a/js/Sources/SampleCLK.js +++ b/js/Sources/SampleCLK.js @@ -14,11 +14,11 @@ break } if (frequ<0) { message("Frequency must be a positif number"); -ok=None; +ok=false; } if (abs(offset)>frequ) { message("The |Offset| must be less than the Frequency"); -ok=None; +ok=false; } if (ok) { if (or(model.rpar.slice()!=[frequ,offset])) { @@ -43,7 +43,7 @@ model.evtout=1; model.rpar=[1,0]; model.blocktype="d"; model.firing=-1; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=[sci2exp(1),sci2exp(0)]; x=standard_define([2,2],model,exprs," "); } diff --git a/js/Sources/TIME_f.js b/js/Sources/TIME_f.js index 46a2a052..8df57a71 100644 --- a/js/Sources/TIME_f.js +++ b/js/Sources/TIME_f.js @@ -10,7 +10,7 @@ model=scicos_model(); model.sim="timblk"; model.out=1; model.blocktype="c"; -model.dep_ut=[None,true]; +model.dep_ut=[false,true]; gr_i=[]; x=standard_define([2,2],model,[],gr_i); } diff --git a/js/Sources/TKSCALE.js b/js/Sources/TKSCALE.js index 4930eff6..f0c6fdab 100644 --- a/js/Sources/TKSCALE.js +++ b/js/Sources/TKSCALE.js @@ -25,7 +25,7 @@ model.out=1; model.evtin=1; model.rpar=[a,b,f]; model.blocktype="d"; -model.dep_ut=[None,None]; +model.dep_ut=[false,false]; exprs=[sci2exp(a),sci2exp(b),sci2exp(f)]; gr_i=[]; x=standard_define([3,2],model,exprs,gr_i); diff --git a/js/Threshold/GENERAL_f.js b/js/Threshold/GENERAL_f.js index 2c1d9d68..1161a6ce 100644 --- a/js/Threshold/GENERAL_f.js +++ b/js/Threshold/GENERAL_f.js @@ -1,3 +1,3 @@ -Syntax error in input LexToken(COLON,':',1,1849) +Syntax error in input LexToken(COMMA,',',1,1919) /* autogenerated from "macros/Threshold/GENERAL_f.sci" */ None diff --git a/js/Threshold/NEGTOPOS_f.js b/js/Threshold/NEGTOPOS_f.js index 0b6349b8..5dfff00c 100644 --- a/js/Threshold/NEGTOPOS_f.js +++ b/js/Threshold/NEGTOPOS_f.js @@ -15,7 +15,7 @@ model.evtout=1; model.rpar=[-1,-1,0,-1]; model.blocktype="z"; model.firing=-1; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; gr_i=[]; x=standard_define([2,2],model,[],gr_i); } diff --git a/js/Threshold/POSTONEG_f.js b/js/Threshold/POSTONEG_f.js index 2826dc8b..df078ba0 100644 --- a/js/Threshold/POSTONEG_f.js +++ b/js/Threshold/POSTONEG_f.js @@ -15,7 +15,7 @@ model.in1=1; model.evtout=1; model.rpar=[-1,-1,-1,0]; model.blocktype="z"; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; model.firing=[-1]; gr_i=[]; x=standard_define([2,2],model,[],gr_i); diff --git a/js/Threshold/ZCROSS_f.js b/js/Threshold/ZCROSS_f.js index acb978fe..32f2b440 100644 --- a/js/Threshold/ZCROSS_f.js +++ b/js/Threshold/ZCROSS_f.js @@ -42,7 +42,7 @@ model.evtout=1; model.rpar=[-1,-1,0,0]; model.blocktype="z"; model.firing=-1; -model.dep_ut=[true,None]; +model.dep_ut=[true,false]; exprs=strcat(sci2exp(in1)); gr_i=[]; x=standard_define([2,2],model,exprs,gr_i); |