[Yuima-commits] r579 - in pkg/yuima: . R

[noreply at r-forge.r-project.org]

Author: iacus
Date: 2017-01-23 14:39:42 +0100 (Mon, 23 Jan 2017)
New Revision: 579

Modified:
   pkg/yuima/DESCRIPTION
   pkg/yuima/R/yuima.R
Log:
fixed show method

Modified: pkg/yuima/DESCRIPTION
===================================================================
--- pkg/yuima/DESCRIPTION	2017-01-23 09:40:08 UTC (rev 578)
+++ pkg/yuima/DESCRIPTION	2017-01-23 13:39:42 UTC (rev 579)
@@ -1,7 +1,7 @@
 Package: yuima
 Type: Package
 Title: The YUIMA Project Package for SDEs
-Version: 1.5.3
+Version: 1.5.4
 Depends: R(>= 2.10.0), methods, zoo, stats4, utils, expm, cubature, mvtnorm
 Imports: Rcpp (>= 0.12.1)
 Author: YUIMA Project Team

Modified: pkg/yuima/R/yuima.R
===================================================================
--- pkg/yuima/R/yuima.R	2017-01-23 09:40:08 UTC (rev 578)
+++ pkg/yuima/R/yuima.R	2017-01-23 13:39:42 UTC (rev 579)
@@ -312,12 +312,16 @@
     is.cogarch <- FALSE
     is.poisson <- is.Poisson(mod)
 
-    if(length(mod at drift)>0 & !all(as.character(mod at drift) %in% c("(0)","expression((0))"))) has.drift <- TRUE
-    if(length(mod at diffusion)>0 & !all(as.character(mod at diffusion) %in% c("(0)", "expression((0))"))) has.diff <- TRUE
-    if(length(mod at jump.coeff)>0) has.levy <- TRUE
-    if(!is.null(mod at hurst) & !is.na(mod at hurst)){
-     if(mod at hurst != 0.5)
-      has.fbm <- TRUE
+    if(length(mod at drift)>0 & !all(as.character(mod at drift) %in% c("(0)","expression((0))"))) { has.drift <- TRUE }
+    if(length(mod at diffusion)>0 & !all(as.character(mod at diffusion) %in% c("(0)", "expression((0))"))) { has.diff <- TRUE}
+    if(length(mod at jump.coeff)>0){ has.levy <- TRUE}
+    
+    if(!is.null(mod at hurst)){
+      if(!is.na(mod at hurst)){
+          if(mod at hurst != 0.5){
+            has.fbm <- TRUE
+          }
+      }
     }
     if( has.diff ) is.wienerdiff <- TRUE
     #if( has.drift | has.diff ) is.wienerdiff <- TRUE