[Rcpp-commits] r3594 - in pkg/RcppArmadillo: . inst inst/include/armadillo_bits
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Thu May 3 20:41:02 CEST 2012
Author: edd
Date: 2012-05-03 20:41:02 +0200 (Thu, 03 May 2012)
New Revision: 3594
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/auxlib_meat.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/fn_elem.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/op_htrans_meat.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/unwrap.hpp
Log:
RcppArmadillo release 0.3.0.3 containing Armadillo 3.0.3
Modified: pkg/RcppArmadillo/ChangeLog
===================================================================
--- pkg/RcppArmadillo/ChangeLog 2012-05-03 03:54:36 UTC (rev 3593)
+++ pkg/RcppArmadillo/ChangeLog 2012-05-03 18:41:02 UTC (rev 3594)
@@ -1,3 +1,9 @@
+2012-05-03 Dirk Eddelbuettel <edd at debian.org>
+
+ * DESCRIPTION: Release 0.3.0.2
+
+ * inst/include/*: Upgraded to new release 3.0.3 of Armadillo
+
2012-04-29 Dirk Eddelbuettel <edd at debian.org>
* inst/examples/fastLm.r: New example fastLm
@@ -11,7 +17,7 @@
2012-04-17 Dirk Eddelbuettel <edd at debian.org>
* inst/include/RcppArmadilloConfig.h: Undefine NDEBUG to not suppress
- Armadillo dedebug messages
+ Armadillo debug messages
2012-04-12 Dirk Eddelbuettel <edd at debian.org>
Modified: pkg/RcppArmadillo/DESCRIPTION
===================================================================
--- pkg/RcppArmadillo/DESCRIPTION 2012-05-03 03:54:36 UTC (rev 3593)
+++ pkg/RcppArmadillo/DESCRIPTION 2012-05-03 18:41:02 UTC (rev 3594)
@@ -1,7 +1,7 @@
Package: RcppArmadillo
Type: Package
Title: Rcpp integration for Armadillo templated linear algebra library
-Version: 0.3.0.2
+Version: 0.3.0.3
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 3.0.2). Thus users do not need to
+ Armadillo library (currently version 3.0.3). 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 2012-05-03 03:54:36 UTC (rev 3593)
+++ pkg/RcppArmadillo/inst/NEWS 2012-05-03 18:41:02 UTC (rev 3594)
@@ -1,3 +1,13 @@
+0.3.0.3 2012-05-03
+
+ o Upgraded to Armadillo release 3.0.3
+
+ * fixes for inplace transpose of complex number matrices
+ * fixes for complex number version of svd_econ()
+ * fixes for potential aliasing issues with submatrix views
+
+ o New example script fastLm
+
0.3.0.2 2012-04-19
o Upgraded to Armadillo release 3.0.2
Modified: pkg/RcppArmadillo/inst/include/armadillo_bits/arma_version.hpp
===================================================================
--- pkg/RcppArmadillo/inst/include/armadillo_bits/arma_version.hpp 2012-05-03 03:54:36 UTC (rev 3593)
+++ pkg/RcppArmadillo/inst/include/armadillo_bits/arma_version.hpp 2012-05-03 18:41:02 UTC (rev 3594)
@@ -18,7 +18,7 @@
#define ARMA_VERSION_MAJOR 3
#define ARMA_VERSION_MINOR 0
-#define ARMA_VERSION_PATCH 2
+#define ARMA_VERSION_PATCH 3
#define ARMA_VERSION_NAME "Antarctic Chilli Ranch"
Modified: pkg/RcppArmadillo/inst/include/armadillo_bits/auxlib_meat.hpp
===================================================================
--- pkg/RcppArmadillo/inst/include/armadillo_bits/auxlib_meat.hpp 2012-05-03 03:54:36 UTC (rev 3593)
+++ pkg/RcppArmadillo/inst/include/armadillo_bits/auxlib_meat.hpp 2012-05-03 18:41:02 UTC (rev 3594)
@@ -1433,11 +1433,10 @@
podarray<T> wr(A_n_rows);
podarray<T> wi(A_n_rows);
- Mat<T> A_copy = A;
blas_int info = 0;
arma_extra_debug_print("lapack::geev()");
- lapack::geev(&jobvl, &jobvr, &n_rows, A_copy.memptr(), &lda, wr.memptr(), wi.memptr(), l_eigvec.memptr(), &n_rows, r_eigvec.memptr(), &n_rows, work.memptr(), &lwork, &info);
+ lapack::geev(&jobvl, &jobvr, &n_rows, A.memptr(), &lda, wr.memptr(), wi.memptr(), l_eigvec.memptr(), &n_rows, r_eigvec.memptr(), &n_rows, work.memptr(), &lwork, &info);
eigval.set_size(A_n_rows);
Modified: pkg/RcppArmadillo/inst/include/armadillo_bits/fn_elem.hpp
===================================================================
--- pkg/RcppArmadillo/inst/include/armadillo_bits/fn_elem.hpp 2012-05-03 03:54:36 UTC (rev 3593)
+++ pkg/RcppArmadillo/inst/include/armadillo_bits/fn_elem.hpp 2012-05-03 18:41:02 UTC (rev 3594)
@@ -1,5 +1,5 @@
-// Copyright (C) 2008-2011 NICTA (www.nicta.com.au)
-// Copyright (C) 2008-2011 Conrad Sanderson
+// Copyright (C) 2008-2012 NICTA (www.nicta.com.au)
+// Copyright (C) 2008-2012 Conrad Sanderson
//
// This file is part of the Armadillo C++ library.
// It is provided without any warranty of fitness
@@ -97,14 +97,14 @@
template<typename T1>
inline
-const Gen<typename T1::pod_type, gen_zeros>
+const Gen< Mat<typename T1::pod_type>, gen_zeros >
imag(const Base<typename T1::pod_type,T1>& X)
{
arma_extra_debug_sigprint();
const Proxy<T1> A(X.get_ref());
- return Gen<typename T1::pod_type, gen_zeros>(A.get_n_rows(), A.get_n_cols());
+ return Gen< Mat<typename T1::pod_type>, gen_zeros>(A.get_n_rows(), A.get_n_cols());
}
Modified: pkg/RcppArmadillo/inst/include/armadillo_bits/op_htrans_meat.hpp
===================================================================
--- pkg/RcppArmadillo/inst/include/armadillo_bits/op_htrans_meat.hpp 2012-05-03 03:54:36 UTC (rev 3593)
+++ pkg/RcppArmadillo/inst/include/armadillo_bits/op_htrans_meat.hpp 2012-05-03 18:41:02 UTC (rev 3594)
@@ -110,7 +110,7 @@
else
{
Mat<eT> tmp;
- op_strans::apply_noalias(tmp, A);
+ op_htrans::apply_noalias(tmp, A);
out.steal_mem(tmp);
}
Modified: pkg/RcppArmadillo/inst/include/armadillo_bits/unwrap.hpp
===================================================================
--- pkg/RcppArmadillo/inst/include/armadillo_bits/unwrap.hpp 2012-05-03 03:54:36 UTC (rev 3593)
+++ pkg/RcppArmadillo/inst/include/armadillo_bits/unwrap.hpp 2012-05-03 18:41:02 UTC (rev 3594)
@@ -119,22 +119,6 @@
-template<typename eT>
-class unwrap< subview_col<eT> >
- {
- public:
-
- inline unwrap(const subview_col<eT>& A)
- : M( const_cast<eT*>( A.colptr(0) ), A.n_rows, 1, false, false )
- {
- arma_extra_debug_sigprint();
- }
-
- const Mat<eT> M;
- };
-
-
-
template<typename out_eT, typename T1, typename T2, typename glue_type>
class unwrap< mtGlue<out_eT, T1, T2, glue_type> >
{
@@ -281,23 +265,6 @@
-template<typename eT>
-class unwrap_check< subview_col<eT> >
- {
- public:
-
- inline
- unwrap_check(const subview_col<eT>& A, const Mat<eT>& B)
- : M( const_cast<eT*>( A.colptr(0) ), A.n_rows, 1, (&(A.m) == &B), false )
- {
- arma_extra_debug_sigprint();
- }
-
- const Mat<eT> M;
- };
-
-
-
//
//
//
More information about the Rcpp-commits
mailing list