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

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

Author: iacus
Date: 2020-02-05 15:27:15 +0100 (Wed, 05 Feb 2020)
New Revision: 716

Modified:
   pkg/yuima/DESCRIPTION
   pkg/yuima/R/asymptotic_term_third_function.R
   pkg/yuima/R/qmle.R
Log:
fixing

Modified: pkg/yuima/DESCRIPTION
===================================================================
--- pkg/yuima/DESCRIPTION	2019-09-22 21:16:17 UTC (rev 715)
+++ pkg/yuima/DESCRIPTION	2020-02-05 14:27:15 UTC (rev 716)
@@ -1,7 +1,7 @@
 Package: yuima
 Type: Package
 Title: The YUIMA Project Package for SDEs
-Version: 1.9.3
+Version: 1.9.4
 Depends: R(>= 2.10.0), methods, zoo, stats4, utils, expm, cubature,
         mvtnorm
 Imports: Rcpp (>= 0.12.1), boot (>= 1.3-2), glassoFast
@@ -10,11 +10,3 @@
 Description: Simulation and Inference for SDEs and Other Stochastic Processes.
 License: GPL-2
 URL: http://www.yuima-project.com
-LinkingTo: Rcpp, RcppArmadillo
-Repository: R-Forge
-Repository/R-Forge/Project: yuima
-Repository/R-Forge/Revision: 690
-Repository/R-Forge/DateTimeStamp: 2019-03-21 19:59:50
-Date/Publication: 2019-03-21 19:59:50
-NeedsCompilation: yes
-Packaged: 2019-03-21 20:10:10 UTC; rforge

Modified: pkg/yuima/R/asymptotic_term_third_function.R
===================================================================
--- pkg/yuima/R/asymptotic_term_third_function.R	2019-09-22 21:16:17 UTC (rev 715)
+++ pkg/yuima/R/asymptotic_term_third_function.R	2020-02-05 14:27:15 UTC (rev 716)
@@ -680,8 +680,13 @@
 		if(r.size == 1){
 			b1 <- matrix(b1,1,block)
 		}
-
+        #   b1 <- matrix(b1, ncol=block) # FIXME: should be a matrix with block-columns but it is a scalar
 		for(t in 1:block){
+            #  print(str(b1))
+            #print(t)
+            #print(block)
+            #print(str(b1[,t]))
+            #print(r.size)
 			b1a[,t] <- matrix(b1[,t],1,r.size) %*%
 				     t(matrix(aMat[,,my.range[t]],k.size,r.size))
 		}
@@ -8627,8 +8632,8 @@
 		d.size <- env$d.size
 		r.size <- env$r.size
 		block <- env$block
-
-		coef1 <- get_F_tilde1$result1[[1]][,block]
+        #  print(block)
+        coef1 <- get_F_tilde1$result1[[1]][,block] # FIXME: this is broken, should have the same dimension as block but has 2
 		coef2 <- get_F_tilde1$result2[[1]][,block]
 		coef3 <- get_F_tilde1$result3[[1]][,block]
 		coef4 <- get_F_tilde1$result4[[1]][,block]
@@ -9195,4 +9200,4 @@
 #	}
 
 
-#
\ No newline at end of file
+#

Modified: pkg/yuima/R/qmle.R
===================================================================
--- pkg/yuima/R/qmle.R	2019-09-22 21:16:17 UTC (rev 715)
+++ pkg/yuima/R/qmle.R	2020-02-05 14:27:15 UTC (rev 716)
@@ -1026,7 +1026,7 @@
   vcov <- matrix(NA, length(coef), length(coef))
   if (length(coef)) {
     rrr <- try(solve(oout$hessian), TRUE)
-    if(class(rrr) != "try-error")
+    if(class(rrr)[1] != "try-error")
       vcov <- rrr
   }