Skip to content
Open
Changes from 1 commit
Commits
Show all changes
102 commits
Select commit Hold shift + click to select a range
3822155
first cmaes addition
beniz May 5, 2014
d5bcdbd
adding cmaes repository
beniz May 6, 2014
fc4cb4d
added cmaes plugin
May 6, 2014
ea48ab9
first working auto-loaded cmaes
May 6, 2014
b26ba26
fixed cmaes wrapper + added likelihood gaussian fit to tutorial
May 6, 2014
d1cf676
connecting error estimates to cmaes wrapper
May 6, 2014
f8fa37f
default CMA-ES progress function set to no output
May 15, 2014
8f4a6fb
added support for box-type constraints with CMA-ES
May 16, 2014
064e2d7
added support to multiple flavors of CMA-ES
May 19, 2014
b86a301
added 1D histograms fitting benchmark for CMA-ES
May 19, 2014
0b67e07
fixed loading of libraries in CMA-ES tutorial hist fit
May 19, 2014
9f24748
fixed status in libcmaes wrapper
May 19, 2014
7f0bf46
fixed initialization of parameters with CMA-ES
May 20, 2014
3422ef4
added 2D bench for cmaes
May 20, 2014
aa18df9
added explanations to hist 1D fit for cmaes
May 20, 2014
70e1ed9
fixed parameters init for CMA-ES after refactoring of the libcmaes
May 21, 2014
05fb18e
provides error to true in CMAESMinimizer.h + preparing for fixed para…
May 21, 2014
34e619e
set default sigma0 for CMA-ES as the max step size across parameters
May 26, 2014
3dec521
fixed multiple loading of external lib in fit tutorial for CMA-ES
May 26, 2014
dd16df8
introduced first MINOS version for CMA-ES + added control of ftoleran…
May 26, 2014
a6e12ed
added to CMA-ES packagte the same tests that are available for Minuit2
May 26, 2014
cf4db6a
fixes and additions to current set of fit tutorials for CMA-ES + new …
May 26, 2014
979f0f3
connected fUp to CMA-ES confidence interval (minos) computations
May 27, 2014
68d6bf9
added control of max iterations and max functions eval to CMA-ES thro…
May 27, 2014
62770e9
did bump the default max function budget for CMA-ES
May 27, 2014
da653ef
added support for MinimizerOptions with cmaes, fixes #4
Jun 16, 2014
be005d8
using conservative min initial step-size value across all parameters …
Jun 16, 2014
e2a31e4
adapted tutorials to new cmaes performances
Jun 16, 2014
11f339a
added support for gradient information with cmaes when available
Jun 16, 2014
76c0566
added cmaes full bench tutorial script
Jun 17, 2014
6d38217
added more examples + fixes to cmaes bench script
Jun 18, 2014
b94822f
added support for cmaes / minuit2 budget and cpu ratio to benchmark
Jun 18, 2014
8a101dc
fixed settings of fixed variables in cmaes minimizer
Jun 18, 2014
3e1e5c8
fixed clearing of parameter object in cmaes wrapper
Jun 19, 2014
40c4652
new scheme in cmaes benchmark in order to compare algorithms on exact…
Jun 19, 2014
de7c095
added new functions to cmaes benchmark, in new format
Jun 19, 2014
d6114c3
added combined fit cmaes benchmark to new format
Jun 19, 2014
1c75402
completed migration of cmaes benchmarks
Jun 19, 2014
599c633
added control of number of cmaes benchmark loops over functions
Jun 19, 2014
3d5ee0b
first release of the cmaes / minuit2 benchmark tool and visualization
Jun 20, 2014
dce5cac
added support for Edm to ROOT with CMA-ES, closes #6
Jun 24, 2014
b52a4ad
filled up missing functions in CMA-ES minimizer wrapper
Jun 24, 2014
e30f82e
made CMA-ES minimizer's status compatible with those of Minuit2, clos…
Jun 24, 2014
cb014cf
clean up of CMA-ES minimizer header
Jun 24, 2014
d28ecf4
logscale + fixes to benchmark suite for CMA-ES and plot
Jun 24, 2014
d0b2f92
improvements to CMA-ES benchmark suite
Jun 24, 2014
6c0b546
CMA-ES benchmark suite support for multiple lambda values
Jun 25, 2014
8a42c51
logging of freeDim variable
Jun 25, 2014
f1c0d99
CMA-ES benchmark suite with multiple lambda values
Jun 25, 2014
af1dff8
reactivate all problems on CMA-ES benchmark
Jun 25, 2014
2c38cba
added linear scaling of input parameters to CMA-ES Minimizer, ref #5
Jun 27, 2014
90490a3
added support for sigma as option to CMA-ES Minimizer
Jun 27, 2014
45d9ec5
added optional linear scaling to CMA-ES Minimizer, ref #5
Jun 27, 2014
63f1a2a
added support for optional linear scaling to CMA-ES benchmark suite, …
Jun 27, 2014
bbef414
updated CMA-ES lorentz tutorial with control of sigma and lambda
Jun 27, 2014
2b54859
fixed sigma0 as conservative value when linear scaling is not activat…
Jul 1, 2014
8216cf4
added computation of error bounds when geno/pheno tranform is active …
Jul 2, 2014
bb76c2a
refactoring for new Minimizer getters for fTol, fUp and fMaxIter
Jul 7, 2014
befc81b
added support of numerical gradient injection to cma-es wrapper
Jul 11, 2014
742edc9
change for setting edm with cma-es
Jul 11, 2014
9653b9d
update to the minuit/cmaes benchmark
Aug 18, 2014
2e91b1b
major fix to CMA-ES / Minuit2 benchmark
Aug 20, 2014
e126cb5
updated cmaes due to new setters/getters in libcmaes
Sep 9, 2014
df89432
merge with stash
Sep 9, 2014
8c35698
fixed previous commit
Sep 9, 2014
1518c3f
fixed access to private cmaes pli members
Sep 9, 2014
e60aced
added support for multihreaded objective function calls to CMA-ES fro…
Sep 15, 2014
02f8d38
added support for control of the quiet option of libcmaes through Min…
Sep 18, 2014
6c24145
cmaes: added support for seed as an option + added example of a custo…
Sep 18, 2014
877f001
cmaes: fixed activation of gradient function when available from with…
Sep 19, 2014
dd2232c
fix wrt to cmaes API
Nov 8, 2014
e75c2fe
cmaes working with cmake
Nov 10, 2014
8800eda
fixes for cmake and configure building systems with cmaes
Nov 10, 2014
6737f0e
fix for new cmaes pli accesors
Nov 12, 2014
cae5669
Support for CMA-ES minimizer based on libcmaes
Nov 18, 2014
9c59ba5
allow cmake build with CMA-ES support without pkg-config nor full ins…
Nov 21, 2014
2cd13ce
libcmaes and CMA-ES are OFF by default
Nov 21, 2014
fb6735b
fixed libcmaes flag in compilation
Nov 21, 2014
d3baabe
cmake download libcmaes and eigen3, install them locally from scratch…
Nov 22, 2014
19adf9d
name of export project was confusing cmake
beniz Nov 25, 2014
0c09249
only build libcmaes lib with no exe when build from ROOT cmake
beniz Nov 25, 2014
8d9dc92
added cmaes support README.md file
Jan 5, 2015
cab10b3
lower the default number of CMA-ES profile likelihood (aka Minos) ite…
Mar 3, 2015
f3b9fda
activate full CMA-ES Root benchmark
Mar 3, 2015
9e3f6cd
CMA-ES glue code cleanup
Mar 3, 2015
e897163
added support for novel CMA-ES options: uncertainty handling and elitism
Mar 3, 2015
b672a5c
cleanup of the CMA-ES tutorial fit examples
Mar 3, 2015
56d2821
connected libcmaes contour function
Mar 6, 2015
cf516ca
use libcmaes simplified algo setter
Mar 6, 2015
9ea683e
cleared compilation warnings of CMA-ES Minimizer
Mar 6, 2015
6399d49
disabling libcmaes surrogates as unused in ROOT and for faster build …
Mar 6, 2015
e315e06
added Scan function to CMAESMinimizer
Mar 6, 2015
d9ddb00
using libcmaes errors() call for standard deviation
Mar 9, 2015
c88245c
added proper funding reference of the CMA-ES integration work
Mar 10, 2015
f8a72c7
fixed TF1 merge
beniz Apr 17, 2017
4e9c057
cmaes ROOT_USE_PACKAGE removal
beniz Apr 17, 2017
1edb454
removed backup file
beniz Apr 18, 2017
00fa9b7
buildcmaes in alphabetical order
beniz Apr 18, 2017
41d376a
fixed Root main URL in cmaes module README
beniz Apr 18, 2017
51b16e9
removed protectors around cmaes minimizer headers
beniz Apr 18, 2017
3556ff0
Apply some fixes after merging CMAES branch
lmoneta Jan 14, 2021
492a08f
Fix configuration for cmaes by looking also for Eigen3 that is needed…
lmoneta Jan 14, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixed multiple loading of external lib in fit tutorial for CMA-ES
  • Loading branch information
Emmanuel Benazera authored and lmoneta committed Jan 14, 2021
commit 3dec521b66bc05b0a4c73e17d3852153e409cdb6
12 changes: 9 additions & 3 deletions tutorials/fit/cmaesGausFit.C
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
#include <iostream>
#include <string>

bool libloaded = false;

void testGausFit( std::string type = "cmaes", int n = 1000) {

gRandom = new TRandom3();
Expand Down Expand Up @@ -81,9 +83,13 @@ void testGausFit( std::string type = "cmaes", int n = 1000) {

}

void cmaesGausFit() {
gSystem->Load("/usr/lib/x86_64-linux-gnu/libglog.so");
gSystem->Load("/usr/lib/x86_64-linux-gnu/libgflags.so");
void cmaesGausFit() {
if (!libloaded)
{
gSystem->Load("/usr/lib/x86_64-linux-gnu/libglog.so");
gSystem->Load("/usr/lib/x86_64-linux-gnu/libgflags.so");
libloaded = true;
}
int n = 1000;
testGausFit("cmaes",n);
//testGausFit("acmaes",n);
Expand Down