diff options
author | Sunil Shetye | 2018-06-16 19:47:55 +0530 |
---|---|---|
committer | Sunil Shetye | 2018-06-18 10:46:22 +0530 |
commit | dc0c2354295fc1c80d5c0e10b053e5926861b5d3 (patch) | |
tree | f985ad20bba0639e5d85e3be91552b4dca6f7fc9 /js/Branching | |
parent | 3a3e1d6aa7fd38a910a7416040050ffa9550566e (diff) | |
download | sci2js-dc0c2354295fc1c80d5c0e10b053e5926861b5d3.tar.gz sci2js-dc0c2354295fc1c80d5c0e10b053e5926861b5d3.tar.bz2 sci2js-dc0c2354295fc1c80d5c0e10b053e5926861b5d3.zip |
support var(:,:) syntax
Diffstat (limited to 'js/Branching')
-rw-r--r-- | js/Branching/CLKFROM.js | 2 | ||||
-rw-r--r-- | js/Branching/CLKGOTO.js | 4 | ||||
-rw-r--r-- | js/Branching/CLKGotoTagVisibility.js | 4 | ||||
-rw-r--r-- | js/Branching/ESELECT_f.js | 2 | ||||
-rw-r--r-- | js/Branching/EXTRACTOR.js | 2 | ||||
-rw-r--r-- | js/Branching/FROM.js | 2 | ||||
-rw-r--r-- | js/Branching/FROMMO.js | 2 | ||||
-rw-r--r-- | js/Branching/GOTO.js | 4 | ||||
-rw-r--r-- | js/Branching/GOTOMO.js | 4 | ||||
-rw-r--r-- | js/Branching/GotoTagVisibility.js | 4 | ||||
-rw-r--r-- | js/Branching/GotoTagVisibilityMO.js | 4 | ||||
-rw-r--r-- | js/Branching/ISELECT_f.js | 2 | ||||
-rw-r--r-- | js/Branching/ISELECT_m.js | 4 | ||||
-rw-r--r-- | js/Branching/M_SWITCH.js | 2 | ||||
-rw-r--r-- | js/Branching/NRMSOM_f.js | 2 | ||||
-rw-r--r-- | js/Branching/SCALAR2VECTOR.js | 4 | ||||
-rw-r--r-- | js/Branching/SELECT_f.js | 2 | ||||
-rw-r--r-- | js/Branching/SELECT_m.js | 4 | ||||
-rw-r--r-- | js/Branching/SWITCH2.js | 2 | ||||
-rw-r--r-- | js/Branching/SWITCH2_m.js | 4 |
20 files changed, 30 insertions, 30 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); |