Merge pull request #10 from dm13450/devrfix

Devrfix
dm13450 · Dec 10, 2019 · 60b8122 · 60b8122
2 parents 28faf09 + 9c3c30b
commit 60b8122
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 16 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -20,6 +20,8 @@ cache: packages
 r_packages:
   - covr
 
+r_build_args: '--compact-vignettes="gs+qpdf"'
+
 addons:
   apt:
     packages:

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: dirichletprocess
 Type: Package
 Title: Build Dirichlet Process Objects for Bayesian Modelling
-Version: 0.3.0.9000
+Version: 0.3.1
 Authors@R: c(
             person("Gordon", "J. Ross", email="[email protected]", role=c("aut")),
             person("Dean", "Markwick", email="[email protected]", role=c("aut", "cre")),

diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,12 @@
-# dirichletprocess 0.3.3
+# dirichletprocess 0.3.1
+
+* Fixed matrix class checking for R 4.0.0
+* Corrected typos in vignette
+* Added a parameter for the number of initial clusters in DirichletProcessMvnormal.
+* Various refactoring.
+
+
+# dirichletprocess 0.3.0
 
 * Added Hidden Markov models.
 * Fixed bug in PosteriorClusters and PosteriorFunction.

diff --git a/R/mvnormal_semi_conjugate.R b/R/mvnormal_semi_conjugate.R
@@ -5,7 +5,7 @@
 Mvnormal2Create <- function(priorParameters) {
 
 
-  if (class(priorParameters$mu0) != "matrix"){
+  if (!is.matrix(priorParameters$mu0)){
     priorParameters$mu0 <- matrix(priorParameters$mu0, nrow=1)
   }
 

diff --git a/R/utilities.R b/R/utilities.R
@@ -12,7 +12,7 @@ weighted_function_generator <- function(func, weights, params) {
 
   weightedFunc <- function(y) {
 
-    if (class(y) %in% c("matrix", "data.frame")){
+    if (is.matrix(y) || is.data.frame(y)){
       out <- numeric(nrow(y))
       y <- as.matrix(y)
     }

diff --git a/cran-comments.md b/cran-comments.md
@@ -1,22 +1,15 @@
--dirichletprocess 0.3.0
+-dirichletprocess 0.3.1
 -----------------------
 
-## Resubmission
 
-This is a resubmission. In this version I have:
-
-* Removed the uneeded LICENSE file
-
-This is an update to the previous submission. 
 
 ## Changes
 In this version I have:
 
-* Added Hidden Markov models.
-* Fixed bug in PosteriorClusters and PosteriorFunction.
-* Added in new Beta mixture model for avoiding boundary. 
-* Fixed a bug in ChangeObservations when using more than one dimension. 
-* Added in Burn, Print and Diagnostic Plots.
+* Fixed matrix class checking for R 4.0.0
+* Corrected typos in vignette
+* Added a parameter for the number of initial clusters in DirichletProcessMvnormal.
+* Various refactoring.
 
 ## Test environments
 * local OS X install, R 3.5.0
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,6 +20,8 @@ cache: packages @@
     r_packages:
       - covr
+    r_build_args: '--compact-vignettes="gs+qpdf"'
     addons:
       apt:
         packages:
@@ Expand Down @@