diff -Nru acebayes-1.5.1/debian/changelog acebayes-1.5.2/debian/changelog --- acebayes-1.5.1/debian/changelog 2018-11-23 02:55:16.000000000 +0000 +++ acebayes-1.5.2/debian/changelog 2018-11-23 02:55:16.000000000 +0000 @@ -1,14 +1,21 @@ -acebayes (1.5.1-1cran1ppa0) xenial; urgency=medium +acebayes (1.5.2-1cran1ppa0) xenial; urgency=medium - * Compilation for Ubuntu 16.04.4 LTS + * Compilation for Ubuntu 16.04.5 LTS + + -- Michael Rutter Fri, 23 Nov 2018 02:53:58 +0000 + +acebayes (1.5.2-1cran1) testing; urgency=low + + * cran2deb svn: 362M with DB version 1. + + -- cran2deb4ubuntu Thu, 22 Nov 2018 10:39:00 -0500 - -- Michael Rutter Sat, 15 Sep 2018 18:56:44 +0000 acebayes (1.5.1-1cran1) testing; urgency=low * cran2deb svn: 362M with DB version 1. - -- cran2deb4ubuntu Sat, 15 Sep 2018 09:39:54 -0400 + -- cran2deb4ubuntu Sat, 15 Sep 2018 09:40:02 -0400 acebayes (1.5-1cran1) testing; urgency=low diff -Nru acebayes-1.5.1/DESCRIPTION acebayes-1.5.2/DESCRIPTION --- acebayes-1.5.1/DESCRIPTION 2018-09-13 10:50:03.000000000 +0000 +++ acebayes-1.5.2/DESCRIPTION 2018-11-21 12:30:02.000000000 +0000 @@ -1,8 +1,8 @@ Package: acebayes Type: Package Title: Optimal Bayesian Experimental Design using the ACE Algorithm -Version: 1.5.1 -Date: 2018-09-13 +Version: 1.5.2 +Date: 2018-11-21 Author: Antony M. Overstall, David C. Woods & Maria Adamou Maintainer: Antony M. Overstall Description: Optimal Bayesian experimental design using the approximate coordinate exchange (ACE) algorithm. @@ -13,6 +13,6 @@ Suggests: R.rsp VignetteBuilder: R.rsp NeedsCompilation: yes -Packaged: 2018-09-13 09:54:30 UTC; amo105 +Packaged: 2018-11-21 11:58:42 UTC; amo105 Repository: CRAN -Date/Publication: 2018-09-13 10:50:03 UTC +Date/Publication: 2018-11-21 12:30:02 UTC Binary files /tmp/tmpV6UthU/3TEFabCdC1/acebayes-1.5.1/inst/doc/acebayes.pdf and /tmp/tmpV6UthU/YUiU2mLTzp/acebayes-1.5.2/inst/doc/acebayes.pdf differ diff -Nru acebayes-1.5.1/man/acebayes-package.Rd acebayes-1.5.2/man/acebayes-package.Rd --- acebayes-1.5.1/man/acebayes-package.Rd 2018-09-13 09:53:56.000000000 +0000 +++ acebayes-1.5.2/man/acebayes-package.Rd 2018-11-21 11:57:32.000000000 +0000 @@ -26,8 +26,8 @@ \tabular{ll}{ Package: \tab acebayes\cr Type: \tab Package\cr -Version: \tab 1.5.1\cr -Date: \tab 2018-09-13\cr +Version: \tab 1.5.2\cr +Date: \tab 2018-11-21\cr License: \tab GPL-2\cr } The most important functions are as follows. diff -Nru acebayes-1.5.1/MD5 acebayes-1.5.2/MD5 --- acebayes-1.5.1/MD5 2018-09-13 10:50:03.000000000 +0000 +++ acebayes-1.5.2/MD5 2018-11-21 12:30:03.000000000 +0000 @@ -1,12 +1,12 @@ -66b24b601332a263cb196351c833c005 *DESCRIPTION +29ecb6bca64aa3f74b115e4f5daf0fdf *DESCRIPTION 1f3d20f7a979a2624f70f1f131b27ca8 *NAMESPACE -8e7f4f3157ccb706a4623f832ad7f7dc *R/acebayes.R +150e2cbddfbab5e36d65e89de053f9ed *R/acebayes.R 0f999fd76f6935f6106c60e045f03151 *R/sysdata.rda 5eb4b0c6016256abb49ab2372b9894fa *build/vignette.rds -b48e70478c21dee3d94d8f8f03571e15 *inst/doc/acebayes.pdf +e34a4a390056d99b1a6caa7aa7b11473 *inst/doc/acebayes.pdf 29c17b2c90236aa0b33246b5522c4ec1 *inst/doc/acebayes.pdf.asis 1d5adb3ce5f06906451e12238062ba6a *man/ace.Rd -e13377880033765412ac052ae80a0c66 *man/acebayes-package.Rd +d475b8d976cbc62042c51d40bd28eba6 *man/acebayes-package.Rd 720ea6942ecb6d396abd4e21c181668d *man/aceglm.Rd 48869a44cb8d9f12c52d0b2b6b3c781d *man/acenlm.Rd 333470099e4184395269c4dd5dc80375 *man/aceobjects.Rd diff -Nru acebayes-1.5.1/R/acebayes.R acebayes-1.5.2/R/acebayes.R --- acebayes-1.5.1/R/acebayes.R 2018-09-13 09:53:56.000000000 +0000 +++ acebayes-1.5.2/R/acebayes.R 2018-11-21 11:57:32.000000000 +0000 @@ -400,8 +400,8 @@ if (criterion == "A" | criterion == "D" | criterion == "E") { if(identical(method, "quadrature")) { - no.terms <- 1 + length(attr(terms(formula), "term.labels")) - + #no.terms <- 1 + length(attr(terms(formula), "term.labels")) #### Problem here if you don't want an interecpt + no.terms <- attr(terms(formula), "intercept") + length(attr(terms(formula), "term.labels")) if(identical(names(prior)[1:2], c("mu", "sigma2"))) { if(identical(length(prior$mu), as.integer(1))) { qmu <- rep(prior$mu, no.terms) @@ -950,8 +950,8 @@ } mu1 <- matrix(grad(d = d3, paras = sam3)[1:(B2 * n1)], ncol = n1, byrow = TRUE) - mu2 <- mu1[-(1:B), ] - mu1 <- mu1[1:B, ] + mu2 <- matrix(mu1[-(1:B), ],nrow=B) + mu1 <- matrix(mu1[1:B, ],nrow=B) y <- matrix(rnorm(n = n1 * B, mean = as.vector(mu1), sd = rep(sqrt(sam[1:B, colnames(sam) == "sig2"]), n1)), ncol = n1) @@ -976,8 +976,8 @@ } mu1 <- matrix(grad(d = d3, paras = sam3)[1:(B2 * n1)], ncol = n1, byrow = TRUE) - mu2 <- mu1[-(1:B), ] - mu1 <- mu1[1:B, ] + mu2 <- matrix(mu1[-(1:B), ],nrow=B) + mu1 <- matrix(mu1[1:B, ],nrow=B) y <- matrix(rnorm(n = n1 * B, mean = as.vector(mu1), sd = rep(sqrt(sam[1:B, colnames(sam) == "sig2"]), n1)), ncol = n1)