From 1c853ecdb95f9c99b42c6fcb62725d79487371ea Mon Sep 17 00:00:00 2001 From: nojhan Date: Fri, 10 Feb 2023 11:54:45 +0100 Subject: [PATCH] revert 399b22266 (virtual fitness interface temptative) Incompatible with MOEO's change of interface. --- eo/src/EO.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/eo/src/EO.h b/eo/src/EO.h index f0e5213ac..a2c3b490a 100644 --- a/eo/src/EO.h +++ b/eo/src/EO.h @@ -72,7 +72,9 @@ template class EO: public eoObject, public eoPersistent virtual ~EO() {}; /// Return fitness value. - virtual const Fitness& fitness() const { + // virtual const Fitness& fitness() const { // This would be impossible with MOEO. + // virtual Fitness fitness() const { // Cannot do that either, MOEO changes the interface. + Fitness fitness() const { if (invalid()) throw eoInvalidFitnessError("Cannot retrieve unevaluated fitness"); return repFitness; @@ -91,7 +93,7 @@ template class EO: public eoObject, public eoPersistent /** Set fitness. At the same time, validates it. * @param _fitness New fitness value. */ - virtual void fitness(const Fitness& _fitness) + void fitness(const Fitness& _fitness) { repFitness = _fitness; invalidFitness = false;