Skip to content

Feature/complete pr799 #800

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 3 commits into from
Jan 14, 2018
Merged

Feature/complete pr799 #800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fcfdc2d
simplify is_na()
krlmlr Jan 11, 2018
38d024f
NEWS
krlmlr Jan 11, 2018
bd491da
also speed up complex case (extending #799)
eddelbuettel Jan 14, 2018
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
10 changes: 9 additions & 1 deletion ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
2018-01-14 Dirk Eddelbuettel <edd@debian.org>

* inst/include/Rcpp/traits/is_na.h (Rcpp): Also speed up
Rcpp::is_na<Rcomplex>

2018-01-11 Kirill Müller <krlmlr@mailbox.org>

* inst/include/Rcpp/traits/is_na.h: Speed up Rcpp::is_na<double>()

2018-01-09 Iñaki Ucar <i.ucar86@gmail.com>

* inst/include/Rcpp/vector/proxy.h: Improve support for NVCC, the CUDA
compiler (pull request #798, fixed issue #797)

2018-01-06 Kendon Bell <kmb56@berkeley.edu>

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: 0.12.14.5
Date: 2017-12-21
Version: 0.12.14.6
Date: 2018-01-14
Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey, Qiang Kou,
Nathan Russell, Douglas Bates and John Chambers
Maintainer: Dirk Eddelbuettel <edd@debian.org>
Expand Down
8 changes: 4 additions & 4 deletions inst/include/Rcpp/traits/is_na.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
//
// is_na.h: Rcpp R/C++ interface class library -- vector operators
//
// Copyright (C) 2010 - 2013 Dirk Eddelbuettel and Romain Francois
// Copyright (C) 2010 - 2018 Dirk Eddelbuettel and Romain Francois
// Copyright (C) 2018 Dirk Eddelbuettel and Kirill Mueller
//
// This file is part of Rcpp.
//
Expand Down Expand Up @@ -39,13 +40,12 @@ namespace Rcpp{

template <>
inline bool is_na<REALSXP>(double x) {
return internal::Rcpp_IsNA(x) || internal::Rcpp_IsNaN(x);
return R_isnancpp(x);
}

template <>
inline bool is_na<CPLXSXP>(Rcomplex x) {
return internal::Rcpp_IsNA(x.r) || internal::Rcpp_IsNA(x.i) ||
internal::Rcpp_IsNaN(x.r) || internal::Rcpp_IsNaN(x.i);
return R_isnancpp(x.r) || R_isnancpp(x.i);
}

template <>
Expand Down