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

diversity assignment corrected in moeoFrontByFrontCrowdingDiversityAssignment.h

Browse source
This commit is contained in:
Arnaud Liefooghe 2016-04-19 17:34:39 +02:00
commit c0bf207fc1
1 changed files with 111 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

83
moeo/src/diversity/moeoFrontByFrontCrowdingDiversityAssignment.h
View file

@ -1,38 +1,40 @@
/* /*
* <moeoFrontByFrontCrowdingDiversityAssignment.h> * <moeoFrontByFrontCrowdingDiversityAssignment.h>
* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2009 * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2009
* (C) OPAC Team, LIFL, 2002-2009 * (C) OPAC Team, LIFL, 2002-2009
* *
* Arnaud Liefooghe, Waldo Cancino * Arnaud Liefooghe, Waldo Cancino
* *
* This software is governed by the CeCILL license under French law and * April 2016: Bug fix in the sorting of population (corrected thanks to Martin Stehlik)
* abiding by the rules of distribution of free software. You can use, *
* modify and/ or redistribute the software under the terms of the CeCILL * This software is governed by the CeCILL license under French law and
* license as circulated by CEA, CNRS and INRIA at the following URL * abiding by the rules of distribution of free software. You can use,
* "http://www.cecill.info". * modify and/ or redistribute the software under the terms of the CeCILL
* * license as circulated by CEA, CNRS and INRIA at the following URL
* As a counterpart to the access to the source code and rights to copy, * "http://www.cecill.info".
* modify and redistribute granted by the license, users are provided only *
* with a limited warranty and the software's author, the holder of the * As a counterpart to the access to the source code and rights to copy,
* economic rights, and the successive licensors have only limited liability. * modify and redistribute granted by the license, users are provided only
* * with a limited warranty and the software's author, the holder of the
* In this respect, the user's attention is drawn to the risks associated * economic rights, and the successive licensors have only limited liability.
* with loading, using, modifying and/or developing or reproducing the *
* software by the user in light of its specific status of free software, * In this respect, the user's attention is drawn to the risks associated
* that may mean that it is complicated to manipulate, and that also * with loading, using, modifying and/or developing or reproducing the
* therefore means that it is reserved for developers and experienced * software by the user in light of its specific status of free software,
* professionals having in-depth computer knowledge. Users are therefore * that may mean that it is complicated to manipulate, and that also
* encouraged to load and test the software's suitability as regards their * therefore means that it is reserved for developers and experienced
* requirements in conditions enabling the security of their systems and/or * professionals having in-depth computer knowledge. Users are therefore
* data to be ensured and, more generally, to use and operate it in the * encouraged to load and test the software's suitability as regards their
* same conditions as regards security. * requirements in conditions enabling the security of their systems and/or
* The fact that you are presently reading this means that you have had * data to be ensured and, more generally, to use and operate it in the
* knowledge of the CeCILL license and that you accept its terms. * same conditions as regards security.
* * The fact that you are presently reading this means that you have had
* ParadisEO WebSite : http://paradiseo.gforge.inria.fr * knowledge of the CeCILL license and that you accept its terms.
* Contact: paradiseo-help@lists.gforge.inria.fr *
* * ParadisEO WebSite : http://paradiseo.gforge.inria.fr
*/ * Contact: paradiseo-help@lists.gforge.inria.fr
*
*/
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#ifndef MOEOFRONTBYFRONTCROWDINGDIVERSITYASSIGNMENT2_H_ #ifndef MOEOFRONTBYFRONTCROWDINGDIVERSITYASSIGNMENT2_H_
@ -50,8 +52,8 @@
*/ */
template < class MOEOT > template < class MOEOT >
class moeoFrontByFrontCrowdingDiversityAssignment : public moeoCrowdingDiversityAssignment < MOEOT > class moeoFrontByFrontCrowdingDiversityAssignment : public moeoCrowdingDiversityAssignment < MOEOT >
{ {
public: public:
/** the objective vector type of the solutions */ /** the objective vector type of the solutions */
typedef typename MOEOT::ObjectiveVector ObjectiveVector; typedef typename MOEOT::ObjectiveVector ObjectiveVector;
@ -69,7 +71,7 @@ class moeoFrontByFrontCrowdingDiversityAssignment : public moeoCrowdingDiversity
std::cout << "WARNING : updateByDeleting not implemented in moeoFrontByFrontCrowdingDistanceDiversityAssignment" << std::endl; std::cout << "WARNING : updateByDeleting not implemented in moeoFrontByFrontCrowdingDistanceDiversityAssignment" << std::endl;
} }
private: private:
using moeoCrowdingDiversityAssignment < MOEOT >::inf; using moeoCrowdingDiversityAssignment < MOEOT >::inf;
using moeoCrowdingDiversityAssignment < MOEOT >::tiny; using moeoCrowdingDiversityAssignment < MOEOT >::tiny;
@ -124,7 +126,10 @@ class moeoFrontByFrontCrowdingDiversityAssignment : public moeoCrowdingDiversity
// sort in the descending order using the values of the objective 'obj' // sort in the descending order using the values of the objective 'obj'
moeoOneObjectiveComparator < MOEOT > objComp(obj); moeoOneObjectiveComparator < MOEOT > objComp(obj);
moeoPtrComparator<MOEOT> cmp2( objComp ); moeoPtrComparator<MOEOT> cmp2( objComp );
std::sort(sortedptrpop.begin(), sortedptrpop.end(), cmp2); // erroneous part
// std::sort(sortedptrpop.begin(), sortedptrpop.end(), cmp2);
// correct version
std::sort(sortedptrpop.begin()+a, sortedptrpop.begin()+b+1, cmp2);
// min & max // min & max
min = (sortedptrpop[b])->objectiveVector()[obj]; min = (sortedptrpop[b])->objectiveVector()[obj];
max = (sortedptrpop[a])->objectiveVector()[obj]; max = (sortedptrpop[a])->objectiveVector()[obj];
@ -170,6 +175,6 @@ class moeoFrontByFrontCrowdingDiversityAssignment : public moeoCrowdingDiversity
} }
}; };
#endif /*MOEOFRONTBYFRONTCROWDINGDIVERSITYASSIGNMENT_H_*/ #endif /*MOEOFRONTBYFRONTCROWDINGDIVERSITYASSIGNMENT_H_*/