Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Matthias Mayr
limbo
Commits
4476b810
Commit
4476b810
authored
Jul 13, 2016
by
Antoine Cully
Browse files
fix typos in names of the benchmark function
parent
9318018c
Changes
6
Hide whitespace changes
Inline
Side-by-side
src/benchmarks/bayesopt/hp_opt.cpp
View file @
4476b810
...
...
@@ -48,12 +48,12 @@ int main(int nargs, char* args[])
strcpy
(
par
.
kernel
.
name
,
"kSEARD"
);
benchmark
<
BraninNormalized
>
(
par
,
"branin"
);
benchmark
<
Hartman6
>
(
par
,
"hartman6"
);
benchmark
<
Hartman3
>
(
par
,
"hartman3"
);
benchmark
<
Hartman
n
6
>
(
par
,
"hartman
n
6"
);
benchmark
<
Hartman
n
3
>
(
par
,
"hartman
n
3"
);
benchmark
<
Rastrigin
>
(
par
,
"rastrigin"
);
benchmark
<
Sphere
>
(
par
,
"sphere"
);
benchmark
<
Ellipsoid
>
(
par
,
"ellipsoid"
);
benchmark
<
Gold
e
nPrice
>
(
par
,
"gold
e
nprice"
);
benchmark
<
Gold
stei
nPrice
>
(
par
,
"gold
stei
nprice"
);
benchmark
<
SixHumpCamel
>
(
par
,
"sixhumpcamel"
);
return
0
;
...
...
src/benchmarks/bayesopt/simple.cpp
View file @
4476b810
...
...
@@ -48,12 +48,12 @@ int main(int nargs, char* args[])
strcpy
(
par
.
kernel
.
name
,
"kMaternISO5"
);
benchmark
<
BraninNormalized
>
(
par
,
"branin"
);
benchmark
<
Hartman6
>
(
par
,
"hartman6"
);
benchmark
<
Hartman3
>
(
par
,
"hartman3"
);
benchmark
<
Hartman
n
6
>
(
par
,
"hartman
n
6"
);
benchmark
<
Hartman
n
3
>
(
par
,
"hartman
n
3"
);
benchmark
<
Rastrigin
>
(
par
,
"rastrigin"
);
benchmark
<
Sphere
>
(
par
,
"sphere"
);
benchmark
<
Ellipsoid
>
(
par
,
"ellipsoid"
);
benchmark
<
Gold
e
nPrice
>
(
par
,
"gold
e
nprice"
);
benchmark
<
Gold
stei
nPrice
>
(
par
,
"gold
stei
nprice"
);
benchmark
<
SixHumpCamel
>
(
par
,
"sixhumpcamel"
);
return
0
;
...
...
src/benchmarks/bayesopt/testfunctions.hpp
View file @
4476b810
...
...
@@ -138,7 +138,7 @@ struct Rastrigin {
};
// see : http://www.sfu.ca/~ssurjano/hart3.html
struct
Hartman3
{
struct
Hartman
n
3
{
static
constexpr
size_t
dim_in
=
3
;
static
constexpr
size_t
dim_out
=
1
;
...
...
@@ -172,7 +172,7 @@ struct Hartman3 {
};
// see : http://www.sfu.ca/~ssurjano/hart6.html
struct
Hartman6
{
struct
Hartman
n
6
{
static
constexpr
size_t
dim_in
=
6
;
static
constexpr
size_t
dim_out
=
1
;
...
...
@@ -210,7 +210,7 @@ struct Hartman6 {
// see : http://www.sfu.ca/~ssurjano/goldpr.html
// (with ln, as suggested in Jones et al.)
struct
Gold
e
nPrice
{
struct
Gold
stei
nPrice
{
static
constexpr
size_t
dim_in
=
2
;
static
constexpr
size_t
dim_out
=
1
;
...
...
src/benchmarks/limbo/hp_opt.cpp
View file @
4476b810
...
...
@@ -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
;
benchmark
<
Opt_t
,
BraninNormalized
>
(
"branin"
);
benchmark
<
Opt_t
,
Hartman6
>
(
"hartman6"
);
benchmark
<
Opt_t
,
Hartman3
>
(
"hartman3"
);
benchmark
<
Opt_t
,
Hartman
n
6
>
(
"hartman
n
6"
);
benchmark
<
Opt_t
,
Hartman
n
3
>
(
"hartman
n
3"
);
benchmark
<
Opt_t
,
Rastrigin
>
(
"rastrigin"
);
benchmark
<
Opt_t
,
Sphere
>
(
"sphere"
);
benchmark
<
Opt_t
,
Ellipsoid
>
(
"ellipsoid"
);
benchmark
<
Opt_t
,
Gold
e
nPrice
>
(
"gold
e
nprice"
);
benchmark
<
Opt_t
,
Gold
stei
nPrice
>
(
"gold
stei
nprice"
);
benchmark
<
Opt_t
,
SixHumpCamel
>
(
"sixhumpcamel"
);
return
0
;
...
...
src/benchmarks/limbo/simple.cpp
View file @
4476b810
...
...
@@ -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
;
benchmark
<
Opt_t
,
BraninNormalized
>
(
"branin"
);
benchmark
<
Opt_t
,
Hartman6
>
(
"hartman6"
);
benchmark
<
Opt_t
,
Hartman3
>
(
"hartman3"
);
benchmark
<
Opt_t
,
Hartman
n
6
>
(
"hartman
n
6"
);
benchmark
<
Opt_t
,
Hartman
n
3
>
(
"hartman
n
3"
);
benchmark
<
Opt_t
,
Rastrigin
>
(
"rastrigin"
);
benchmark
<
Opt_t
,
Sphere
>
(
"sphere"
);
benchmark
<
Opt_t
,
Ellipsoid
>
(
"ellipsoid"
);
benchmark
<
Opt_t
,
Gold
e
nPrice
>
(
"gold
e
nprice"
);
benchmark
<
Opt_t
,
Gold
stei
nPrice
>
(
"gold
stei
nprice"
);
benchmark
<
Opt_t
,
SixHumpCamel
>
(
"sixhumpcamel"
);
return
0
;
...
...
src/benchmarks/limbo/testfunctions.hpp
View file @
4476b810
...
...
@@ -110,7 +110,7 @@ struct Rastrigin {
};
// see : http://www.sfu.ca/~ssurjano/hart3.html
struct
Hartman3
{
struct
Hartman
n
3
{
static
constexpr
size_t
dim_in
=
3
;
static
constexpr
size_t
dim_out
=
1
;
...
...
@@ -144,7 +144,7 @@ struct Hartman3 {
};
// see : http://www.sfu.ca/~ssurjano/hart6.html
struct
Hartman6
{
struct
Hartman
n
6
{
static
constexpr
size_t
dim_in
=
6
;
static
constexpr
size_t
dim_out
=
1
;
...
...
@@ -182,7 +182,7 @@ struct Hartman6 {
// see : http://www.sfu.ca/~ssurjano/goldpr.html
// (with ln, as suggested in Jones et al.)
struct
Gold
e
nPrice
{
struct
Gold
stei
nPrice
{
static
constexpr
size_t
dim_in
=
2
;
static
constexpr
size_t
dim_out
=
1
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment