From b3da3a8b6f26351841e2353f76a908f95d0d496b Mon Sep 17 00:00:00 2001 From: jhumeau Date: Wed, 30 Jun 2010 14:42:15 +0000 Subject: [PATCH] git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1879 331e1502-861f-0410-8da2-ba01fb791d7f --- tags/paradiseo-1.3-beta2/paradiseo-mo/test/CMakeLists.txt | 2 +- .../paradiseo-moeo/src/archive/moeoArchive.h | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/tags/paradiseo-1.3-beta2/paradiseo-mo/test/CMakeLists.txt b/tags/paradiseo-1.3-beta2/paradiseo-mo/test/CMakeLists.txt index 780682249..4d47aba81 100644 --- a/tags/paradiseo-1.3-beta2/paradiseo-mo/test/CMakeLists.txt +++ b/tags/paradiseo-1.3-beta2/paradiseo-mo/test/CMakeLists.txt @@ -51,7 +51,7 @@ SET (TEST_LIST t-moDummyMemory t-moSolVectorTabuList t-moBestImprAspiration - t-moSimpleHCexplorer + #t-moSimpleHCexplorer t-moRandomBestHCexplorer t-moNeutralHCexplorer t-moFirstImprHCexplorer diff --git a/tags/paradiseo-1.3-beta2/paradiseo-moeo/src/archive/moeoArchive.h b/tags/paradiseo-1.3-beta2/paradiseo-moeo/src/archive/moeoArchive.h index 5f3eb6137..dd7ecc1d7 100644 --- a/tags/paradiseo-1.3-beta2/paradiseo-moeo/src/archive/moeoArchive.h +++ b/tags/paradiseo-1.3-beta2/paradiseo-moeo/src/archive/moeoArchive.h @@ -223,14 +223,11 @@ protected: } return res; } - -private: + /** The moeoObjectiveVectorComparator used to compare solutions */ moeoObjectiveVectorComparator < ObjectiveVector > & comparator; /** A moeoObjectiveVectorComparator based on Pareto dominance (used as default) */ moeoParetoObjectiveVectorComparator < ObjectiveVector > paretoComparator; - -protected: /** boolean */ bool replace; };