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

Nettoyage

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1823 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jhumeau 2010-05-26 15:18:59 +00:00
commit f7490eeadd
51 changed files with 444 additions and 1385 deletions
Download patch file Download diff file Expand all files Collapse all files

147
trunk/paradiseo-moeo/src/do/make_ls_moeo.h
View file

@ -1,147 +0,0 @@
/*
* <make_ls_moeo.h>
* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
* (C) OPAC Team, LIFL, 2002-2007
*
* Arnaud Liefooghe
*
* 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.
*
* 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
*
*/
//-----------------------------------------------------------------------------
#ifndef MAKE_LS_MOEO_H_
#define MAKE_LS_MOEO_H_
#include <eoContinue.h>
#include <eoEvalFunc.h>
#include <eoGenOp.h>
#include <utils/eoParser.h>
#include <utils/eoState.h>
#include <algo/moeoIBMOLS.h>
#include <algo/moeoIteratedIBMOLS.h>
#include <algo/moeoLS.h>
#include <archive/moeoArchive.h>
#include <fitness/moeoBinaryIndicatorBasedFitnessAssignment.h>
#include <fitness/moeoExpBinaryIndicatorBasedFitnessAssignment.h>
#include <metric/moeoNormalizedSolutionVsSolutionBinaryMetric.h>
#include <move/moeoMoveIncrEval.h>
/**
* This functions allows to build a moeoLS from the parser
* @param _parser the parser
* @param _state to store allocated objects
* @param _eval the funtions evaluator
* @param _moveIncrEval the incremental evaluation
* @param _continue the stopping crietria
* @param _op the variation operators
* @param _opInit the initilization operator
* @param _moveInit the move initializer
* @param _nextMove the move incrementor
* @param _archive the archive of non-dominated solutions
*/
template < class MOEOT, class Move >
moeoLS < MOEOT, eoPop<MOEOT> & > & do_make_ls_moeo (
eoParser & _parser,
eoState & _state,
eoEvalFunc < MOEOT > & _eval,
moeoMoveIncrEval < Move > & _moveIncrEval,
eoContinue < MOEOT > & _continue,
eoMonOp < MOEOT > & _op,
eoMonOp < MOEOT > & _opInit,
moMoveInit < Move > & _moveInit,
moNextMove < Move > & _nextMove,
moeoArchive < MOEOT > & _archive
)
{
/* the objective vector type */
typedef typename MOEOT::ObjectiveVector ObjectiveVector;
/* the fitness assignment strategy */
std::string & fitnessParam = _parser.getORcreateParam(std::string("IndicatorBased"), "fitness",
"Fitness assignment strategy parameter: IndicatorBased...", 'F',
"Evolution Engine").value();
std::string & indicatorParam = _parser.getORcreateParam(std::string("Epsilon"), "indicator",
"Binary indicator to use with the IndicatorBased assignment: Epsilon, Hypervolume", 'i',
"Evolution Engine").value();
double rho = _parser.getORcreateParam(1.1, "rho", "reference point for the hypervolume indicator",
'r', "Evolution Engine").value();
double kappa = _parser.getORcreateParam(0.05, "kappa", "Scaling factor kappa for IndicatorBased",
'k', "Evolution Engine").value();
moeoBinaryIndicatorBasedFitnessAssignment < MOEOT > * fitnessAssignment;
if (fitnessParam == std::string("IndicatorBased"))
{
// metric
moeoNormalizedSolutionVsSolutionBinaryMetric < ObjectiveVector, double > *metric;
if (indicatorParam == std::string("Epsilon"))
{
metric = new moeoAdditiveEpsilonBinaryMetric < ObjectiveVector >;
}
else if (indicatorParam == std::string("Hypervolume"))
{
metric = new moeoHypervolumeBinaryMetric < ObjectiveVector > (rho);
}
else
{
std::string stmp = std::string("Invalid binary quality indicator: ") + indicatorParam;
throw std::runtime_error(stmp.c_str());
}
fitnessAssignment = new moeoExpBinaryIndicatorBasedFitnessAssignment < MOEOT> (*metric, kappa);
}
else
{
std::string stmp = std::string("Invalid fitness assignment strategy: ") + fitnessParam;
throw std::runtime_error(stmp.c_str());
}
_state.storeFunctor(fitnessAssignment);
// number of iterations
unsigned int n = _parser.getORcreateParam(1, "n", "Number of iterations for population Initialization", 'n', "Evolution Engine").value();
// LS
std::string & lsParam = _parser.getORcreateParam(std::string("I-IBMOLS"), "ls",
"Local Search: IBMOLS, I-IBMOLS (Iterated-IBMOLS)...", 'L',
"Evolution Engine").value();
moeoLS < MOEOT, eoPop<MOEOT> & > * ls;
if (lsParam == std::string("IBMOLS"))
{
ls = new moeoIBMOLS < MOEOT, Move > (_moveInit, _nextMove, _eval, _moveIncrEval, *fitnessAssignment, _continue);
;
}
else if (lsParam == std::string("I-IBMOLS"))
{
ls = new moeoIteratedIBMOLS < MOEOT, Move > (_moveInit, _nextMove, _eval, _moveIncrEval, *fitnessAssignment, _continue, _op, _opInit, n);
}
else
{
std::string stmp = std::string("Invalid fitness assignment strategy: ") + fitnessParam;
throw std::runtime_error(stmp.c_str());
}
_state.storeFunctor(ls);
// that's it !
return *ls;
}
#endif /*MAKE_LS_MOEO_H_*/

2
trunk/paradiseo-moeo/src/fitness/moeoAggregationFitnessAssignment.h
View file

@ -41,7 +41,7 @@
#include <eoPop.h>
#include <eoEvalFunc.h>
#include <fitness/moeoSingleObjectivization.h>
#include <scalarStuffs/fitness/moeoSingleObjectivization.h>
/*
* Fitness assignment scheme which use weight foreach objectives

2
trunk/paradiseo-moeo/src/fitness/moeoConstraintFitnessAssignment.h
View file

@ -40,7 +40,7 @@
#define MOEOCONSTRAINTFITNESSASSIGNMENT_H_
#include <eoPop.h>
#include <fitness/moeoSingleObjectivization.h>
#include <scalarStuffs/fitness/moeoSingleObjectivization.h>
#include <utils/moeoObjectiveVectorNormalizer.h>
/*

1
trunk/paradiseo-moeo/src/metric/moeoVecVsVecAdditiveEpsilonBinaryMetric.h
View file

@ -41,6 +41,7 @@
#include <comparator/moeoParetoObjectiveVectorComparator.h>
#include <metric/moeoMetric.h>
#include <metric/moeoVecVsVecEpsilonBinaryMetric.h>
/**
* moeoVecVsVecAdditiveEpsilonBinaryMetric is the implementation of moeoVecVsVecEpsilonBinaryMetric whose calculate an additive epsilon indicator

117
trunk/paradiseo-moeo/src/moeo
View file

@ -42,55 +42,44 @@
#include <eo>
#include <algo/moeoAlgo.h>
#include <algo/moeoASEEA.h>
#include <algo/moeoEA.h>
#include <algo/moeoEasyEA.h>
#include <algo/moeoIBEA.h>
#include <algo/moeoMOGA.h>
#include <algo/moeoNSGA.h>
#include <algo/moeoNSGAII.h>
#include <algo/moeoPopAlgo.h>
#include <algo/moeoSEEA.h>
#include <algo/moeoASEEA.h>
#include <algo/moeoSPEA2.h>
#include <algo/moeoHC.h>
#include <algo/moeoTS.h>
#include <algo/moeoVNS.h>
#include <algo/moeoSA.h>
#include <algo/moeoILS.h>
#include <algo/moeoVFAS.h>
#include <algo/moeoPopLS.h>
#include <algo/moeoUnifiedDominanceBasedLS.h>
#include <algo/moeoPLS1.h>
#include <algo/moeoPLS2.h>
#include <algo/moeoPopAlgo.h>
#include <algo/moeoPopLS.h>
#include <algo/moeoSEEA.h>
#include <algo/moeoSPEA2.h>
#include <algo/moeoUnifiedDominanceBasedLS.h>
#include <archive/moeoArchive.h>
#include <archive/moeoArchiveIndex.h>
#include <archive/moeoBoundedArchive.h>
#include <archive/moeoEpsilonHyperboxArchive.h>
#include <archive/moeoFitDivBoundedArchive.h>
#include <archive/moeoFixedSizeArchive.h>
#include <archive/moeoIndexedArchive.h>
#include <archive/moeoImprOnlyBoundedArchive.h>
#include <archive/moeoSPEA2Archive.h>
#include <archive/moeoUnboundedArchive.h>
#include <archive/moeoImprOnlyBoundedArchive.h>
#include <archive/moeoFitDivBoundedArchive.h>
#include <archive/moeoEpsilonHyperboxArchive.h>
#include <archive/moeoQuadTree.h>
#include <archive/moeoQuickUnboundedArchiveIndex.h>
#include <comparator/moeoAggregativeComparator.h>
#include <comparator/moeoComparator.h>
#include <comparator/moeoDiversityThenFitnessComparator.h>
#include <comparator/moeoEpsilonObjectiveVectorComparator.h>
#include <comparator/moeoFitnessComparator.h>
#include <comparator/moeoFitnessThenDiversityComparator.h>
#include <comparator/moeoGDominanceObjectiveVectorComparator.h>
#include <comparator/moeoObjectiveVectorComparator.h>
#include <comparator/moeoObjectiveObjectiveVectorComparator.h>
#include <comparator/moeoObjectiveVectorComparator.h>
#include <comparator/moeoOneObjectiveComparator.h>
#include <comparator/moeoParetoObjectiveVectorComparator.h>
#include <comparator/moeoPtrComparator.h>
#include <comparator/moeoStrictObjectiveVectorComparator.h>
#include <comparator/moeoWeakObjectiveVectorComparator.h>
#include <comparator/moeoFitnessComparator.h>
#include <core/MOEO.h>
#include <core/moeoBitVector.h>
@ -104,14 +93,10 @@
#include <distance/moeoDistance.h>
#include <distance/moeoDistanceMatrix.h>
#include <distance/moeoObjSpaceDistance.h>
#include <distance/moeoEuclideanDistance.h>
#include <distance/moeoManhattanDistance.h>
#include <distance/moeoNormalizedDistance.h>
#include <distance/moeoAchievementScalarizingFunctionDistance.h>
#include <distance/moeoAugmentedAchievementScalarizingFunctionDistance.h>
#include <distance/moeoAugmentedWeightedChebychevDistance.h>
#include <distance/moeoWeightedChebychevDistance.h>
#include <distance/moeoObjSpaceDistance.h>
#include <diversity/moeoCrowdingDiversityAssignment.h>
#include <diversity/moeoDiversityAssignment.h>
@ -121,17 +106,14 @@
#include <diversity/moeoNearestNeighborDiversityAssignment.h>
#include <diversity/moeoSharingDiversityAssignment.h>
#include <explorer/moeoHCMoveLoopExpl.h>
#include <explorer/moeoTSMoveLoopExpl.h>
#include <explorer/moeoPopNeighborhoodExplorer.h>
#include <explorer/moeoExhaustiveNeighborhoodExplorer.h>
#include <explorer/moeoFirstImprovingNeighborhoodExplorer.h>
#include <explorer/moeoSimpleSubNeighborhoodExplorer.h>
#include <explorer/moeoNoDesimprovingNeighborhoodExplorer.h>
#include <explorer/moeoPopNeighborhoodExplorer.h>
#include <explorer/moeoSimpleSubNeighborhoodExplorer.h>
#include <explorer/moeoSubNeighborhoodExplorer.h>
#include <fitness/moeoAchievementFitnessAssignment.h>
#include <fitness/moeoAggregationFitnessAssignment.h>
#include <fitness/moeoBinaryIndicatorBasedFitnessAssignment.h>
#include <fitness/moeoConstraintFitnessAssignment.h>
@ -145,47 +127,80 @@
#include <fitness/moeoExpBinaryIndicatorBasedFitnessAssignment.h>
#include <fitness/moeoFitnessAssignment.h>
#include <fitness/moeoIndicatorBasedFitnessAssignment.h>
#include <fitness/moeoReferencePointIndicatorBasedFitnessAssignment.h>
#include <fitness/moeoScalarFitnessAssignment.h>
#include <fitness/moeoSingleObjectivization.h>
#include <fitness/moeoUnaryIndicatorBasedFitnessAssignment.h>
#include <fitness/moeoAchievementScalarizingFunctionMetricFitnessAssignment.h>
#include <fitness/moeoAugmentedAchievementScalarizingFunctionMetricFitnessAssignment.h>
#include <fitness/moeoWeightedChebychevMetricFitnessAssignment.h>
#include <fitness/moeoAugmentedWeightedChebychevMetricFitnessAssignment.h>
#include <fitness/moeoIncrEvalSingleObjectivizer.h>
#include <hybridization/moeoDMLSGenUpdater.h>
#include <hybridization/moeoDMLSMonOp.h>
#include <metric/moeoAdditiveEpsilonBinaryMetric.h>
#include <metric/moeoContributionMetric.h>
#include <metric/moeoDistanceMetric.h>
#include <metric/moeoEntropyMetric.h>
#include <metric/moeoHypervolumeBinaryMetric.h>
#include <metric/moeoHyperVolumeDifferenceMetric.h>
#include <metric/moeoHyperVolumeMetric.h>
#include <metric/moeoMetric.h>
#include <metric/moeoNormalizedSolutionVsSolutionBinaryMetric.h>
#include <metric/moeoVecVsVecEpsilonBinaryMetric.h>
#include <metric/moeoVecVsVecAdditiveEpsilonBinaryMetric.h>
#include <metric/moeoVecVsVecEpsilonBinaryMetric.h>
#include <metric/moeoVecVsVecMultiplicativeEpsilonBinaryMetric.h>
#include <metric/moeoDistanceMetric.h>
#include <replacement/moeoElitistReplacement.h>
#include <replacement/moeoEnvironmentalReplacement.h>
#include <replacement/moeoGenerationalReplacement.h>
#include <replacement/moeoReplacement.h>
#include <scalarStuffs/algo/moeoHC.h>
#include <scalarStuffs/algo/moeoILS.h>
#include <scalarStuffs/algo/moeoSA.h>
#include <scalarStuffs/algo/moeoSolAlgo.h>
#include <scalarStuffs/algo/moeoTS.h>
#include <scalarStuffs/algo/moeoVFAS.h>
#include <scalarStuffs/algo/moeoVNS.h>
#include <scalarStuffs/archive/moeoArchiveIndex.h>
#include <scalarStuffs/archive/moeoIndexedArchive.h>
#include <scalarStuffs/archive/moeoQuadTree.h>
#include <scalarStuffs/archive/moeoQuadTreeArchive.h>
#include <scalarStuffs/archive/moeoQuickUnboundedArchiveIndex.h>
#include <scalarStuffs/distance/moeoAchievementScalarizingFunctionDistance.h>
#include <scalarStuffs/distance/moeoAugmentedAchievementScalarizingFunctionDistance.h>
#include <scalarStuffs/distance/moeoAugmentedWeightedChebychevDistance.h>
#include <scalarStuffs/distance/moeoWeightedChebychevDistance.h>
#include <scalarStuffs/explorer/moeoHCMoveLoopExpl.h>
#include <scalarStuffs/explorer/moeoTSMoveLoopExpl.h>
#include <scalarStuffs/fitness/moeoAchievementFitnessAssignment.h>
#include <scalarStuffs/fitness/moeoAchievementScalarizingFunctionMetricFitnessAssignment.h>
#include <scalarStuffs/fitness/moeoAugmentedAchievementScalarizingFunctionMetricFitnessAssignment.h>
#include <scalarStuffs/fitness/moeoAugmentedWeightedChebychevMetricFitnessAssignment.h>
#include <scalarStuffs/fitness/moeoIncrEvalSingleObjectivizer.h>
#include <scalarStuffs/fitness/moeoMetricFitnessAssignment.h>
#include <scalarStuffs/fitness/moeoSingleObjectivization.h>
#include <scalarStuffs/fitness/moeoWeightedChebychevMetricFitnessAssignment.h>
#include <scalarStuffs/weighting/moeoAnytimeWeightStrategy.h>
#include <scalarStuffs/weighting/moeoAugmentedQexploreWeightStrategy.h>
#include <scalarStuffs/weighting/moeoDichoWeightStrategy.h>
#include <scalarStuffs/weighting/moeoDummyRefPointStrategy.h>
#include <scalarStuffs/weighting/moeoDummyWeightStrategy.h>
#include <scalarStuffs/weighting/moeoFixedTimeBothDirectionWeightStrategy.h>
#include <scalarStuffs/weighting/moeoFixedTimeOneDirectionWeightStrategy.h>
#include <scalarStuffs/weighting/moeoQexploreWeightStrategy.h>
#include <scalarStuffs/weighting/moeoRandWeightStrategy.h>
#include <scalarStuffs/weighting/moeoVariableRefPointStrategy.h>
#include <scalarStuffs/weighting/moeoVariableWeightStrategy.h>
#include <selection/moeoDetArchiveSelect.h>
#include <selection/moeoDetTournamentSelect.h>
#include <selection/moeoExhaustiveUnvisitedSelect.h>
#include <selection/moeoNumberUnvisitedSelect.h>
#include <selection/moeoRandomSelect.h>
#include <selection/moeoRouletteSelect.h>
#include <selection/moeoSelectFromPopAndArch.h>
#include <selection/moeoSelectOne.h>
#include <selection/moeoSelectors.h>
#include <selection/moeoStochTournamentSelect.h>
#include <selection/moeoDetArchiveSelect.h>
#include <selection/moeoUnvisitedSelect.h>
#include <selection/moeoExhaustiveUnvisitedSelect.h>
#include <selection/moeoNumberUnvisitedSelect.h>
#include <utils/moeoArchiveObjectiveVectorSavingUpdater.h>
#include <utils/moeoArchiveUpdater.h>
@ -194,19 +209,7 @@
#include <utils/moeoBinaryMetricSavingUpdater.h>
#include <utils/moeoConvertPopToObjectiveVectors.h>
#include <utils/moeoDominanceMatrix.h>
#include <utils/moeoObjectiveVectorNormalizer.h>
#include <utils/moeoObjVecStat.h>
#include <utils/moeoAnytimeWeightStrategy.h>
#include <utils/moeoDummyRefPointStrategy.h>
#include <utils/moeoDummyWeightStrategy.h>
#include <utils/moeoRandWeightStrategy.h>
#include <utils/moeoVariableWeightStrategy.h>
#include <utils/moeoVariableRefPointStrategy.h>
#include <utils/moeoQexploreWeightStrategy.h>
#include <utils/moeoAugmentedQexploreWeightStrategy.h>
#include <utils/moeoFixedTimeOneDirectionWeightStrategy.h>
#include <utils/moeoFixedTimeBothDirectionWeightStrategy.h>
#include <utils/moeoDichoWeightStrategy.h>
#endif /*MOEO_*/

