manual merge

Author: eddelbuettel

ChangeLog

@@ -7,6 +7,11 @@
         RawVector and ExpressionVector, from the discussion with
         Dirk Eddelbuettel and Kevin Ushey
 
+2014-11-30  Romain Francois  <[email protected]>
+
+        * inst/include/Rcpp/vector/proxy.h: Const iteration correction
+        * inst/include/Rcpp/sugar: Ditto in three files
+
 2014-11-25  Dirk Eddelbuettel  <[email protected]>
 
         * inst/include/Rcpp/grow.h: Apply additional Shield<> use around tail

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: Rcpp
 Title: Seamless R and C++ Integration
-Version: 0.11.3.2
-Date: 2014-11-23
+Version: 0.11.3.3
+Date: 2014-11-30
 Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey, 
  Douglas Bates, and John Chambers
 Maintainer: Dirk Eddelbuettel <[email protected]>

inst/NEWS.Rd

@@ -18,6 +18,8 @@
       as suggested by Martin Morgan on the rcpp-devel list.
       \item Sorting is now prohibited at compile time for objects of type
       \code{List}, \code{RawVector} and \code{ExpressionVector}.
+      \item Vectors now have a \code{Vector::const\_iterator} that is 'const correct'
+      thanks to fix by Romain following bug report in rcpp-devel by Martyn Plummer 
     }
     \item Changes in Rcpp Attributes:
     \itemize{

inst/include/Rcpp/sugar/functions/setdiff.h

@@ -2,7 +2,7 @@
 //
 // setdiff.h: Rcpp R/C++ interface class library -- setdiff
 //
-// Copyright (C) 2012   Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2012 - 2014  Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -55,7 +55,7 @@ namespace sugar{
         Vector<RTYPE> get() const {
             int n = lhs_set.size() ;
             Vector<RTYPE> out = no_init(n) ;
-            std::copy( lhs_set.begin(), lhs_set.end(), get_const_begin(out) ) ;
+            std::copy( lhs_set.begin(), lhs_set.end(), out.begin() ) ;
             return out ;
         }
 
@@ -120,7 +120,7 @@ namespace sugar{
         Vector<RTYPE> get() const {
             int n = intersect.size() ;
             Vector<RTYPE> out = no_init(n) ;
-            std::copy( intersect.begin(), intersect.end(), get_const_begin(out) ) ;
+            std::copy( intersect.begin(), intersect.end(), out.begin() ) ;
             return out ;
         }
 
@@ -145,7 +145,7 @@ namespace sugar{
         Vector<RTYPE> get() const {
             int n = result.size() ;
             Vector<RTYPE> out = no_init(n) ;
-            std::copy( result.begin(), result.end(), get_const_begin(out) ) ;
+            std::copy( result.begin(), result.end(), out.begin() ) ;
             return out ;
         }
 

inst/include/Rcpp/sugar/matrix/as_vector.h

@@ -2,7 +2,7 @@
 //
 // as_vector.h: Rcpp R/C++ interface class library -- as_vector( sugar matrix expression )
 //
-// Copyright (C) 2010 - 2011 Dirk Eddelbuettel and Romain Francois
+// Copyright (C) 2010 - 2014 Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of Rcpp.
 //
@@ -44,7 +44,7 @@ inline Rcpp::Vector<RTYPE>
 as_vector__impl( MatrixBase<RTYPE,NA,T>& t, Rcpp::traits::true_type ){
     Matrix<RTYPE>& ref = t.get_ref() ;
     int size = ref.ncol()*ref.nrow() ;
-    typename Rcpp::Vector<RTYPE>::iterator first(static_cast<const Rcpp::Vector<RTYPE>&>(ref).begin())  ;
+    typename Rcpp::Vector<RTYPE>::const_iterator first(static_cast<const Rcpp::Vector<RTYPE>&>(ref).begin())  ;
     return Vector<RTYPE>(first, first+size );
 }
 

inst/include/Rcpp/sugar/nona/nona.h

@@ -46,7 +46,7 @@ namespace sugar {
     public:
         typedef typename Rcpp::VectorBase<RTYPE,NA, Rcpp::Vector<RTYPE> > SUGAR_TYPE ;
         typedef typename Rcpp::traits::storage_type<RTYPE>::type STORAGE ;
-        typedef typename Rcpp::Vector<RTYPE>::iterator iterator ;
+        typedef typename Rcpp::Vector<RTYPE>::const_iterator iterator ;
 
         Nona( const SUGAR_TYPE& expr) : data(expr.get_ref().begin()), n(expr.size()){}
 

inst/include/Rcpp/vector/MatrixColumn.h

@@ -44,7 +44,7 @@ class MatrixColumn : public VectorBase<RTYPE,true,MatrixColumn<RTYPE> > {
 
     MatrixColumn( const MATRIX& parent, int i ) :
         n(parent.nrow()),
-        start(parent.begin() + i * n ),
+        start( const_cast<MATRIX&>(parent).begin() + i * n ),
         const_start(parent.begin() + i *n)
     {
         if( i < 0 || i >= parent.ncol() ) throw index_out_of_bounds() ;

inst/include/Rcpp/vector/proxy.h

@@ -240,7 +240,7 @@ namespace traits {
 	};
 	template <int RTYPE>
 	struct r_vector_const_iterator {
-		typedef typename storage_type<RTYPE>::type* type ;
+		typedef const typename storage_type<RTYPE>::type* type ;
 	};
 
 	template <int RTYPE> struct proxy_based_iterator{

inst/unitTests/cpp/Matrix.cpp

@@ -225,3 +225,16 @@ NumericMatrix runit_no_init_matrix() {
     }
     return x;
 }
+
+void runit_const_Matrix_column_set( NumericMatrix::Column& col1, const NumericMatrix::Column& col2 ){
+    col1 = col2 ;    
+}
+
+// [[Rcpp::export]]
+NumericVector runit_const_Matrix_column( const NumericMatrix& m ){
+   NumericMatrix::Column col1( m, 0 ) ;
+   NumericMatrix::Column col2( m, 1 ) ;
+   runit_const_Matrix_column_set(col1, col2) ;
+   return col1 ;
+}
+

inst/unitTests/runit.Matrix.R

@@ -165,5 +165,10 @@ if (.runThisTest) {
       checkEquals(m, matrix(c(0, 1, 2, 3), nrow = 2))
     }
 
+    test.NumericMatrix.const.Column <- function(){
+      m <- matrix(as.numeric(1:9), nrow = 3)
+      res <- runit_const_Matrix_column(m)
+      checkEquals( m[,1], m[,2] )
+    }
 
 }