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

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

Author: iacus
Date: 2014-05-04 14:03:02 +0200 (Sun, 04 May 2014)
New Revision: 314

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

Modified: pkg/yuima/DESCRIPTION
===================================================================
--- pkg/yuima/DESCRIPTION	2014-05-04 11:00:15 UTC (rev 313)
+++ pkg/yuima/DESCRIPTION	2014-05-04 12:03:02 UTC (rev 314)
@@ -1,7 +1,7 @@
 Package: yuima
 Type: Package
 Title: The YUIMA Project package for SDEs
-Version: 1.0.20
+Version: 1.0.21
 Date: 2014-05-02
 Depends: methods, zoo, stats4, utils, expm
 Suggests: cubature, mvtnorm

Modified: pkg/yuima/R/yuima.R
===================================================================
--- pkg/yuima/R/yuima.R	2014-05-04 11:00:15 UTC (rev 313)
+++ pkg/yuima/R/yuima.R	2014-05-04 12:03:02 UTC (rev 314)
@@ -189,6 +189,8 @@
             if(!is.null(data)){
               .Object at data <- data
               eqn <- dim(data)
+              if(is.null(sampling))
+               sampling <- setSampling(grid=list(index(get.zoo.data(data)[[1]])))
             }
             
             if(!is.null(model)){
@@ -296,7 +298,7 @@
     ldif <- 0
     if(length(mod at diffusion)>0)
      ldif <- length(mod at diffusion[[1]])
-    if(ldif==1){
+    if(ldif==1 & (length(mod at diffusion)==0)){
      if( as.character(mod at diffusion[[1]]) == "(0)" ){
       has.diff <- FALSE
       is.wienerdiff <- FALSE
@@ -309,8 +311,15 @@
     if( is.wienerdiff | is.fracdiff | is.jumpdiff  ){
         if( is.wienerdiff & ! is.carma){
          cat("\nDiffusion process")
-         if( is.fracdiff & mod at hurst!=0.5)
-         cat(sprintf(" with Hurst index:%.2f", mod at hurst))
+         if( is.fracdiff ){
+             if(!is.na(mod at hurst)){
+                 if(mod at hurst!=0.5){
+                  cat(sprintf(" with Hurst index:%.2f", mod at hurst))
+                 }
+             } else {
+                 cat(" with unknown Hurst index")
+             }
+         }
         }
         if(is.carma)
           cat(sprintf("\nCarma process p=%d, q=%d", mod at info@p, mod at info@q))