From 958ab63d9ced8191b073ea8e6d562a2179c431de Mon Sep 17 00:00:00 2001 From: verel Date: Fri, 15 Jan 2010 13:23:05 +0000 Subject: [PATCH] ajout de terminate dans explorer git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1643 331e1502-861f-0410-8da2-ba01fb791d7f --- branches/newMo/src/algo/moLocalSearch.h | 2 ++ branches/newMo/src/explorer/moNeighborhoodExplorer.h | 2 ++ branches/newMo/src/explorer/moSimpleHCexplorer.h | 2 ++ 3 files changed, 6 insertions(+) diff --git a/branches/newMo/src/algo/moLocalSearch.h b/branches/newMo/src/algo/moLocalSearch.h index df34747c3..18a201207 100644 --- a/branches/newMo/src/algo/moLocalSearch.h +++ b/branches/newMo/src/algo/moLocalSearch.h @@ -42,6 +42,8 @@ public: num++; } while (continuator(solution) && searchExplorer.isContinue(solution)); + searchExplorer.terminate(solution); + }; private: diff --git a/branches/newMo/src/explorer/moNeighborhoodExplorer.h b/branches/newMo/src/explorer/moNeighborhoodExplorer.h index a6ea12700..8046edd8d 100644 --- a/branches/newMo/src/explorer/moNeighborhoodExplorer.h +++ b/branches/newMo/src/explorer/moNeighborhoodExplorer.h @@ -25,6 +25,8 @@ public: virtual bool accept(EOT & solution) = 0 ; + virtual void terminate(EOT & solution) = 0 ; + /** Return the class id. * @return the class name as a std::string */ diff --git a/branches/newMo/src/explorer/moSimpleHCexplorer.h b/branches/newMo/src/explorer/moSimpleHCexplorer.h index c570df181..162b11d51 100644 --- a/branches/newMo/src/explorer/moSimpleHCexplorer.h +++ b/branches/newMo/src/explorer/moSimpleHCexplorer.h @@ -20,6 +20,8 @@ public: virtual void updateParam (EOT & solution) { } ; + virtual void terminate (EOT & solution) { } ; + virtual void operator() (EOT & solution) { //est qu'on peut initializer