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/NonLinear | |
parent | 3a3e1d6aa7fd38a910a7416040050ffa9550566e (diff) | |
download | sci2js-dc0c2354295fc1c80d5c0e10b053e5926861b5d3.tar.gz sci2js-dc0c2354295fc1c80d5c0e10b053e5926861b5d3.tar.bz2 sci2js-dc0c2354295fc1c80d5c0e10b053e5926861b5d3.zip |
support var(:,:) syntax
Diffstat (limited to 'js/NonLinear')
-rw-r--r-- | js/NonLinear/ABSBLK_f.js | 2 | ||||
-rw-r--r-- | js/NonLinear/ABS_VALUE.js | 2 | ||||
-rw-r--r-- | js/NonLinear/COSBLK_f.js | 2 | ||||
-rw-r--r-- | js/NonLinear/DLRADAPT_f.js | 2 | ||||
-rw-r--r-- | js/NonLinear/EXPBLK_f.js | 2 | ||||
-rw-r--r-- | js/NonLinear/EXPBLK_m.js | 2 | ||||
-rw-r--r-- | js/NonLinear/FSV_f.js | 2 | ||||
-rw-r--r-- | js/NonLinear/INTRP2BLK_f.js | 2 | ||||
-rw-r--r-- | js/NonLinear/INTRPLBLK_f.js | 2 | ||||
-rw-r--r-- | js/NonLinear/INVBLK.js | 2 | ||||
-rw-r--r-- | js/NonLinear/INVBLK_f.js | 2 | ||||
-rw-r--r-- | js/NonLinear/LOGBLK_f.js | 2 | ||||
-rw-r--r-- | js/NonLinear/LOOKUP_f.js | 4 | ||||
-rw-r--r-- | js/NonLinear/MAX_f.js | 2 | ||||
-rw-r--r-- | js/NonLinear/MIN_f.js | 2 | ||||
-rw-r--r-- | js/NonLinear/POWBLK_f.js | 2 | ||||
-rw-r--r-- | js/NonLinear/PRODUCT.js | 6 | ||||
-rw-r--r-- | js/NonLinear/PROD_f.js | 2 | ||||
-rw-r--r-- | js/NonLinear/QUANT_f.js | 2 | ||||
-rw-r--r-- | js/NonLinear/SATURATION.js | 2 | ||||
-rw-r--r-- | js/NonLinear/SAT_f.js | 2 | ||||
-rw-r--r-- | js/NonLinear/SIGNUM.js | 2 | ||||
-rw-r--r-- | js/NonLinear/SINBLK_f.js | 2 | ||||
-rw-r--r-- | js/NonLinear/TANBLK_f.js | 2 |
24 files changed, 27 insertions, 27 deletions
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); |