[Rcpp-commits] r3213 - in pkg/RcppEigen: . inst/include/Eigen/src/Core inst/include/Eigen/src/Core/util inst/include/Eigen/src/Sparse man

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

Author: dmbates
Date: 2011-10-21 23:46:45 +0200 (Fri, 21 Oct 2011)
New Revision: 3213

Modified:
   pkg/RcppEigen/DESCRIPTION
   pkg/RcppEigen/inst/include/Eigen/src/Core/MatrixBase.h
   pkg/RcppEigen/inst/include/Eigen/src/Core/SolveTriangular.h
   pkg/RcppEigen/inst/include/Eigen/src/Core/util/Macros.h
   pkg/RcppEigen/inst/include/Eigen/src/Sparse/TriangularSolver.h
   pkg/RcppEigen/man/RcppEigen-package.Rd
Log:
Update to version 3.0.3 of Eigen, new version number and date.


Modified: pkg/RcppEigen/DESCRIPTION
===================================================================
--- pkg/RcppEigen/DESCRIPTION	2011-10-21 16:55:00 UTC (rev 3212)
+++ pkg/RcppEigen/DESCRIPTION	2011-10-21 21:46:45 UTC (rev 3213)
@@ -13,7 +13,7 @@
  best implementations based on Lapack and level-3 BLAS.
  .
  The RcppEigen package includes the header files from the Eigen C++
- template library (currently version 3.0.2). Thus users do not need to
+ template library (currently version 3.0.3). Thus users do not need to
  install Eigen itself in order to use RcppEigen.
  .
  Eigen is licensed under the GNU LGPL version 3 or later, and also
@@ -21,7 +21,7 @@
  bindings/bridge to Eigen) is licensed under the GNU GPL version 2 or
  later, as is the rest of Rcpp.
 License: GPL (>= 2)
-Depends: Rcpp (>= 0.9.5.1), methods
+Depends: Rcpp (>= 0.9.5.1)
 LazyLoad: yes
 LinkingTo: Rcpp
 Imports: Matrix

Modified: pkg/RcppEigen/inst/include/Eigen/src/Core/MatrixBase.h
===================================================================
--- pkg/RcppEigen/inst/include/Eigen/src/Core/MatrixBase.h	2011-10-21 16:55:00 UTC (rev 3212)
+++ pkg/RcppEigen/inst/include/Eigen/src/Core/MatrixBase.h	2011-10-21 21:46:45 UTC (rev 3213)
@@ -250,7 +250,8 @@
     
     // huuuge hack. make Eigen2's matrix.part<Diagonal>() work in eigen3. Problem: Diagonal is now a class template instead
     // of an integer constant. Solution: overload the part() method template wrt template parameters list.
-    template<template<typename T, int n> class U>
+    // Note: replacing next line by "template<template<typename T, int n> class U>" produces a mysterious error C2082 in MSVC.
+    template<template<typename, int> class U>
     const DiagonalWrapper<ConstDiagonalReturnType> part() const
     { return diagonal().asDiagonal(); }
     #endif // EIGEN2_SUPPORT

Modified: pkg/RcppEigen/inst/include/Eigen/src/Core/SolveTriangular.h
===================================================================
--- pkg/RcppEigen/inst/include/Eigen/src/Core/SolveTriangular.h	2011-10-21 16:55:00 UTC (rev 3212)
+++ pkg/RcppEigen/inst/include/Eigen/src/Core/SolveTriangular.h	2011-10-21 21:46:45 UTC (rev 3213)
@@ -180,7 +180,7 @@
   eigen_assert(cols() == rows());
   eigen_assert( (Side==OnTheLeft && cols() == other.rows()) || (Side==OnTheRight && cols() == other.cols()) );
   eigen_assert(!(Mode & ZeroDiag));
-  eigen_assert(Mode & (Upper|Lower));
+  eigen_assert((Mode & (Upper|Lower)) != 0);
 
   enum { copy = internal::traits<OtherDerived>::Flags & RowMajorBit  && OtherDerived::IsVectorAtCompileTime };
   typedef typename internal::conditional<copy,

Modified: pkg/RcppEigen/inst/include/Eigen/src/Core/util/Macros.h
===================================================================
--- pkg/RcppEigen/inst/include/Eigen/src/Core/util/Macros.h	2011-10-21 16:55:00 UTC (rev 3212)
+++ pkg/RcppEigen/inst/include/Eigen/src/Core/util/Macros.h	2011-10-21 21:46:45 UTC (rev 3213)
@@ -28,7 +28,7 @@
 
 #define EIGEN_WORLD_VERSION 3
 #define EIGEN_MAJOR_VERSION 0
-#define EIGEN_MINOR_VERSION 2
+#define EIGEN_MINOR_VERSION 3
 
 #define EIGEN_VERSION_AT_LEAST(x,y,z) (EIGEN_WORLD_VERSION>x || (EIGEN_WORLD_VERSION>=x && \
                                       (EIGEN_MAJOR_VERSION>y || (EIGEN_MAJOR_VERSION>=y && \

Modified: pkg/RcppEigen/inst/include/Eigen/src/Sparse/TriangularSolver.h
===================================================================
--- pkg/RcppEigen/inst/include/Eigen/src/Sparse/TriangularSolver.h	2011-10-21 16:55:00 UTC (rev 3212)
+++ pkg/RcppEigen/inst/include/Eigen/src/Sparse/TriangularSolver.h	2011-10-21 21:46:45 UTC (rev 3213)
@@ -171,7 +171,7 @@
   eigen_assert(m_matrix.cols() == m_matrix.rows());
   eigen_assert(m_matrix.cols() == other.rows());
   eigen_assert(!(Mode & ZeroDiag));
-  eigen_assert(Mode & (Upper|Lower));
+  eigen_assert((Mode & (Upper|Lower)) != 0);
 
   enum { copy = internal::traits<OtherDerived>::Flags & RowMajorBit };
 
@@ -298,7 +298,7 @@
   eigen_assert(m_matrix.cols() == m_matrix.rows());
   eigen_assert(m_matrix.cols() == other.rows());
   eigen_assert(!(Mode & ZeroDiag));
-  eigen_assert(Mode & (Upper|Lower));
+  eigen_assert((Mode & (Upper|Lower)) != 0);
 
 //   enum { copy = internal::traits<OtherDerived>::Flags & RowMajorBit };
 

Modified: pkg/RcppEigen/man/RcppEigen-package.Rd
===================================================================
--- pkg/RcppEigen/man/RcppEigen-package.Rd	2011-10-21 16:55:00 UTC (rev 3212)
+++ pkg/RcppEigen/man/RcppEigen-package.Rd	2011-10-21 21:46:45 UTC (rev 3213)
@@ -10,14 +10,15 @@
   algebra with Rcpp
 }
 \details{
-  \tabular{ll}{
-    Package: \tab RcppEigen\cr
-    Type: \tab Package\cr
-    Version: \tab 0.2\cr
-    Date: \tab 2011-06-13\cr
-    License: \tab GPL(>= 2)\cr
-    LazyLoad: \tab yes\cr
-  }
+  This package contains the header files for the Eigen C++ template
+  library.  The typical usage is to install this package and list it in
+  the \env{LinkingTo: } line in the \file{DESCRIPTION} file of
+  other packages.  The C++ source code and the R source code in this
+  package are for illustration only.
+
+  As described at the Eigen project's home page,
+  \url{http://eigen.tuxfamily.org}, Eigen is a versatile, fast, reliable
+  and elegant collection of C++ classes for linear algebra.
 }
 \references{\url{http://eigen.tuxfamily.org}}
 \keyword{ package }