Major Vignette Changes

Major updates to the vignette after Gordon’s feedback
dm13450 · Dec 8, 2017 · 3a85887 · 3a85887
1 parent f19882c
commit 3a85887
Show file tree

Hide file tree

Showing 104 changed files with 43,469 additions and 474 deletions.
diff --git a/.RData b/.RData
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -21,5 +21,4 @@ Suggests: testthat,
 Imports: gtools,
          ggplot2,
          mvtnorm
-VignetteBuilder: knitr
 RoxygenNote: 6.0.1
diff --git a/R/fit.R b/R/fit.R
@@ -47,6 +47,7 @@ Fit.default <- function(dpObj, its, updatePrior = FALSE, progressBar=TRUE) {
     }
   }
 
+  dpObj$weights <- dpObj$pointsPerCluster / dpObj$n
   dpObj$alphaChain <- alphaChain
   dpObj$weightsChain <- weightsChain
   dpObj$clusterParametersChain <- clusterParametersChain

diff --git a/dirichletprocess.Rproj b/dirichletprocess.Rproj
@@ -9,7 +9,7 @@ UseSpacesForTab: Yes
 NumSpacesForTab: 2
 Encoding: UTF-8
 
-RnwWeave: knitr
+RnwWeave: Sweave
 LaTeX: pdfLaTeX
 
 AutoAppendNewline: Yes

diff --git a/tests/testthat/test_weibull_uniform_gamma.R b/tests/testthat/test_weibull_uniform_gamma.R
@@ -20,6 +20,18 @@ test_that("Weibull Likelihood", {
 
 })
 
+test_that("Weibull Likelihood: Negative x", {
+
+  weibull_test_params_1 <- list(array(1, dim=c(1,1,1)), array(1, dim=c(1,1,1)))
+  weibull_test_params_2 <- list(array(.1, dim=c(1,1,1)), array(.1, dim=c(1,1,1)))
+  testEval <- sapply(seq(-10, -0.1, by=0.1), function(x) Likelihood(test_mdobj, x, weibull_test_params_1))
+  testEval2 <- sapply(seq(-10, -0.1, by=0.1), function(x) Likelihood(test_mdobj, x, weibull_test_params_2))
+
+  expect_true(all(testEval==0))
+  expect_true(all(testEval2==0))
+})
+
+
 test_that("Weibull Prior Density", {
 
   expect_equal(PriorDensity(test_mdobj, matrix(c(1,1),ncol=2)), dunif(1, 0,1))

diff --git a/vignettes/Custom-Distributions.Rmd b/vignettes/Custom-Distributions.Rmd