Commit 4476b810 authored by Antoine Cully's avatar Antoine Cully
Browse files

fix typos in names of the benchmark function

parent 9318018c
...@@ -48,12 +48,12 @@ int main(int nargs, char* args[]) ...@@ -48,12 +48,12 @@ int main(int nargs, char* args[])
strcpy(par.kernel.name, "kSEARD"); strcpy(par.kernel.name, "kSEARD");
benchmark<BraninNormalized>(par, "branin"); benchmark<BraninNormalized>(par, "branin");
benchmark<Hartman6>(par, "hartman6"); benchmark<Hartmann6>(par, "hartmann6");
benchmark<Hartman3>(par, "hartman3"); benchmark<Hartmann3>(par, "hartmann3");
benchmark<Rastrigin>(par, "rastrigin"); benchmark<Rastrigin>(par, "rastrigin");
benchmark<Sphere>(par, "sphere"); benchmark<Sphere>(par, "sphere");
benchmark<Ellipsoid>(par, "ellipsoid"); benchmark<Ellipsoid>(par, "ellipsoid");
benchmark<GoldenPrice>(par, "goldenprice"); benchmark<GoldsteinPrice>(par, "goldsteinprice");
benchmark<SixHumpCamel>(par, "sixhumpcamel"); benchmark<SixHumpCamel>(par, "sixhumpcamel");
return 0; return 0;
......
...@@ -48,12 +48,12 @@ int main(int nargs, char* args[]) ...@@ -48,12 +48,12 @@ int main(int nargs, char* args[])
strcpy(par.kernel.name, "kMaternISO5"); strcpy(par.kernel.name, "kMaternISO5");
benchmark<BraninNormalized>(par, "branin"); benchmark<BraninNormalized>(par, "branin");
benchmark<Hartman6>(par, "hartman6"); benchmark<Hartmann6>(par, "hartmann6");
benchmark<Hartman3>(par, "hartman3"); benchmark<Hartmann3>(par, "hartmann3");
benchmark<Rastrigin>(par, "rastrigin"); benchmark<Rastrigin>(par, "rastrigin");
benchmark<Sphere>(par, "sphere"); benchmark<Sphere>(par, "sphere");
benchmark<Ellipsoid>(par, "ellipsoid"); benchmark<Ellipsoid>(par, "ellipsoid");
benchmark<GoldenPrice>(par, "goldenprice"); benchmark<GoldsteinPrice>(par, "goldsteinprice");
benchmark<SixHumpCamel>(par, "sixhumpcamel"); benchmark<SixHumpCamel>(par, "sixhumpcamel");
return 0; return 0;
......
...@@ -138,7 +138,7 @@ struct Rastrigin { ...@@ -138,7 +138,7 @@ struct Rastrigin {
}; };
// see : http://www.sfu.ca/~ssurjano/hart3.html // see : http://www.sfu.ca/~ssurjano/hart3.html
struct Hartman3 { struct Hartmann3 {
static constexpr size_t dim_in = 3; static constexpr size_t dim_in = 3;
static constexpr size_t dim_out = 1; static constexpr size_t dim_out = 1;
...@@ -172,7 +172,7 @@ struct Hartman3 { ...@@ -172,7 +172,7 @@ struct Hartman3 {
}; };
// see : http://www.sfu.ca/~ssurjano/hart6.html // see : http://www.sfu.ca/~ssurjano/hart6.html
struct Hartman6 { struct Hartmann6 {
static constexpr size_t dim_in = 6; static constexpr size_t dim_in = 6;
static constexpr size_t dim_out = 1; static constexpr size_t dim_out = 1;
...@@ -210,7 +210,7 @@ struct Hartman6 { ...@@ -210,7 +210,7 @@ struct Hartman6 {
// see : http://www.sfu.ca/~ssurjano/goldpr.html // see : http://www.sfu.ca/~ssurjano/goldpr.html
// (with ln, as suggested in Jones et al.) // (with ln, as suggested in Jones et al.)
struct GoldenPrice { struct GoldsteinPrice {
static constexpr size_t dim_in = 2; static constexpr size_t dim_in = 2;
static constexpr size_t dim_out = 1; static constexpr size_t dim_out = 1;
......
...@@ -105,12 +105,12 @@ int main() ...@@ -105,12 +105,12 @@ int main()
typedef bayes_opt::BOptimizer<Params, modelfun<GP_t>, initfun<Init_t>, acquifun<Acqui_t>, acquiopt<AcquiOpt_t>, statsfun<Stat_t>, stopcrit<Stop_t>> Opt_t; typedef bayes_opt::BOptimizer<Params, modelfun<GP_t>, initfun<Init_t>, acquifun<Acqui_t>, acquiopt<AcquiOpt_t>, statsfun<Stat_t>, stopcrit<Stop_t>> Opt_t;
benchmark<Opt_t, BraninNormalized>("branin"); benchmark<Opt_t, BraninNormalized>("branin");
benchmark<Opt_t, Hartman6>("hartman6"); benchmark<Opt_t, Hartmann6>("hartmann6");
benchmark<Opt_t, Hartman3>("hartman3"); benchmark<Opt_t, Hartmann3>("hartmann3");
benchmark<Opt_t, Rastrigin>("rastrigin"); benchmark<Opt_t, Rastrigin>("rastrigin");
benchmark<Opt_t, Sphere>("sphere"); benchmark<Opt_t, Sphere>("sphere");
benchmark<Opt_t, Ellipsoid>("ellipsoid"); benchmark<Opt_t, Ellipsoid>("ellipsoid");
benchmark<Opt_t, GoldenPrice>("goldenprice"); benchmark<Opt_t, GoldsteinPrice>("goldsteinprice");
benchmark<Opt_t, SixHumpCamel>("sixhumpcamel"); benchmark<Opt_t, SixHumpCamel>("sixhumpcamel");
return 0; return 0;
......
...@@ -93,12 +93,12 @@ int main() ...@@ -93,12 +93,12 @@ int main()
typedef bayes_opt::BOptimizer<Params, modelfun<GP_t>, initfun<Init_t>, acquifun<Acqui_t>, acquiopt<AcquiOpt_t>, statsfun<Stat_t>, stopcrit<Stop_t>> Opt_t; typedef bayes_opt::BOptimizer<Params, modelfun<GP_t>, initfun<Init_t>, acquifun<Acqui_t>, acquiopt<AcquiOpt_t>, statsfun<Stat_t>, stopcrit<Stop_t>> Opt_t;
benchmark<Opt_t, BraninNormalized>("branin"); benchmark<Opt_t, BraninNormalized>("branin");
benchmark<Opt_t, Hartman6>("hartman6"); benchmark<Opt_t, Hartmann6>("hartmann6");
benchmark<Opt_t, Hartman3>("hartman3"); benchmark<Opt_t, Hartmann3>("hartmann3");
benchmark<Opt_t, Rastrigin>("rastrigin"); benchmark<Opt_t, Rastrigin>("rastrigin");
benchmark<Opt_t, Sphere>("sphere"); benchmark<Opt_t, Sphere>("sphere");
benchmark<Opt_t, Ellipsoid>("ellipsoid"); benchmark<Opt_t, Ellipsoid>("ellipsoid");
benchmark<Opt_t, GoldenPrice>("goldenprice"); benchmark<Opt_t, GoldsteinPrice>("goldsteinprice");
benchmark<Opt_t, SixHumpCamel>("sixhumpcamel"); benchmark<Opt_t, SixHumpCamel>("sixhumpcamel");
return 0; return 0;
......
...@@ -110,7 +110,7 @@ struct Rastrigin { ...@@ -110,7 +110,7 @@ struct Rastrigin {
}; };
// see : http://www.sfu.ca/~ssurjano/hart3.html // see : http://www.sfu.ca/~ssurjano/hart3.html
struct Hartman3 { struct Hartmann3 {
static constexpr size_t dim_in = 3; static constexpr size_t dim_in = 3;
static constexpr size_t dim_out = 1; static constexpr size_t dim_out = 1;
...@@ -144,7 +144,7 @@ struct Hartman3 { ...@@ -144,7 +144,7 @@ struct Hartman3 {
}; };
// see : http://www.sfu.ca/~ssurjano/hart6.html // see : http://www.sfu.ca/~ssurjano/hart6.html
struct Hartman6 { struct Hartmann6 {
static constexpr size_t dim_in = 6; static constexpr size_t dim_in = 6;
static constexpr size_t dim_out = 1; static constexpr size_t dim_out = 1;
...@@ -182,7 +182,7 @@ struct Hartman6 { ...@@ -182,7 +182,7 @@ struct Hartman6 {
// see : http://www.sfu.ca/~ssurjano/goldpr.html // see : http://www.sfu.ca/~ssurjano/goldpr.html
// (with ln, as suggested in Jones et al.) // (with ln, as suggested in Jones et al.)
struct GoldenPrice { struct GoldsteinPrice {
static constexpr size_t dim_in = 2; static constexpr size_t dim_in = 2;
static constexpr size_t dim_out = 1; static constexpr size_t dim_out = 1;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment