[Rcpp-commits] r1684 - in pkg/Rcpp/inst: doc/Rcpp-sugar include/Rcpp/sugar/functions unitTests

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

Author: romain
Date: 2010-06-23 20:19:21 +0200 (Wed, 23 Jun 2010)
New Revision: 1684

Added:
   pkg/Rcpp/inst/include/Rcpp/sugar/functions/ceil.h
Modified:
   pkg/Rcpp/inst/doc/Rcpp-sugar/Rcpp-sugar.Rnw
   pkg/Rcpp/inst/include/Rcpp/sugar/functions/functions.h
   pkg/Rcpp/inst/unitTests/runit.sugar.exp.R
Log:
sugar/ceil

Modified: pkg/Rcpp/inst/doc/Rcpp-sugar/Rcpp-sugar.Rnw
===================================================================
--- pkg/Rcpp/inst/doc/Rcpp-sugar/Rcpp-sugar.Rnw	2010-06-23 18:18:56 UTC (rev 1683)
+++ pkg/Rcpp/inst/doc/Rcpp-sugar/Rcpp-sugar.Rnw	2010-06-23 18:19:21 UTC (rev 1684)
@@ -451,6 +451,7 @@
 
 \subsubsection{exp}
 \subsubsection{floor}
+\subsubsection{ceil}
 
 \section{Performance}
 \label{sec:performance}

Added: pkg/Rcpp/inst/include/Rcpp/sugar/functions/ceil.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/sugar/functions/ceil.h	                        (rev 0)
+++ pkg/Rcpp/inst/include/Rcpp/sugar/functions/ceil.h	2010-06-23 18:19:21 UTC (rev 1684)
@@ -0,0 +1,88 @@
+// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 8 -*-
+//
+// ceil.h: Rcpp R/C++ interface class library -- ceil
+//
+// 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__ceil_h
+#define Rcpp__sugar__ceil_h
+
+namespace Rcpp{
+namespace sugar{
+
+template <bool NA, int RTYPE>
+class ceil__impl{
+public:
+	typedef typename Rcpp::traits::storage_type<RTYPE>::type STORAGE ;
+	static inline double get( STORAGE x){
+		return Rcpp::traits::is_na<RTYPE>(x) ? NA_INTEGER : ceil(x) ;
+	}
+} ;
+
+template <int RTYPE>
+class ceil__impl<false,RTYPE>{
+public:
+	typedef typename Rcpp::traits::storage_type<RTYPE>::type STORAGE ;
+	static inline double get( STORAGE x){
+		return ceil(x) ;
+	}
+} ;
+
+	
+template <int RTYPE, bool NA, typename T>
+class Ceil : public Rcpp::VectorBase< REALSXP ,NA, Ceil<RTYPE,NA,T> > {
+public:
+	typedef typename Rcpp::VectorBase<RTYPE,NA,T> VEC_TYPE ;
+	typedef typename Rcpp::traits::storage_type<RTYPE>::type STORAGE ;
+	
+	Ceil( const VEC_TYPE& object_ ) : object(object_){}
+	
+	inline double operator[]( int i ) const {
+		return ceil__impl<NA,RTYPE>::get( object[i] );
+	}
+	inline int size() const { return object.size() ; }
+	         
+private:
+	const VEC_TYPE& object ;
+} ;
+	
+} // sugar
+
+template <bool NA, typename T>
+inline sugar::Ceil<INTSXP,NA,T> ceil( const VectorBase<INTSXP,NA,T>& t){
+	return sugar::Ceil<INTSXP,NA,T>( t ) ;
+}
+
+template <bool NA, typename T>
+inline sugar::Ceil<REALSXP,NA,T> ceil( const VectorBase<REALSXP,NA,T>& t){
+	return sugar::Ceil<REALSXP,NA,T>( t ) ;
+}
+
+template <bool NA, typename T>
+inline sugar::Ceil<INTSXP,NA,T> ceiling( const VectorBase<INTSXP,NA,T>& t){
+	return sugar::Ceil<INTSXP,NA,T>( t ) ;
+}
+
+template <bool NA, typename T>
+inline sugar::Ceil<REALSXP,NA,T> ceiling( const VectorBase<REALSXP,NA,T>& t){
+	return sugar::Ceil<REALSXP,NA,T>( t ) ;
+}
+
+} // Rcpp
+#endif
+

Modified: pkg/Rcpp/inst/include/Rcpp/sugar/functions/functions.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/sugar/functions/functions.h	2010-06-23 18:18:56 UTC (rev 1683)
+++ pkg/Rcpp/inst/include/Rcpp/sugar/functions/functions.h	2010-06-23 18:19:21 UTC (rev 1684)
@@ -36,5 +36,6 @@
 #include <Rcpp/sugar/functions/abs.h>
 #include <Rcpp/sugar/functions/exp.h>
 #include <Rcpp/sugar/functions/floor.h>
+#include <Rcpp/sugar/functions/ceil.h>
 
 #endif

Modified: pkg/Rcpp/inst/unitTests/runit.sugar.exp.R
===================================================================
--- pkg/Rcpp/inst/unitTests/runit.sugar.exp.R	2010-06-23 18:18:56 UTC (rev 1683)
+++ pkg/Rcpp/inst/unitTests/runit.sugar.exp.R	2010-06-23 18:19:21 UTC (rev 1684)
@@ -47,3 +47,18 @@
 	checkEquals( fx(x,y) , list( floor(x), floor(y) ) )
 }
 
+test.sugar.ceil <- function( ){
+
+	fx <- cxxfunction( signature( x = "numeric", y = "integer" ), '
+	
+		NumericVector xx(x) ;
+		IntegerVector yy(y) ;
+		
+		return List::create( ceil(xx), ceil(yy) ) ;
+	', plugin = "Rcpp" )
+	
+	x <- rnorm(10)
+	y <- -10:10
+	checkEquals( fx(x,y) , list( ceiling(x), ceiling(y) ) )
+}
+