diff options
author | Sunil Shetye | 2018-06-15 16:28:50 +0530 |
---|---|---|
committer | Sunil Shetye | 2018-06-15 16:43:21 +0530 |
commit | cd1c69226494b2228095aef86493ba79b5f9e6e2 (patch) | |
tree | 6392340324d89c4b7a6b78d22b6e50bcc4a78804 /js/NonLinear | |
parent | be9f32c23ef04b74ad1b07a09f0663015dc98993 (diff) | |
download | sci2js-cd1c69226494b2228095aef86493ba79b5f9e6e2.tar.gz sci2js-cd1c69226494b2228095aef86493ba79b5f9e6e2.tar.bz2 sci2js-cd1c69226494b2228095aef86493ba79b5f9e6e2.zip |
support complex in both formats
Diffstat (limited to 'js/NonLinear')
-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/LOGBLK_f.js | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/js/NonLinear/DLRADAPT_f.js b/js/NonLinear/DLRADAPT_f.js index d79aea87..7eb57e9d 100644 --- a/js/NonLinear/DLRADAPT_f.js +++ b/js/NonLinear/DLRADAPT_f.js @@ -34,7 +34,7 @@ break DLRADAPT_f.prototype.define = function DLRADAPT_f() { p=[0,1]; rn=[]; -rd=[math.complex("0.2+0.8i"),math.complex("0.2-0.8i"),math.complex("0.3+0.7i"),math.complex("0.3-0.7i")]; +rd=[math.complex(0.2,0.8),math.complex(0.2,-0.8),math.complex(0.3,0.7),math.complex(0.3,-0.7)]; g=[1,1]; last_u=[]; last_y=[0,0]; diff --git a/js/NonLinear/EXPBLK_f.js b/js/NonLinear/EXPBLK_f.js index 5c99a517..4952f704 100644 --- a/js/NonLinear/EXPBLK_f.js +++ b/js/NonLinear/EXPBLK_f.js @@ -28,7 +28,7 @@ break } EXPBLK_f.prototype.define = function EXPBLK_f() { in1=1; -a=%e; +a=math.E; model=scicos_model(); model.sim="expblk"; model.in=-1; diff --git a/js/NonLinear/EXPBLK_m.js b/js/NonLinear/EXPBLK_m.js index 5d548d31..531ca3fb 100644 --- a/js/NonLinear/EXPBLK_m.js +++ b/js/NonLinear/EXPBLK_m.js @@ -28,7 +28,7 @@ break } EXPBLK_m.prototype.define = function EXPBLK_m() { in1=1; -a=%e; +a=math.E; model=scicos_model(); model.sim=list("expblk_m",4); model.in=-1; diff --git a/js/NonLinear/LOGBLK_f.js b/js/NonLinear/LOGBLK_f.js index 8b17f02e..26210f1e 100644 --- a/js/NonLinear/LOGBLK_f.js +++ b/js/NonLinear/LOGBLK_f.js @@ -30,7 +30,7 @@ break } LOGBLK_f.prototype.define = function LOGBLK_f() { in1=1; -a=%e; +a=math.E; model=scicos_model(); model.sim="logblk"; model.in=-1; |