Commit bf057f00 authored by Konstantinos Chatzilygeroudis's avatar Konstantinos Chatzilygeroudis
Browse files

Changing defaults..

parent fda264a7
......@@ -2,7 +2,7 @@
#include <limbo/kernel/matern_five_halfs.hpp>
#include <limbo/mean/data.hpp>
#include <limbo/model/gp.hpp>
#include <limbo/acqui/ucb.hpp>
#include <limbo/acqui/gp_ucb.hpp>
#include <limbo/bayes_opt/boptimizer.hpp>
#include <limbo/stat.hpp>
......
......@@ -23,19 +23,12 @@
#include <limbo/stat/aggregated_observations.hpp>
#include <limbo/stat/console_summary.hpp>
#include <limbo/tools/sys.hpp>
#include <limbo/kernel/squared_exp_ard.hpp>
#include <limbo/acqui/gp_ucb.hpp>
#include <limbo/kernel/exp.hpp>
#include <limbo/acqui/ucb.hpp>
#include <limbo/mean/data.hpp>
#ifdef USE_LIBCMAES
#include <limbo/opt/cmaes.hpp>
#elif defined USE_NLOPT
#include <limbo/opt/nlopt_no_grad.hpp>
#else
#include <limbo/opt/grid_search.hpp>
#endif
#include <limbo/model/gp.hpp>
#include <limbo/model/gp/kernel_lf_opt.hpp>
#include <limbo/init/random_sampling.hpp>
#include <limbo/tools/math.hpp>
namespace limbo {
namespace defaults {
......@@ -143,12 +136,12 @@ namespace limbo {
struct defaults {
typedef init::RandomSampling<Params> init_t; // 1
typedef kernel::SquaredExpARD<Params> kf_t;
typedef kernel::Exp<Params> kf_t;
typedef mean::Data<Params> mean_t;
typedef model::GP<Params, kf_t, mean_t, model::gp::KernelLFOpt<Params>> model_t; // 2
typedef model::GP<Params, kf_t, mean_t> model_t; // 2
// WARNING: you have to specify the acquisition function
// if you use a custom model
typedef acqui::GP_UCB<Params, model_t> acqui_t; // 3
typedef acqui::UCB<Params, model_t> acqui_t; // 3
typedef boost::fusion::vector<stat::Samples<Params>, stat::AggregatedObservations<Params>, stat::ConsoleSummary<Params>> stat_t; // 4
typedef boost::fusion::vector<stop::MaxIterations<Params>> stop_t; // 5
};
......
......@@ -12,6 +12,13 @@
#include <limbo/tools/macros.hpp>
#include <limbo/tools/random_generator.hpp>
#include <limbo/bayes_opt/bo_base.hpp>
#ifdef USE_LIBCMAES
#include <limbo/opt/cmaes.hpp>
#elif defined USE_NLOPT
#include <limbo/opt/nlopt_no_grad.hpp>
#else
#include <limbo/opt/grid_search.hpp>
#endif
namespace limbo {
namespace defaults {
......
......@@ -196,10 +196,10 @@ struct Params {
BO_PARAM(int, iterations, 40);
};
struct kernel_squared_exp_ard : public defaults::kernel_squared_exp_ard {
struct kernel_exp : public defaults::kernel_exp {
};
struct acqui_gpucb : public defaults::acqui_gpucb {
struct acqui_ucb : public defaults::acqui_ucb {
};
#ifdef USE_LIBCMAES
......@@ -212,11 +212,6 @@ struct Params {
struct opt_gridsearch : public defaults::opt_gridsearch {
};
#endif
struct opt_rprop : public defaults::opt_rprop {
};
struct opt_parallelrepeater : public defaults::opt_parallelrepeater {
};
};
template <typename T>
......
......@@ -23,7 +23,7 @@ struct Params {
BO_PARAM(int, iterations, 0);
};
struct kernel_squared_exp_ard : public defaults::kernel_squared_exp_ard {
struct kernel_exp : public defaults::kernel_exp {
};
struct kernel_maternfivehalfs {
......@@ -34,9 +34,6 @@ struct Params {
struct acqui_ucb : public defaults::acqui_ucb {
};
struct acqui_gpucb : public defaults::acqui_gpucb {
};
#ifdef USE_LIBCMAES
struct opt_cmaes : public defaults::opt_cmaes {
};
......@@ -47,11 +44,6 @@ struct Params {
struct opt_gridsearch : public defaults::opt_gridsearch {
};
#endif
struct opt_rprop : public defaults::opt_rprop {
};
struct opt_parallelrepeater : public defaults::opt_parallelrepeater {
};
};
struct fit_eval {
......
......@@ -30,7 +30,7 @@ struct Params {
BO_PARAM(int, stats_enabled, true);
};
struct kernel_squared_exp_ard : public defaults::kernel_squared_exp_ard {
struct kernel_exp : public defaults::kernel_exp {
};
// we use 10 random samples to initialize the algorithm
......@@ -44,15 +44,7 @@ struct Params {
};
// we use the default parameters for acqui_ucb
struct acqui_gpucb : public defaults::acqui_gpucb {
};
/// we use the default parameters for rprop (hyper-parameter optimization)
struct opt_rprop : public defaults::opt_rprop {
};
/// default parameters for the parallel_repeater ((hyper-parameter optimization))
struct opt_parallelrepeater : public defaults::opt_parallelrepeater {
struct acqui_ucb : public defaults::acqui_ucb {
};
};
......
......@@ -28,7 +28,7 @@ struct Params {
BO_PARAM(int, stats_enabled, true);
};
struct kernel_squared_exp_ard : public defaults::kernel_squared_exp_ard {
struct kernel_exp : public defaults::kernel_exp {
};
// we use 10 random samples to initialize the algorithm
......@@ -42,15 +42,7 @@ struct Params {
};
// we use the default parameters for acqui_ucb
struct acqui_gpucb : public defaults::acqui_gpucb {
};
/// we use the default parameters for rprop (hyper-parameter optimization)
struct opt_rprop : public defaults::opt_rprop {
};
/// default parameters for the parallel_repeater ((hyper-parameter optimization))
struct opt_parallelrepeater : public defaults::opt_parallelrepeater {
struct acqui_ucb : public defaults::acqui_ucb {
};
};
......
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