[Rcpp-commits] r1644 - pkg/Rcpp/inst/include/Rcpp/sugar/logical
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Mon Jun 21 14:49:27 CEST 2010
Author: romain
Date: 2010-06-21 14:49:27 +0200 (Mon, 21 Jun 2010)
New Revision: 1644
Added:
pkg/Rcpp/inst/include/Rcpp/sugar/logical/or.h
Modified:
pkg/Rcpp/inst/include/Rcpp/sugar/logical/SingleLogicalResult.h
pkg/Rcpp/inst/include/Rcpp/sugar/logical/logical.h
Log:
dded or
Modified: pkg/Rcpp/inst/include/Rcpp/sugar/logical/SingleLogicalResult.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/sugar/logical/SingleLogicalResult.h 2010-06-21 12:46:32 UTC (rev 1643)
+++ pkg/Rcpp/inst/include/Rcpp/sugar/logical/SingleLogicalResult.h 2010-06-21 12:49:27 UTC (rev 1644)
@@ -94,192 +94,9 @@
inline bool is_unresolved(){ return result == UNRESOLVED ; }
} ;
-template <bool NA> struct negate{
- static inline int apply( int x ){
- return Rcpp::traits::is_na<LGLSXP>( x ) ? x :
- ( x ? FALSE : TRUE ) ;
- }
-} ;
-template<> struct negate<false>{
- static inline int apply( int x){
- return x ? FALSE : TRUE ;
- } ;
-} ;
-
-
-template <bool NA, typename T>
-class Negate_SingleLogicalResult : public SingleLogicalResult<NA, Negate_SingleLogicalResult<NA,T> >{
-public:
- typedef SingleLogicalResult<NA,T> TYPE ;
- typedef SingleLogicalResult<NA, Negate_SingleLogicalResult<NA,T> > BASE ;
- Negate_SingleLogicalResult( const TYPE& orig_ ) : orig(orig_) {}
-
- inline void apply(){
- BASE::set( negate<NA>::apply( orig.get() ) );
- }
-
-private:
- const TYPE& orig ;
-
-} ;
-
-template <bool LHS_NA, typename LHS_T, bool RHS_NA, typename RHS_T>
-class And_SingleLogicalResult_SingleLogicalResult :
-public SingleLogicalResult<
- (LHS_NA || RHS_NA) ,
- And_SingleLogicalResult_SingleLogicalResult<LHS_NA,LHS_T,RHS_NA,RHS_T>
- >
-{
-public:
- typedef SingleLogicalResult<LHS_NA,LHS_T> LHS_TYPE ;
- typedef SingleLogicalResult<RHS_NA,RHS_T> RHS_TYPE ;
- typedef SingleLogicalResult<
- (LHS_NA || RHS_NA) ,
- And_SingleLogicalResult_SingleLogicalResult<LHS_NA,LHS_T,RHS_NA,RHS_T>
- > BASE ;
-
- And_SingleLogicalResult_SingleLogicalResult( const LHS_TYPE& lhs_, const RHS_TYPE& rhs_) :
- lhs(lhs_), rhs(rhs_){} ;
-
- inline void apply(){
- int left = lhs.get() ;
- if( Rcpp::traits::is_na<LGLSXP>( left ) ){
- BASE::set( left ) ;
- } else if( left == FALSE ){
- BASE::set( FALSE ) ;
- } else {
- BASE::set( rhs.get() ) ;
- }
- }
-
-private:
- const LHS_TYPE& lhs ;
- const RHS_TYPE& rhs ;
-
-} ;
-
-// special version when we know the rhs is not NA
-template <bool LHS_NA, typename LHS_T, typename RHS_T>
-class And_SingleLogicalResult_SingleLogicalResult<LHS_NA,LHS_T,false,RHS_T> :
-public SingleLogicalResult<
- LHS_NA ,
- And_SingleLogicalResult_SingleLogicalResult<LHS_NA,LHS_T,false,RHS_T>
- >
-{
-public:
- typedef SingleLogicalResult<LHS_NA,LHS_T> LHS_TYPE ;
- typedef SingleLogicalResult<false,RHS_T> RHS_TYPE ;
- typedef SingleLogicalResult<
- LHS_NA,
- And_SingleLogicalResult_SingleLogicalResult<LHS_NA,LHS_T,false,RHS_T>
- > BASE ;
-
- And_SingleLogicalResult_SingleLogicalResult( const LHS_TYPE& lhs_, const RHS_TYPE& rhs_) :
- lhs(lhs_), rhs(rhs_){} ;
-
- inline void apply(){
- // here we know rhs does not have NA, so we start with the rhs
- int right = rhs.get() ;
- if( right == FALSE ){
- BASE::set( FALSE ) ;
- } else {
- BASE::set( lhs.get() ) ;
- }
- }
-
-private:
- const LHS_TYPE& lhs ;
- const RHS_TYPE& rhs ;
-
-} ;
-
-
-// special version when we know the lhs is not NA
-template <typename LHS_T, bool RHS_NA, typename RHS_T>
-class And_SingleLogicalResult_SingleLogicalResult<false,LHS_T,RHS_NA,RHS_T> :
-public SingleLogicalResult<
- RHS_NA ,
- And_SingleLogicalResult_SingleLogicalResult<false,LHS_T,RHS_NA,RHS_T>
- >
-{
-public:
- typedef SingleLogicalResult<false,LHS_T> LHS_TYPE ;
- typedef SingleLogicalResult<RHS_NA,RHS_T> RHS_TYPE ;
- typedef SingleLogicalResult<
- RHS_NA,
- And_SingleLogicalResult_SingleLogicalResult<false,LHS_T,RHS_NA,RHS_T>
- > BASE ;
-
- And_SingleLogicalResult_SingleLogicalResult( const LHS_TYPE& lhs_, const RHS_TYPE& rhs_) :
- lhs(lhs_), rhs(rhs_){} ;
-
- inline void apply(){
- // here we know lhs does not have NA, so we start with the rhs
- int left = lhs.get() ;
- if( left == FALSE ){
- BASE::set( FALSE ) ;
- } else {
- BASE::set( rhs.get() ) ;
- }
- }
-
-private:
- const LHS_TYPE& lhs ;
- const RHS_TYPE& rhs ;
-
-} ;
-
-// special version when we know both the lhs and the rhs are not NA
-template <typename LHS_T, typename RHS_T>
-class And_SingleLogicalResult_SingleLogicalResult<false,LHS_T,false,RHS_T> :
-public SingleLogicalResult<
- false ,
- And_SingleLogicalResult_SingleLogicalResult<false,LHS_T,false,RHS_T>
- >
-{
-public:
- typedef SingleLogicalResult<false,LHS_T> LHS_TYPE ;
- typedef SingleLogicalResult<false,RHS_T> RHS_TYPE ;
- typedef SingleLogicalResult<
- false,
- And_SingleLogicalResult_SingleLogicalResult<false,LHS_T,false,RHS_T>
- > BASE ;
-
- And_SingleLogicalResult_SingleLogicalResult( const LHS_TYPE& lhs_, const RHS_TYPE& rhs_) :
- lhs(lhs_), rhs(rhs_){} ;
-
- inline void apply(){
- int left = lhs.get() ;
- if( left == FALSE ){
- BASE::set( FALSE ) ;
- } else {
- BASE::set( rhs.get() ) ;
- }
- }
-
-private:
- const LHS_TYPE& lhs ;
- const RHS_TYPE& rhs ;
-
-} ;
-
}
}
-template <bool NA,typename T>
-inline Rcpp::sugar::Negate_SingleLogicalResult<NA,T>
-operator!( const Rcpp::sugar::SingleLogicalResult<NA,T>& x){
- return Rcpp::sugar::Negate_SingleLogicalResult<NA,T>( x );
-}
-template <bool LHS_NA, typename LHS_T, bool RHS_NA, typename RHS_T>
-inline Rcpp::sugar::And_SingleLogicalResult_SingleLogicalResult<LHS_NA,LHS_T,RHS_NA,RHS_T>
-operator&&(
- const Rcpp::sugar::SingleLogicalResult<LHS_NA,LHS_T>& lhs,
- const Rcpp::sugar::SingleLogicalResult<LHS_NA,LHS_T>& rhs
-){
- return Rcpp::sugar::And_SingleLogicalResult_SingleLogicalResult<LHS_NA,LHS_T,RHS_NA,RHS_T>( lhs, rhs ) ;
-}
-
#endif
Modified: pkg/Rcpp/inst/include/Rcpp/sugar/logical/logical.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/sugar/logical/logical.h 2010-06-21 12:46:32 UTC (rev 1643)
+++ pkg/Rcpp/inst/include/Rcpp/sugar/logical/logical.h 2010-06-21 12:49:27 UTC (rev 1644)
@@ -25,7 +25,7 @@
#include <Rcpp/sugar/logical/SingleLogicalResult.h>
#include <Rcpp/sugar/logical/not.h>
#include <Rcpp/sugar/logical/and.h>
-// #include <Rcpp/sugar/logical/or.h>
+#include <Rcpp/sugar/logical/or.h>
#endif
Added: pkg/Rcpp/inst/include/Rcpp/sugar/logical/or.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/sugar/logical/or.h (rev 0)
+++ pkg/Rcpp/inst/include/Rcpp/sugar/logical/or.h 2010-06-21 12:49:27 UTC (rev 1644)
@@ -0,0 +1,181 @@
+// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 8 -*-
+//
+// or.h: Rcpp R/C++ interface class library --
+//
+// 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__logical_or_h
+#define Rcpp__sugar__logical_or_h
+
+namespace Rcpp{
+namespace sugar{
+
+template <bool LHS_NA, typename LHS_T, bool RHS_NA, typename RHS_T>
+class Or_SingleLogicalResult_SingleLogicalResult :
+public SingleLogicalResult<
+ (LHS_NA || RHS_NA) ,
+ Or_SingleLogicalResult_SingleLogicalResult<LHS_NA,LHS_T,RHS_NA,RHS_T>
+ >
+{
+public:
+ typedef SingleLogicalResult<LHS_NA,LHS_T> LHS_TYPE ;
+ typedef SingleLogicalResult<RHS_NA,RHS_T> RHS_TYPE ;
+ typedef SingleLogicalResult<
+ (LHS_NA || RHS_NA) ,
+ Or_SingleLogicalResult_SingleLogicalResult<LHS_NA,LHS_T,RHS_NA,RHS_T>
+ > BASE ;
+
+ Or_SingleLogicalResult_SingleLogicalResult( const LHS_TYPE& lhs_, const RHS_TYPE& rhs_) :
+ lhs(lhs_), rhs(rhs_){} ;
+
+ inline void apply(){
+ int left = lhs.get() ;
+ if( Rcpp::traits::is_na<LGLSXP>( left ) ){
+ BASE::set( left ) ;
+ } else if( left == TRUE ){
+ BASE::set( TRUE ) ;
+ } else {
+ BASE::set( rhs.get() ) ;
+ }
+ }
+
+private:
+ const LHS_TYPE& lhs ;
+ const RHS_TYPE& rhs ;
+
+} ;
+
+// special version when we know the rhs is not NA
+template <bool LHS_NA, typename LHS_T, typename RHS_T>
+class Or_SingleLogicalResult_SingleLogicalResult<LHS_NA,LHS_T,false,RHS_T> :
+public SingleLogicalResult<
+ LHS_NA ,
+ Or_SingleLogicalResult_SingleLogicalResult<LHS_NA,LHS_T,false,RHS_T>
+ >
+{
+public:
+ typedef SingleLogicalResult<LHS_NA,LHS_T> LHS_TYPE ;
+ typedef SingleLogicalResult<false,RHS_T> RHS_TYPE ;
+ typedef SingleLogicalResult<
+ LHS_NA,
+ Or_SingleLogicalResult_SingleLogicalResult<LHS_NA,LHS_T,false,RHS_T>
+ > BASE ;
+
+ Or_SingleLogicalResult_SingleLogicalResult( const LHS_TYPE& lhs_, const RHS_TYPE& rhs_) :
+ lhs(lhs_), rhs(rhs_){} ;
+
+ inline void apply(){
+ // here we know rhs does not have NA, so we start with the rhs
+ int right = rhs.get() ;
+ if( right == TRUE ){
+ BASE::set( TRUE ) ;
+ } else {
+ BASE::set( lhs.get() ) ;
+ }
+ }
+
+private:
+ const LHS_TYPE& lhs ;
+ const RHS_TYPE& rhs ;
+
+} ;
+
+
+// special version when we know the lhs is not NA
+template <typename LHS_T, bool RHS_NA, typename RHS_T>
+class Or_SingleLogicalResult_SingleLogicalResult<false,LHS_T,RHS_NA,RHS_T> :
+public SingleLogicalResult<
+ RHS_NA ,
+ Or_SingleLogicalResult_SingleLogicalResult<false,LHS_T,RHS_NA,RHS_T>
+ >
+{
+public:
+ typedef SingleLogicalResult<false,LHS_T> LHS_TYPE ;
+ typedef SingleLogicalResult<RHS_NA,RHS_T> RHS_TYPE ;
+ typedef SingleLogicalResult<
+ RHS_NA,
+ Or_SingleLogicalResult_SingleLogicalResult<false,LHS_T,RHS_NA,RHS_T>
+ > BASE ;
+
+ Or_SingleLogicalResult_SingleLogicalResult( const LHS_TYPE& lhs_, const RHS_TYPE& rhs_) :
+ lhs(lhs_), rhs(rhs_){} ;
+
+ inline void apply(){
+ // here we know lhs does not have NA, so we start with the rhs
+ int left = lhs.get() ;
+ if( left == TRUE ){
+ BASE::set( TRUE ) ;
+ } else {
+ BASE::set( rhs.get() ) ;
+ }
+ }
+
+private:
+ const LHS_TYPE& lhs ;
+ const RHS_TYPE& rhs ;
+
+} ;
+
+// special version when we know both the lhs and the rhs are not NA
+template <typename LHS_T, typename RHS_T>
+class Or_SingleLogicalResult_SingleLogicalResult<false,LHS_T,false,RHS_T> :
+public SingleLogicalResult<
+ false ,
+ Or_SingleLogicalResult_SingleLogicalResult<false,LHS_T,false,RHS_T>
+ >
+{
+public:
+ typedef SingleLogicalResult<false,LHS_T> LHS_TYPE ;
+ typedef SingleLogicalResult<false,RHS_T> RHS_TYPE ;
+ typedef SingleLogicalResult<
+ false,
+ Or_SingleLogicalResult_SingleLogicalResult<false,LHS_T,false,RHS_T>
+ > BASE ;
+
+ Or_SingleLogicalResult_SingleLogicalResult( const LHS_TYPE& lhs_, const RHS_TYPE& rhs_) :
+ lhs(lhs_), rhs(rhs_){} ;
+
+ inline void apply(){
+ int left = lhs.get() ;
+ if( left == TRUE ){
+ BASE::set( TRUE ) ;
+ } else {
+ BASE::set( rhs.get() ) ;
+ }
+ }
+
+private:
+ const LHS_TYPE& lhs ;
+ const RHS_TYPE& rhs ;
+
+} ;
+
+}
+}
+
+template <bool LHS_NA, typename LHS_T, bool RHS_NA, typename RHS_T>
+inline Rcpp::sugar::Or_SingleLogicalResult_SingleLogicalResult<LHS_NA,LHS_T,RHS_NA,RHS_T>
+operator||(
+ const Rcpp::sugar::SingleLogicalResult<LHS_NA,LHS_T>& lhs,
+ const Rcpp::sugar::SingleLogicalResult<LHS_NA,LHS_T>& rhs
+){
+ return Rcpp::sugar::Or_SingleLogicalResult_SingleLogicalResult<LHS_NA,LHS_T,RHS_NA,RHS_T>( lhs, rhs ) ;
+}
+
+
+#endif
More information about the Rcpp-commits
mailing list