8
trunk/paradiseo-moeo/src/algo/moeoHC.h → trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoHC.h
View file

@ -36,10 +36,10 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef __moeoHC_h
#define __moeoHC_h
#include <explorer/moeoHCMoveLoopExpl.h>
#include <fitness/moeoSingleObjectivization.h>
#include <fitness/moeoIncrEvalSingleObjectivizer.h>
#include <algo/moeoSolAlgo.h>
#include <scalarStuffs/explorer/moeoHCMoveLoopExpl.h>
#include <scalarStuffs/fitness/moeoSingleObjectivization.h>
#include <scalarStuffs/fitness/moeoIncrEvalSingleObjectivizer.h>
#include <scalarStuffs/algo/moeoSolAlgo.h>
#include <moHC.h>
//! Hill Climbing (HC)
/*!

20
trunk/paradiseo-moeo/src/algo/moeoILS.h → trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoILS.h
View file

@ -37,19 +37,19 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef _moeoILS_h
#define _moeoILS_h
#include <moILS.h>
#include <moComparator.h>
#include <algo/moeoHC.h>
#include <algo/moeoTS.h>
#include <algo/moeoSA.h>
#include <eoEvalFunc.h>
#include <algo/moeoSolAlgo.h>
#include <moHCMoveLoopExpl.h>
#include <fitness/moeoSingleObjectivization.h>
#include <explorer/moeoHCMoveLoopExpl.h>
#include <moILS.h>
#include <scalarStuffs/algo/moeoHC.h>
#include <scalarStuffs/algo/moeoTS.h>
#include <scalarStuffs/algo/moeoSA.h>
#include <eoEvalFunc.h>
#include <scalarStuffs/algo/moeoSolAlgo.h>
#include <moHCMoveLoopExpl.h>
#include <scalarStuffs/fitness/moeoSingleObjectivization.h>
#include <scalarStuffs/explorer/moeoHCMoveLoopExpl.h>
//! Iterated Local Search (ILS)
/*!
Class which describes the algorithm for a iterated local search.

6
trunk/paradiseo-moeo/src/algo/moeoSA.h → trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoSA.h
View file

@ -38,10 +38,10 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#define __moeoSA_h
#include <eoEvalFunc.h>
#include <algo/moeoSolAlgo.h>
#include <scalarStuffs/algo/moeoSolAlgo.h>
#include <moTSMoveLoopExpl.h>
#include <fitness/moeoSingleObjectivization.h>
#include <explorer/moeoTSMoveLoopExpl.h>
#include <scalarStuffs/fitness/moeoSingleObjectivization.h>
#include <scalarStuffs/explorer/moeoTSMoveLoopExpl.h>
#include <moSA.h>
//! Simulated annealing (SA)
/*!

0
trunk/paradiseo-moeo/src/algo/moeoSolAlgo.h → trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoSolAlgo.h
View file

6
trunk/paradiseo-moeo/src/algo/moeoTS.h → trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoTS.h
View file

@ -39,9 +39,9 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#include <moTS.h>
#include <eoEvalFunc.h>
#include <algo/moeoSolAlgo.h>
#include <fitness/moeoSingleObjectivization.h>
#include <explorer/moeoTSMoveLoopExpl.h>
#include <scalarStuffs/algo/moeoSolAlgo.h>
#include <scalarStuffs/fitness/moeoSingleObjectivization.h>
#include <scalarStuffs/explorer/moeoTSMoveLoopExpl.h>
//! Tabu Search (TS)
/*!
Generic algorithm that describes a tabu search.

77
trunk/paradiseo-moeo/src/algo/moeoVFAS.h → trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoVFAS.h
View file

@ -40,14 +40,14 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#include <moComparator.h>
#include <eoEvalFunc.h>
#include <algo/moeoSolAlgo.h>
#include <fitness/moeoSingleObjectivization.h>
#include <scalarStuffs/algo/moeoSolAlgo.h>
#include <scalarStuffs/fitness/moeoSingleObjectivization.h>
#include <fitness/moeoAggregationFitnessAssignment.h>
#include <explorer/moeoHCMoveLoopExpl.h>
#include <utils/moeoVariableWeightStrategy.h>
#include <utils/moeoVariableRefPointStrategy.h>
#include <utils/moeoDummyWeightStrategy.h>
#include <utils/moeoDummyRefPointStrategy.h>
#include <scalarStuffs/explorer/moeoHCMoveLoopExpl.h>
#include <scalarStuffs/weighting/moeoVariableWeightStrategy.h>
#include <scalarStuffs/weighting/moeoVariableRefPointStrategy.h>
#include <scalarStuffs/weighting/moeoDummyWeightStrategy.h>
#include <scalarStuffs/weighting/moeoDummyRefPointStrategy.h>
//! Variable fitness assignment search (vfas)
/*!
Search using multiple fitness assignment to search solution to a multi objective problem
@ -61,38 +61,36 @@ class moeoVFAS:public moeoPopAlgo < typename M::EOType >
typedef typename M::EOType MOEOT;
typedef typename MOEOT::ObjectiveVector ObjectiveVector;
typedef typename MOEOT::Fitness Fitness;
/*!
constructor using a moAlgo and a vector of weight
take a base vector of weight, and modify it to relaunch the algo with a diferent fitness
use a selectOne to determine which moeot should be the base for the algo launch
use a eoPop to keep result from each iteration
@param _algorithm The solution based heuristic to use. It should at least use the fitness value at some point.
@param _continue The stopping criterion.
@param _select a selector to choose on which moeot we use the algorithm
@param _weights a vector containing the base weights, which will be changed at each iteration.
@param _eval The evaluation function.
@param _wstrat the strategy to change weights (should be constructed with the same weights as the fitness)
/**
* constructor using a moAlgo and a vector of weight
* take a base vector of weight, and modify it to relaunch the algo with a diferent fitness
* use a selectOne to determine which moeot should be the base for the algo launch
* use a eoPop to keep result from each iteration
* @param _algorithm The solution based heuristic to use. It should at least use the fitness value at some point.
* @param _continue The stopping criterion.
* @param _select a selector to choose on which moeot we use the algorithm
* @param _weights a vector containing the base weights, which will be changed at each iteration.
* @param _eval The evaluation function.
* @param _wstrat the strategy to change weights (should be constructed with the same weights as the fitness)
*/
moeoVFAS (moeoSolAlgo<MOEOT> & _algorithm, eoContinue <MOEOT> & _continue,moeoSelectOne<MOEOT> &_select,
std::vector<double> &_weights, eoEvalFunc< MOEOT > &_eval , moeoVariableWeightStrategy<MOEOT> &_wstrat ):
algo(_algorithm),cont(_continue), select(_select), weights(_weights),eval(_eval),refPoint(defaultRefPoint), wstrat(_wstrat), rstrat(defaultRstrat)
{}
/*!
constructor using a moAlgo an ObjectiveVector and a vector of weight
take a base vector of weight, and modify it to relaunch the algo with a diferent fitness
use a selectOne to determine which moeot should be the base for the algo launch
use a eoPop to keep result from each iteration
@param _algorithm The solution based heuristic to use. It should at least use the fitness value at some point.
@param _continue The stopping criterion.
@param _select a selector to choose on which moeot we use the algorithm
@param _weights a vector containing the base weights, which will be changed at each iteration.
@param _refPoint a reference point changed at each iteration
@param _eval The evaluation function.
@param _wstrat the strategy to change weights (should be constructed with the same weights as the fitness)
@param _rstrat the strategy to change the reference point
/**
* constructor using a moAlgo an ObjectiveVector and a vector of weight
* take a base vector of weight, and modify it to relaunch the algo with a diferent fitness
* use a selectOne to determine which moeot should be the base for the algo launch
* use a eoPop to keep result from each iteration
* @param _algorithm The solution based heuristic to use. It should at least use the fitness value at some point.
* @param _continue The stopping criterion.
* @param _select a selector to choose on which moeot we use the algorithm
* @param _weights a vector containing the base weights, which will be changed at each iteration.
* @param _refPoint a reference point changed at each iteration
* @param _eval The evaluation function.
* @param _wstrat the strategy to change weights (should be constructed with the same weights as the fitness)
* @param _rstrat the strategy to change the reference point
*/
moeoVFAS (moeoSolAlgo<MOEOT> & _algorithm, eoContinue <MOEOT> & _continue,moeoSelectOne<MOEOT> &_select,
std::vector<double> &_weights, ObjectiveVector &_refPoint, eoEvalFunc< MOEOT > &_eval , moeoVariableWeightStrategy<MOEOT> &_wstrat , moeoVariableRefPointStrategy<MOEOT>& _rstrat):
@ -100,12 +98,13 @@ class moeoVFAS:public moeoPopAlgo < typename M::EOType >
{}
/**
constructor without the weights
@param _algorithm The solution based heuristic to use. It should at least use the fitness value at some point.
@param _continue The stopping criterion.
@param _select a selector to choose on which moeot we use the algorithm
@param _eval The evaluation function.
**/
* constructor without the weights
* @param _algorithm The solution based heuristic to use. It should at least use the fitness value at some point.
* @param _continue The stopping criterion.
* @param _select a selector to choose on which moeot we use the algorithm
* @param _eval The evaluation function.
* @param _wstrat the strategy to change weights (should be constructed with the same weights as the fitness)
*/
moeoVFAS (moeoSolAlgo<MOEOT> & _algorithm, eoContinue <MOEOT> & _continue,moeoSelectOne<MOEOT> &_select,
eoEvalFunc< MOEOT > &_eval, moeoVariableWeightStrategy<MOEOT> &_wstrat):
algo(_algorithm),cont(_continue), select(_select), weights(defaultWeights), eval(_eval), refPoint(defaultRefPoint), wstrat(defaultWstrat), rstrat(defaultRstrat)

6
trunk/paradiseo-moeo/src/algo/moeoVNS.h → trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoVNS.h
View file

@ -39,10 +39,10 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#include <moAlgo.h>
#include <eoEvalFunc.h>
#include <algo/moeoSolAlgo.h>
#include <scalarStuffs/algo/moeoSolAlgo.h>
#include <moHCMoveLoopExpl.h>
#include <fitness/moeoSingleObjectivization.h>
#include <explorer/moeoHCMoveLoopExpl.h>
#include <scalarStuffs/fitness/moeoSingleObjectivization.h>
#include <scalarStuffs/explorer/moeoHCMoveLoopExpl.h>
//! Variable Neighbors Search (VNS)
/*!
Class which describes the algorithm for a Variable Neighbors Search.

0
trunk/paradiseo-moeo/src/archive/moeoArchiveIndex.h → trunk/paradiseo-moeo/src/scalarStuffs/archive/moeoArchiveIndex.h
View file

2
trunk/paradiseo-moeo/src/archive/moeoIndexedArchive.h → trunk/paradiseo-moeo/src/scalarStuffs/archive/moeoIndexedArchive.h
View file

@ -3,7 +3,7 @@
#include <eoPop.h>
#include <archive/moeoArchive.h>
#include <archive/moeoArchiveIndex.h>
#include <scalarStuffs/archive/moeoArchiveIndex.h>
/**
* Archive used for 2 dimension vectors which remove pareto dominated values

2
trunk/paradiseo-moeo/src/archive/moeoQuadTree.h → trunk/paradiseo-moeo/src/scalarStuffs/archive/moeoQuadTree.h
View file

@ -40,7 +40,7 @@
#define MOEOQUADTREE_H_
#include <comparator/moeoParetoObjectiveVectorComparator.h>
#include <archive/moeoArchiveIndex.h>
#include <scalarStuffs/archive/moeoArchiveIndex.h>
template < class ObjectiveVector >
class QuadTreeNode{
public:

6
trunk/paradiseo-moeo/src/archive/moeoQuadTreeArchive.h → trunk/paradiseo-moeo/src/scalarStuffs/archive/moeoQuadTreeArchive.h
View file

@ -69,12 +69,6 @@ public:
typedef typename MOEOT::ObjectiveVector ObjectiveVector;
/**
* Ctor where you can choose your own moeoObjectiveVectorComparator
* @param _comparator the functor used to compare objective vectors
* @param _epsilon the vector contains epsilon values for each objective
* @param _replace boolean which determine if a solution with the same objectiveVector than another one, can replace it or not
*/
moeoQuadTreeArchive() : moeoArchive < MOEOT >(){}
/**

0
trunk/paradiseo-moeo/src/archive/moeoQuickUnboundedArchiveIndex.h → trunk/paradiseo-moeo/src/scalarStuffs/archive/moeoQuickUnboundedArchiveIndex.h
View file

0
trunk/paradiseo-moeo/src/distance/moeoAchievementScalarizingFunctionDistance.h → trunk/paradiseo-moeo/src/scalarStuffs/distance/moeoAchievementScalarizingFunctionDistance.h
View file

0
trunk/paradiseo-moeo/src/distance/moeoAugmentedAchievementScalarizingFunctionDistance.h → trunk/paradiseo-moeo/src/scalarStuffs/distance/moeoAugmentedAchievementScalarizingFunctionDistance.h
View file

0
trunk/paradiseo-moeo/src/distance/moeoAugmentedWeightedChebychevDistance.h → trunk/paradiseo-moeo/src/scalarStuffs/distance/moeoAugmentedWeightedChebychevDistance.h
View file

0
trunk/paradiseo-moeo/src/distance/moeoWeightedChebychevDistance.h → trunk/paradiseo-moeo/src/scalarStuffs/distance/moeoWeightedChebychevDistance.h
View file

2
trunk/paradiseo-moeo/src/explorer/moeoHCMoveLoopExpl.h → trunk/paradiseo-moeo/src/scalarStuffs/explorer/moeoHCMoveLoopExpl.h
View file

@ -42,7 +42,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#include <moMoveIncrEval.h>
#include <moMoveSelect.h>
#include <moeo>
#include <fitness/moeoIncrEvalSingleObjectivizer.h>
#include <scalarStuffs/fitness/moeoIncrEvalSingleObjectivizer.h>
/**
move explorer for multiobjectives solutions
*/

