diff --git a/ChangeLog b/ChangeLog index 716def113..7c0b68f83 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2025-10-13 Dirk Eddelbuettel + + * DESCRIPTION (Version, Date): Roll micro version and date + * inst/include/Rcpp/config.h: Idem + + * inst/tinytest/test_sugar.R: Simplify and generalize the August fix + as we no longer need to control for R-devel which has been corrected + 2025-09-04 Dirk Eddelbuettel * DESCRIPTION (Version, Date): Roll micro version and date diff --git a/DESCRIPTION b/DESCRIPTION index f7f5923d2..68aeb7f6b 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: Rcpp Title: Seamless R and C++ Integration -Version: 1.1.0.3 -Date: 2025-09-04 +Version: 1.1.0.4 +Date: 2025-10-13 Authors@R: c(person("Dirk", "Eddelbuettel", role = c("aut", "cre"), email = "edd@debian.org", comment = c(ORCID = "0000-0001-6419-907X")), person("Romain", "Francois", role = "aut", diff --git a/inst/include/Rcpp/config.h b/inst/include/Rcpp/config.h index bd590db9d..d5e330708 100644 --- a/inst/include/Rcpp/config.h +++ b/inst/include/Rcpp/config.h @@ -31,7 +31,7 @@ #define RCPP_VERSION_STRING "1.1.0" // the current source snapshot (using four components, if a fifth is used in DESCRIPTION we ignore it) -#define RCPP_DEV_VERSION RcppDevVersion(1,1,0,3) -#define RCPP_DEV_VERSION_STRING "1.1.0.3" +#define RCPP_DEV_VERSION RcppDevVersion(1,1,0,4) +#define RCPP_DEV_VERSION_STRING "1.1.0.4" #endif diff --git a/inst/tinytest/test_sugar.R b/inst/tinytest/test_sugar.R index b9fbbc6d7..c92d09cef 100644 --- a/inst/tinytest/test_sugar.R +++ b/inst/tinytest/test_sugar.R @@ -1269,20 +1269,12 @@ expect_equal(cx_col_sums(x), colSums(x), info = "complex / colSums / keep NA / m expect_equal(cx_col_sums(x, TRUE), colSums(x, TRUE), info = "complex / colSums / rm NA / mixed input") expect_equal(cx_row_means(x), rowMeans(x), info = "complex / rowMeans / keep NA / mixed input") -if (getRversion() < "4.6.0") { - expect_equal(cx_row_means(x, TRUE), rowMeans(x, TRUE), info = "complex / rowMeans / rm NA / mixed input") -} else { - ## TODO FIXME R-devel has borked rowMeans / colMeans for complex matrices with NA values - expect_equal(cx_row_means(x, TRUE), apply(x, 1, mean, na.rm=TRUE), info = "complex / rowMeans / rm NA / mixed input") -} +expect_equal(cx_row_means(x, TRUE), rowMeans(x, TRUE), info = "complex / rowMeans / rm NA / mixed input") +expect_equal(cx_row_means(x, TRUE), apply(x, 1, mean, na.rm=TRUE), info = "complex / rowMeans / rm NA / mixed input") expect_equal(cx_col_means(x), colMeans(x), info = "complex / colMeans / keep NA / mixed input") -if (getRversion() < "4.6.0") { - expect_equal(cx_col_means(x, TRUE), colMeans(x, TRUE), info = "complex / colMeans / rm NA / mixed input") -} else { - ## TODO FIXME R-devel has borked rowMeans / colMeans for complex matrices with NA values - expect_equal(cx_col_means(x, TRUE), apply(x, 2, mean, na.rm=TRUE), info = "complex / rowMeans / rm NA / mixed input") -} +expect_equal(cx_col_means(x, TRUE), colMeans(x, TRUE), info = "complex / colMeans / rm NA / mixed input") +expect_equal(cx_col_means(x, TRUE), apply(x, 2, mean, na.rm=TRUE), info = "complex / colMeans / rm NA / mixed input") x[] <- NA_complex_