From 2c0638aa8f788c499fdd6958a7ccc2a5496e5d4f Mon Sep 17 00:00:00 2001
From: nojhan <nojhan@gmail.com>
Date: Tue, 10 Jul 2012 12:04:25 +0200
Subject: [PATCH] correct template typedef for NormalMulti* classes

---
 edo/src/edoEstimatorNormalMulti.h | 10 ++++------
 edo/src/edoNormalMultiCenter.h    |  7 +++----
 edo/src/edoSamplerNormalMulti.h   |  9 ++++-----
 edo/test/t-mean-distance.cpp      | 15 ++++++++++-----
 4 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/edo/src/edoEstimatorNormalMulti.h b/edo/src/edoEstimatorNormalMulti.h
index f5666b8f..1ce893ba 100644
--- a/edo/src/edoEstimatorNormalMulti.h
+++ b/edo/src/edoEstimatorNormalMulti.h
@@ -155,18 +155,16 @@ public:
 #ifdef WITH_EIGEN
 
 //! edoEstimatorNormalMulti< EOT >
-template < typename EOT >
-class edoEstimatorNormalMulti : public edoEstimator< edoNormalMulti< EOT > >
+template < typename EOT, typename EOD = edoNormalMulti<EOT> >
+class edoEstimatorNormalMulti : public edoEstimator< EOD >
 {
 public:
     class CovMatrix
     {
     public:
         typedef typename EOT::AtomType AtomType;
-        // typedef typename edoNormalMulti<AtomType>::Vector Vector;
-        // typedef typename edoNormalMulti<AtomType>::Matrix Matrix;
-        typedef Eigen::Matrix< AtomType, 1, Eigen::Dynamic, Eigen::RowMajor> Vector;
-        typedef Eigen::Matrix< AtomType, Eigen::Dynamic, Eigen::Dynamic, Eigen::RowMajor> Matrix;
+        typedef typename EOD::Vector Vector;
+        typedef typename EOD::Matrix Matrix;
 
         CovMatrix( const eoPop< EOT >& pop )
         {
diff --git a/edo/src/edoNormalMultiCenter.h b/edo/src/edoNormalMultiCenter.h
index 07d5e3d3..034a581a 100644
--- a/edo/src/edoNormalMultiCenter.h
+++ b/edo/src/edoNormalMultiCenter.h
@@ -52,13 +52,12 @@ public:
 #else
 #ifdef WITH_EIGEN
 
-template < typename EOT >
-class edoNormalMultiCenter : public edoModifierMass< edoNormalMulti< EOT > >
+template < typename EOT, typename EOD = edoNormalMulti< EOT > >
+class edoNormalMultiCenter : public edoModifierMass<EOD>
 {
 public:
     typedef typename EOT::AtomType AtomType;
-    // typedef typename edoNormalMulti<AtomType>::Vector Vector;
-    typedef Eigen::Matrix< AtomType, 1, Eigen::Dynamic, Eigen::RowMajor> Vector;
+    typedef typename EOD::Vector Vector;
 
     void operator() ( edoNormalMulti< EOT >& distrib, EOT& mass )
     {
diff --git a/edo/src/edoSamplerNormalMulti.h b/edo/src/edoSamplerNormalMulti.h
index 702d05af..74db6612 100644
--- a/edo/src/edoSamplerNormalMulti.h
+++ b/edo/src/edoSamplerNormalMulti.h
@@ -96,10 +96,9 @@ class edoSamplerNormalMulti : public edoSampler< EOD >
 {
 public:
     typedef typename EOT::AtomType AtomType;
-    // typedef typename edoNormalMulti<AtomType>::Vector Vector;
-    // typedef typename edoNormalMulti<AtomType>::Matrix Matrix;
-    typedef Eigen::Matrix< AtomType, 1, Eigen::Dynamic, Eigen::RowMajor> Vector;
-    typedef Eigen::Matrix< AtomType, Eigen::Dynamic, Eigen::Dynamic, Eigen::RowMajor> Matrix;
+
+    typedef typename EOD::Vector Vector;
+    typedef typename EOD::Matrix Matrix;
 
     edoSamplerNormalMulti( edoRepairer<EOT> & repairer ) 
         : edoSampler< EOD >( repairer)
@@ -116,7 +115,7 @@ public:
         // Computes L and D such as V = L D L^T
         Eigen::LDLT<Matrix> cholesky( distrib.varcovar() );
         Matrix L = cholesky.matrixL();
-        Matrix D = cholesky.vectorD();
+        Matrix D = cholesky.vectorD().asDiagonal();
 
         // now compute the final symetric matrix: LsD = L D^1/2
         // remember that V = ( L D^1/2) ( L D^1/2)^T
diff --git a/edo/test/t-mean-distance.cpp b/edo/test/t-mean-distance.cpp
index 45448e82..ae6de0eb 100644
--- a/edo/test/t-mean-distance.cpp
+++ b/edo/test/t-mean-distance.cpp
@@ -43,7 +43,7 @@ Authors:
 
 typedef eoReal< eoMinimizingFitness > EOT;
 typedef edoNormalMulti< EOT > Distrib;
-typedef EOT::AtomType AtomType;
+typedef typename EOT::AtomType AtomType;
 
 #ifdef WITH_BOOST
 #include <boost/numeric/ublas/vector.hpp>
@@ -53,10 +53,8 @@ typedef EOT::AtomType AtomType;
 #else
 #ifdef WITH_EIGEN
 #include <Eigen/Dense>
-    // typedef typename edoNormalMulti<AtomType>::Vector Vector;
-    // typedef typename edoNormalMulti<AtomType>::Matrix Matrix;
-    typedef Eigen::Matrix< AtomType, 1, Eigen::Dynamic, Eigen::RowMajor> Vector;
-    typedef Eigen::Matrix< AtomType, Eigen::Dynamic, Eigen::Dynamic, Eigen::RowMajor> Matrix;
+    typedef typename edoNormalMulti<EOT>::Vector Vector;
+    typedef typename edoNormalMulti<EOT>::Matrix Matrix;
 #endif
 #endif
 
@@ -144,7 +142,14 @@ int main(int ac, char** av)
                     // (2) distribution initial parameters
 
 
+#ifdef WITH_BOOST
                     Vector mean( s_size, mean_value );
+#else
+#ifdef WITH_EIGEN
+                    Vector mean( s_size );
+                    mean = Vector::Constant( s_size, mean_value);
+#endif
+#endif
                     Matrix varcovar( s_size, s_size );
 
                     varcovar( 0, 0 ) = covar1_value;