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

redundant code in moveBack()

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1951 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
boufaras 2010-10-04 15:22:23 +00:00
commit 7abd6697f3
1 changed files with 77 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

143
trunk/paradiseo-mo/src/problems/permutation/moSwapNeighbor.h
View file

@ -1,99 +1,94 @@
/* /*
<moSwapNeighbor.h> <moSwapNeighbor.h>
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
Sébastien Verel, Arnaud Liefooghe, Jérémie Humeau Sébastien Verel, Arnaud Liefooghe, Jérémie Humeau
This software is governed by the CeCILL license under French law and This software is governed by the CeCILL license under French law and
abiding by the rules of distribution of free software. You can ue, abiding by the rules of distribution of free software. You can ue,
modify and/ or redistribute the software under the terms of the CeCILL modify and/ or redistribute the software under the terms of the CeCILL
license as circulated by CEA, CNRS and INRIA at the following URL license as circulated by CEA, CNRS and INRIA at the following URL
"http://www.cecill.info". "http://www.cecill.info".
In this respect, the user's attention is drawn to the risks associated In this respect, the user's attention is drawn to the risks associated
with loading, using, modifying and/or developing or reproducing the with loading, using, modifying and/or developing or reproducing the
software by the user in light of its specific status of free software, software by the user in light of its specific status of free software,
that may mean that it is complicated to manipulate, and that also that may mean that it is complicated to manipulate, and that also
therefore means that it is reserved for developers and experienced therefore means that it is reserved for developers and experienced
professionals having in-depth computer knowledge. Users are therefore professionals having in-depth computer knowledge. Users are therefore
encouraged to load and test the software's suitability as regards their encouraged to load and test the software's suitability as regards their
requirements in conditions enabling the security of their systems and/or requirements in conditions enabling the security of their systems and/or
data to be ensured and, more generally, to use and operate it in the data to be ensured and, more generally, to use and operate it in the
same conditions as regards security. same conditions as regards security.
The fact that you are presently reading this means that you have had The fact that you are presently reading this means that you have had
knowledge of the CeCILL license and that you accept its terms. knowledge of the CeCILL license and that you accept its terms.
ParadisEO WebSite : http://paradiseo.gforge.inria.fr ParadisEO WebSite : http://paradiseo.gforge.inria.fr
Contact: paradiseo-help@lists.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr
*/ */
#ifndef _moSwapNeighbor_h #ifndef _moSwapNeighbor_h
#define _moSwapNeighbor_h #define _moSwapNeighbor_h
#include <neighborhood/moBackableNeighbor.h> #include <neighborhood/moBackableNeighbor.h>
/** /**
* Swap Neighbor * Swap Neighbor
*/ */
template <class EOT, class Fitness=typename EOT::Fitness> template<class EOT, class Fitness = typename EOT::Fitness>
class moSwapNeighbor: public moBackableNeighbor<EOT, Fitness> class moSwapNeighbor: public moBackableNeighbor<EOT, Fitness> {
{
public: public:
/** /**
* Apply the swap * Apply the swap
* @param _solution the solution to move * @param _solution the solution to move
*/ */
virtual void move(EOT& _solution) { virtual void move(EOT& _solution) {
unsigned int tmp; unsigned int tmp;
tmp=_solution[indices.first]; tmp = _solution[indices.first];
_solution[indices.first]=_solution[indices.second]; _solution[indices.first] = _solution[indices.second];
_solution[indices.second]=tmp; _solution[indices.second] = tmp;
_solution.invalidate(); _solution.invalidate();
} }
/** /**
* apply the swap to restore the solution (use by moFullEvalByModif) * apply the swap to restore the solution (use by moFullEvalByModif)
* @param _solution the solution to move back * @param _solution the solution to move back
*/ */
virtual void moveBack(EOT& _solution) { virtual void moveBack(EOT& _solution) {
unsigned int tmp; move(_solution);
tmp=_solution[indices.first]; }
_solution[indices.first]=_solution[indices.second];
_solution[indices.second]=tmp;
_solution.invalidate();
}
/** /**
* Setter to fix the two indexes to swap * Setter to fix the two indexes to swap
* @param _first first index * @param _first first index
* @param _second second index * @param _second second index
*/ */
void setIndices(unsigned int _first, unsigned int _second) { void setIndices(unsigned int _first, unsigned int _second) {
indices.first = _first; indices.first = _first;
indices.second = _second; indices.second = _second;
} }
/** /**
* Get the two indexes to swap * Get the two indexes to swap
* @param _first first index * @param _first first index
* @param _second second index * @param _second second index
*/ */
void getIndices(unsigned int & _first, unsigned int & _second) { void getIndices(unsigned int & _first, unsigned int & _second) {
_first = indices.first; _first = indices.first;
_second = indices.second; _second = indices.second;
} }
/** /**
* Print the Neighbor * Print the Neighbor
*/ */
void print() { void print() {
std::cout << "[" << indices.first << ", " << indices.second << "] -> " << (*this).fitness() << std::endl; std::cout << "[" << indices.first << ", " << indices.second << "] -> "
} << (*this).fitness() << std::endl;
}
private: private:
std::pair<unsigned int, unsigned int> indices; std::pair<unsigned int, unsigned int> indices;
}; };