[Rcpp-commits] r1579 - in pkg/Rcpp/inst: include/Rcpp/sugar unitTests

[noreply at r-forge.r-project.org]

Author: romain
Date: 2010-06-17 21:52:57 +0200 (Thu, 17 Jun 2010)
New Revision: 1579

Added:
   pkg/Rcpp/inst/include/Rcpp/sugar/plus.h
   pkg/Rcpp/inst/unitTests/runit.sugar.plus.R
Modified:
   pkg/Rcpp/inst/include/Rcpp/sugar/sugar.h
Log:
operator+

Added: pkg/Rcpp/inst/include/Rcpp/sugar/plus.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/sugar/plus.h	                        (rev 0)
+++ pkg/Rcpp/inst/include/Rcpp/sugar/plus.h	2010-06-17 19:52:57 UTC (rev 1579)
@@ -0,0 +1,106 @@
+// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 8 -*-
+//
+// plus.h: Rcpp R/C++ interface class library -- 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__plus_h
+#define Rcpp__sugar__plus_h
+
+namespace Rcpp{
+namespace sugar{
+
+	// TODO: what happens in the limits, see what R does
+	template <int RTYPE,bool LHS_NA, bool RHS_NA>
+	class plus{
+	public:
+		typedef typename traits::storage_type<RTYPE>::type STORAGE ;
+		inline STORAGE apply( STORAGE lhs, STORAGE rhs) const {
+			return traits::is_na<RTYPE>(lhs) ? lhs : ( traits::is_na<RTYPE>(rhs) ? rhs : (lhs + rhs) ) ;
+		}
+	} ;
+	template <int RTYPE,bool RHS_NA>
+	class plus<RTYPE,false,RHS_NA>{
+	public:
+		typedef typename traits::storage_type<RTYPE>::type STORAGE ;
+		inline STORAGE apply( STORAGE lhs, STORAGE rhs) const {
+			return traits::is_na<RTYPE>(rhs) ? rhs : (lhs + rhs);
+		}
+	} ;
+	template <int RTYPE,bool LHS_NA>
+	class plus<RTYPE,LHS_NA,false>{
+	public:
+		typedef typename traits::storage_type<RTYPE>::type STORAGE ;
+		inline STORAGE apply( STORAGE lhs, STORAGE rhs) const {
+			return traits::is_na<RTYPE>(lhs) ? lhs : (lhs + rhs);
+		}
+	} ;
+	template <int RTYPE>
+	class plus<RTYPE,false,false>{
+	public:
+		typedef typename traits::storage_type<RTYPE>::type STORAGE ;
+		inline STORAGE apply( STORAGE lhs, STORAGE rhs) const {
+			return lhs + rhs;
+		}
+	} ;
+	
+
+	template <int RTYPE, bool _NA_, typename VEC_TYPE>
+	class Plus_Vector_Primitive : public Rcpp::VectorBase<RTYPE,true, Plus_Vector_Primitive<RTYPE,_NA_,VEC_TYPE> > {
+	public:
+		typedef typename traits::storage_type<RTYPE>::type STORAGE ;
+		typedef plus<RTYPE,_NA_,true> OPERATOR ;
+		
+		Plus_Vector_Primitive( const VEC_TYPE& lhs_, STORAGE rhs_ ) : 
+			lhs(lhs_), rhs(rhs_), op() {}
+		
+		inline STORAGE operator[]( int i ) const {
+			return op.apply( lhs[i], rhs ) ;
+		}
+		
+		inline int size() const { return lhs.size() ; }
+	
+		
+	private:
+		const VEC_TYPE& lhs ;
+		STORAGE rhs ;
+		OPERATOR op ; 
+	} ;
+}
+}
+
+template <int RTYPE,bool _NA_, typename T>
+inline Rcpp::sugar::Plus_Vector_Primitive< RTYPE , _NA_ , Rcpp::VectorBase<RTYPE,_NA_,T> >
+operator+( 
+	const Rcpp::VectorBase<RTYPE,_NA_,T>& lhs, 
+	typename Rcpp::traits::storage_type<RTYPE>::type rhs 
+) {
+	return Rcpp::sugar::Plus_Vector_Primitive<RTYPE,_NA_, Rcpp::VectorBase<RTYPE,_NA_,T> >( lhs, rhs ) ;
+}
+
+
+template <int RTYPE,bool _NA_, typename T>
+inline Rcpp::sugar::Plus_Vector_Primitive< RTYPE , _NA_ , Rcpp::VectorBase<RTYPE,_NA_,T> >
+operator+( 
+	typename Rcpp::traits::storage_type<RTYPE>::type rhs, 
+	const Rcpp::VectorBase<RTYPE,_NA_,T>& lhs
+) {
+	return Rcpp::sugar::Plus_Vector_Primitive<RTYPE,_NA_, Rcpp::VectorBase<RTYPE,_NA_,T> >( lhs, rhs ) ;
+}
+
+#endif

Modified: pkg/Rcpp/inst/include/Rcpp/sugar/sugar.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/sugar/sugar.h	2010-06-17 18:55:03 UTC (rev 1578)
+++ pkg/Rcpp/inst/include/Rcpp/sugar/sugar.h	2010-06-17 19:52:57 UTC (rev 1579)
@@ -31,5 +31,6 @@
 #include <Rcpp/sugar/Comparator.h>
 #include <Rcpp/sugar/Comparator_With_One_Value.h>
 #include <Rcpp/sugar/logical_operators.h>
+#include <Rcpp/sugar/plus.h>
 
 #endif

Added: pkg/Rcpp/inst/unitTests/runit.sugar.plus.R
===================================================================
--- pkg/Rcpp/inst/unitTests/runit.sugar.plus.R	                        (rev 0)
+++ pkg/Rcpp/inst/unitTests/runit.sugar.plus.R	2010-06-17 19:52:57 UTC (rev 1579)
@@ -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.plus <- function( ){
+
+	fx <- cxxfunction( signature( x = "integer" ), '
+		IntegerVector xx(x) ;
+		return List::create(
+			xx + 10, 
+			10 + xx 
+			) ;
+	', plugin = "Rcpp" )
+	
+	
+	checkEquals( fx(1:10) , list( 11:20,11:20)  )
+}
+