Commit 14dc004f authored by Jean-Baptiste Mouret's avatar Jean-Baptiste Mouret
Browse files

cleaning

parent 64d72dde
......@@ -13,7 +13,7 @@ struct Params {
// knowles : 11 * dim - 1
};
struct maxiterations {
BO_PARAM(int, n_iterations, 50);
BO_PARAM(int, n_iterations, 20);
};
struct ucb : public defaults::ucb {};
struct gp_ucb : public defaults::gp_ucb {};
......@@ -68,10 +68,11 @@ int main() {
// typedef model::GP<Params, kernel_t, mean_t> gp_t;
// typedef acquisition_functions::UCB<Params, gp_t> ucb_t;
//Parego<Params, model_fun<gp_t>, acq_fun<ucb_t> > opt;
{
Parego<Params> opt;
opt.optimize(mop2());
auto p_model = opt.model_pareto_front(0, 1.0, 0.0025);
auto p_model = opt.model_pareto_front(0, 1.0, 0.001);
auto p_data = opt.data_pareto_front();
std::ofstream pareto_model("mop2_pareto_model.dat"),
......@@ -83,6 +84,7 @@ int main() {
<< std::endl;
for (auto x : p_data)
pareto_data << std::get<1>(x).transpose() << std::endl;
}
return 0;
}
......@@ -101,7 +101,6 @@ namespace limbo {
double a = this->_obs_mean.dot(this->_alpha);
return -0.5 * a - 0.5 * det - 0.5 * n * log(2 * M_PI);
}
// see Rasmussen and Williams, 2006 (p. 114)
......
......@@ -98,7 +98,6 @@ namespace limbo {
return pareto::pareto_set(_pack_data(points, objs, sigma));
}
protected:
pareto_t _pack_data(const std::vector<Eigen::VectorXd>& points,
const std::vector<Eigen::VectorXd>& objs,
......@@ -161,6 +160,7 @@ namespace limbo {
}
return scalarized;
}
};
......
......@@ -42,11 +42,6 @@ namespace limbo {
<< std::endl;
}
protected:
};
......
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