diff --git a/trunk/paradiseo-mo/src/neighborhood/moNeighbor.h b/trunk/paradiseo-mo/src/neighborhood/moNeighbor.h index 56bbf911b..f14e834b2 100644 --- a/trunk/paradiseo-mo/src/neighborhood/moNeighbor.h +++ b/trunk/paradiseo-mo/src/neighborhood/moNeighbor.h @@ -44,22 +44,23 @@ * Container of the neighbor informations */ template< class EOType, class Fitness=typename EOType::Fitness> -class moNeighbor : public eoObject, public eoPersistent +class moNeighbor : public EO { public: typedef EOType EOT; + using EO::fitness; /** * Default Constructor */ - moNeighbor() {} + moNeighbor():EO() {} /** * Copy Constructor * @param _neighbor to copy */ moNeighbor(const moNeighbor& _neighbor) { - repFitness = _neighbor.fitness(); + fitness(_neighbor.fitness()); } /** @@ -68,7 +69,7 @@ public: * @return a neighbor equal to the other */ virtual moNeighbor& operator=(const moNeighbor& _neighbor) { - repFitness = _neighbor.fitness(); + fitness(_neighbor.fitness()); return (*this); } @@ -78,31 +79,6 @@ public: */ virtual void move(EOT & _solution) = 0 ; - /** - * Get the fitness - * @return fitness of the neighbor - */ - const Fitness fitness() const { - return repFitness; - } - - - /** - * Get fitness as reference, useful when fitness is set in a multi-stage way, e.g., MOFitness gets performance information, is subsequently ranked - * @return fitness as reference of the neighbor - */ - Fitness& fitnessReference() { - return repFitness; - } - - /** - * Set fitness. At the same time, validates it. - * @param _fitness new fitness value. - */ - void fitness(const Fitness& _fitness) { - repFitness = _fitness; - } - /** * Test equality between two neighbors * @param _neighbor a neighbor @@ -120,29 +96,6 @@ public: return "moNeighbor"; } - /** - * Read object. - * Calls base class, just in case that one had something to do. - * The read and print methods should be compatible and have the same format. - * In principle, format is "plain": they just print a number - * @param _is a std::istream. - */ - virtual void readFrom(std::istream& _is) { - _is >> repFitness; - } - - /** - * Write object. Called printOn since it prints the object _on_ a stream. - * @param _os A std::ostream. - */ - virtual void printOn(std::ostream& _os) const { - _os << repFitness << std::endl; - } - -protected: - // minimal information on the neighbor : fitness - Fitness repFitness ; - }; #endif