From 05c14f31a6d7c47f6fa6d1ae13f81f320bc5b134 Mon Sep 17 00:00:00 2001 From: verel Date: Tue, 6 Dec 2011 10:50:15 +0000 Subject: [PATCH] Add the notion of currentNeighbor in the moNeighborhoodExploration git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2538 331e1502-861f-0410-8da2-ba01fb791d7f --- .../src/explorer/moNeighborhoodExplorer.h | 12 ++++++++++++ trunk/paradiseo-mo/src/explorer/moSimpleHCexplorer.h | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/trunk/paradiseo-mo/src/explorer/moNeighborhoodExplorer.h b/trunk/paradiseo-mo/src/explorer/moNeighborhoodExplorer.h index 369cd5cdd..7f9781359 100644 --- a/trunk/paradiseo-mo/src/explorer/moNeighborhoodExplorer.h +++ b/trunk/paradiseo-mo/src/explorer/moNeighborhoodExplorer.h @@ -118,11 +118,23 @@ public: } protected: + // default class for the empty constructor moDummyNeighborhood dummyNeighborhood; + + // default class for the empty constructor moDummyEval dummyEval; + + // the neighborhood which is explored Neighborhood & neighborhood; + + // evaluation of a neighbor moEval& eval; + + // flag : true a the neighbor is accepted and the movement is made bool isMoved; + + // the current neighbor of the exploration : common features of algorithm + Neighbor currentNeighbor }; #endif diff --git a/trunk/paradiseo-mo/src/explorer/moSimpleHCexplorer.h b/trunk/paradiseo-mo/src/explorer/moSimpleHCexplorer.h index df934cb9a..40edfece5 100644 --- a/trunk/paradiseo-mo/src/explorer/moSimpleHCexplorer.h +++ b/trunk/paradiseo-mo/src/explorer/moSimpleHCexplorer.h @@ -170,7 +170,7 @@ private: moNeighborComparator& neighborComparator; moSolNeighborComparator& solNeighborComparator; - //Pointer on the best and the current neighbor + // the best and the current neighbor Neighbor best; Neighbor current;