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

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

Author: iacus
Date: 2014-09-03 19:27:50 +0200 (Wed, 03 Sep 2014)
New Revision: 324

Modified:
   pkg/yuima/DESCRIPTION
   pkg/yuima/NAMESPACE
   pkg/yuima/R/adaBayes.R
   pkg/yuima/R/asymptotic_term_second.R
   pkg/yuima/R/asymptotic_term_third.R
Log:
fixed for CRAN submission

Modified: pkg/yuima/DESCRIPTION
===================================================================
--- pkg/yuima/DESCRIPTION	2014-09-03 10:56:19 UTC (rev 323)
+++ pkg/yuima/DESCRIPTION	2014-09-03 17:27:50 UTC (rev 324)
@@ -1,10 +1,9 @@
 Package: yuima
 Type: Package
 Title: The YUIMA Project package for SDEs
-Version: 1.0.27
-Date: 2014-09-03
-Depends: methods, zoo, stats4, utils, expm
-Suggests: cubature, mvtnorm
+Version: 1.0.28
+Date: 2014-09-04
+Depends: methods, zoo, stats4, utils, expm, cubature, mvtnorm
 Author: YUIMA Project Team
 Maintainer: Stefano M. Iacus <stefano.iacus at unimi.it>
 Description: Simulation and Inference for Stochastic Differential Equations

Modified: pkg/yuima/NAMESPACE
===================================================================
--- pkg/yuima/NAMESPACE	2014-09-03 10:56:19 UTC (rev 323)
+++ pkg/yuima/NAMESPACE	2014-09-03 17:27:50 UTC (rev 324)
@@ -2,10 +2,12 @@
 
 ##importFrom("stats", "end", "time", "start")
 importFrom("graphics", "plot")
-importFrom("zoo")
+import("zoo")
 importFrom(stats, confint)
-importFrom(stats4)
-importFrom(expm)
+import("stats4")
+import("expm")
+import("mvtnorm")
+import("cubature")
 
 importFrom(utils, toLatex)
 

Modified: pkg/yuima/R/adaBayes.R
===================================================================
--- pkg/yuima/R/adaBayes.R	2014-09-03 10:56:19 UTC (rev 323)
+++ pkg/yuima/R/adaBayes.R	2014-09-03 17:27:50 UTC (rev 324)
@@ -14,11 +14,7 @@
 	print <- FALSE
 	
 	call <- match.call()
-	if(method=="mcmc"){
-		require(mvtnorm)
-	}else{
-		require(cubature)
-	}
+
 	if( missing(yuima))
 		yuima.stop("yuima object is missing.")
 	
Modified: pkg/yuima/R/asymptotic_term_second.R
===================================================================
--- pkg/yuima/R/asymptotic_term_second.R	2014-09-03 10:56:19 UTC (rev 323)
+++ pkg/yuima/R/asymptotic_term_second.R	2014-09-03 17:27:50 UTC (rev 324)
@@ -395,7 +395,7 @@
 
 
 	## get d0
-	## required library(adapt)
+	## 
 
 	get.d0.term <- function(){
 
@@ -421,7 +421,7 @@
 
 			tmp <- integrate(gz_pi02,mu-7*sqrt(Sigma),mu+7*sqrt(Sigma))$value
 
-		}else if( 2 <= k.size || k.size <= 20 ){	# use library 'adapt' to solve multi-dimentional integration
+		}else if( 2 <= k.size || k.size <= 20 ){	# use  'cubature' to solve multi-dimentional integration
 
 			lambda <- eigen(Sigma)$values
 			matA <- eigen(Sigma)$vector
@@ -744,7 +744,7 @@
 	}
 
 	# calculate d1
-	## required library(adapt)
+	## 
 
 	get.d1.term<- function(){
 
Modified: pkg/yuima/R/asymptotic_term_third.R
===================================================================
--- pkg/yuima/R/asymptotic_term_third.R	2014-09-03 10:56:19 UTC (rev 323)
+++ pkg/yuima/R/asymptotic_term_third.R	2014-09-03 17:27:50 UTC (rev 324)
@@ -393,7 +393,7 @@
 
 
 	## get d0
-	## required library(adapt)
+	## 
 
 	get.d0.term <- function(){
 
@@ -419,7 +419,7 @@
 
 			tmp <- integrate(gz_pi02,mu-7*sqrt(Sigma),mu+7*sqrt(Sigma))$value
 
-		}else if( 2 <= k.size || k.size <= 20 ){	# use library 'adapt' to solve multi-dimentional integration
+		}else if( 2 <= k.size || k.size <= 20 ){	# use 'cubature' to solve multi-dimentional integration
 
 			lambda <- eigen(Sigma)$values
 			matA <- eigen(Sigma)$vector
@@ -736,7 +736,7 @@
 	}
 
 	# calculate d1
-	## required library(adapt)
+	## 
 
 	get.d1.term<- function(){