From 0897afd4832d8ea8048cb82a7fc6f29e2f485b0e Mon Sep 17 00:00:00 2001 From: boufaras Date: Wed, 9 Feb 2011 10:44:31 +0000 Subject: [PATCH] git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2129 331e1502-861f-0410-8da2-ba01fb791d7f --- ParadisEO-GPU/src/problems/eval/EvalOneMax.h | 98 ++++++++-------- ParadisEO-GPU/src/problems/eval/QAPEval.h | 114 +++++++++---------- 2 files changed, 106 insertions(+), 106 deletions(-) diff --git a/ParadisEO-GPU/src/problems/eval/EvalOneMax.h b/ParadisEO-GPU/src/problems/eval/EvalOneMax.h index b6a740398..1922369ec 100644 --- a/ParadisEO-GPU/src/problems/eval/EvalOneMax.h +++ b/ParadisEO-GPU/src/problems/eval/EvalOneMax.h @@ -1,36 +1,36 @@ /* - - Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 + + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 - Karima Boufaras, Thé Van LUONG + Karima Boufaras, Thé Van LUONG - This software is governed by the CeCILL license under French law and - abiding by the rules of distribution of free software. You can use, - 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 use, + 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". - As a counterpart to the access to the source code and rights to copy, - modify and redistribute granted by the license, users are provided only - with a limited warranty and the software's author, the holder of the - economic rights, and the successive licensors have only limited liability. + As a counterpart to the access to the source code and rights to copy, + modify and redistribute granted by the license, users are provided only + with a limited warranty and the software's author, the holder of the + economic rights, and the successive licensors have only limited liability. - 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 __EvalOneMax #define __EvalOneMax @@ -42,37 +42,37 @@ template class EvalOneMax: public eoEvalFunc { -public: + public: - /** - * Constructor - */ + /** + * Constructor + */ - EvalOneMax() { - } + EvalOneMax() { + } - /** - * Destructor - */ + /** + * Destructor + */ - ~EvalOneMax(void) { - } + ~EvalOneMax(void) { + } - /** - * Full evaluation of the solution - * @param _bitVector the solution to evaluate - */ + /** + * Full evaluation of the solution + * @param _bitVector the solution to evaluate + */ - void operator()(EOT & _bitVector) { + void operator()(EOT & _bitVector) { - unsigned sum = 0; + unsigned sum = 0; - for (unsigned i = 0; i < _bitVector.size(); i++) - sum += _bitVector[i]; + for (unsigned i = 0; i < _bitVector.size(); i++) + sum += _bitVector[i]; - //set the solution fitness - _bitVector.fitness(sum); - } + //set the solution fitness + _bitVector.fitness(sum); + } }; diff --git a/ParadisEO-GPU/src/problems/eval/QAPEval.h b/ParadisEO-GPU/src/problems/eval/QAPEval.h index 13cda89c8..2777e772a 100644 --- a/ParadisEO-GPU/src/problems/eval/QAPEval.h +++ b/ParadisEO-GPU/src/problems/eval/QAPEval.h @@ -1,36 +1,36 @@ /* - - Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 + + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 - Boufaras Karima, Thé Van Luong + Boufaras Karima, Thé Van Luong - This software is governed by the CeCILL license under French law and - abiding by the rules of distribution of free software. You can use, - 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 use, + 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". - As a counterpart to the access to the source code and rights to copy, - modify and redistribute granted by the license, users are provided only - with a limited warranty and the software's author, the holder of the - economic rights, and the successive licensors have only limited liability. + As a counterpart to the access to the source code and rights to copy, + modify and redistribute granted by the license, users are provided only + with a limited warranty and the software's author, the holder of the + economic rights, and the successive licensors have only limited liability. - 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 __QAPEval #define __QAPEval @@ -38,46 +38,46 @@ #include template -class QAPEval: public eoEvalFunc { + class QAPEval: public eoEvalFunc { -public: + public: - /** - * Constructor - * @param _qapData the specific data problem useful to evalute solution(flow & distance matrices of QAP problem) - */ + /** + * Constructor + * @param _qapData the specific data problem useful to evalute solution(flow & distance matrices of QAP problem) + */ - QAPEval(QAPData & _qapData) { - qapData = _qapData; - } + QAPEval(QAPData & _qapData) { + qapData = _qapData; + } - /** - * Destructor - */ + /** + * Destructor + */ - ~QAPEval() { - } + ~QAPEval() { + } - /** - * Full evaluation of the solution - * @param _sol the solution to evaluate - */ + /** + * Full evaluation of the solution + * @param _sol the solution to evaluate + */ - void operator()(EOT & _sol) { - int cost = 0; - unsigned int size = qapData.getSize(); - for (unsigned int i = 0; i < size; i++) - for (unsigned int j = 0; j < size; j++) { - cost += qapData.a_h[i * size + j] * qapData.b_h[_sol[i] * size - + _sol[j]]; - } + void operator()(EOT & _sol) { + int cost = 0; + unsigned int size = qapData.getSize(); + for (unsigned int i = 0; i < size; i++) + for (unsigned int j = 0; j < size; j++) { + cost += qapData.a_h[i * size + j] * qapData.b_h[_sol[i] * size + + _sol[j]]; + } - _sol.fitness(cost); - } + _sol.fitness(cost); + } -protected: + protected: - QAPData qapData; + QAPData qapData; };