[Rcpp-commits] r4314 - in pkg/RcppArmadillo: . debian inst inst/include/armadillo_bits
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Tue Apr 30 14:11:22 CEST 2013
Author: edd
Date: 2013-04-30 14:11:22 +0200 (Tue, 30 Apr 2013)
New Revision: 4314
Modified:
pkg/RcppArmadillo/ChangeLog
pkg/RcppArmadillo/DESCRIPTION
pkg/RcppArmadillo/debian/changelog
pkg/RcppArmadillo/inst/NEWS.Rd
pkg/RcppArmadillo/inst/include/armadillo_bits/SpCol_meat.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/SpMat_bones.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/SpMat_meat.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/arma_version.hpp
Log:
RcppArmadillo 0.3.810.2 with Armadillo 3.810.2
Modified: pkg/RcppArmadillo/ChangeLog
===================================================================
--- pkg/RcppArmadillo/ChangeLog 2013-04-28 13:23:13 UTC (rev 4313)
+++ pkg/RcppArmadillo/ChangeLog 2013-04-30 12:11:22 UTC (rev 4314)
@@ -1,3 +1,10 @@
+2013-04-30 Dirk Eddelbuettel <edd at debian.org>
+
+ * DESCRIPTION: Release 0.3.810.2
+ * inst/NEWS: Release 0.3.810.2
+ * inst/include/*: Upgraded to new release 3.810.2 of Armadillo
+ * debian/*: Similarly updated for new release to Debian
+
2013-04-19 Dirk Eddelbuettel <edd at debian.org>
* DESCRIPTION: Release 0.3.810.0
Modified: pkg/RcppArmadillo/DESCRIPTION
===================================================================
--- pkg/RcppArmadillo/DESCRIPTION 2013-04-28 13:23:13 UTC (rev 4313)
+++ pkg/RcppArmadillo/DESCRIPTION 2013-04-30 12:11:22 UTC (rev 4314)
@@ -1,7 +1,7 @@
Package: RcppArmadillo
Type: Package
Title: Rcpp integration for Armadillo templated linear algebra library
-Version: 0.3.810.0
+Version: 0.3.810.2
Date: $Date$
Author: Romain Francois, Dirk Eddelbuettel and Doug Bates
Maintainer: Dirk Eddelbuettel <edd at debian.org>
@@ -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 3.810.0). Thus users do not need to
+ Armadillo library (currently version 3.810.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/debian/changelog
===================================================================
--- pkg/RcppArmadillo/debian/changelog 2013-04-28 13:23:13 UTC (rev 4313)
+++ pkg/RcppArmadillo/debian/changelog 2013-04-30 12:11:22 UTC (rev 4314)
@@ -1,3 +1,9 @@
+r-cran-rcpparmadillo (0.3.810.2-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Dirk Eddelbuettel <edd at debian.org> Tue, 30 Apr 2013 07:07:01 -0500
+
r-cran-rcpparmadillo (0.3.810.0-1) unstable; urgency=low
* New upstream release
Modified: pkg/RcppArmadillo/inst/NEWS.Rd
===================================================================
--- pkg/RcppArmadillo/inst/NEWS.Rd 2013-04-28 13:23:13 UTC (rev 4313)
+++ pkg/RcppArmadillo/inst/NEWS.Rd 2013-04-30 12:11:22 UTC (rev 4314)
@@ -2,6 +2,15 @@
\title{News for Package 'RcppArmadillo'}
\newcommand{\cpkg}{\href{http://CRAN.R-project.org/package=#1}{\pkg{#1}}}
+\section{Changes in RcppArmadillo version 0.3.810.2 (2013-04-30)}{
+ \itemize{
+ \item Upgraded to Armadillo release Version 3.810.2
+ \itemize{
+ \item minor fix for initialisation of sparse matrices
+ }
+ }
+}
+
\section{Changes in RcppArmadillo version 0.3.810.0 (2013-04-19)}{
\itemize{
\item Upgraded to Armadillo release Version 3.810.0 (Newell Highway)
Modified: pkg/RcppArmadillo/inst/include/armadillo_bits/SpCol_meat.hpp
===================================================================
--- pkg/RcppArmadillo/inst/include/armadillo_bits/SpCol_meat.hpp 2013-04-28 13:23:13 UTC (rev 4313)
+++ pkg/RcppArmadillo/inst/include/armadillo_bits/SpCol_meat.hpp 2013-04-30 12:11:22 UTC (rev 4314)
@@ -23,7 +23,7 @@
-//! construct a column vector with the specified number of n_elem
+//! construct a column vector with the specified number of elements
template<typename eT>
inline
SpCol<eT>::SpCol(const uword in_n_elem)
@@ -346,7 +346,7 @@
{
arma_extra_debug_sigprint();
- arma_debug_check( row_num >= SpMat<eT>::n_rows, "Col::shed_row(): out of bounds");
+ arma_debug_check( row_num >= SpMat<eT>::n_rows, "SpCol::shed_row(): out of bounds");
shed_rows(row_num, row_num);
}
@@ -364,7 +364,7 @@
arma_debug_check
(
(in_row1 > in_row2) || (in_row2 >= SpMat<eT>::n_rows),
- "Col::shed_rows(): indices out of bounds or incorrectly used"
+ "SpCol::shed_rows(): indices out of bounds or incorrectly used"
);
const uword diff = (in_row2 - in_row1 + 1);
@@ -532,6 +532,7 @@
}
+
#ifdef ARMA_EXTRA_SPCOL_MEAT
#include ARMA_INCFILE_WRAP(ARMA_EXTRA_SPCOL_MEAT)
#endif
Modified: pkg/RcppArmadillo/inst/include/armadillo_bits/SpMat_bones.hpp
===================================================================
--- pkg/RcppArmadillo/inst/include/armadillo_bits/SpMat_bones.hpp 2013-04-28 13:23:13 UTC (rev 4313)
+++ pkg/RcppArmadillo/inst/include/armadillo_bits/SpMat_bones.hpp 2013-04-30 12:11:22 UTC (rev 4314)
@@ -1,7 +1,7 @@
-// Copyright (C) 2011-2012 Ryan Curtin
+// Copyright (C) 2011-2013 Ryan Curtin
+// Copyright (C) 2012-2013 Conrad Sanderson
// Copyright (C) 2011 Matthew Amidon
-// Copyright (C) 2012 Conrad Sanderson
-//
+//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -65,18 +65,7 @@
inline const SpMat& operator=(const std::string& text);
inline SpMat(const SpMat<eT>& x);
- /**
- * Construct a sparse matrix and insert a large number of points at once.
- * locations.row[0] should be row indices, locations.row[1] should be column
- * indices, and values should be the corresponding values. If sorted is true,
- * then it is assumed that the locations and values are already sorted in
- * column-major ordering.
- *
- * The size is automatically determined to be the minimum size to fit all
- * points in the locations list.
- */
template<typename T1, typename T2> inline SpMat(const Base<uword,T1>& locations, const Base<eT,T2>& values, const bool sort_locations = true);
- //! Same as the other batch insertion constructor, but with manual size specification.
template<typename T1, typename T2> inline SpMat(const Base<uword,T1>& locations, const Base<eT,T2>& values, const uword n_rows, const uword n_cols, const bool sort_locations = true);
inline const SpMat& operator=(const eT val); //! Sets size to 1x1.
Modified: pkg/RcppArmadillo/inst/include/armadillo_bits/SpMat_meat.hpp
===================================================================
--- pkg/RcppArmadillo/inst/include/armadillo_bits/SpMat_meat.hpp 2013-04-28 13:23:13 UTC (rev 4313)
+++ pkg/RcppArmadillo/inst/include/armadillo_bits/SpMat_meat.hpp 2013-04-30 12:11:22 UTC (rev 4314)
@@ -1,7 +1,7 @@
-// Copyright (C) 2011-2012 Ryan Curtin
+// Copyright (C) 2011-2013 Ryan Curtin
+// Copyright (C) 2012-2013 Conrad Sanderson
// Copyright (C) 2011 Matthew Amidon
-// Copyright (C) 2012 Conrad Sanderson
-//
+//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -3873,7 +3873,7 @@
(
(
( (in_rows > ARMA_MAX_UHWORD) || (in_cols > ARMA_MAX_UHWORD) )
- ? ( (float(in_rows) * float(in_cols)) > float(ARMA_MAX_UHWORD) )
+ ? ( (float(in_rows) * float(in_cols)) > float(ARMA_MAX_UWORD) )
: false
),
"SpMat::init(): requested size is too large"
Modified: pkg/RcppArmadillo/inst/include/armadillo_bits/arma_version.hpp
===================================================================
--- pkg/RcppArmadillo/inst/include/armadillo_bits/arma_version.hpp 2013-04-28 13:23:13 UTC (rev 4313)
+++ pkg/RcppArmadillo/inst/include/armadillo_bits/arma_version.hpp 2013-04-30 12:11:22 UTC (rev 4314)
@@ -13,7 +13,7 @@
#define ARMA_VERSION_MAJOR 3
#define ARMA_VERSION_MINOR 810
-#define ARMA_VERSION_PATCH 0
+#define ARMA_VERSION_PATCH 2
#define ARMA_VERSION_NAME "Newell Highway"
More information about the Rcpp-commits
mailing list