[Rcpp-commits] r3409 - in pkg/RcppArmadillo: . inst inst/include/armadillo_bits

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

Author: edd
Date: 2011-12-12 23:56:37 +0100 (Mon, 12 Dec 2011)
New Revision: 3409

Modified:
   pkg/RcppArmadillo/ChangeLog
   pkg/RcppArmadillo/DESCRIPTION
   pkg/RcppArmadillo/inst/NEWS
   pkg/RcppArmadillo/inst/include/armadillo_bits/arma_version.hpp
   pkg/RcppArmadillo/inst/include/armadillo_bits/op_resize_meat.hpp
Log:
Release 0.2.34 with Armadillo 2.4.2


Modified: pkg/RcppArmadillo/ChangeLog
===================================================================
--- pkg/RcppArmadillo/ChangeLog	2011-12-12 17:35:59 UTC (rev 3408)
+++ pkg/RcppArmadillo/ChangeLog	2011-12-12 22:56:37 UTC (rev 3409)
@@ -1,3 +1,10 @@
+2011-12-12  Dirk Eddelbuettel  <edd at debian.org>
+
+	* DESCRIPTION: Release 0.2.34
+
+	* inst/include/*: Upgraded to new release 2.4.2 of Armadillo
+	* 
+
 2011-12-07  Dirk Eddelbuettel  <edd at debian.org>
 
 	* DESCRIPTION: Release 0.2.33
@@ -2,3 +9,3 @@
 
-	* inst/include/*: Upgraded to new test release 2.4.1 of Armadillo
+	* inst/include/*: Upgraded to new release 2.4.1 of Armadillo
 
@@ -8,7 +15,7 @@
 
 	* DESCRIPTION: Release 0.2.32
 
-	* inst/include/*: Upgraded to new test release 2.4.0 of Armadillo
+	* inst/include/*: Upgraded to new release 2.4.0 of Armadillo
 
 2011-11-28  Dirk Eddelbuettel  <edd at debian.org>
 

Modified: pkg/RcppArmadillo/DESCRIPTION
===================================================================
--- pkg/RcppArmadillo/DESCRIPTION	2011-12-12 17:35:59 UTC (rev 3408)
+++ pkg/RcppArmadillo/DESCRIPTION	2011-12-12 22:56:37 UTC (rev 3409)
@@ -1,7 +1,7 @@
 Package: RcppArmadillo
 Type: Package
 Title: Rcpp integration for Armadillo templated linear algebra library
-Version: 0.2.33
+Version: 0.2.34
 Date: $Date$
 Author: Romain Francois, Dirk Eddelbuettel and Doug Bates
 Maintainer: Romain Francois, Dirk Eddelbuettel and Doug Bates <RcppArmadillo-authors at r-enthusiasts.com>
@@ -21,7 +21,7 @@
  (due to speed and/or integration capabilities), rather than another language.
  .
  The RcppArmadillo package includes the header files from the templated
- Armadillo library (currently version 2.4.1). Thus users do not need to
+ Armadillo library (currently version 2.4.2). Thus users do not need to
  install Armadillo itself in order to use RcppArmadillo.
  .
  This Armadillo integration provides a nice illustration of the 

Modified: pkg/RcppArmadillo/inst/NEWS
===================================================================
--- pkg/RcppArmadillo/inst/NEWS	2011-12-12 17:35:59 UTC (rev 3408)
+++ pkg/RcppArmadillo/inst/NEWS	2011-12-12 22:56:37 UTC (rev 3409)
@@ -1,3 +1,10 @@
+0.2.33	2011-12-12
+
+    o   Upgraded to Armadillo release 2.4.2
+
+          * clarified documentation for .reshape()
+          * fix for handling of empty matrices by .resize()
+
 0.2.33	2011-12-07
 
     o   Upgraded to Armadillo release 2.4.1

Modified: pkg/RcppArmadillo/inst/include/armadillo_bits/arma_version.hpp
===================================================================
--- pkg/RcppArmadillo/inst/include/armadillo_bits/arma_version.hpp	2011-12-12 17:35:59 UTC (rev 3408)
+++ pkg/RcppArmadillo/inst/include/armadillo_bits/arma_version.hpp	2011-12-12 22:56:37 UTC (rev 3409)
@@ -18,7 +18,7 @@
 
 #define ARMA_VERSION_MAJOR 2
 #define ARMA_VERSION_MINOR 4
-#define ARMA_VERSION_PATCH 1
+#define ARMA_VERSION_PATCH 2
 #define ARMA_VERSION_NAME  "Loco Lounge Lizard"
 
 

Modified: pkg/RcppArmadillo/inst/include/armadillo_bits/op_resize_meat.hpp
===================================================================
--- pkg/RcppArmadillo/inst/include/armadillo_bits/op_resize_meat.hpp	2011-12-12 17:35:59 UTC (rev 3408)
+++ pkg/RcppArmadillo/inst/include/armadillo_bits/op_resize_meat.hpp	2011-12-12 22:56:37 UTC (rev 3409)
@@ -48,7 +48,7 @@
     out.zeros();
     }
   
-  if(out.n_elem > 0)
+  if( (out.n_elem > 0) && (A.n_elem > 0) )
     {
     const uword end_row = (std::min)(out_n_rows, A_n_rows) - 1;
     const uword end_col = (std::min)(out_n_cols, A_n_cols) - 1;
@@ -98,7 +98,7 @@
     out.zeros();
     }
   
-  if(out.n_elem > 0)
+  if( (out.n_elem > 0) && (A.n_elem > 0) )
     {
     const uword end_row   = (std::min)(out_n_rows,   A_n_rows)   - 1;
     const uword end_col   = (std::min)(out_n_cols,   A_n_cols)   - 1;