allow the syntax Matrix mat(no_init(n,nc)) (#905)

Author: eddelbuettel

ChangeLog

@@ -3,6 +3,15 @@
 	* inst/include/Rcpp/date_datetime/Date.h: Remove the empty destructor
 	to make g++-9 (prerelease) happy [CRAN request]
 
+	* inst/unitTests/runit.Matrix.R: Correct typo
+
+2018-09-27  Romain Francois  <[email protected]>
+
+	* inst/include/Rcpp/vector/Matrix.h: Fix Matrix(no_init(int,int))
+	constructor
+	* inst/unitTests/runit.Matrix.R: test for above
+	* inst/unitTests/cpp/Matrix.cpp: same
+
 2018-09-26  Dirk Eddelbuettel  <[email protected]>
 
 	* docker/ci/Dockerfile: Set env var RunAllRcppTests=yes

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: Rcpp
 Title: Seamless R and C++ Integration
-Version: 0.12.19
-Date: 2018-09-21
+Version: 0.12.19.1
+Date: 2018-09-27
 Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey, Qiang Kou,
  Nathan Russell, Douglas Bates and John Chambers
 Maintainer: Dirk Eddelbuettel <[email protected]>

inst/include/Rcpp/vector/Matrix.h

@@ -90,7 +90,7 @@ class Matrix : public Vector<RTYPE, StoragePolicy>, public MatrixBase<RTYPE, tru
     Matrix& operator=( const SubMatrix<RTYPE>& ) ;
 
     explicit Matrix( const no_init_matrix& obj) {
-        Storage::set__( Rf_allocMatrix( RTYPE, obj.nrow(), obj.ncol() ) );
+        VECTOR::set__( Rf_allocMatrix( RTYPE, obj.nrow(), obj.ncol() ) );
     }
 
     inline int ncol() const {

inst/unitTests/cpp/Matrix.cpp

@@ -279,8 +279,17 @@ NumericMatrix runit_no_init_matrix() {
     return x;
 }
 
+// [[Rcpp::export]]
+NumericMatrix runit_no_init_matrix_ctor() {
+    NumericMatrix x(no_init(2, 2));
+    for (int i = 0; i < 4; i++) {
+        x[i] = i;
+    }
+    return x;
+}
+
 void runit_const_Matrix_column_set( NumericMatrix::Column& col1, const NumericMatrix::Column& col2 ){
-    col1 = col2 ;    
+    col1 = col2 ;
 }
 
 // [[Rcpp::export]]
@@ -332,7 +341,7 @@ NumericMatrix matrix_scalar_divide2(const NumericMatrix & x, double y) {
     return y / x;
 }
 
-// 24 October 2016 
+// 24 October 2016
 // eye, ones, and zeros static member functions
 
 // [[Rcpp::export]]

inst/unitTests/runit.Matrix.R

@@ -197,6 +197,11 @@ if (.runThisTest) {
       checkEquals(m, matrix(c(0, 1, 2, 3), nrow = 2))
     }
 
+    test.NumericMatrix.no.init.ctor <- function() {
+        m <- runit_no_init_matrix_ctor()
+        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)
@@ -241,7 +246,7 @@ if (.runThisTest) {
         colnames(M) <- LETTERS[1:ncol(M)]
         checkEquals(transposeCharacter(M), t(M), msg="character transpose with row and colnames")
     }
-    
+
     test.Matrix.Scalar.op <- function() {
         M <- matrix(c(1:12), 3, 4)
         checkEquals(matrix_scalar_plus(M, 2), M + 2, msg="matrix + scalar")
@@ -253,26 +258,26 @@ if (.runThisTest) {
     ## 23 October 2016
     ## eye function
     test.Matrix.eye <- function() {
-        
+
         checkEquals(
             dbl_eye(3),
             diag(1.0, 3, 3),
             "eye - numeric"
         )
-        
+
         checkEquals(
             int_eye(3),
             diag(1L, 3, 3),
             "eye - integer"
         )
-        
+
         checkEquals(
             cx_eye(3),
             diag(1.0 + 0i, 3, 3),
             "eye - complex"
         )
-        
-        ## diag(TRUE, 3, 3) was registering as 
+
+        ## diag(TRUE, 3, 3) was registering as
         ## a numeric matrix on Travis for some reason
         mat <- matrix(FALSE, 3, 3)
         diag(mat) <- TRUE
@@ -282,86 +287,86 @@ if (.runThisTest) {
             "eye - logical"
         )
     }
-    
+
     ## ones function
     test.Matrix.ones <- function() {
-        
+
         checkEquals(
             dbl_ones(3),
             matrix(1.0, 3, 3),
             "ones - numeric"
         )
-        
+
         checkEquals(
             int_ones(3),
             matrix(1L, 3, 3),
             "ones - integer"
         )
-        
+
         checkEquals(
             cx_ones(3),
             matrix(1.0 + 0i, 3, 3),
             "ones - complex"
         )
-        
+
         checkEquals(
             lgl_ones(3),
             matrix(TRUE, 3, 3),
             "ones - logical"
         )
     }
-    
+
     ## zeros function
     test.Matrix.zeros <- function() {
-        
+
         checkEquals(
             dbl_zeros(3),
             matrix(0.0, 3, 3),
             "zeros - numeric"
         )
-        
+
         checkEquals(
             int_zeros(3),
             matrix(0L, 3, 3),
             "zeros - integer"
         )
-        
+
         checkEquals(
             cx_zeros(3),
             matrix(0.0 + 0i, 3, 3),
             "zeros - complex"
         )
-        
+
         checkEquals(
             lgl_zeros(3),
             matrix(FALSE, 3, 3),
             "zeros - logical"
         )
     }
-    
-    
+
+
     test.Matrix.diagfill <- function() {
-        
+
         checkEquals(num_diag_fill(diag(1.0, 2, 4), 0.0),
                     matrix(0.0, 2, 4),
                     msg = "diagonal fill - case: n < p")
-        
+
         checkEquals(num_diag_fill(diag(1.0, 4, 2), 0.0),
                     matrix(0.0, 4, 2),
                     msg = "diagonal fill - case: n > p")
-        
+
         checkEquals(num_diag_fill(diag(1.0, 3, 3), 0.0),
                     matrix(0.0, 3, 3),
                     msg = "diagonal fill - case: n = p")
-        
+
         m <- matrix("", 2, 4)
         diag(m) <- letters[1:2]
-        
-        checkEquals(char_diag_fill(m, ""), 
+
+        checkEquals(char_diag_fill(m, ""),
                     matrix("", 2, 4),
                     msg = "diagonal fill - char")
-        
-        
+
+
     }
 
 }