From d009ffcc1956987d5384b182f9be3317990146b0 Mon Sep 17 00:00:00 2001
From: jhumeau <jhumeau@331e1502-861f-0410-8da2-ba01fb791d7f>
Date: Tue, 19 Jan 2010 09:33:54 +0000
Subject: [PATCH] =?UTF-8?q?Arborescence=20modifi=C3=A9e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1651 331e1502-861f-0410-8da2-ba01fb791d7f
---
 .../moFullEvalBitNeighbor.h                   |  0
 branches/newMo/src/newmo.h                    | 21 ++++++++++++-------
 .../src/{eval => old}/moIncrEvalWrapper.h     |  2 +-
 .../{neighborhood => old}/moMoveNeighbor.h    |  0
 .../moMoveNeighborhood.h                      |  0
 branches/newMo/src/{ => old}/move/moMove.h    |  0
 .../newMo/src/{ => old}/move/moMoveIncrEval.h |  0
 .../newMo/src/{ => old}/move/moMoveInit.h     |  0
 .../newMo/src/{ => old}/move/moNextMove.h     |  0
 9 files changed, 14 insertions(+), 9 deletions(-)
 rename branches/newMo/src/{neighborhood => eval}/moFullEvalBitNeighbor.h (100%)
 rename branches/newMo/src/{eval => old}/moIncrEvalWrapper.h (95%)
 rename branches/newMo/src/{neighborhood => old}/moMoveNeighbor.h (100%)
 rename branches/newMo/src/{neighborhood => old}/moMoveNeighborhood.h (100%)
 rename branches/newMo/src/{ => old}/move/moMove.h (100%)
 rename branches/newMo/src/{ => old}/move/moMoveIncrEval.h (100%)
 rename branches/newMo/src/{ => old}/move/moMoveInit.h (100%)
 rename branches/newMo/src/{ => old}/move/moNextMove.h (100%)

diff --git a/branches/newMo/src/neighborhood/moFullEvalBitNeighbor.h b/branches/newMo/src/eval/moFullEvalBitNeighbor.h
similarity index 100%
rename from branches/newMo/src/neighborhood/moFullEvalBitNeighbor.h
rename to branches/newMo/src/eval/moFullEvalBitNeighbor.h
diff --git a/branches/newMo/src/newmo.h b/branches/newMo/src/newmo.h
index 2aa9b165a..fbfd72fb8 100755
--- a/branches/newMo/src/newmo.h
+++ b/branches/newMo/src/newmo.h
@@ -35,27 +35,32 @@
 
 #include <algo/moLocalSearch.h>
 
+#include <comparator/moComparator.h>
 #include <comparator/moNeighborComparator.h>
 
 #include <continuator/moContinuator.h>
 #include <continuator/moTrueContinuator.h>
 
+#include <eval/moEval.h>
+#include <eval/moFullEvalBitNeighbor.h>
+#include <eval/moFullEvalByCopy.h>
+#include <eval/moFullEvalByModif.h>
+
 #include <explorer/moNeighborhoodExplorer.h>
 #include <explorer/moSimpleHCexplorer.h>
 
+#include <neighborhood/moBackableNeighbor.h>
 #include <neighborhood/moBitNeighbor.h>
 #include <neighborhood/moBitNeighborhood.h>
 #include <neighborhood/moEmptyNeighbor.h>
-#include <neighborhood/moFullEvalBitNeighbor.h>
-#include <neighborhood/moFullEvalNeighbor.h>
-#include <neighborhood/moMoveNeighbor.h>
-#include <neighborhood/moMoveNeighborhood.h>
 #include <neighborhood/moNeighbor.h>
 #include <neighborhood/moNeighborhood.h>
 
-#include <move/moMove.h>
-#include <move/moMoveIncrEval.h>
-#include <move/moMoveInit.h>
-#include <move/moNextMove.h>
+#include <old/moMove.h>
+#include <old/moMoveIncrEval.h>
+#include <old/moMoveInit.h>
+#include <old/moNextMove.h>
+#include <old/moMoveNeighbor.h>
+#include <old/moMoveNeighborhood.h>
 
 #endif
diff --git a/branches/newMo/src/eval/moIncrEvalWrapper.h b/branches/newMo/src/old/moIncrEvalWrapper.h
similarity index 95%
rename from branches/newMo/src/eval/moIncrEvalWrapper.h
rename to branches/newMo/src/old/moIncrEvalWrapper.h
index be1835c0d..d951804d5 100644
--- a/branches/newMo/src/eval/moIncrEvalWrapper.h
+++ b/branches/newMo/src/old/moIncrEvalWrapper.h
@@ -19,7 +19,7 @@ public:
 
      /*
      * make the evaluation of the current neighbor and update the information on this neighbor
-     * the evaluation could be increamental
+     * the evaluation could be incremental
      */
      virtual void eval(MoveNeighbor& _neighbor,EOT & _solution){
      	_neighbor.fitness(incrEval(*(_neighbor.getMove()), _solution));
diff --git a/branches/newMo/src/neighborhood/moMoveNeighbor.h b/branches/newMo/src/old/moMoveNeighbor.h
similarity index 100%
rename from branches/newMo/src/neighborhood/moMoveNeighbor.h
rename to branches/newMo/src/old/moMoveNeighbor.h
diff --git a/branches/newMo/src/neighborhood/moMoveNeighborhood.h b/branches/newMo/src/old/moMoveNeighborhood.h
similarity index 100%
rename from branches/newMo/src/neighborhood/moMoveNeighborhood.h
rename to branches/newMo/src/old/moMoveNeighborhood.h
diff --git a/branches/newMo/src/move/moMove.h b/branches/newMo/src/old/move/moMove.h
similarity index 100%
rename from branches/newMo/src/move/moMove.h
rename to branches/newMo/src/old/move/moMove.h
diff --git a/branches/newMo/src/move/moMoveIncrEval.h b/branches/newMo/src/old/move/moMoveIncrEval.h
similarity index 100%
rename from branches/newMo/src/move/moMoveIncrEval.h
rename to branches/newMo/src/old/move/moMoveIncrEval.h
diff --git a/branches/newMo/src/move/moMoveInit.h b/branches/newMo/src/old/move/moMoveInit.h
similarity index 100%
rename from branches/newMo/src/move/moMoveInit.h
rename to branches/newMo/src/old/move/moMoveInit.h
diff --git a/branches/newMo/src/move/moNextMove.h b/branches/newMo/src/old/move/moNextMove.h
similarity index 100%
rename from branches/newMo/src/move/moNextMove.h
rename to branches/newMo/src/old/move/moNextMove.h