* the Upper->UpperTriangular change

* finally get ei_add_test right

3 files changed, 8 insertions, 8 deletions

diff --git a/bench/btl/libs/eigen2/eigen2_interface.hh b/bench/btl/libs/eigen2/eigen2_interface.hh
index 0f5b6f640..40d8f9c70 100644
--- a/bench/btl/libs/eigen2/eigen2_interface.hh
+++ b/bench/btl/libs/eigen2/eigen2_interface.hh
@@ -134,11 +134,11 @@ public :
   }
 
   static inline void trisolve_lower(const gene_matrix & L, const gene_vector& B, gene_vector& X, int N){
-    X = L.template marked<Lower>().solveTriangular(B);
+    X = L.template marked<LowerTriangular>().solveTriangular(B);
   }
 
   static inline void trisolve_lower_matrix(const gene_matrix & L, const gene_matrix& B, gene_matrix& X, int N){
-    X = L.template marked<Lower>().solveTriangular(B);
+    X = L.template marked<LowerTriangular>().solveTriangular(B);
   }
 
   static inline void cholesky(const gene_matrix & X, gene_matrix & C, int N){
diff --git a/bench/sparse_cholesky.cpp b/bench/sparse_cholesky.cpp
index 5e07fac9b..ec8078e4c 100644
--- a/bench/sparse_cholesky.cpp
+++ b/bench/sparse_cholesky.cpp
@@ -37,8 +37,8 @@
         X  \
   } timer.stop(); }
 
-// typedef SparseMatrix<Scalar,Upper> EigenSparseTriMatrix;
-typedef SparseMatrix<Scalar,SelfAdjoint|Lower> EigenSparseSelfAdjointMatrix;
+// typedef SparseMatrix<Scalar,UpperTriangular> EigenSparseTriMatrix;
+typedef SparseMatrix<Scalar,SelfAdjoint|LowerTriangular> EigenSparseSelfAdjointMatrix;
 
 void fillSpdMatrix(float density, int rows, int cols,  EigenSparseSelfAdjointMatrix& dst)
 {
diff --git a/bench/sparse_trisolver.cpp b/bench/sparse_trisolver.cpp
index 021433043..158a381d8 100644
--- a/bench/sparse_trisolver.cpp
+++ b/bench/sparse_trisolver.cpp
@@ -34,8 +34,8 @@
         X  \
   } timer.stop(); }
 
-typedef SparseMatrix<Scalar,Upper> EigenSparseTriMatrix;
-typedef SparseMatrix<Scalar,RowMajorBit|Upper> EigenSparseTriMatrixRow;
+typedef SparseMatrix<Scalar,UpperTriangular> EigenSparseTriMatrix;
+typedef SparseMatrix<Scalar,RowMajorBit|UpperTriangular> EigenSparseTriMatrixRow;
 
 void fillMatrix(float density, int rows, int cols,  EigenSparseTriMatrix& dst)
 {
@@ -83,11 +83,11 @@ int main(int argc, char *argv[])
       eiToDense(sm1, m1);
       m2 = m1;
 
-      BENCH(x = m1.marked<Upper>().solveTriangular(b);)
+      BENCH(x = m1.marked<UpperTriangular>().solveTriangular(b);)
       std::cout << "   colmajor^-1 * b:\t" << timer.value() << endl;
 //       std::cerr << x.transpose() << "\n";
 
-      BENCH(x = m2.marked<Upper>().solveTriangular(b);)
+      BENCH(x = m2.marked<UpperTriangular>().solveTriangular(b);)
       std::cout << "   rowmajor^-1 * b:\t" << timer.value() << endl;
 //       std::cerr << x.transpose() << "\n";
     }