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

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

Author: iacus
Date: 2017-01-23 01:35:30 +0100 (Mon, 23 Jan 2017)
New Revision: 574

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

Modified: pkg/yuima/DESCRIPTION
===================================================================
--- pkg/yuima/DESCRIPTION	2017-01-22 08:59:49 UTC (rev 573)
+++ pkg/yuima/DESCRIPTION	2017-01-23 00:35:30 UTC (rev 574)
@@ -1,7 +1,7 @@
 Package: yuima
 Type: Package
 Title: The YUIMA Project Package for SDEs
-Version: 1.5.0
+Version: 1.5.1
 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-22 08:59:49 UTC (rev 573)
+++ pkg/yuima/R/yuima.R	2017-01-23 00:35:30 UTC (rev 574)
@@ -312,19 +312,22 @@
     is.cogarch <- FALSE
     is.poisson <- is.Poisson(mod)
 
-    if(length(mod at drift)>0) has.drift <- TRUE
-    if(length(mod at diffusion)>0) has.diff <- 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)) has.fbm <- TRUE
-    
-    if( has.drift | has.diff ) is.wienerdiff <- TRUE
+    if(!is.null(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
     if( has.fbm  ) is.fracdiff <- TRUE
     if( has.levy ) is.jumpdiff <- TRUE
     ldif <- 0
     if(length(mod at diffusion)>0)
      ldif <- length(mod at diffusion[[1]])
     if(ldif==1 & (length(mod at diffusion)==0)){
-     if( as.character(mod at diffusion[[1]]) == "(0)" ){
+     if( as.character(mod at diffusion[[1]]) %in% c("(0)","expression(0)") ){
       has.diff <- FALSE
       is.wienerdiff <- FALSE
       is.fracdiff <- FALSE
@@ -337,10 +340,11 @@
       is.wienerdiff <- FALSE
       is.fracdiff <- FALSE
     }
-      
+    
     if( is.wienerdiff | is.fracdiff | is.jumpdiff  ){
         if( is.wienerdiff & ! is.carma & !is.poisson & !is.cogarch){
          cat("\nDiffusion process")
+         if(!has.drift) cat(", driftless")
          if( is.fracdiff ){
              if(!is.na(mod at hurst)){
                  if(mod at hurst!=0.5){
@@ -358,15 +362,16 @@
         if(is.poisson)
           cat("\nCompound Poisson process")
           
-        if( (is.jumpdiff & ! is.cogarch) ){
+        if( (is.jumpdiff & !is.cogarch) ){
             if( (is.wienerdiff | is.carma) & !is.poisson ){
                 cat(" with Levy jumps")
             } else {
                 if(!is.poisson)
-                cat("Levy jump process")
+                cat("Levy process")
             }
         }else{
-          cat(" with Levy jumps")
+          if(is.jumpdiff)
+           cat(" with Levy jumps")
         }
         
         cat(sprintf("\nNumber of equations: %d", mod at equation.number))