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

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

Author: iacus
Date: 2016-10-25 17:20:09 +0200 (Tue, 25 Oct 2016)
New Revision: 487

Modified:
   pkg/yuima/DESCRIPTION
   pkg/yuima/R/yuima.data.R
Log:
new ver

Modified: pkg/yuima/DESCRIPTION
===================================================================
--- pkg/yuima/DESCRIPTION	2016-10-20 07:54:10 UTC (rev 486)
+++ pkg/yuima/DESCRIPTION	2016-10-25 15:20:09 UTC (rev 487)
@@ -1,7 +1,7 @@
 Package: yuima
 Type: Package
 Title: The YUIMA Project Package for SDEs
-Version: 1.2.2
+Version: 1.2.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.data.R
===================================================================
--- pkg/yuima/R/yuima.data.R	2016-10-20 07:54:10 UTC (rev 486)
+++ pkg/yuima/R/yuima.data.R	2016-10-25 15:20:09 UTC (rev 487)
@@ -31,8 +31,14 @@
       dats <- merge(dats,dat[[i]])
     }
   }
-  if(length(dat)>1){
-   colnames(dats) <- colnames(ydata at data@original.data)
+  
+  if(!is.null(dim(dats))){
+    if(class(ydata)=="yuima")
+     colnames(dats) <- colnames(ydata at data@original.data)
+    if(class(ydata)=="yuima.data")
+      colnames(dats) <- colnames(ydata at original.data)
+     
+      
   }
   
   return(dats)