0
trunk/paradiseo-moeo/src/explorer/moeoTSMoveLoopExpl.h → trunk/paradiseo-moeo/src/scalarStuffs/explorer/moeoTSMoveLoopExpl.h
View file

0
trunk/paradiseo-moeo/src/fitness/moeoAchievementFitnessAssignment.h → trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoAchievementFitnessAssignment.h
View file

4
trunk/paradiseo-moeo/src/fitness/moeoAchievementScalarizingFunctionMetricFitnessAssignment.h → trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoAchievementScalarizingFunctionMetricFitnessAssignment.h
View file

@ -40,8 +40,8 @@
#define MOEOASFAFITNESSASSIGNMENT_H_
#include <eoPop.h>
#include <fitness/moeoSingleObjectivization.h>
#include <distance/moeoAchievementScalarizingFunctionDistance.h>
#include <scalarStuffs/fitness/moeoSingleObjectivization.h>
#include <scalarStuffs/distance/moeoAchievementScalarizingFunctionDistance.h>
#include <metric/moeoDistanceMetric.h>
#include <utils/moeoObjectiveVectorNormalizer.h>

4
trunk/paradiseo-moeo/src/fitness/moeoAugmentedAchievementScalarizingFunctionMetricFitnessAssignment.h → trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoAugmentedAchievementScalarizingFunctionMetricFitnessAssignment.h
View file

