* indentation, whitespace cleanup
This commit is contained in:
parent
8341376247
commit
e8f6c5f21b
4 changed files with 36 additions and 35 deletions
|
|
@ -3,7 +3,7 @@
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
// eoApply.h
|
// eoApply.h
|
||||||
// (c) Maarten Keijzer 2000
|
// (c) Maarten Keijzer 2000
|
||||||
/*
|
/*
|
||||||
This library is free software; you can redistribute it and/or
|
This library is free software; you can redistribute it and/or
|
||||||
modify it under the terms of the GNU Lesser General Public
|
modify it under the terms of the GNU Lesser General Public
|
||||||
License as published by the Free Software Foundation; either
|
License as published by the Free Software Foundation; either
|
||||||
|
|
@ -19,7 +19,7 @@
|
||||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
|
|
||||||
Contact: todos@geneura.ugr.es, http://geneura.ugr.es
|
Contact: todos@geneura.ugr.es, http://geneura.ugr.es
|
||||||
mak@dhi.dk
|
mak@dhi.dk
|
||||||
*/
|
*/
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
@ -94,7 +94,7 @@ void omp_apply(eoUF<EOT&, void>& _proc, std::vector<EOT>& _pop)
|
||||||
//default(none) shared(_proc, _pop, size)
|
//default(none) shared(_proc, _pop, size)
|
||||||
for (size_t i = 0; i < size; ++i)
|
for (size_t i = 0; i < size; ++i)
|
||||||
{
|
{
|
||||||
_proc(_pop[i]);
|
_proc(_pop[i]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -112,7 +112,7 @@ void omp_dynamic_apply(eoUF<EOT&, void>& _proc, std::vector<EOT>& _pop)
|
||||||
//default(none) shared(_proc, _pop, size)
|
//default(none) shared(_proc, _pop, size)
|
||||||
for (size_t i = 0; i < size; ++i)
|
for (size_t i = 0; i < size; ++i)
|
||||||
{
|
{
|
||||||
_proc(_pop[i]);
|
_proc(_pop[i]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -14,26 +14,29 @@ SET(CMA_LIB_OUTPUT_PATH ${EO_BINARY_DIR}/lib)
|
||||||
|
|
||||||
SET(LIBRARY_OUTPUT_PATH ${ES_LIB_OUTPUT_PATH}) # the same output for the two libs
|
SET(LIBRARY_OUTPUT_PATH ${ES_LIB_OUTPUT_PATH}) # the same output for the two libs
|
||||||
|
|
||||||
SET (ES_SOURCES make_algo_scalar_es.cpp
|
SET(ES_SOURCES
|
||||||
make_algo_scalar_real.cpp
|
make_algo_scalar_es.cpp
|
||||||
make_checkpoint_es.cpp
|
make_algo_scalar_real.cpp
|
||||||
make_checkpoint_real.cpp
|
make_checkpoint_es.cpp
|
||||||
make_continue_es.cpp
|
make_checkpoint_real.cpp
|
||||||
make_continue_real.cpp
|
make_continue_es.cpp
|
||||||
make_genotype_es.cpp
|
make_continue_real.cpp
|
||||||
make_genotype_real.cpp
|
make_genotype_es.cpp
|
||||||
make_op_es.cpp
|
make_genotype_real.cpp
|
||||||
make_op_real.cpp
|
make_op_es.cpp
|
||||||
make_pop_es.cpp
|
make_op_real.cpp
|
||||||
make_pop_real.cpp
|
make_pop_es.cpp
|
||||||
make_run_es.cpp
|
make_pop_real.cpp
|
||||||
make_run_real.cpp)
|
make_run_es.cpp
|
||||||
|
make_run_real.cpp
|
||||||
SET (CMA_SOURCES eig.cpp
|
)
|
||||||
CMAState.cpp
|
|
||||||
CMAParams.cpp)
|
SET(CMA_SOURCES
|
||||||
|
eig.cpp
|
||||||
|
CMAState.cpp
|
||||||
|
CMAParams.cpp
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
ADD_LIBRARY(es STATIC ${ES_SOURCES})
|
ADD_LIBRARY(es STATIC ${ES_SOURCES})
|
||||||
INSTALL(TARGETS es ARCHIVE DESTINATION lib COMPONENT libraries)
|
INSTALL(TARGETS es ARCHIVE DESTINATION lib COMPONENT libraries)
|
||||||
|
|
||||||
|
|
@ -54,4 +57,3 @@ SET(CMA_VERSION ${GLOBAL_VERSION})
|
||||||
SET_TARGET_PROPERTIES(cma PROPERTIES VERSION "${CMA_VERSION}")
|
SET_TARGET_PROPERTIES(cma PROPERTIES VERSION "${CMA_VERSION}")
|
||||||
|
|
||||||
######################################################################################
|
######################################################################################
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -12,14 +12,15 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
|
||||||
SET(GA_LIB_OUTPUT_PATH ${EO_BINARY_DIR}/lib)
|
SET(GA_LIB_OUTPUT_PATH ${EO_BINARY_DIR}/lib)
|
||||||
SET(LIBRARY_OUTPUT_PATH ${GA_LIB_OUTPUT_PATH})
|
SET(LIBRARY_OUTPUT_PATH ${GA_LIB_OUTPUT_PATH})
|
||||||
|
|
||||||
SET (GA_SOURCES make_algo_scalar_ga.cpp
|
SET(GA_SOURCES
|
||||||
make_checkpoint_ga.cpp
|
make_algo_scalar_ga.cpp
|
||||||
make_continue_ga.cpp
|
make_checkpoint_ga.cpp
|
||||||
make_genotype_ga.cpp
|
make_continue_ga.cpp
|
||||||
make_op_ga.cpp
|
make_genotype_ga.cpp
|
||||||
make_pop_ga.cpp
|
make_op_ga.cpp
|
||||||
make_run_ga.cpp)
|
make_pop_ga.cpp
|
||||||
|
make_run_ga.cpp
|
||||||
|
)
|
||||||
|
|
||||||
ADD_LIBRARY(ga STATIC ${GA_SOURCES})
|
ADD_LIBRARY(ga STATIC ${GA_SOURCES})
|
||||||
INSTALL(TARGETS ga ARCHIVE DESTINATION lib COMPONENT libraries)
|
INSTALL(TARGETS ga ARCHIVE DESTINATION lib COMPONENT libraries)
|
||||||
|
|
@ -35,4 +36,3 @@ SET(GA_VERSION ${GLOBAL_VERSION})
|
||||||
SET_TARGET_PROPERTIES(ga PROPERTIES VERSION "${GA_VERSION}")
|
SET_TARGET_PROPERTIES(ga PROPERTIES VERSION "${GA_VERSION}")
|
||||||
|
|
||||||
######################################################################################
|
######################################################################################
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,2 @@
|
||||||
FILE(GLOB HDRS *.h)
|
FILE(GLOB HDRS *.h)
|
||||||
INSTALL(FILES ${HDRS} DESTINATION include/eo/gp COMPONENT headers)
|
INSTALL(FILES ${HDRS} DESTINATION include/eo/gp COMPONENT headers)
|
||||||
|
|
||||||
|
|
|
||||||
Reference in a new issue