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

fichier deplacé

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1833 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jhumeau 2010-05-27 12:22:34 +00:00
commit d5842c8d90
16 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -41,10 +41,10 @@
#include <eoPop.h>
#include <eoEvalFunc.h>
#include <scalarStuffs/fitness/moeoSingleObjectivization.h>
#include <fitness/moeoSingleObjectivization.h>
/*
* Fitness assignment scheme which use weight foreach objectives
* Fitness assignment scheme which use weight for each objective
*/
template < class MOEOT >
class moeoAggregationFitnessAssignment : public moeoSingleObjectivization < MOEOT >

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

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

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

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

@ -113,7 +113,6 @@
#include <explorer/moeoSimpleSubNeighborhoodExplorer.h>
#include <explorer/moeoSubNeighborhoodExplorer.h>
#include <fitness/moeoAggregationFitnessAssignment.h>
#include <fitness/moeoBinaryIndicatorBasedFitnessAssignment.h>
#include <fitness/moeoConstraintFitnessAssignment.h>
@ -129,6 +128,7 @@
#include <fitness/moeoIndicatorBasedFitnessAssignment.h>
#include <fitness/moeoReferencePointIndicatorBasedFitnessAssignment.h>
#include <fitness/moeoScalarFitnessAssignment.h>
#include <fitness/moeoSingleObjectivization.h>
#include <fitness/moeoUnaryIndicatorBasedFitnessAssignment.h>
#include <hybridization/moeoDMLSGenUpdater.h>
@ -176,7 +176,6 @@
#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>

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

@ -37,7 +37,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#ifndef __moeoHC_h
#define __moeoHC_h
#include <scalarStuffs/explorer/moeoHCMoveLoopExpl.h>
#include <scalarStuffs/fitness/moeoSingleObjectivization.h>
#include <fitness/moeoSingleObjectivization.h>
#include <scalarStuffs/fitness/moeoIncrEvalSingleObjectivizer.h>
#include <scalarStuffs/algo/moeoSolAlgo.h>
#include <moHC.h>

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

@ -47,7 +47,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#include <eoEvalFunc.h>
#include <scalarStuffs/algo/moeoSolAlgo.h>
#include <moHCMoveLoopExpl.h>
#include <scalarStuffs/fitness/moeoSingleObjectivization.h>
#include <fitness/moeoSingleObjectivization.h>
#include <scalarStuffs/explorer/moeoHCMoveLoopExpl.h>
//! Iterated Local Search (ILS)

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

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

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

@ -40,7 +40,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#include <moTS.h>
#include <eoEvalFunc.h>
#include <scalarStuffs/algo/moeoSolAlgo.h>
#include <scalarStuffs/fitness/moeoSingleObjectivization.h>
#include <fitness/moeoSingleObjectivization.h>
#include <scalarStuffs/explorer/moeoTSMoveLoopExpl.h>
//! Tabu Search (TS)
/*!

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

@ -41,7 +41,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#include <eoEvalFunc.h>
#include <scalarStuffs/algo/moeoSolAlgo.h>
#include <scalarStuffs/fitness/moeoSingleObjectivization.h>
#include <fitness/moeoSingleObjectivization.h>
#include <fitness/moeoAggregationFitnessAssignment.h>
#include <scalarStuffs/explorer/moeoHCMoveLoopExpl.h>
#include <scalarStuffs/weighting/moeoVariableWeightStrategy.h>

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

@ -41,7 +41,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#include <eoEvalFunc.h>
#include <scalarStuffs/algo/moeoSolAlgo.h>
#include <moHCMoveLoopExpl.h>
#include <scalarStuffs/fitness/moeoSingleObjectivization.h>
#include <fitness/moeoSingleObjectivization.h>
#include <scalarStuffs/explorer/moeoHCMoveLoopExpl.h>
//! Variable Neighbors Search (VNS)
/*!

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

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

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

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

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

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

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

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

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

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

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

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