@ -43,9 +43,9 @@
#include <eo>
#include <vector>
#include <eoPop.h>
#include <fitness/moeoSingleObjectivization.h>
#include <scalarStuffs/fitness/moeoSingleObjectivization.h>
#include <utils/moeoObjectiveVectorNormalizer.h>
#include <distance/moeoAugmentedAchievementScalarizingFunctionDistance.h>
#include <scalarStuffs/distance/moeoAugmentedAchievementScalarizingFunctionDistance.h>
/*
* Fitness assignment scheme which use a metric

2
trunk/paradiseo-moeo/src/fitness/moeoAugmentedWeightedChebychevMetricFitnessAssignment.h → trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoAugmentedWeightedChebychevMetricFitnessAssignment.h
View file

@ -40,7 +40,7 @@
#define MOEOAUGCHEVMETRICFITNESSASSIGNMENT_H_
#include <eoPop.h>
#include <fitness/moeoSingleObjectivization.h>
#include <scalarStuffs/fitness/moeoSingleObjectivization.h>
#include <utils/moeoObjectiveVectorNormalizer.h>
/*

2
trunk/paradiseo-moeo/src/fitness/moeoIncrEvalSingleObjectivizer.h → trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoIncrEvalSingleObjectivizer.h
View file

@ -42,7 +42,7 @@
#include <eo>
#include <moMoveIncrEval.h>
#include <fitness/moeoFitnessAssignment.h>
#include <fitness/moeoSingleObjectivization.h>
#include <scalarStuffs/fitness/moeoSingleObjectivization.h>
#include <eoEvalFunc.h>
/**

2
trunk/paradiseo-moeo/src/fitness/moeoMetricFitnessAssignment.h → trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoMetricFitnessAssignment.h
View file

@ -43,7 +43,7 @@
#include <eo>
#include <vector>
#include <eoPop.h>
#include <fitness/moeoSingleObjectivization.h>
#include <scalarStuffs/fitness/moeoSingleObjectivization.h>
#include <utils/moeoObjectiveVectorNormalizer.h>
/*

0
trunk/paradiseo-moeo/src/fitness/moeoSingleObjectivization.h → trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoSingleObjectivization.h
View file

4
trunk/paradiseo-moeo/src/fitness/moeoWeightedChebychevMetricFitnessAssignment.h → trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoWeightedChebychevMetricFitnessAssignment.h
View file

@ -43,9 +43,9 @@
#include <eo>
#include <vector>
#include <eoPop.h>
#include <fitness/moeoSingleObjectivization.h>
#include <scalarStuffs/fitness/moeoSingleObjectivization.h>
#include <utils/moeoObjectiveVectorNormalizer.h>
#include <distance/moeoWeightedChebychevDistance.h>
#include <scalarStuffs/distance/moeoWeightedChebychevDistance.h>
/*
* Fitness assignment scheme which use a metric

101
trunk/paradiseo-moeo/src/utils/moeoAnytimeWeightStrategy.h
View file

@ -1,101 +0,0 @@
/*
* <moeoAnytimeWeightStrategy.h>
* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
* (C) OPAC Team, LIFL, 2002-2007
*
* François Legillon
*
* 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.
*
* 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
*
*/
//-----------------------------------------------------------------------------
#ifndef MOEOANYTIMEWEIGHTSTRAT_H_
#define MOEOANYTIMEWEIGHTSTRAT_H_
#include <utils/moeoVariableWeightStrategy.h>
#include <algorithm>
#include <utility>
#include <utils/rnd_generators.h>
/**
* Change all weights according to a pattern ressembling to a "double strategy" 2 to 1 then 1 to 2.
* Can only be applied to 2 objectives vector problem
*/
template <class MOEOT>
class moeoAnytimeWeightStrategy: public moeoVariableWeightStrategy<MOEOT>
{
public:
/**
* default constructor
*/
moeoAnytimeWeightStrategy():random(default_random),depth(0){}
/**
* constructor with a given random generator, for algorithms wanting to keep the same generator for some reason
* @param _random an uniform random generator
*/
moeoAnytimeWeightStrategy(UF_random_generator<double> &_random):random(_random), depth(0){}
/**
*
* @param _weights the weights to change
* @param _moeot not used
*/
void operator()(std::vector<double>& _weights, const MOEOT& _moeot){
if (depth<2){
if (depth==0) toTest.push_back(0.5);
_weights[0]=depth;
_weights[1]=1-_weights[0];
depth++;
old1=0;
old2=1;
return;
}
if (!toTest.empty()){
_weights[0]=toTest.front();
_weights[1]=1-_weights[0];
toTest.erase(toTest.begin());
toTest.push_back((_weights[0]+old1)/2);
toTest.push_back((_weights[0]+old2)/2);
old2=old1;
old1=_weights[0];
}else{
std::cout<<"Error: Strange occurence in moeoAnytimeWeightStrategy "<<std::endl;
}
}
private:
double old1;
double old2;
UF_random_generator<double> &random;
UF_random_generator<double> default_random;
int depth;
std::list<double> toTest;
};
#endif

169
trunk/paradiseo-moeo/src/utils/moeoAugmentedQexploreWeightStrategy.h
View file

@ -1,169 +0,0 @@
/*
* <moeoAugmentedQexploreWeightStrategy.h>
* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
* (C) OPAC Team, LIFL, 2002-2007
*
* François Legillon
*
* 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.
*
* 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
*
*/
//-----------------------------------------------------------------------------
#ifndef MOEOAUGMENTEDQEXPLWEIGHTSTRAT_H_
#define MOEOAUGMENTEDQEXPLWEIGHTSTRAT_H_
#include <utils/moeoVariableWeightStrategy.h>
#include <algorithm>
#include <utility>
#include <utils/rnd_generators.h>
/**
* Change all weights according to a pattern ressembling to a "double strategy" 2 to 1 then 1 to 2.
* Can only be applied to 2 objectives vector problem
*/
template <class MOEOT>
class moeoAugmentedQexploreWeightStrategy: public moeoVariableWeightStrategy<MOEOT>
{
public:
/**
* default constructor
*/
moeoAugmentedQexploreWeightStrategy():depth(0),num(0),reset(true){
nums.resize(1,0);
}
/**
*
* @param _weights the weights to change
* @param moeot a moeot, not used
*/
void operator()(std::vector<double> &_weights,const MOEOT &moeot){
int dim=moeot.objectiveVector().size();
bool res=false;
int max=dim-1;
if (depth==0) do_reset();
while (!res) {
res=translate(dim,_weights);
next_num(dim);
if (nums[0]>max){
do_reset();
}
}
}
private:
void next_num(int dim){
int max=dim-1;
int idx=nums.size()-1;
if (depth==0){
do_reset();
}else{
idx=nums.size()-1;
while(idx>0 && nums[idx]==max) idx--;
int to_assign=nums[idx]+1;
for (unsigned int i=idx;i<nums.size();i++){
nums[i]=to_assign;
}
}
}
bool translate(int dim, std::vector<double> &_weights){
_weights.clear();
_weights.resize(dim,0);
for (unsigned int i=0;i<nums.size();i++){
_weights[nums[i]]++;
if (depth>1 && _weights[nums[i]]==depth) {
return false;
}
}
bool accept_pow=false;
bool accept_prim=false;
for (unsigned int i=0;i<_weights.size();i++){
if (accept_pow || (_weights[i]!=1 && !is2pow(_weights[i]))) {
accept_pow=true;
}
if (accept_prim || (coprim(_weights[i],depth)))
accept_prim=true;
_weights[i]=(_weights[i]+0.0)/(0.0+depth);
}
return accept_prim && accept_pow;
}
void do_reset(){
if (depth==0) depth=1;
else depth=depth*2;
nums.resize(depth);
for (unsigned int i=0;i<nums.size();i++){
nums[i]=0;
}
reset=false;
}
int next_prime(int old){
int res=old;
bool prim=true;
do{
res+=1;
prim=true;
for (unsigned int i=2;i<=sqrt(res);i++){
if ((res%i)==0) prim=false;
}
}while (!prim);
return res;
}
bool coprim(int a, int b){
if (b==0){
return a==1;
}else {
return coprim(b,a%b);
}
}
bool is2pow(int a){
if (a==1 || a==0) {
return true;
}
else if ((a%2)!=0) {
return false;
}
else {
return is2pow(a/2);
}
}
std::vector<int> nums;
int depth,num;
bool reset;
};
#endif

153
trunk/paradiseo-moeo/src/utils/moeoDichoWeightStrategy.h
View file

@ -1,153 +0,0 @@
/*
* <moeoDichoWeightStrategy.h>
* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
* (C) OPAC Team, LIFL, 2002-2007
*
* Fran<-61><-89>ois Legillon
*
* 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.
*
* 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
*
*/
//-----------------------------------------------------------------------------
#ifndef MOEODICHOWEIGHTSTRAT_H_
#define MOEODICHOWEIGHTSTRAT_H_
#include <utils/moeoVariableWeightStrategy.h>
#include <algorithm>
#include <utility>
#include <utils/rnd_generators.h>
/**
* Change all weights according to a pattern ressembling to a "double strategy" 2 to 1 then 1 to 2.
* Can only be applied to 2 objectives vector problem
*/
template <class MOEOT>
class moeoDichoWeightStrategy: public moeoVariableWeightStrategy<MOEOT>
{
public:
/**
* default constructor
*/
moeoDichoWeightStrategy():random(default_random),num(0){}
/**
* constructor with a given random generator, for algorithms wanting to keep the same generator for some reason
* @param _random an uniform random generator
*/
moeoDichoWeightStrategy(UF_random_generator<double> &_random):random(_random),num(0){}
/**
*
* @param _weights the weights to change
* @param moeot a moeot, will be kept in an archive in order to calculate weights later
*/
void operator()(std::vector<double> &_weights,const MOEOT &moeot){
std::vector<double> res;
ObjectiveVector tmp;
_weights.resize(moeot.objectiveVector().size());
if (arch.size()<2){
//archive too small, we generate starting weights to populate it
//if no better solution is provided, we will toggle between (0,1) and (1,0)
arch(moeot);
if (num==0){
_weights[0]=0;
_weights[1]=1;
num++;
}else{
_weights[1]=0;
_weights[0]=1;
num=0;
std::sort(arch.begin(),arch.end(),cmpParetoSort());
it=arch.begin();
}
return;
}else{
if (it!=arch.end()){
tmp=(*it).objectiveVector();
it++;
if (it==arch.end()){
//we were at the last elements, recurse to update the archive
operator()(_weights,moeot);
return;
}
toAdd.push_back(moeot);
res=normal(tmp,(*it).objectiveVector());
_weights[0]=res[0];
_weights[1]=res[1];
}else{
//we only add new elements to the archive once we have done an entire cycle on it,
//to prevent iterator breaking
//then we reset the iterator, and we recurse to start over
arch(toAdd);
toAdd.clear();
std::sort(arch.begin(),arch.end(),cmpParetoSort());
it=arch.begin();
operator()(_weights,moeot);
return;
}
}
}
private:
typedef typename MOEOT::ObjectiveVector ObjectiveVector;
std::vector<double> normal(const ObjectiveVector &_obj1, const ObjectiveVector &_obj2){
std::vector<double> res;
double sum=0;
for (unsigned int i=0;i<_obj1.size();i++){
if (_obj1[i]>_obj2[i])
res.push_back(_obj1[i]-_obj2[i]);
else
res.push_back(_obj2[i]-_obj1[i]);
sum+=res[i];
}
for (unsigned int i=0;i<_obj1.size();i++) res[i]=res[i]/sum;
return res;
}
struct cmpParetoSort
{
//since we apply it to a 2dimension pareto front, we can sort every objectiveVector
// following either objective without problem
bool operator()(const MOEOT & a,const MOEOT & b) const
{
return b.objectiveVector()[0]<a.objectiveVector()[0];
}
};
UF_random_generator<double> &random;
UF_random_generator<double> default_random;
int num;
moeoUnboundedArchive<MOEOT> arch;
eoPop<MOEOT> toAdd;
typename eoPop<MOEOT>::iterator it;
};
#endif

51
trunk/paradiseo-moeo/src/utils/moeoDummyRefPointStrategy.h
View file

@ -1,51 +0,0 @@
/*
* <moeoDummyRefPointStrategy.h>
* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
* (C) OPAC Team, LIFL, 2002-2007
*
* François Legillon
*
* 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.
*
* 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
*
*/
//-----------------------------------------------------------------------------
#ifndef MOEODUMMYREFPOINT_H_
#define MOEODUMMYREFPOINT_H_
/**
* dummy class for variable reference point strategies. do nothing
*/
template <class MOEOT>
class moeoDummyRefPointStrategy : public moeoVariableRefPointStrategy<MOEOT>
{
public:
virtual void operator()(typename MOEOT::ObjectiveVector &_obj, const MOEOT &_moeo ){}
};
#endif

61
trunk/paradiseo-moeo/src/utils/moeoDummyWeightStrategy.h
View file

@ -1,61 +0,0 @@
/*
* <moeoDummyWeightStrategy.h>
* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
* (C) OPAC Team, LIFL, 2002-2007
*
* François Legillon
*
* 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.
*
* 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
*
*/
//-----------------------------------------------------------------------------
#ifndef MOEODUMMYWEIGHTSTRAT_H_
#define MOEODUMMYWEIGHTSTRAT_H_
#include <utils/moeoVariableWeightStrategy.h>
/**
* Dummy variable weight strategy. Fill the weight with equal values
*/
template <class MOEOT>
class moeoDummyWeightStrategy: public moeoVariableWeightStrategy<MOEOT>
{
public:
/**
* main function
* @param _weights the weights to change
* @param _moeot not used
*/
void operator()(std::vector<double> &_weights,const MOEOT &_moeot){
for (unsigned int i=0;i<_weights.size();i++){
_weights[i]=(1.0/_weights.size());
}
}
};
#endif

87
trunk/paradiseo-moeo/src/utils/moeoFixedTimeBothDirectionWeightStrategy.h
View file

@ -1,87 +0,0 @@
/*
* <moeoFixedTimeBothDirectionWeightStrategy>
* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
* (C) OPAC Team, LIFL, 2002-2007
*
* François Legillon
*
* 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.
*
* 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
*
*/
//-----------------------------------------------------------------------------
#ifndef MOEOFTBDWSWEIGHTSTRAT_H_
#define MOEOFTBDWSWEIGHTSTRAT_H_
#include <utils/moeoVariableWeightStrategy.h>
#include <algorithm>
#include <utility>
#include <utils/rnd_generators.h>
/**
* Change all weights according to a "double strategy" pattern 2 to 1 then 1 to 2.
*/
template <class MOEOT>
class moeoFixedTimeBothDirectionWeightStrategy: public moeoVariableWeightStrategy<MOEOT>
{
public:
/**
* default constructor
* @param _step how much we want the weight to change every iteration
*/
moeoFixedTimeBothDirectionWeightStrategy(double _step):step(_step),current(0),direction(false){}
/**
*
* @param _weights the weights to change
* @param moeot a moeot, not used
*/
void operator()(std::vector<double> &_weights,const MOEOT &moeot){
double res;
if (current==1){
res=1;
current=0;
direction=!direction;
}else res=current;
if (current+step>1){
current=1;
}else current+=step;
if (direction){
_weights[0]=res;
_weights[1]=1-res;
}else{
_weights[0]=1-res;
_weights[1]=res;
}
}
private:
double step;
double current;
bool direction;
};
#endif

