[Rcpp-commits] r3167 - in pkg/RcppArmadillo: . inst inst/include/armadillo_bits
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Tue Aug 2 17:22:07 CEST 2011
Author: edd
Date: 2011-08-02 17:22:06 +0200 (Tue, 02 Aug 2011)
New Revision: 3167
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/fn_det.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/glue_cor_meat.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/glue_cov_meat.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/op_cor_meat.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/op_cov_meat.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/running_stat_vec_meat.hpp
Log:
RcppArmadillo 0.2.28 based on Armadillo 2.2.1
Modified: pkg/RcppArmadillo/ChangeLog
===================================================================
--- pkg/RcppArmadillo/ChangeLog 2011-07-31 02:44:45 UTC (rev 3166)
+++ pkg/RcppArmadillo/ChangeLog 2011-08-02 15:22:06 UTC (rev 3167)
@@ -1,3 +1,9 @@
+2011-08-02 Dirk Eddelbuettel <edd at debian.org>
+
+ * DESCRIPTION: Release 0.2.28
+
+ * inst/include/*: Updated to release 2.2.1 of Armadillo
+
2011-07-22 Dirk Eddelbuettel <edd at debian.org>
* DESCRIPTION: Release 0.2.27
Modified: pkg/RcppArmadillo/DESCRIPTION
===================================================================
--- pkg/RcppArmadillo/DESCRIPTION 2011-07-31 02:44:45 UTC (rev 3166)
+++ pkg/RcppArmadillo/DESCRIPTION 2011-08-02 15:22:06 UTC (rev 3167)
@@ -1,7 +1,7 @@
Package: RcppArmadillo
Type: Package
Title: Rcpp integration for Armadillo templated linear algebra library
-Version: 0.2.27
+Version: 0.2.28
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.1.91). Thus users do not need to
+ Armadillo library (currently version 2.2.1). 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-07-31 02:44:45 UTC (rev 3166)
+++ pkg/RcppArmadillo/inst/NEWS 2011-08-02 15:22:06 UTC (rev 3167)
@@ -1,3 +1,16 @@
+0.2.28 2011-08-02
+
+ o Upgraded to Armadillo release 2.2.1 "Blue Skies Debauchery"
+
+ * faster multiplication of small matrices
+ * faster trans()
+ * faster handling of submatrices by norm()
+ * added economical singular value decomposition: svd_thin()
+ * added circ_toeplitz()
+ * added .is_colvec() & .is_rowvec()
+ * fixes for handling of complex numbers by cov(), cor(),
+ running_stat_vec
+
0.2.27 2011-07-22
o Upgraded to Armadillo release 2.1.91 "v2.2 beta 1"
Modified: pkg/RcppArmadillo/inst/include/armadillo_bits/arma_version.hpp
===================================================================
--- pkg/RcppArmadillo/inst/include/armadillo_bits/arma_version.hpp 2011-07-31 02:44:45 UTC (rev 3166)
+++ pkg/RcppArmadillo/inst/include/armadillo_bits/arma_version.hpp 2011-08-02 15:22:06 UTC (rev 3167)
@@ -17,9 +17,9 @@
#define ARMA_VERSION_MAJOR 2
-#define ARMA_VERSION_MINOR 1
-#define ARMA_VERSION_PATCH 91
-#define ARMA_VERSION_NAME "2.2 beta 1"
+#define ARMA_VERSION_MINOR 2
+#define ARMA_VERSION_PATCH 1
+#define ARMA_VERSION_NAME "Blue Skies Debauchery"
Modified: pkg/RcppArmadillo/inst/include/armadillo_bits/fn_det.hpp
===================================================================
--- pkg/RcppArmadillo/inst/include/armadillo_bits/fn_det.hpp 2011-07-31 02:44:45 UTC (rev 3166)
+++ pkg/RcppArmadillo/inst/include/armadillo_bits/fn_det.hpp 2011-08-02 15:22:06 UTC (rev 3167)
@@ -103,10 +103,13 @@
(
const Op<T1,op_htrans>& in,
const bool slow = false,
- const typename arma_blas_type_only<typename T1::elem_type>::result* junk = 0)
+ const typename arma_blas_type_only<typename T1::elem_type>::result* junk1 = 0,
+ const typename arma_not_cx<typename T1::elem_type>::result* junk2 = 0
+ )
{
arma_extra_debug_sigprint();
- arma_ignore(junk);
+ arma_ignore(junk1);
+ arma_ignore(junk2);
typedef typename T1::elem_type eT;
Modified: pkg/RcppArmadillo/inst/include/armadillo_bits/glue_cor_meat.hpp
===================================================================
--- pkg/RcppArmadillo/inst/include/armadillo_bits/glue_cor_meat.hpp 2011-07-31 02:44:45 UTC (rev 3166)
+++ pkg/RcppArmadillo/inst/include/armadillo_bits/glue_cor_meat.hpp 2011-08-02 15:22:06 UTC (rev 3167)
@@ -140,8 +140,8 @@
const u32 N = A.n_rows;
const eT norm_val = (norm_type == 0) ? ( (N > 1) ? eT(N-1) : eT(1) ) : eT(N);
- out = trans(conj(A)) * B;
- out -= (trans(conj(sum(A))) * sum(B))/eT(N);
+ out = trans(A) * B; // out = strans(conj(A)) * B;
+ out -= (trans(sum(A)) * sum(B))/eT(N); // out -= (strans(conj(sum(A))) * sum(B))/eT(N);
out /= norm_val;
out /= conv_to< Mat<eT> >::from( trans(stddev(A)) * stddev(B) );
}
Modified: pkg/RcppArmadillo/inst/include/armadillo_bits/glue_cov_meat.hpp
===================================================================
--- pkg/RcppArmadillo/inst/include/armadillo_bits/glue_cov_meat.hpp 2011-07-31 02:44:45 UTC (rev 3166)
+++ pkg/RcppArmadillo/inst/include/armadillo_bits/glue_cov_meat.hpp 2011-08-02 15:22:06 UTC (rev 3167)
@@ -1,5 +1,5 @@
-// Copyright (C) 2009-2010 NICTA (www.nicta.com.au)
-// Copyright (C) 2009-2010 Conrad Sanderson
+// Copyright (C) 2009-2011 NICTA (www.nicta.com.au)
+// Copyright (C) 2009-2011 Conrad Sanderson
// Copyright (C) 2009-2010 Dimitrios Bouzas
//
// This file is part of the Armadillo C++ library.
@@ -117,8 +117,8 @@
const u32 N = A.n_rows;
const eT norm_val = (norm_type == 0) ? ( (N > 1) ? eT(N-1) : eT(1) ) : eT(N);
- out = trans(conj(A)) * B;
- out -= (trans(conj(sum(A))) * sum(B))/eT(N);
+ out = trans(A) * B; // out = strans(conj(A)) * B;
+ out -= (trans(sum(A)) * sum(B))/eT(N); // out -= (strans(conj(sum(A))) * sum(B))/eT(N);
out /= norm_val;
}
}
Modified: pkg/RcppArmadillo/inst/include/armadillo_bits/op_cor_meat.hpp
===================================================================
--- pkg/RcppArmadillo/inst/include/armadillo_bits/op_cor_meat.hpp 2011-07-31 02:44:45 UTC (rev 3166)
+++ pkg/RcppArmadillo/inst/include/armadillo_bits/op_cor_meat.hpp 2011-08-02 15:22:06 UTC (rev 3167)
@@ -1,5 +1,5 @@
-// Copyright (C) 2009-2010 NICTA (www.nicta.com.au)
-// Copyright (C) 2009-2010 Conrad Sanderson
+// Copyright (C) 2009-2011 NICTA (www.nicta.com.au)
+// Copyright (C) 2009-2011 Conrad Sanderson
// Copyright (C) 2009-2010 Dimitrios Bouzas
//
// This file is part of the Armadillo C++ library.
@@ -81,8 +81,8 @@
const Row<eT> acc = sum(A);
const Row<T> sd = stddev(A);
- out = trans(conj(A)) * A;
- out -= (trans(conj(acc)) * acc)/eT(N);
+ out = trans(A) * A; // out = strans(conj(A)) * A;
+ out -= (trans(acc) * acc)/eT(N); // out -= (strans(conj(acc)) * acc)/eT(N);
out /= norm_val;
//out = out / (trans(sd) * sd);
Modified: pkg/RcppArmadillo/inst/include/armadillo_bits/op_cov_meat.hpp
===================================================================
--- pkg/RcppArmadillo/inst/include/armadillo_bits/op_cov_meat.hpp 2011-07-31 02:44:45 UTC (rev 3166)
+++ pkg/RcppArmadillo/inst/include/armadillo_bits/op_cov_meat.hpp 2011-08-02 15:22:06 UTC (rev 3167)
@@ -1,5 +1,5 @@
-// Copyright (C) 2009-2010 NICTA (www.nicta.com.au)
-// Copyright (C) 2009-2010 Conrad Sanderson
+// Copyright (C) 2009-2011 NICTA (www.nicta.com.au)
+// Copyright (C) 2009-2011 Conrad Sanderson
// Copyright (C) 2009-2010 Dimitrios Bouzas
//
// This file is part of the Armadillo C++ library.
@@ -79,11 +79,11 @@
{
const u32 N = A.n_rows;
const eT norm_val = (norm_type == 0) ? ( (N > 1) ? eT(N-1) : eT(1) ) : eT(N);
-
+
const Row<eT> acc = sum(A);
-
- out = trans(conj(A)) * A;
- out -= (trans(conj(acc)) * acc)/eT(N);
+
+ out = trans(A) * A; // out = strans(conj(A)) * A;
+ out -= (trans(acc) * acc)/eT(N); // out -= (strans(conj(acc)) * acc)/eT(N);
out /= norm_val;
}
}
Modified: pkg/RcppArmadillo/inst/include/armadillo_bits/running_stat_vec_meat.hpp
===================================================================
--- pkg/RcppArmadillo/inst/include/armadillo_bits/running_stat_vec_meat.hpp 2011-07-31 02:44:45 UTC (rev 3166)
+++ pkg/RcppArmadillo/inst/include/armadillo_bits/running_stat_vec_meat.hpp 2011-08-02 15:22:06 UTC (rev 3167)
@@ -491,11 +491,11 @@
if(sample.n_cols == 1)
{
- tmp2 = conj(tmp1)*trans(tmp1);
+ tmp2 = conj(tmp1)*strans(tmp1);
}
else
{
- tmp2 = trans(conj(tmp1))*tmp1;
+ tmp2 = trans(tmp1)*tmp1; //tmp2 = strans(conj(tmp1))*tmp1;
}
x.r_cov *= (N_minus_1/N);
More information about the Rcpp-commits
mailing list