version 0.7

cran · Oct 18, 2023 · d3e5183 · d3e5183
1 parent ad642c1
commit d3e5183
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 26 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,6 @@
+vscc version 0.7
+- Minor edits requested by CRAN
+
 vscc version 0.6
 - Consistent computation of BIC from vscc and vsccmanly
 

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,14 +1,15 @@
 Package: vscc
 Type: Package
 Title: Variable Selection for Clustering and Classification
-Version: 0.6
-Date: 2023-06-06
+Version: 0.7
+Date: 2023-10-17
 Authors@R: c(person("Jeffrey L.", "Andrews", role = c("aut")),
   person("Mackenzie R.", "Neal", role = "aut"),
-  person("Paul D.", "McNicholas", role = c("aut", "cre"), email = "mcnicholas@math.mcmaster.ca"))
+  person("Paul D.", "McNicholas", role = c("aut", "cre"), email = "mcnicholas@math.mcmaster.ca",
+  comment = c(ORCID = "0000-0002-2482-523X")))
 Author: Jeffrey L. Andrews [aut],
   Mackenzie R. Neal [aut],
-  Paul D. McNicholas [aut, cre]
+  Paul D. McNicholas [aut, cre] (<https://orcid.org/0000-0002-2482-523X>)
 Maintainer: Paul D. McNicholas <mcnicholas@math.mcmaster.ca>
 Description: Performs variable selection/feature reduction under a clustering or 
   classification framework. In particular, it can be used in an automated fashion 
@@ -17,9 +18,9 @@ Description: Performs variable selection/feature reduction under a clustering or
   See Andrews and McNicholas (2014) <doi:10.1007/s00357-013-9139-2> and Neal and McNicholas (2023)
   <doi:10.48550/arXiv.2305.16464>. 
 License: GPL (>= 2)
-Imports: teigen, mclust
+Imports: teigen, mclust, MixGHD
 Depends: ManlyMix
 NeedsCompilation: no
 Repository: CRAN
-Packaged: 2023-06-06 13:59:40 UTC; paul
-Date/Publication: 2023-06-06 14:10:02 UTC
+Packaged: 2023-10-17 17:17:35 UTC; paul
+Date/Publication: 2023-10-17 22:20:02 UTC
diff --git a/MD5 b/MD5
@@ -1,15 +1,15 @@
-97ee9700e887f5c675227ddd40c977b7 *ChangeLog
-027a37118007f82754e879c327a8266e *DESCRIPTION
-f6dcc6301dd2125b404b46ba2e803f82 *NAMESPACE
+d1a5abc3fd79a4755477f8ac211afb84 *ChangeLog
+4ec1f312817a0380c34766e472946bab *DESCRIPTION
+6ad3d706682390eda3e130cfdcd95c69 *NAMESPACE
 a89264140a524e5a23b352409b4d7bf0 *R/plot.vscc.R
 972aa6ba1490610d319b494faf438267 *R/print.vscc.R
 047e0a9d46d96515e37bd0cee7a531a2 *R/summary.vscc.R
-db05aaf33977fec8f84e83241700b8d4 *R/vscc.R
+9aa181eec09cfa89f93f9eaebb615539 *R/vscc.R
 d80b98b4b9f5fbc68cbb9452bdd11d05 *R/vsccmanly.R
 3c79c9cbfa84fc3505f04d04ec83f817 *inst/CITATION
-8e326ec8701ba007282f3def488202d8 *man/plot.vscc.Rd
-2756ffb174a334f94f4b454838653292 *man/print.vscc.Rd
+b26b853e12ac919dc93eecda73649831 *man/plot.vscc.Rd
+4d97f8519768f0a54b69371812d1a6f1 *man/print.vscc.Rd
 127ab493eaa074f69eeb2cbd2e17117f *man/summary.vscc.Rd
-61562fc67c9f48712ec5e528900488ed *man/vscc-package.Rd
-f3d7d8ef11cc3b68efae790dca79ea82 *man/vscc.Rd
+f6ec0f838587cf4e456b5663dd1d9fa9 *man/vscc-package.Rd
+b8c802ea87be28d3a29c0134c68aa9fe *man/vscc.Rd
 2c416b83d5c367e6daa678abd99b9c39 *man/vsccmanly.Rd
diff --git a/NAMESPACE b/NAMESPACE
@@ -1,5 +1,5 @@
 export(vscc,vsccmanly)
-import(stats, utils, teigen, mclust, ManlyMix)
+import(stats, utils, teigen, mclust, ManlyMix, MixGHD)
 importFrom("grDevices", "rainbow")
 importFrom("graphics", "pairs")
 S3method(plot, vscc)

diff --git a/R/vscc.R b/R/vscc.R
@@ -17,7 +17,7 @@ vscc <-function(x, G=1:9, automate="mclust", initial=NULL, initunc=NULL, train=N
     else{
 	  	if(automate=="teigen"){
 #	  		require("teigen")
-  			if(packageVersion("teigen")<1.9){
+  			if(as.numeric(substr(packageVersion("teigen"), 1,3))<1.9){
   				warning(paste("The 'vscc' package requires 'teigen' version 1.9 or higher, version", packageVersion("teigen"), "is currently installed: issues may arise."))
   			}
 	  		if(is.null(initial)){
@@ -42,7 +42,7 @@ vscc <-function(x, G=1:9, automate="mclust", initial=NULL, initunc=NULL, train=N
 	  	else{
 		  	if(automate=="mclust"){
 #			  	require("mclust")
-		  		if(packageVersion("mclust")<4.0){
+		  		if(as.numeric(substr(packageVersion("mclust"), 1,3))<4.0){
 		  			warning(paste("VSCC requires 'mclust' version 4.0 or higher, version", packageVersion("mclust"), "is currently installed: issues may arise."))
 		  		}
 		  		if(is.null(initial)){

diff --git a/man/plot.vscc.Rd b/man/plot.vscc.Rd
@@ -30,7 +30,8 @@ Jeffrey L. Andrews
 \examples{
 require("mclust")
 data(banknote)
-bankrun <- vscc(banknote[,-1])
+X<-banknote[,-1]
+bankrun <- vscc(X)
 plot(bankrun)
 }
 %\keyword{ ~kwd1 }
diff --git a/man/print.vscc.Rd b/man/print.vscc.Rd
@@ -35,6 +35,7 @@ Jeffrey L. Andrews
 \examples{
 require("mclust")
 data(banknote)
-vscc(banknote[,-1])
+X<-banknote[,-1]
+vscc(X)
 }
 %\keyword{ ~kwd1 }
diff --git a/man/vscc-package.Rd b/man/vscc-package.Rd
@@ -9,9 +9,9 @@ Performs variable selection under a clustering or classification framework. Auto
 \tabular{ll}{
 Package: \tab vscc\cr
 Type: \tab Package\cr
-Version: \tab 0.5\cr
-Date: \tab 2023-05-02\cr
-License: \tab GPL>=2\cr
+Version: \tab 0.7\cr
+Date: \tab 2023-10-17\cr
+License: \tab GPL>="2"\cr
 }
 }
 \author{
@@ -22,7 +22,7 @@ Maintainer: Paul D. McNicholas <mcnicholas@math.mcmaster.ca>
 \references{
 See \code{citation("vscc")}.
 }
-\keyword{ package }
+\keyword{package}
 \seealso{
 \code{\link{vscc}}
 }

diff --git a/man/vscc.Rd b/man/vscc.Rd
@@ -77,8 +77,8 @@ Jeffrey L. Andrews, Paul D. McNicholas
 }
 \examples{
 require("mclust")
-data(banknote) #Load data
-head(banknote[,-1]) #Show preview of full data set
+data(banknote)
+head(banknote)
 bankrun <- vscc(banknote[,-1])
 head(bankrun$topselected) #Show preview of selected variables
 table(banknote[,1], bankrun$initialrun$classification) #Clustering results on full data set