nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor: put cache in lib + clean doc

Browse source
This commit is contained in:
Johann Dreo 2023-02-06 23:12:36 +01:00 • committed by nojhan
commit d64f2b38ed
3 changed files with 33 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

32
mo/src/problems/partition/moBinaryPartition.h
View file

@ -180,25 +180,29 @@ class moBinaryPartition : public EO<FitT>
and this->rejected == other.rejected; and this->rejected == other.rejected;
} }
//! Class name for state management.
virtual std::string className() const override virtual std::string className() const override
{ {
return "moBinaryPartition"; return "moBinaryPartition";
} }
virtual void fitness(const FitT& fit) override // //! Accessor to set fitness.
{ // virtual void fitness(const FitT& fit) override
// std::clog << "Fitness assignment -- solution: " << *this << " gets fitness: " << fit << std::endl; // {
EO<FitT>::fitness(fit); // // std::clog << "Fitness assignment -- solution: " << *this << " gets fitness: " << fit << std::endl;
} // EO<FitT>::fitness(fit);
// }
virtual const FitT& fitness() const override // //! Accessor to get fitness.
{ // virtual const FitT& fitness() const override
return EO<FitT>::fitness(); // {
} // return EO<FitT>::fitness();
// }
virtual void invalidate() override // //! Accessor to invalidate fitness.
{ // virtual void invalidate() override
// this->fitness().clear(); // {
EO<FitT>::invalidate(); // // this->fitness().clear();
} // EO<FitT>::invalidate();
// }
}; };

21
mo/src/problems/partition/moBinaryPartitionSwapNeighbor.h
View file

@ -159,6 +159,7 @@ class moBinaryPartitionSwapNeighbor :
public: public:
//! Class name for state management.
virtual std::string className() const override { virtual std::string className() const override {
return "moBinaryPartitionSwapNeighbor"; return "moBinaryPartitionSwapNeighbor";
} }
@ -173,26 +174,28 @@ class moBinaryPartitionSwapNeighbor :
<< " +" << select; << " +" << select;
} }
//! Accessor to set the size.
void size(size_t _selected_nb) { void size(size_t _selected_nb) {
assert(_selected_nb > 0); assert(_selected_nb > 0);
this->selected_nb = _selected_nb; this->selected_nb = _selected_nb;
this->invalidate(); this->invalidate();
} }
//! Accessor to get the size.
size_t size() const { size_t size() const {
return this->selected_nb; return this->selected_nb;
} }
virtual void fitness(const Fitness& fit) override // virtual void fitness(const Fitness& fit) override
{ // {
// std::clog << "Fitness assignment -- neighbor: " << *this << " gets fitness: " << fit << std::endl; // // std::clog << "Fitness assignment -- neighbor: " << *this << " gets fitness: " << fit << std::endl;
EO<Fitness>::fitness(fit); // EO<Fitness>::fitness(fit);
} // }
virtual const Fitness& fitness() const override // virtual const Fitness& fitness() const override
{ // {
return EO<Fitness>::fitness(); // return EO<Fitness>::fitness();
} // }
#ifndef NDEBUG #ifndef NDEBUG
public: public:

1
mo/src/problems/partition/moBinaryPartitionSwapNeighborhood.h
View file

@ -134,6 +134,7 @@ class moBinaryPartitionSwapNeighborhood : public moNeighborhood<moBinaryPartitio
return solution.rejected.size() > 0; return solution.rejected.size() > 0;
} }
//! Class name for state management.
virtual std::string className() const override { virtual std::string className() const override {
return "moBinaryPartitionSwapNeighborhood"; return "moBinaryPartitionSwapNeighborhood";
} }