diff options
Diffstat (limited to 'js/Misc')
-rw-r--r-- | js/Misc/BACKLASH.js | 2 | ||||
-rw-r--r-- | js/Misc/BOUNCE.js | 6 | ||||
-rw-r--r-- | js/Misc/BOUNCEXY.js | 10 | ||||
-rw-r--r-- | js/Misc/BPLATFORM.js | 8 | ||||
-rw-r--r-- | js/Misc/CBLOCK4.js | 8 | ||||
-rw-r--r-- | js/Misc/CONSTRAINT2_c.js | 4 | ||||
-rw-r--r-- | js/Misc/CONSTRAINT_c.js | 2 | ||||
-rw-r--r-- | js/Misc/DEADBAND.js | 2 | ||||
-rw-r--r-- | js/Misc/DEBUG.js | 2 | ||||
-rw-r--r-- | js/Misc/DIFF_f.js | 2 | ||||
-rw-r--r-- | js/Misc/EDGETRIGGER.js | 2 | ||||
-rw-r--r-- | js/Misc/ENDBLK.js | 4 | ||||
-rw-r--r-- | js/Misc/LOGICAL_OP.js | 10 | ||||
-rw-r--r-- | js/Misc/MEMORY_f.js | 4 | ||||
-rw-r--r-- | js/Misc/PENDULUM_ANIM.js | 8 | ||||
-rw-r--r-- | js/Misc/RATELIMITER.js | 2 | ||||
-rw-r--r-- | js/Misc/RELATIONALOP.js | 6 | ||||
-rw-r--r-- | js/Misc/SPLIT_f.js | 2 | ||||
-rw-r--r-- | js/Misc/SUPER_f.js | 2 | ||||
-rw-r--r-- | js/Misc/TEXT_f.js | 4 | ||||
-rw-r--r-- | js/Misc/c_block.js | 2 | ||||
-rw-r--r-- | js/Misc/fortran_block.js | 2 | ||||
-rw-r--r-- | js/Misc/func_block.js | 2 | ||||
-rw-r--r-- | js/Misc/generic_block.js | 10 | ||||
-rw-r--r-- | js/Misc/generic_block2.js | 10 | ||||
-rw-r--r-- | js/Misc/generic_block3.js | 14 | ||||
-rw-r--r-- | js/Misc/scifunc_block_m.js | 2 |
27 files changed, 66 insertions, 66 deletions
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); |