Skip to content

Improve na_omit for vectors without NA #492

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
Jun 15, 2016
Merged

Improve na_omit for vectors without NA #492

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
2cd6f61
Improve na_omit for vectors without NA
artemklevtsov Jun 13, 2016
dc66f93
Add an unit tests for the sugar na_omit
artemklevtsov Jun 14, 2016
1f519e2
Add an entry to the Changelog
artemklevtsov Jun 14, 2016
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
7 changes: 7 additions & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
2016-06-14 Artem Klevtsov <a.a.klevtsov@gmail.com>

* inst/include/Rcpp/sugar/functions/na_omit.h: Improve na_omit for
vectors without NA
* inst/unitTests/cpp/sugar.cpp: Add unit test for the na_omit
* inst/unitTests/runit.sugar.R: Ditto

2016-06-02 Kirill Müller <krlmlr@mailbox.org>

* inst/include/Rcpp/algorithm.h: Use "long long" only if available
Expand Down
9 changes: 7 additions & 2 deletions inst/include/Rcpp/sugar/functions/na_omit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ namespace sugar{
R_xlen_t n = x.size() ;
R_xlen_t n_out = n - sum( is_na(x) ) ;

Vector<RTYPE> out(n_out) ;
if( n_out == n ) return x ;

Vector<RTYPE> out = no_init(n_out) ;
for( R_xlen_t i=0, j=0; i<n; i++){
if( Vector<RTYPE>::is_na( x[i] ) ) continue ;
out[j++] = x[i];
Expand All @@ -43,7 +45,10 @@ namespace sugar{
R_xlen_t n = x.size() ;
R_xlen_t n_out = n - sum( is_na(x) ) ;

Vector<RTYPE> out(n_out) ;
if( n_out == n ) return x;

Vector<RTYPE> out = no_init(n_out) ;

bool has_name = x.attr("names") != R_NilValue ;
if( has_name ){
CharacterVector names = x.attr("names") ;
Expand Down
5 changes: 5 additions & 0 deletions inst/unitTests/cpp/sugar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,11 @@ LogicalVector runit_any_isna( NumericVector xx){
return any( is_na( xx ) ) ;
}

// [[Rcpp::export]]
NumericVector runit_na_omit( NumericVector xx ){
return na_omit( xx ) ;
}

// [[Rcpp::export]]
List runit_lapply( IntegerVector xx){
List res = lapply( xx, seq_len );
Expand Down
10 changes: 10 additions & 0 deletions inst/unitTests/runit.sugar.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,16 @@ if (.runThisTest) {
checkEquals( fx( c(1:5,NA,7:10) ) , TRUE )
}

test.sugar.na_omit.na <- function( ){
fx <- runit_na_omit
checkEquals( fx( c(1:5,NA,7:10) ), fx( c(1:5,7:10) ) )
}

test.sugar.na_omit.nona <- function( ){
fx <- runit_na_omit
checkEquals( fx( c(1:10) ), fx( c(1:10) ) )
}

test.sugar.lapply <- function( ){
fx <- runit_lapply
checkEquals( fx( 1:10 ), lapply( 1:10, seq_len ) )
Expand Down