From aacba6f8138b4eb0b3f94f41ccfd8259395ff25a Mon Sep 17 00:00:00 2001
From: LPTK <lionel.parreaux@gmail.com>
Date: Thu, 13 Jun 2013 11:26:15 +0200
Subject: [PATCH] stddev test

---
 mo/src/continuator/moStdFitnessNeighborStat.h |  2 +-
 mo/src/neighborhood/moRealNeighborhood.h      |  2 +-
 mo/test/CMakeLists.txt                        |  7 ++++---
 mo/test/t-moStdFitnessNeighborStat.cpp        | 16 ++++++++++++++--
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/mo/src/continuator/moStdFitnessNeighborStat.h b/mo/src/continuator/moStdFitnessNeighborStat.h
index b9a547954..4c058c8ee 100644
--- a/mo/src/continuator/moStdFitnessNeighborStat.h
+++ b/mo/src/continuator/moStdFitnessNeighborStat.h
@@ -42,7 +42,7 @@
  * From moNeighborhoodStat, to compute the average and the standard deviation of fitness in the neighborhood
  */
 template< class Neighbor >
-class moStdFitnessNeighborStat : public moStat<typename Neighbor::EOT, double >
+class moStdFitnessNeighborStat : public moStat<typename Neighbor::EOT, double>
 {
 public :
     typedef typename Neighbor::EOT EOT ;
diff --git a/mo/src/neighborhood/moRealNeighborhood.h b/mo/src/neighborhood/moRealNeighborhood.h
index 7e0a4a738..7cac43735 100644
--- a/mo/src/neighborhood/moRealNeighborhood.h
+++ b/mo/src/neighborhood/moRealNeighborhood.h
@@ -4,7 +4,7 @@
 
 #include <mo>
 #include <eoFunctor.h> // FIXME: Why don't we use eoFunctorBase on the mother classes
-#include "moRealNeighbor.h"
+#include "neighbor/moRealNeighbor.h"
 
 template<class Distrib, class Neighbor>
 class moRealNeighborhood : public moRndNeighborhood< Neighbor >, public eoFunctorBase
diff --git a/mo/test/CMakeLists.txt b/mo/test/CMakeLists.txt
index 2cb8d97c6..6e8846be9 100644
--- a/mo/test/CMakeLists.txt
+++ b/mo/test/CMakeLists.txt
@@ -4,6 +4,7 @@
 
 include_directories(${EO_SRC_DIR}/src)
 include_directories(${MO_SRC_DIR}/src)
+include_directories(${EDO_SRC_DIR}/src)
 include_directories(${PROBLEMS_SRC_DIR})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
@@ -95,10 +96,10 @@ set (TEST_LIST
 		t-moIndexedVectorTabuList
 #		t-moRndIndexedVectorTabuList
 		t-moStdFitnessNeighborStat
-		t-moStdDevEstimator.cpp
+		t-moStdDevEstimator
 		t-moDynSpanCoolingSchedule
-		t-moTriki.cpp
-		t-moTrikiReal.cpp
+		t-moTriki
+		t-moTrikiReal
 		)
 
 ######################################################################################
diff --git a/mo/test/t-moStdFitnessNeighborStat.cpp b/mo/test/t-moStdFitnessNeighborStat.cpp
index bd5ce0de0..d562dffa9 100644
--- a/mo/test/t-moStdFitnessNeighborStat.cpp
+++ b/mo/test/t-moStdFitnessNeighborStat.cpp
@@ -2,11 +2,23 @@
 // t-moFitnessNeighborStat.cpp
 //-----------------------------------------------------------------------------
 
-#include ".h"
+#include <eo>
+//#include "eoReal.h"
+#include "continuator/moStdFitnessNeighborStat.h"
+#include "neighborhood/moRealNeighbor.h"
+#include "neighborhood/moRealNeighborhood.h"
 
 //-----------------------------------------------------------------------------
 
+typedef eoReal< eoMinimizingFitness > EOT;
+typedef moRealNeighbor< EOT > Neighbor;
+
 int main(int ac, char** av)
 {
-
+    moNeighborhoodStat<Neighbor> nhStat
+    moStdFitnessNeighborStat<Neighbor> stat(nhStat);
+    EOT solution(2, 5);
+    stat(solution);
+    //assert(stat.value() == 1);
+    std::cout << "ok " << stat.value() << endl;
 }