diff --git a/DESCRIPTION b/DESCRIPTION index 9bb3c29..ff0b2b7 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: Rclusterpp Type: Package -Title: Linkable C++ Clustering +Title: Linkable 'C++' Hierarchical Clustering Version: 0.2.6 VignetteBuilder: knitr Date: 2022-08-02 @@ -10,8 +10,7 @@ Authors@R: c(person("Michael Linderman",role="aut",email="michael.d.linderman@gm person("Robert Tibshirani",role="ctb",email="tibs@stanford.edu"), person("Balasubramanian Narasimhan",role="cre",email="naras@stanford.edu"), person("Justin Landis",role = "ctb",email = "jtlandis314@gmail.com")) -Description: Provide flexible native clustering routines that can be - linked against in downstream packages. +Description: Space efficient "stored data" implementations for common hierarchical clustering routines (simple, complex, average and Ward's linkage)that scale to hundreds of thousands of observations. Rclusterpp provides flexible native clustering functions that can be linked against in downstream packages. License: MIT + file LICENSE Depends: R (>= 2.12.0), Rcpp (>= 0.10.4) LinkingTo: Rcpp, RcppEigen diff --git a/R/Rclusterpp.package.skeleton.R b/R/Rclusterpp.package.skeleton.R index 256be1a..a8ad0cd 100644 --- a/R/Rclusterpp.package.skeleton.R +++ b/R/Rclusterpp.package.skeleton.R @@ -1,4 +1,4 @@ -# Adapted from Rclusterpp.package.skeleton.R in Rclusterpp package +# Adapted from RcppEigen.package.skeleton.R in the RcppEigen package Rclusterpp.package.skeleton <- function( name = "anRpackage", list = character(), environment = .GlobalEnv, diff --git a/tests/doRUnit.R b/tests/doRUnit.R index 02e3146..0bf8d90 100644 --- a/tests/doRUnit.R +++ b/tests/doRUnit.R @@ -10,6 +10,7 @@ if( identical( .Platform$OS.type, "windows" ) && identical( .Platform$r_arch, "x } else { path <- system.file(package=pkg, "unit_tests") } + oldwd <- getwd() setwd(path) cat("\nRunning unit tests:\n") print(list(pkg=pkg, getwd=getwd(), pathToUnitTests=path)) @@ -37,7 +38,7 @@ if( identical( .Platform$OS.type, "windows" ) && identical( .Platform$r_arch, "x # Report to HTML file #printHTMLProtocol(tests, fileName=paste(pathReport, ".html", sep="")) - + setwd(oldwd) # Return stop() to cause R CMD check stop in case of # - failures i.e. FALSE to unit tests or # - errors i.e. R errors