Skip to content

Generalized a test which had adjusted to a (temporary) R-devel issue (closes #1397) #1399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 13, 2025
Merged

Generalized a test which had adjusted to a (temporary) R-devel issue (closes #1397) #1399

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89de1b2
Generalized a test which had adjusted to a (temporary) R-devel issue
eddelbuettel Oct 13, 2025
2f4a5ee
Correct a nit picked (quite correctly) by copilot
eddelbuettel Oct 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
2025-10-13 Dirk Eddelbuettel <edd@debian.org>

* 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 <edd@debian.org>

* DESCRIPTION (Version, Date): Roll micro version and date
Expand Down
4 changes: 2 additions & 2 deletions DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 2 additions & 2 deletions inst/include/Rcpp/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
16 changes: 4 additions & 12 deletions inst/tinytest/test_sugar.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 / rowMeans / rm NA / mixed input")

x[] <- NA_complex_

Expand Down