From 7abd6697f3b83c35570bae7aa7fa4540666ce0af Mon Sep 17 00:00:00 2001 From: boufaras Date: Mon, 4 Oct 2010 15:22:23 +0000 Subject: [PATCH] redundant code in moveBack() git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1951 331e1502-861f-0410-8da2-ba01fb791d7f --- .../src/problems/permutation/moSwapNeighbor.h | 143 +++++++++--------- 1 file changed, 69 insertions(+), 74 deletions(-) diff --git a/trunk/paradiseo-mo/src/problems/permutation/moSwapNeighbor.h b/trunk/paradiseo-mo/src/problems/permutation/moSwapNeighbor.h index 1deeda5f1..2fa6d2054 100644 --- a/trunk/paradiseo-mo/src/problems/permutation/moSwapNeighbor.h +++ b/trunk/paradiseo-mo/src/problems/permutation/moSwapNeighbor.h @@ -1,99 +1,94 @@ /* - -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 -abiding by the rules of distribution of free software. You can ue, -modify and/ or redistribute the software under the terms of the CeCILL -license as circulated by CEA, CNRS and INRIA at the following URL -"http://www.cecill.info". + This software is governed by the CeCILL license under French law and + abiding by the rules of distribution of free software. You can ue, + modify and/ or redistribute the software under the terms of the CeCILL + license as circulated by CEA, CNRS and INRIA at the following URL + "http://www.cecill.info". -In this respect, the user's attention is drawn to the risks associated -with loading, using, modifying and/or developing or reproducing the -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 -therefore means that it is reserved for developers and experienced -professionals having in-depth computer knowledge. Users are therefore -encouraged to load and test the software's suitability as regards their -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 -same conditions as regards security. -The fact that you are presently reading this means that you have had -knowledge of the CeCILL license and that you accept its terms. + In this respect, the user's attention is drawn to the risks associated + with loading, using, modifying and/or developing or reproducing the + 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 + therefore means that it is reserved for developers and experienced + professionals having in-depth computer knowledge. Users are therefore + encouraged to load and test the software's suitability as regards their + 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 + same conditions as regards security. + The fact that you are presently reading this means that you have had + knowledge of the CeCILL license and that you accept its terms. -ParadisEO WebSite : http://paradiseo.gforge.inria.fr -Contact: paradiseo-help@lists.gforge.inria.fr -*/ + ParadisEO WebSite : http://paradiseo.gforge.inria.fr + Contact: paradiseo-help@lists.gforge.inria.fr + */ #ifndef _moSwapNeighbor_h #define _moSwapNeighbor_h #include - /** * Swap Neighbor */ -template -class moSwapNeighbor: public moBackableNeighbor -{ +template +class moSwapNeighbor: public moBackableNeighbor { public: - /** - * Apply the swap - * @param _solution the solution to move - */ - virtual void move(EOT& _solution) { - unsigned int tmp; - tmp=_solution[indices.first]; - _solution[indices.first]=_solution[indices.second]; - _solution[indices.second]=tmp; - _solution.invalidate(); - } + /** + * Apply the swap + * @param _solution the solution to move + */ + virtual void move(EOT& _solution) { + unsigned int tmp; + tmp = _solution[indices.first]; + _solution[indices.first] = _solution[indices.second]; + _solution[indices.second] = tmp; + _solution.invalidate(); + } - /** - * apply the swap to restore the solution (use by moFullEvalByModif) - * @param _solution the solution to move back - */ - virtual void moveBack(EOT& _solution) { - unsigned int tmp; - tmp=_solution[indices.first]; - _solution[indices.first]=_solution[indices.second]; - _solution[indices.second]=tmp; - _solution.invalidate(); - } + /** + * apply the swap to restore the solution (use by moFullEvalByModif) + * @param _solution the solution to move back + */ + virtual void moveBack(EOT& _solution) { + move(_solution); + } - /** - * Setter to fix the two indexes to swap - * @param _first first index - * @param _second second index - */ - void setIndices(unsigned int _first, unsigned int _second) { - indices.first = _first; - indices.second = _second; - } + /** + * Setter to fix the two indexes to swap + * @param _first first index + * @param _second second index + */ + void setIndices(unsigned int _first, unsigned int _second) { + indices.first = _first; + indices.second = _second; + } - /** - * Get the two indexes to swap - * @param _first first index - * @param _second second index - */ - void getIndices(unsigned int & _first, unsigned int & _second) { - _first = indices.first; - _second = indices.second; - } + /** + * Get the two indexes to swap + * @param _first first index + * @param _second second index + */ + void getIndices(unsigned int & _first, unsigned int & _second) { + _first = indices.first; + _second = indices.second; + } - /** - * Print the Neighbor - */ - void print() { - std::cout << "[" << indices.first << ", " << indices.second << "] -> " << (*this).fitness() << std::endl; - } + /** + * Print the Neighbor + */ + void print() { + std::cout << "[" << indices.first << ", " << indices.second << "] -> " + << (*this).fitness() << std::endl; + } private: - std::pair indices; + std::pair indices; };