[Rcpp-commits] r4024 - in pkg/Rcpp: . inst/include/Rcpp/sugar/functions

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

Author: romain
Date: 2012-11-23 00:17:52 +0100 (Fri, 23 Nov 2012)
New Revision: 4024

Added:
   pkg/Rcpp/inst/include/Rcpp/sugar/functions/table.h
Modified:
   pkg/Rcpp/ChangeLog
   pkg/Rcpp/TODO
   pkg/Rcpp/inst/include/Rcpp/sugar/functions/functions.h
Log:
table

Modified: pkg/Rcpp/ChangeLog
===================================================================
--- pkg/Rcpp/ChangeLog	2012-11-22 23:15:28 UTC (rev 4023)
+++ pkg/Rcpp/ChangeLog	2012-11-22 23:17:52 UTC (rev 4024)
@@ -3,6 +3,9 @@
         * include/Rcpp/iostream.h: use delete rdbuf() as recommended by Martyn Plummer
         * include/Rcpp/sugar/functions/self_match.h: self_match, giving a
         functionality similar to match( x, unique(x) )
+        * src/coerce.cpp: added coercion to STRSXP
+        * include/Rcpp/internal/r_coerce.h : added r_coerce<.,STRPSXP>
+        * include/Rcpp/sugar/functions/table.h: sugar table
         
 2012-11-21  JJ Allaire <jj at rstudio.org>
 

Modified: pkg/Rcpp/TODO
===================================================================
--- pkg/Rcpp/TODO	2012-11-22 23:15:28 UTC (rev 4023)
+++ pkg/Rcpp/TODO	2012-11-22 23:17:52 UTC (rev 4024)
@@ -44,7 +44,7 @@
 	
     o	Vector * Matrix, Matrix * Matrix
 
-    o   duplicated, count
+    o   duplicated
     
     o   operator% 
     

Modified: pkg/Rcpp/inst/include/Rcpp/sugar/functions/functions.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/sugar/functions/functions.h	2012-11-22 23:15:28 UTC (rev 4023)
+++ pkg/Rcpp/inst/include/Rcpp/sugar/functions/functions.h	2012-11-22 23:17:52 UTC (rev 4024)
@@ -63,6 +63,7 @@
 
 #include <Rcpp/sugar/functions/unique.h>
 #include <Rcpp/sugar/functions/match.h>
+#include <Rcpp/sugar/functions/table.h>
 #include <Rcpp/sugar/functions/self_match.h>
 #include <Rcpp/sugar/functions/setdiff.h>
 

Added: pkg/Rcpp/inst/include/Rcpp/sugar/functions/table.h
===================================================================
--- pkg/Rcpp/inst/include/Rcpp/sugar/functions/table.h	                        (rev 0)
+++ pkg/Rcpp/inst/include/Rcpp/sugar/functions/table.h	2012-11-22 23:17:52 UTC (rev 4024)
@@ -0,0 +1,102 @@
+// -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 8 -*-
+//
+// table.h: Rcpp R/C++ interface class library -- table match
+//
+// Copyright (C) 2012   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__table_h
+#define Rcpp__sugar__table_h
+          
+namespace Rcpp{
+namespace sugar{
+
+template <typename HASH, typename STORAGE>
+class CountInserter {
+public:
+    CountInserter( HASH& hash_ ) : hash(hash_), index(0) {}
+    
+    inline void operator()( STORAGE value ){
+        hash[value]++ ;
+    }
+    
+private:
+    HASH& hash ;
+    int index;
+} ; 
+
+template <typename HASH, int RTYPE>
+class Grabber{
+public:
+    Grabber( IntegerVector& res_, CharacterVector& names_ ) : res(res_), names(names_), index(0){}
+    
+    template <typename T>
+    inline void operator()( T pair){
+        res[index] = pair.second ;
+        names[index++] = internal::r_coerce<RTYPE,STRSXP>(pair.first) ;
+    }
+    
+private:
+    IntegerVector& res ;
+    CharacterVector& names ;
+    int index ;
+} ;
+
+template <int RTYPE, typename TABLE_T>        
+class Table {
+public:
+    typedef typename Rcpp::traits::storage_type<RTYPE>::type STORAGE ;
+    
+    Table( const TABLE_T& table ): hash(), map() {
+        // populate the initial hash
+        std::for_each( table.begin(), table.end(), Inserter(hash) ) ;
+        
+        // populate the map, sorted by keys
+        map.insert( hash.begin(), hash.end() ) ;
+    }
+    
+    inline operator IntegerVector() const { 
+        // fill the result
+        int n = map.size() ;
+        IntegerVector result = no_init(n) ;
+        CharacterVector names = no_init(n) ;
+        std::for_each( map.begin(), map.end(), Grabber<SORTED_MAP,RTYPE>(result, names) ) ;
+        result.names() = names ;
+        return result ;
+    }
+    
+private:
+    typedef RCPP_UNORDERED_MAP<STORAGE, int> HASH ;
+    typedef CountInserter<HASH,STORAGE> Inserter ;
+    
+    typedef std::map<STORAGE, int, typename Rcpp::traits::comparator_type<RTYPE>::type > SORTED_MAP ;
+    
+    HASH hash ;
+    SORTED_MAP map ;
+}; 
+    
+} // sugar
+
+template <int RTYPE, bool NA, typename T>
+inline IntegerVector table( const VectorBase<RTYPE,NA,T>& x ){
+    return sugar::Table<RTYPE,T>(x.get_ref()) ;
+}
+
+
+} // Rcpp
+#endif
+