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

* some cleaner updates

Browse source
This commit is contained in:
Caner Candan 2010-07-23 13:18:30 +02:00
commit fde64b063b
7 changed files with 31 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

4
application/cma_sa/CMakeLists.txt
View file

@ -11,11 +11,13 @@ FOREACH(file ${RESOURCES})
EXECUTE_PROCESS(
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_SOURCE_DIR}/${file}
${CMAKE_CURRENT_BINARY_DIR}/${file}
${DO_BINARY_DIR}/${file}
)
ENDFOREACH(file)
FILE(GLOB SOURCES *.cpp)
SET(EXECUTABLE_OUTPUT_PATH ${DO_BINARY_DIR})
ADD_EXECUTABLE(${PROJECT_NAME} ${SOURCES})
TARGET_LINK_LIBRARIES(${PROJECT_NAME} do ${EO_LIBRARIES} ${MO_LIBRARIES})

13
application/cma_sa/main.cpp
View file

@ -48,9 +48,6 @@ int main(int ac, char** av)
doModifierMass< doNormal< EOT > >* modifier = new doNormalCenter< EOT >();
state.storeFunctor(modifier);
// EOT min(2, 42);
// EOT max(2, 32);
//eoEvalFunc< EOT >* plainEval = new BopoRosenbrock< EOT, double, const EOT& >();
eoEvalFunc< EOT >* plainEval = new Sphere< EOT >();
state.storeFunctor(plainEval);
@ -119,11 +116,11 @@ int main(int ac, char** av)
// stopping criteria
// ... and creates the parameter letters: C E g G s T
eoContinue< EOT >& monitoringContinue = do_make_continue(parser, state, eval);
eoContinue< EOT >& monitoring_continue = do_make_continue(parser, state, eval);
// output
eoCheckPoint< EOT >& checkpoint = do_make_checkpoint(parser, state, eval, monitoringContinue);
eoCheckPoint< EOT >& checkpoint = do_make_checkpoint(parser, state, eval, monitoring_continue);
// appends some missing code to checkpoint
@ -146,10 +143,10 @@ int main(int ac, char** av)
// --------------------------
// eoPopStat< EOT >* popStat = new eoPopStat<EOT>;
// state.storeFunctor(popStat);
eoPopStat< EOT >* popStat = new eoPopStat<EOT>;
state.storeFunctor(popStat);
// checkpoint.add(*popStat);
checkpoint.add(*popStat);
// eoMonitor* fileSnapshot = new doFileSnapshot< std::vector< std::string > >("ResPop");
// state.storeFunctor(fileSnapshot);