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

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

Author: iacus
Date: 2016-10-15 17:13:12 +0200 (Sat, 15 Oct 2016)
New Revision: 481

Modified:
   pkg/yuima/DESCRIPTION
   pkg/yuima/R/qmle.R
   pkg/yuima/R/yuima.data.R
Log:
updated onezoo

Modified: pkg/yuima/DESCRIPTION
===================================================================
--- pkg/yuima/DESCRIPTION	2016-10-15 12:31:55 UTC (rev 480)
+++ pkg/yuima/DESCRIPTION	2016-10-15 15:13:12 UTC (rev 481)
@@ -1,7 +1,11 @@
 Package: yuima
 Type: Package
 Title: The YUIMA Project Package for SDEs
+<<<<<<< .mine
+Version: 1.1.11
+=======
 Version: 1.2.0
+>>>>>>> .r480
 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/qmle.R
===================================================================
--- pkg/yuima/R/qmle.R	2016-10-15 12:31:55 UTC (rev 480)
+++ pkg/yuima/R/qmle.R	2016-10-15 15:13:12 UTC (rev 481)
@@ -958,12 +958,17 @@
         oout$hessian[measure.par,measure.par] <- hess1
      }
 
-    vcov <- if (length(coef))
-	  solve(oout$hessian)
-    else matrix(numeric(0L), 0L, 0L)
+#    vcov <- if (length(coef))
+#	  solve(oout$hessian)
+#   else matrix(numeric(0L), 0L, 0L)
 
+    vcov <- matrix(NA, length(coef), length(coef))
+    if (length(coef)) {
+        rrr <- try(solve(oout$hessian), TRUE)
+        if(class(rrr) != "try-error")
+            vcov <- rrr
+    }
 
-
     mycoef <- as.list(coef)
 
     if(!is.CARMA(yuima)){

Modified: pkg/yuima/R/yuima.data.R
===================================================================
--- pkg/yuima/R/yuima.data.R	2016-10-15 12:31:55 UTC (rev 480)
+++ pkg/yuima/R/yuima.data.R	2016-10-15 15:13:12 UTC (rev 481)
@@ -31,6 +31,7 @@
       dats <- merge(dats,dat[[i]])
     }
   }
+  colnames(dats) <- colnames(ydata at data@original.data)
   return(dats)
 }