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

links with old-mo added

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1715 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jhumeau 2010-03-25 10:42:45 +00:00
commit 270ccbcda8
19 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

1
trunk/paradiseo-moeo/src/CMakeLists.txt
View file

@ -4,6 +4,7 @@
###################################################################################### ######################################################################################
INCLUDE_DIRECTORIES(${EO_SRC_DIR}) INCLUDE_DIRECTORIES(${EO_SRC_DIR})
INCLUDE_DIRECTORIES(${OLDMO_SRC_DIR}/src)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
###################################################################################### ######################################################################################

2
trunk/paradiseo-moeo/src/explorer/moeoTSMoveLoopExpl.h
View file

@ -35,7 +35,7 @@
#ifndef _moeoTSMoveLoopExpl_h #ifndef _moeoTSMoveLoopExpl_h
#define _moeoTSMoveLoopExpl_h #define _moeoTSMoveLoopExpl_h
#include <mo> #include <oldmo>
#include <moMoveLoopExpl.h> #include <moMoveLoopExpl.h>
#include <moMoveInit.h> #include <moMoveInit.h>
#include <moNextMove.h> #include <moNextMove.h>

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

@ -40,8 +40,7 @@
#include <moeo> #include <moeo>
#include <eo> #include <eo>
#include <../../paradiseo-mo/src/moMoveIncrEval.h> #include <moMoveIncrEval.h>
//#include <mo>
#include <fitness/moeoFitnessAssignment.h> #include <fitness/moeoFitnessAssignment.h>
#include <fitness/moeoSingleObjectivization.h> #include <fitness/moeoSingleObjectivization.h>
#include <eoEvalFunc.h> #include <eoEvalFunc.h>

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

@ -45,7 +45,7 @@ template <class MOEOT>
class moeoDummyRefPointStrategy : public moeoVariableRefPointStrategy<MOEOT> class moeoDummyRefPointStrategy : public moeoVariableRefPointStrategy<MOEOT>
{ {
public: public:
virtual void operator()(typename MOEOT::ObjectiveVector &_obj,const MOEOT &_moeo ){} virtual void operator()(typename MOEOT::ObjectiveVector &_obj, const MOEOT &_moeo ){}
}; };
#endif #endif

2
trunk/paradiseo-moeo/test/CMakeLists.txt
View file

@ -10,7 +10,7 @@
###################################################################################### ######################################################################################
INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src) INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src)
INCLUDE_DIRECTORIES(${MO_SRC_DIR}/src) INCLUDE_DIRECTORIES(${OLDMO_SRC_DIR}/src)
INCLUDE_DIRECTORIES(${ParadisEO-MOEO_SOURCE_DIR}/src) INCLUDE_DIRECTORIES(${ParadisEO-MOEO_SOURCE_DIR}/src)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})

2
trunk/paradiseo-moeo/test/t-moeoAnytimeWeightStrategy.cpp
View file

@ -38,7 +38,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <eo> // EO #include <eo> // EO
#include <mo> // MO #include <oldmo> // MO
#include <moeo> #include <moeo>
using std::cout; using std::cout;

2
trunk/paradiseo-moeo/test/t-moeoAugmentedQexploreWeightStrategy.cpp
View file

@ -38,7 +38,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <eo> // EO #include <eo> // EO
#include <mo> // MO #include <oldmo> // MO
#include <moeo> #include <moeo>
using std::cout; using std::cout;

2
trunk/paradiseo-moeo/test/t-moeoDichoWeightStrategy.cpp
View file

@ -38,7 +38,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <eo> // EO #include <eo> // EO
#include <mo> // MO #include <oldmo> // MO
#include <moeo> #include <moeo>
using std::cout; using std::cout;

2
trunk/paradiseo-moeo/test/t-moeoFixedTimeBothDirectionWeightStrategy.cpp
View file

@ -38,7 +38,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <eo> // EO #include <eo> // EO
#include <mo> // MO #include <oldmo> // MO
#include <moeo> #include <moeo>
using std::cout; using std::cout;

2
trunk/paradiseo-moeo/test/t-moeoFixedTimeOneDirectionWeightStrategy.cpp
View file

@ -38,7 +38,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <eo> // EO #include <eo> // EO
#include <mo> // MO #include <oldmo> // MO
#include <moeo> #include <moeo>
using std::cout; using std::cout;

2
trunk/paradiseo-moeo/test/t-moeoHC.cpp
View file

@ -38,7 +38,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <eo> // EO #include <eo> // EO
#include <mo> // MO #include <oldmo> // MO
#include <moeo> #include <moeo>
using std::cout; using std::cout;

2
trunk/paradiseo-moeo/test/t-moeoILS_HC.cpp
View file

@ -38,7 +38,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <eo> // EO #include <eo> // EO
#include <mo> // MO #include <oldmo> // MO
#include <moeo> #include <moeo>
using std::cout; using std::cout;

2
trunk/paradiseo-moeo/test/t-moeoILS_SA.cpp
View file

@ -39,7 +39,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <eo> // EO #include <eo> // EO
#include <mo> // MO #include <oldmo> // MO
#include <moeo> #include <moeo>
using std::cout; using std::cout;

2
trunk/paradiseo-moeo/test/t-moeoILS_TS.cpp
View file

@ -38,7 +38,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <eo> // EO #include <eo> // EO
#include <mo> // MO #include <oldmo> // MO
#include <moeo> #include <moeo>
using std::cout; using std::cout;

2
trunk/paradiseo-moeo/test/t-moeoQexploreWeightStrategy.cpp
View file

@ -38,7 +38,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <eo> // EO #include <eo> // EO
#include <mo> // MO #include <oldmo> // MO
#include <moeo> #include <moeo>
using std::cout; using std::cout;

2
trunk/paradiseo-moeo/test/t-moeoTS.cpp
View file

@ -38,7 +38,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <eo> // EO #include <eo> // EO
#include <mo> // MO #include <oldmo> // MO
#include <moeo> #include <moeo>
using std::cout; using std::cout;

2
trunk/paradiseo-moeo/test/t-moeoVFAS.cpp
View file

@ -38,7 +38,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <eo> // EO #include <eo> // EO
#include <mo> // MO #include <oldmo> // MO
#include <moeo> #include <moeo>
using std::cout; using std::cout;

2
trunk/paradiseo-moeo/test/t-moeoVNS.cpp
View file

@ -39,7 +39,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <eo> // EO #include <eo> // EO
#include <mo> // MO #include <oldmo> // MO
#include <moeo> #include <moeo>
#include <cassert> #include <cassert>

1
trunk/paradiseo-moeo/tutorial/CMakeLists.txt
View file

@ -3,6 +3,7 @@
### 1) Definitions ### 1) Definitions
###################################################################################### ######################################################################################
INCLUDE_DIRECTORIES(${MO_SRC_DIR}/src) INCLUDE_DIRECTORIES(${MO_SRC_DIR}/src)
INCLUDE_DIRECTORIES(${OLDMO_SRC_DIR}/src)
SET(FLOWSHOP_SRC_DIR ${ParadisEO-MOEO_SOURCE_DIR}/tutorial/examples/flowshop) SET(FLOWSHOP_SRC_DIR ${ParadisEO-MOEO_SOURCE_DIR}/tutorial/examples/flowshop)
SET(FLOWSHOP_BINARY_DIR ${ParadisEO-MOEO_BINARY_DIR}/tutorial/examples/flowshop) SET(FLOWSHOP_BINARY_DIR ${ParadisEO-MOEO_BINARY_DIR}/tutorial/examples/flowshop)