diff --git a/DESCRIPTION b/DESCRIPTION index 1ae92b3..8c01ffc 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: clevr Type: Package Title: Clustering and Link Prediction Evaluation in R -Version: 0.1.1 -Date: 2020-11-29 +Version: 0.1.2 +Date: 2023-09-16 Authors@R: c( person(given = "Neil", family = "Marchant", @@ -29,7 +29,7 @@ Imports: Rcpp (>= 1.0.5), stats, Matrix LinkingTo: Rcpp, BH (>= 1.69.0) -RoxygenNote: 7.1.1 +RoxygenNote: 7.2.3 Roxygen: list(markdown = TRUE) Suggests: testthat URL: https://github.com/cleanzr/clevr diff --git a/NAMESPACE b/NAMESPACE index d5597f6..9beaba6 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -31,7 +31,6 @@ import(Rcpp) importFrom(Matrix,colSums) importFrom(Matrix,crossprod) importFrom(Matrix,rowSums) -importFrom(Matrix,tcrossprod) importFrom(Matrix,which) importFrom(Rcpp,evalCpp) importFrom(stats,na.action) diff --git a/NEWS.md b/NEWS.md index dcbf22a..76d9562 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,6 @@ +# clevr 0.1.2 +* Address compatibility issue with Matrix 1.6-2 release + # clevr 0.1.1 * Fix behavior when pairs are represented using different types * Improve documentation by adding examples diff --git a/cran-comments.md b/cran-comments.md index 638b050..264be58 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,27 +1,10 @@ -## Resubmission -This is a resubmission. - -There were two comments to address: - -> If there are references describing the methods in your package, please -add these in the description field of your DESCRIPTION file - -The methods implemented in the package are not tied to a particular research -paper, hence there is no obvious reference to cite. - -> We do not need "+ file LICENSE" and the file as these are part of R. - -"| file LICENSE" has been removed from the DESCRIPTION file, and the LICENSE -file has been removed from the package source. - ## Comments -First release on CRAN. +Minor release to address incompatibility with upcoming release of Matrix package. ## Test environments -* Windows 10, R 4.0.3 -* Fedora 33, R 4.0.3 -* winbuilder (devel) +* Fedora 38, R 4.3.1 +* winbuilder, R 4.3.1 ## R CMD check results diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp index c320025..22dc2f1 100644 --- a/src/RcppExports.cpp +++ b/src/RcppExports.cpp @@ -5,6 +5,11 @@ using namespace Rcpp; +#ifdef RCPP_USE_GLOBAL_ROSTREAM +Rcpp::Rostream& Rcpp::Rcout = Rcpp::Rcpp_cout_get(); +Rcpp::Rostream& Rcpp::Rcerr = Rcpp::Rcpp_cerr_get(); +#endif + // pairs_to_membership_cpp IntegerVector pairs_to_membership_cpp(const IntegerMatrix& pairs, int num_records); RcppExport SEXP _clevr_pairs_to_membership_cpp(SEXP pairsSEXP, SEXP num_recordsSEXP) {