From 78a793284672e8af32fb925ad3e71fafe2ffc72e Mon Sep 17 00:00:00 2001 From: LPTK Date: Thu, 13 Jun 2013 16:29:34 +0200 Subject: [PATCH] test cleaning --- mo/test/t-moStdDevEstimator.cpp | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/mo/test/t-moStdDevEstimator.cpp b/mo/test/t-moStdDevEstimator.cpp index 43f51cb8c..a3a6d4e77 100644 --- a/mo/test/t-moStdDevEstimator.cpp +++ b/mo/test/t-moStdDevEstimator.cpp @@ -4,32 +4,21 @@ #include #include "es/eoReal.h" -#include "continuator/moFitnessVarianceStat.h" #include "neighborhood/moRealNeighbor.h" -#include "neighborhood/moRealNeighborhood.h" //Representation and initializer #include -#include +//#include #include // fitness function #include -#include -#include //Neighbors and Neighborhoods #include #include -//Algorithm and its components -#include -#include - -//comparator -#include - - +//Sampling #include @@ -48,18 +37,12 @@ typedef moRealNeighbor< EOT > Neighbor; int main(int ac, char** av) { - - unsigned vecSize = 8; - queenEval fullEval; - eoInitPermutation init(vecSize); - //moFullEvalByCopy shiftEval(fullEval); /// by default - rndShiftNeighborhood rndShiftNH((vecSize-1) * (vecSize-1)); Queen solution; @@ -70,7 +53,9 @@ int main(int ac, char** av) moStdDevEstimator initTemp (500, rndShiftNH, fullEval); + double temp = initTemp(solution); - std::cout << "temp: " << initTemp(solution) << std::endl; - //assert(stat.value() == 625); + std::cout << "temp: " << temp << std::endl; + + assert(temp >= 0); }