80
trunk/paradiseo-moeo/src/utils/moeoFixedTimeOneDirectionWeightStrategy.h
View file

@ -1,80 +0,0 @@
/*
* <moeoFixedTimeOneDirectionWeightStrategy.h>
* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
* (C) OPAC Team, LIFL, 2002-2007
*
* François Legillon
*
* 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.
*
* 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
*
*/
//-----------------------------------------------------------------------------
#ifndef MOEOFTODWSWEIGHTSTRAT_H_
#define MOEOFTODWSWEIGHTSTRAT_H_
#include <utils/moeoVariableWeightStrategy.h>
#include <algorithm>
#include <utility>
#include <utils/rnd_generators.h>
/**
* Change all weights according to a simple strategy by adding a step every generation
*/
template <class MOEOT>
class moeoFixedTimeOneDirectionWeightStrategy: public moeoVariableWeightStrategy<MOEOT>
{
public:
/**
* default constructor
* @param _step how much we want the weight to change every iteration
*/
moeoFixedTimeOneDirectionWeightStrategy(double _step):step(_step),current(0){}
/**
*
* @param _weights the weights to change
* @param moeot a moeot, not used
*/
void operator()(std::vector<double> &_weights,const MOEOT &moeot){
double res;
if (current==1){
res=1;
current=0;
}else res=current;
if (current+step>1){
current=1;
}else current+=step;
_weights[0]=res;
_weights[1]=1-res;
}
private:
double step;
double current;
};
#endif

114
trunk/paradiseo-moeo/src/utils/moeoQexploreWeightStrategy.h
View file

@ -1,114 +0,0 @@
/*
* <moeoQexploreWeightStrategy.h>
* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
* (C) OPAC Team, LIFL, 2002-2007
*
* François Legillon
*
* 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.
*
* 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
*
*/
//-----------------------------------------------------------------------------
#ifndef MOEOQEXPLWEIGHTSTRAT_H_
#define MOEOQEXPLWEIGHTSTRAT_H_
#include <utils/moeoVariableWeightStrategy.h>
#include <algorithm>
#include <utility>
#include <utils/rnd_generators.h>
//#include <rnd_generators.h>
/**
* Change all weights according to a pattern ressembling to a "double strategy" 2 to 1 then 1 to 2.
* Can only be applied to 2 objectives vector problem
*/
template <class MOEOT>
class moeoQexploreWeightStrategy: public moeoVariableWeightStrategy<MOEOT>
{
public:
/**
* default constructor
*/
moeoQexploreWeightStrategy():random(default_random),depth(0),num(0){}
/**
* constructor with a given random generator, for algorithms wanting to keep the same generator for some reason
* @param _random an uniform random generator
*/
moeoQexploreWeightStrategy(UF_random_generator<double> &_random):random(_random),depth(0),num(0){}
/**
*
* @param _weights the weights to change
* @param moeot a moeot, not used
*/
void operator()(std::vector<double> &_weights,const MOEOT &moeot){
if (depth==0){
if (num==0){
num++;
_weights[0]=0;
_weights[1]=1;
}else{
num=1;
depth=1;
_weights[0]=1;
_weights[1]=0;
}
}else{
while (num<depth && !coprim(depth,num)){
num++;
}
if (num>=depth){
depth++;
num=1;
}
_weights[0]=(num+0.0)/depth;
_weights[1]=1-(num+0.0)/depth;
num++;
}
}
private:
bool coprim(int a, int b){
if (b==0){
return a==1;
}else {
return coprim(b,a%b);
}
}
void next_num(){
}
UF_random_generator<double> &random;
UF_random_generator<double> default_random;
int depth,num,idx;
std::list<double> toTest;
};
#endif

83
trunk/paradiseo-moeo/src/utils/moeoRandWeightStrategy.h
View file

@ -1,83 +0,0 @@
/*
* <moeoRandWeightStrategy.h>
* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
* (C) OPAC Team, LIFL, 2002-2007
*
* François Legillon
*
* 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.
*
* 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
*
*/
//-----------------------------------------------------------------------------
#ifndef MOEORANDWEIGHTSTRAT_H_
#define MOEORANDWEIGHTSTRAT_H_
#include <utils/moeoVariableWeightStrategy.h>
/**
* Change all weights randomly.
*/
template <class MOEOT>
class moeoRandWeightStrategy: public moeoVariableWeightStrategy<MOEOT>
{
public:
/**
* default constructor
*/
moeoRandWeightStrategy():random(default_random){}
/**
* constructor with a given random generator, for algorithms wanting to keep the same generator for some reason
* @param _random an uniform random generator
*/
moeoRandWeightStrategy(UF_random_generator<double> &_random):random(_random){}
/**
* main function, fill the weight randomly
* @param _weights the weights to change
* @param _moeot not used
*/
void operator()(std::vector<double> &_weights,const MOEOT &_moeot){
double sum=0;
for (unsigned int i=0;i<_weights.size();i++){
double rnd=random(100000);
sum+=rnd;
_weights[i]=rnd;
}
//we divide by the sum in order to keep the weight sum equal to 1
for (unsigned int i=0;i<_weights.size();i++){
_weights[i]=_weights[i]/sum;
}
}
private:
UF_random_generator<double> &random;
UF_random_generator<double> default_random;
};
#endif

51
trunk/paradiseo-moeo/src/utils/moeoVariableRefPointStrategy.h
View file

@ -1,51 +0,0 @@
/*
* <moeoVariableRefPointStrategy.h>
* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
* (C) OPAC Team, LIFL, 2002-2007
*
* François Legillon
*
* 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.
*
* 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
*
*/
//-----------------------------------------------------------------------------
#ifndef MOEOVARREFPOINT_H_
#define MOEOVARREFPOINT_H_
/**
* Abstract class for strategies for changing reference point, in a fitness assignment that use it.
*/
template <class MOEOT>
class moeoVariableRefPointStrategy
{
public:
virtual void operator()(typename MOEOT::ObjectiveVector &_obj,const MOEOT &_moeo )=0;
};
#endif

51
trunk/paradiseo-moeo/src/utils/moeoVariableWeightStrategy.h
View file

@ -1,51 +0,0 @@
/*
* <moeoVariableWeightStrategy.h>
* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
* (C) OPAC Team, LIFL, 2002-2007
*
* François Legillon
*
* 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.
*
* 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
*
*/
//-----------------------------------------------------------------------------
#ifndef MOEOVARWEIGHT_H_
#define MOEOVARWEIGHT_H_
/**
* Abstract class for strategies for changing weight, in a aggregative fitness assignment.
*/
template <class MOEOT>
class moeoVariableWeightStrategy
{
public:
virtual void operator()(std::vector<double> &_weights,const MOEOT &_moeo )=0;
};
#endif