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

fix for acqui opt w grads

parent 7b8a57a4
......@@ -80,7 +80,7 @@ namespace limbo {
point[dim_in] = x;
if (dim_in == current.size() - 1) {
auto q = bo.model().query(point);
double acqui = std::get<0>(typename BO::acquisition_function_t(bo.model(), bo.current_iteration())(point, afun, false));
double acqui = opt::fun(typename BO::acquisition_function_t(bo.model(), bo.current_iteration())(point, afun, false));
ofs << point.transpose() << " "
<< std::get<0>(q).transpose() << " "
<< std::get<1>(q) << " "
......
......@@ -71,11 +71,11 @@ namespace limbo {
if (!blacklisted && !bo.samples().empty()) {
std::tie(mu, sigma) = bo.model().query(bo.samples().back());
acqui = std::get<0>(typename BO::acquisition_function_t(bo.model(), bo.current_iteration())(bo.samples().back(), afun, false));
acqui = opt::fun(typename BO::acquisition_function_t(bo.model(), bo.current_iteration())(bo.samples().back(), afun, false));
}
else if (!bo.bl_samples().empty()) {
std::tie(mu, sigma) = bo.model().query(bo.bl_samples().back());
acqui = std::get<0>(typename BO::acquisition_function_t(bo.model(), bo.current_iteration())(bo.bl_samples().back(), afun, false));
acqui = opt::fun(typename BO::acquisition_function_t(bo.model(), bo.current_iteration())(bo.bl_samples().back(), afun, false));
}
else
return;
......
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