diff --git a/Fit/StandardFits/MinimizerFunctionalTests.cpp b/Fit/StandardFits/MinimizerFunctionalTests.cpp index 9e81d78fe7e1f7a6b9a6e624f5623ced2d6afbfa..d88e6a14e985a12aef77cdd17d1eb1280cc96017 100644 --- a/Fit/StandardFits/MinimizerFunctionalTests.cpp +++ b/Fit/StandardFits/MinimizerFunctionalTests.cpp @@ -61,7 +61,7 @@ FitSuite *GeneticTest::createFitSuite() result->initPrint(200); IMinimizer *minimizer = MinimizerFactory::createMinimizer(m_minimizer_name, m_minimizer_algorithm); minimizer->getOptions().setMaxIterations(1); - minimizer->getOptions().setValue("RandomSeed",1); +// minimizer->getOptions().setValue("RandomSeed",1); result->setMinimizer(minimizer); for (size_t i = 0; i < m_parameters.size(); ++i) { result->addFitParameter(m_parameters[i].m_name, m_parameters[i].m_start_value, diff --git a/ThirdParty/RootMinimizers/CMakeLists.txt b/ThirdParty/RootMinimizers/CMakeLists.txt index a391e59f2bc0e4f5c06ab403555547213cf6fb44..ed2f6108c8702e71b22321cb3fc97505850cb4f4 100644 --- a/ThirdParty/RootMinimizers/CMakeLists.txt +++ b/ThirdParty/RootMinimizers/CMakeLists.txt @@ -53,3 +53,6 @@ target_link_libraries(${library_name} ${GSL_LIBRARIES}) # include_directories(${ROOT_INCLUDE_DIR}) #endif() +include_directories( + ${Boost_INCLUDE_DIRS} +) diff --git a/ThirdParty/RootMinimizers/src/TMVA/TUUID.cxx b/ThirdParty/RootMinimizers/src/TMVA/TUUID.cxx index 858aefb6dc7954360c968ee0101ee8618412dd61..9003ac8120b79633779f61c8ebd3ab0208599b5d 100644 --- a/ThirdParty/RootMinimizers/src/TMVA/TUUID.cxx +++ b/ThirdParty/RootMinimizers/src/TMVA/TUUID.cxx @@ -1,14 +1,22 @@ #include "TMVA/TUUID.h" #include <string.h> +#include <iostream> +#include <boost/uuid/uuid.hpp> +#include <boost/uuid/uuid_generators.hpp> +//#include <boost/uuid/uuid_io.hpp> + TUUID::TUUID() : fTimeLow(0) { } +// ROOT's implementation is removed in the favor of boost implementation void TUUID::GetUUID(UChar_t uuid[16]) const { - // Return uuid in specified buffer (16 byte = 128 bits). - - memcpy(uuid, &fTimeLow, 16); +// memcpy(uuid, fTimeLow, 16); + boost::uuids::random_generator generator; + boost::uuids::uuid boost_uuid = generator(); + memcpy(uuid, boost_uuid.begin(), 16); +// std::cout << boost_uuid << "aaa" << uuid[0] << std::endl; }