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

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

Author: iacus
Date: 2017-01-23 09:01:57 +0100 (Mon, 23 Jan 2017)
New Revision: 577

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

Modified: pkg/yuima/DESCRIPTION
===================================================================
--- pkg/yuima/DESCRIPTION	2017-01-23 06:44:41 UTC (rev 576)
+++ pkg/yuima/DESCRIPTION	2017-01-23 08:01:57 UTC (rev 577)
@@ -1,7 +1,7 @@
 Package: yuima
 Type: Package
 Title: The YUIMA Project Package for SDEs
-Version: 1.5.2
+Version: 1.5.3
 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 06:44:41 UTC (rev 576)
+++ pkg/yuima/R/yuima.R	2017-01-23 08:01:57 UTC (rev 577)
@@ -315,7 +315,7 @@
     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.null(mod at hurst) & !is.na(mod at hurst)){
      if(mod at hurst != 0.5)
       has.fbm <- TRUE
     }
@@ -377,7 +377,7 @@
         cat(sprintf("\nNumber of equations: %d", mod at equation.number))
         if((is.wienerdiff | is.fracdiff) & !is.poisson)
          cat(sprintf("\nNumber of Wiener noises: %d", mod at noise.number))
-        if(is.jumpdiff)
+        if(is.jumpdiff & !is.poisson)
          cat(sprintf("\nNumber of Levy noises: %d", 1))
         if(is.cogarch)
           cat(sprintf("\nNumber of quadratic variation: %d", 1))