[Rcpp-commits] r1600 - in pkg/Rcpp: . inst/include/Rcpp/sugar inst/unitTests
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Fri Jun 18 14:04:23 CEST 2010
Author: romain
Date: 2010-06-18 14:04:23 +0200 (Fri, 18 Jun 2010)
New Revision: 1600
Added:
pkg/Rcpp/inst/include/Rcpp/sugar/unary_minus.h
pkg/Rcpp/inst/unitTests/runit.sugar.unary.minus.R
Modified:
pkg/Rcpp/TODO
pkg/Rcpp/inst/include/Rcpp/sugar/sugar.h
Log:
unary operator-(VectorBase)
Modified: pkg/Rcpp/TODO
===================================================================
--- pkg/Rcpp/TODO 2010-06-18 11:42:06 UTC (rev 1599)
+++ pkg/Rcpp/TODO 2010-06-18 12:04:23 UTC (rev 1600)
@@ -98,6 +98,8 @@
not sure what is best. Actually the last version is a bad idea because
in R : NA == TRUE is NA
+
+ o Compound operators: ++,--,+=, -=, ...
Testing
Modified: pkg/Rcpp/inst/include/Rcpp/sugar/sugar.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/sugar/sugar.h 2010-06-18 11:42:06 UTC (rev 1599)
+++ pkg/Rcpp/inst/include/Rcpp/sugar/sugar.h 2010-06-18 12:04:23 UTC (rev 1600)
@@ -39,5 +39,6 @@
// unary operators
#include <Rcpp/sugar/not.h>
+#include <Rcpp/sugar/unary_minus.h>
#endif
Added: pkg/Rcpp/inst/include/Rcpp/sugar/unary_minus.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/sugar/unary_minus.h (rev 0)
+++ pkg/Rcpp/inst/include/Rcpp/sugar/unary_minus.h 2010-06-18 12:04:23 UTC (rev 1600)
@@ -0,0 +1,120 @@
+// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 8 -*-
+//
+// unary_minus.h: Rcpp R/C++ interface class library -- unary operator-
+//
+// Copyright (C) 2010 Dirk Eddelbuettel and Romain Francois
+//
+// This file is part of Rcpp.
+//
+// Rcpp is free software: you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
+//
+// Rcpp is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Rcpp. If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef Rcpp__sugar__unary_minus_h
+#define Rcpp__sugar__unary_minus_h
+
+namespace Rcpp{
+namespace sugar{
+
+ template <int RTYPE>
+ struct unary_minus_result_type{
+ typedef typename traits::storage_type<RTYPE>::type type ;
+ enum{ value = RTYPE } ;
+ } ;
+ template <>
+ struct unary_minus_result_type<LGLSXP>{
+ typedef traits::storage_type<INTSXP>::type type ;
+ enum{ value = INTSXP } ;
+ } ;
+
+
+ template <int RTYPE,bool NA>
+ class unary_minus {
+ public:
+ typedef typename traits::storage_type<RTYPE>::type STORAGE ;
+ typedef typename unary_minus_result_type<RTYPE>::type RESULT ;
+ inline RESULT apply( STORAGE x ) const {
+ return Rcpp::traits::is_na<RTYPE>(x) ? x : ( -x ) ;
+ }
+ } ;
+ template <int RTYPE>
+ class unary_minus<RTYPE,false> {
+ public:
+ typedef typename Rcpp::traits::storage_type<RTYPE>::type STORAGE ;
+ typedef typename unary_minus_result_type<RTYPE>::type RESULT ;
+ inline RESULT apply( STORAGE x ) const {
+ return -x ;
+ }
+ } ;
+ template <bool NA>
+ class unary_minus<CPLXSXP,NA>{
+ public:
+ inline Rcomplex apply( Rcomplex x ) const {
+ if (Rcpp::traits::is_na<CPLXSXP>( x ) ) return x;
+
+ Rcomplex cx ;
+ cx.r = -x.r;
+ cx.i = -x.i ;
+ return cx ;
+ }
+ } ;
+ template <>
+ class unary_minus<CPLXSXP,false>{
+ public:
+ inline Rcomplex apply( Rcomplex x ) const {
+ Rcomplex cx ;
+ cx.r = -x.r;
+ cx.i = -x.i ;
+ return cx ;
+ }
+ } ;
+
+
+ template <int RTYPE, bool _NA_, typename VEC_TYPE>
+ class UnaryMinus_Vector : public Rcpp::VectorBase<
+ unary_minus_result_type<RTYPE>::value ,
+ _NA_,
+ UnaryMinus_Vector< unary_minus_result_type<RTYPE>::value ,_NA_,VEC_TYPE>
+ > {
+ public:
+ typedef typename traits::storage_type<RTYPE>::type STORAGE ;
+ typedef typename unary_minus_result_type<RTYPE>::type RESULT ;
+ typedef unary_minus<RTYPE,_NA_> OPERATOR ;
+
+ UnaryMinus_Vector( const VEC_TYPE& lhs_ ) :
+ lhs(lhs_), op() {}
+
+ inline RESULT operator[]( int i ) const {
+ return op.apply( lhs[i] ) ;
+ }
+
+ inline int size() const { return lhs.size() ; }
+
+
+ private:
+ const VEC_TYPE& lhs ;
+ OPERATOR op ;
+ } ;
+
+}
+}
+
+template <int RTYPE,bool _NA_, typename T>
+inline Rcpp::sugar::UnaryMinus_Vector< RTYPE , _NA_ , Rcpp::VectorBase<RTYPE,_NA_,T> >
+operator-(
+ const Rcpp::VectorBase<RTYPE,_NA_,T>& x
+) {
+ return Rcpp::sugar::UnaryMinus_Vector<RTYPE,_NA_, Rcpp::VectorBase<RTYPE,_NA_,T> >( x ) ;
+}
+
+
+#endif
Added: pkg/Rcpp/inst/unitTests/runit.sugar.unary.minus.R
===================================================================
--- pkg/Rcpp/inst/unitTests/runit.sugar.unary.minus.R (rev 0)
+++ pkg/Rcpp/inst/unitTests/runit.sugar.unary.minus.R 2010-06-18 12:04:23 UTC (rev 1600)
@@ -0,0 +1,33 @@
+#!/usr/bin/r -t
+#
+# Copyright (C) 2010 Dirk Eddelbuettel and Romain Francois
+#
+# This file is part of Rcpp.
+#
+# Rcpp is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# Rcpp is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Rcpp. If not, see <http://www.gnu.org/licenses/>.
+
+
+test.sugar.unary.minus <- function( ){
+
+ fx <- cxxfunction( signature( x = "numeric" ), '
+ NumericVector xx(x) ;
+ NumericVector yy = - xx ;
+ return yy ;
+ ', plugin = "Rcpp" )
+
+ checkEquals( fx( seq(0,5,by=10) ), - seq(0,5,by=10) )
+ checkTrue( identical( fx( c(0,NA,2) ), c(0,NA,-2) ) )
+
+}
+
More information about the Rcpp-commits
mailing list