stddev test
This commit is contained in:
parent
930c21f465
commit
aacba6f813
4 changed files with 20 additions and 7 deletions
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
#include <mo>
|
#include <mo>
|
||||||
#include <eoFunctor.h> // FIXME: Why don't we use eoFunctorBase on the mother classes
|
#include <eoFunctor.h> // FIXME: Why don't we use eoFunctorBase on the mother classes
|
||||||
#include "moRealNeighbor.h"
|
#include "neighbor/moRealNeighbor.h"
|
||||||
|
|
||||||
template<class Distrib, class Neighbor>
|
template<class Distrib, class Neighbor>
|
||||||
class moRealNeighborhood : public moRndNeighborhood< Neighbor >, public eoFunctorBase
|
class moRealNeighborhood : public moRndNeighborhood< Neighbor >, public eoFunctorBase
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@
|
||||||
|
|
||||||
include_directories(${EO_SRC_DIR}/src)
|
include_directories(${EO_SRC_DIR}/src)
|
||||||
include_directories(${MO_SRC_DIR}/src)
|
include_directories(${MO_SRC_DIR}/src)
|
||||||
|
include_directories(${EDO_SRC_DIR}/src)
|
||||||
include_directories(${PROBLEMS_SRC_DIR})
|
include_directories(${PROBLEMS_SRC_DIR})
|
||||||
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
|
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
|
||||||
|
|
||||||
|
|
@ -95,10 +96,10 @@ set (TEST_LIST
|
||||||
t-moIndexedVectorTabuList
|
t-moIndexedVectorTabuList
|
||||||
# t-moRndIndexedVectorTabuList
|
# t-moRndIndexedVectorTabuList
|
||||||
t-moStdFitnessNeighborStat
|
t-moStdFitnessNeighborStat
|
||||||
t-moStdDevEstimator.cpp
|
t-moStdDevEstimator
|
||||||
t-moDynSpanCoolingSchedule
|
t-moDynSpanCoolingSchedule
|
||||||
t-moTriki.cpp
|
t-moTriki
|
||||||
t-moTrikiReal.cpp
|
t-moTrikiReal
|
||||||
)
|
)
|
||||||
|
|
||||||
######################################################################################
|
######################################################################################
|
||||||
|
|
|
||||||
|
|
@ -2,11 +2,23 @@
|
||||||
// t-moFitnessNeighborStat.cpp
|
// t-moFitnessNeighborStat.cpp
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
#include ".h"
|
#include <eo>
|
||||||
|
//#include "eoReal.h"
|
||||||
|
#include "continuator/moStdFitnessNeighborStat.h"
|
||||||
|
#include "neighborhood/moRealNeighbor.h"
|
||||||
|
#include "neighborhood/moRealNeighborhood.h"
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
typedef eoReal< eoMinimizingFitness > EOT;
|
||||||
|
typedef moRealNeighbor< EOT > Neighbor;
|
||||||
|
|
||||||
int main(int ac, char** av)
|
int main(int ac, char** av)
|
||||||
{
|
{
|
||||||
|
moNeighborhoodStat<Neighbor> nhStat
|
||||||
|
moStdFitnessNeighborStat<Neighbor> stat(nhStat);
|
||||||
|
EOT solution(2, 5);
|
||||||
|
stat(solution);
|
||||||
|
//assert(stat.value() == 1);
|
||||||
|
std::cout << "ok " << stat.value() << endl;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue