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

Files in directory do/ refactored to relative #include's usage

Browse source
This commit is contained in:
Ronaldd Pinho 2019-06-29 20:50:01 -03:00
commit 281a61b39e
9 changed files with 65 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

28
eo/src/do/make_algo_easea.h
View file

@ -27,35 +27,35 @@
#ifndef _make_algo_easea_h
#define _make_algo_easea_h
#include <utils/eoData.h> // for eo_is_a_rate
#include "../utils/eoData.h" // for eo_is_a_rate
// everything tha's needed for the algorithms - SCALAR fitness
// Selection
// the eoSelectOne's
#include <eoRandomSelect.h>
#include <eoSequentialSelect.h>
#include <eoDetTournamentSelect.h>
#include <eoProportionalSelect.h>
#include <eoFitnessScalingSelect.h>
#include <eoRankingSelect.h>
#include <eoStochTournamentSelect.h>
#include "../eoRandomSelect.h"
#include "../eoSequentialSelect.h"
#include "../eoDetTournamentSelect.h"
#include "../eoProportionalSelect.h"
#include "../eoFitnessScalingSelect.h"
#include "../eoRankingSelect.h"
#include "../eoStochTournamentSelect.h"
// #include <eoSelect.h> included in all others
// Breeders
#include <eoGeneralBreeder.h>
#include "../eoGeneralBreeder.h"
// Replacement
#include "make_general_replacement.h"
#include "eoMGGReplacement.h"
#include "eoG3Replacement.h"
#include "../eoMGGReplacement.h"
#include "../eoG3Replacement.h"
// Algorithm (only this one needed)
#include <eoEasyEA.h>
#include "../eoEasyEA.h"
// also need the parser and param includes
#include <utils/eoParser.h>
#include <utils/eoState.h>
#include "../utils/eoParser.h"
#include "../utils/eoState.h"
/*
* This function builds the algorithm (i.e. selection and replacement)

36
eo/src/do/make_algo_scalar.h
View file

@ -27,39 +27,39 @@
#ifndef _make_algo_scalar_h
#define _make_algo_scalar_h
#include <utils/eoData.h> // for eo_is_a_rate
#include "../utils/eoData.h" // for eo_is_a_rate
// everything tha's needed for the algorithms - SCALAR fitness
// Selection
// the eoSelectOne's
#include <eoRandomSelect.h>
#include <eoSequentialSelect.h>
#include <eoDetTournamentSelect.h>
#include <eoProportionalSelect.h>
#include <eoFitnessScalingSelect.h>
#include <eoRankingSelect.h>
#include <eoStochTournamentSelect.h>
#include <eoSharingSelect.h>
#include <utils/eoDistance.h>
#include "../eoRandomSelect.h"
#include "../eoSequentialSelect.h"
#include "../eoDetTournamentSelect.h"
#include "../eoProportionalSelect.h"
#include "../eoFitnessScalingSelect.h"
#include "../eoRankingSelect.h"
#include "../eoStochTournamentSelect.h"
#include "../eoSharingSelect.h"
#include "../utils/eoDistance.h"
// Breeders
#include <eoGeneralBreeder.h>
#include "../eoGeneralBreeder.h"
// Replacement
// #include <eoReplacement.h>
#include <eoMergeReduce.h>
#include <eoReduceMerge.h>
#include <eoSurviveAndDie.h>
#include "../eoMergeReduce.h"
#include "../eoReduceMerge.h"
#include "../eoSurviveAndDie.h"
// distance
#include <utils/eoDistance.h>
#include "../utils/eoDistance.h"
// Algorithm (only this one needed)
#include <eoEasyEA.h>
#include "../eoEasyEA.h"
// also need the parser and param includes
#include <utils/eoParser.h>
#include <utils/eoState.h>
#include "../utils/eoParser.h"
#include "../utils/eoState.h"
/*

10
eo/src/do/make_checkpoint.h
View file

@ -33,11 +33,11 @@
#include <climits>
#include <eoScalarFitness.h>
#include <utils/selectors.h> // for minimizing_fitness()
#include <EO.h>
#include <eoEvalFuncCounter.h>
#include <utils/checkpointing>
#include "../eoScalarFitness.h"
#include "../utils/selectors.h" // for minimizing_fitness()
#include "../EO.h"
#include "../eoEvalFuncCounter.h"
#include "../utils/checkpointing"
// at the moment, in utils/make_help.cpp
// this should become some eoUtils.cpp with corresponding eoUtils.h

10
eo/src/do/make_checkpoint_FDC.h
View file

@ -29,11 +29,11 @@
#include <climits>
#include <eoScalarFitness.h>
#include <utils/selectors.h> // for minimizing_fitness()
#include <EO.h>
#include <eoEvalFuncCounter.h>
#include <utils/checkpointing>
#include "../eoScalarFitness.h"
#include "../utils/selectors.h" // for minimizing_fitness()
#include "../EO.h"
#include "../eoEvalFuncCounter.h"
#include "../utils/checkpointing"
// at the moment, in utils/make_help.cpp
// this should become some eoUtils.cpp with corresponding eoUtils.h

10
eo/src/do/make_checkpoint_assembled.h
View file

@ -38,11 +38,11 @@
#include <vector>
#include <string>
#include <eoScalarFitnessAssembled.h>
#include <utils/selectors.h>
#include <EO.h>
#include <eoEvalFuncCounter.h>
#include <utils/checkpointing>
#include "../eoScalarFitnessAssembled.h"
#include "../utils/selectors.h"
#include "../EO.h"
#include "../eoEvalFuncCounter.h"
#include "../utils/checkpointing"
// at the moment, in utils/make_help.cpp
// this should become some eoUtils.cpp with corresponding eoUtils.h

16
eo/src/do/make_continue.h
View file

@ -34,18 +34,18 @@ It can then be instantiated, and compiled on its own for a given EOType
*/
// Continuators - all include eoContinue.h
#include <eoCombinedContinue.h>
#include <eoGenContinue.h>
#include <eoSteadyFitContinue.h>
#include <eoEvalContinue.h>
#include <eoFitContinue.h>
#include "../eoCombinedContinue.h"
#include "../eoGenContinue.h"
#include "../eoSteadyFitContinue.h"
#include "../eoEvalContinue.h"
#include "../eoFitContinue.h"
#ifndef _MSC_VER
#include <eoCtrlCContinue.h> // CtrlC handling (using 2 global variables!)
#include "../eoCtrlCContinue.h" // CtrlC handling (using 2 global variables!)
#endif
// also need the parser and param includes
#include <utils/eoParser.h>
#include <utils/eoState.h>
#include "../utils/eoParser.h"
#include "../utils/eoState.h"
/////////////////// the stopping criterion ////////////////

8
eo/src/do/make_general_replacement.h
View file

@ -27,14 +27,14 @@
#ifndef _make_general_replacement_h
#define _make_general_replacement_h
#include <utils/eoData.h> // for eo_is_a_rate
#include "../utils/eoData.h" // for eo_is_a_rate
// Replacement
#include <eoReduceMergeReduce.h>
#include "../eoReduceMergeReduce.h"
// also need the parser and param includes
#include <utils/eoParser.h>
#include <utils/eoState.h>
#include "../utils/eoParser.h"
#include "../utils/eoState.h"
/** a helper function that decodes a parameter read by the parser into an

10
eo/src/do/make_pop.h
View file

@ -28,11 +28,11 @@
#define _make_pop_h
#include <ctime> // for time(0) for random seeding
#include <eoPop.h>
#include <eoInit.h>
#include <utils/eoRNG.h>
#include <utils/eoParser.h>
#include <utils/eoState.h>
#include "../eoPop.h"
#include "../eoInit.h"
#include "../utils/eoRNG.h"
#include "../utils/eoParser.h"
#include "../utils/eoState.h"
/** @defgroup Builders Automatic builders
*

2
eo/src/do/make_run.h
View file

@ -28,7 +28,7 @@
#define _make_run_h
// Algorithm (only this one needed)
#include <eoAlgo.h>
#include "../eoAlgo.h"
/*
* A trivial function - only here to allow instanciation with a give EOType