From d64f2b38ed1294709e26fcfae89e44dcb7dc0df0 Mon Sep 17 00:00:00 2001 From: Johann Dreo Date: Mon, 6 Feb 2023 23:12:36 +0100 Subject: [PATCH] refactor: put cache in lib + clean doc --- mo/src/problems/partition/moBinaryPartition.h | 32 +++++++++++-------- .../partition/moBinaryPartitionSwapNeighbor.h | 21 ++++++------ .../moBinaryPartitionSwapNeighborhood.h | 1 + 3 files changed, 31 insertions(+), 23 deletions(-) diff --git a/mo/src/problems/partition/moBinaryPartition.h b/mo/src/problems/partition/moBinaryPartition.h index 36d1136fa..253c838c6 100644 --- a/mo/src/problems/partition/moBinaryPartition.h +++ b/mo/src/problems/partition/moBinaryPartition.h @@ -180,25 +180,29 @@ class moBinaryPartition : public EO and this->rejected == other.rejected; } + //! Class name for state management. virtual std::string className() const override { return "moBinaryPartition"; } - virtual void fitness(const FitT& fit) override - { - // std::clog << "Fitness assignment -- solution: " << *this << " gets fitness: " << fit << std::endl; - EO::fitness(fit); - } + // //! Accessor to set fitness. + // virtual void fitness(const FitT& fit) override + // { + // // std::clog << "Fitness assignment -- solution: " << *this << " gets fitness: " << fit << std::endl; + // EO::fitness(fit); + // } - virtual const FitT& fitness() const override - { - return EO::fitness(); - } + // //! Accessor to get fitness. + // virtual const FitT& fitness() const override + // { + // return EO::fitness(); + // } - virtual void invalidate() override - { - // this->fitness().clear(); - EO::invalidate(); - } + // //! Accessor to invalidate fitness. + // virtual void invalidate() override + // { + // // this->fitness().clear(); + // EO::invalidate(); + // } }; diff --git a/mo/src/problems/partition/moBinaryPartitionSwapNeighbor.h b/mo/src/problems/partition/moBinaryPartitionSwapNeighbor.h index 2fe5d3a55..915831122 100644 --- a/mo/src/problems/partition/moBinaryPartitionSwapNeighbor.h +++ b/mo/src/problems/partition/moBinaryPartitionSwapNeighbor.h @@ -159,6 +159,7 @@ class moBinaryPartitionSwapNeighbor : public: + //! Class name for state management. virtual std::string className() const override { return "moBinaryPartitionSwapNeighbor"; } @@ -173,26 +174,28 @@ class moBinaryPartitionSwapNeighbor : << " +" << select; } + //! Accessor to set the size. void size(size_t _selected_nb) { assert(_selected_nb > 0); this->selected_nb = _selected_nb; this->invalidate(); } + //! Accessor to get the size. size_t size() const { return this->selected_nb; } - virtual void fitness(const Fitness& fit) override - { - // std::clog << "Fitness assignment -- neighbor: " << *this << " gets fitness: " << fit << std::endl; - EO::fitness(fit); - } + // virtual void fitness(const Fitness& fit) override + // { + // // std::clog << "Fitness assignment -- neighbor: " << *this << " gets fitness: " << fit << std::endl; + // EO::fitness(fit); + // } - virtual const Fitness& fitness() const override - { - return EO::fitness(); - } + // virtual const Fitness& fitness() const override + // { + // return EO::fitness(); + // } #ifndef NDEBUG public: diff --git a/mo/src/problems/partition/moBinaryPartitionSwapNeighborhood.h b/mo/src/problems/partition/moBinaryPartitionSwapNeighborhood.h index ca40fa551..be677d0e2 100644 --- a/mo/src/problems/partition/moBinaryPartitionSwapNeighborhood.h +++ b/mo/src/problems/partition/moBinaryPartitionSwapNeighborhood.h @@ -134,6 +134,7 @@ class moBinaryPartitionSwapNeighborhood : public moNeighborhood 0; } + //! Class name for state management. virtual std::string className() const override { return "moBinaryPartitionSwapNeighborhood"; }