Skip to content

Clean C++ code #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
r-barnes wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Clean C++ code #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 25 additions & 25 deletions src/combina_bnb_solver/CombinaBnBSolver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
*/

#include <algorithm>
#include <queue>
#include <iostream>
#include <queue>
#include <sstream>
#include <string>
#include <stdexcept>
#include <string>

#include <pybind11/pybind11.h>

Expand Down Expand Up @@ -55,9 +55,9 @@ static Value get_with_default(const Map& map, const Key& key, const Value& def)
}


CombinaBnBSolver::CombinaBnBSolver(std::vector<double> const & dt,
CombinaBnBSolver::CombinaBnBSolver(std::vector<double> const & dt,
std::vector<std::vector<double>> const & b_rel,

unsigned int const & n_c,
unsigned int const & n_t,

Expand Down Expand Up @@ -89,15 +89,15 @@ CombinaBnBSolver::CombinaBnBSolver(std::vector<double> const & dt,

b_active_pre(b_active_pre),

sum_eta(2, std::vector<std::vector<double>> (b_rel.size(),
sum_eta(2, std::vector<std::vector<double>> (b_rel.size(),
std::vector<double> (b_rel[0].size()))),

node_queue(nullptr),
best_node(nullptr),
ub_bnb(0.0),

b_bin(b_rel.size(), std::vector<unsigned int>(b_rel[0].size(), 0)),

n_iter(0),
n_print(0),

Expand Down Expand Up @@ -196,18 +196,18 @@ bool CombinaBnBSolver::control_activation_forbidden(

return true;
}

if ((b_active_parent < n_c) && (sigma_child[b_active_parent] >= n_max_switches[b_active_parent])) {

return true;
}


if (min_down_time_parent[b_active_child] > 0.0) {

return true;
}

if ((b_active_parent < n_c) && (b_adjacencies[b_active_child][b_active_parent] == 0)) {

return true;
Expand All @@ -219,7 +219,7 @@ bool CombinaBnBSolver::control_activation_forbidden(

return true;
}

min_up_time_fulfilled += dt[depth_child_test];
up_time_child_test[b_active_child] += dt[depth_child_test];
total_up_time_child_test[b_active_child] += dt[depth_child_test];
Expand Down Expand Up @@ -250,10 +250,10 @@ void CombinaBnBSolver::compute_child_node_properties(
for(unsigned int i = 0; i < n_c; i++){

if(sigma_child[i] < n_max_switches[i]) {
eta_child[i] += dt[*depth_child] *

eta_child[i] += dt[*depth_child] *
(b_rel[i][*depth_child] - double(b_active_child == i));

}

min_down_time_child[i] = fmax(0, min_down_time_child[i] - dt[*depth_child]);
Expand All @@ -262,7 +262,7 @@ void CombinaBnBSolver::compute_child_node_properties(
min_up_time_fulfilled += dt[*depth_child];
up_time_child[b_active_child] += dt[*depth_child];
total_up_time_child[b_active_child] += dt[*depth_child];

(*depth_child)++;


Expand Down Expand Up @@ -306,7 +306,7 @@ void CombinaBnBSolver::compute_child_node_properties(
}


NodePtr CombinaBnBSolver::create_or_fathom_child_node(const NodePtr& parent_node,
NodePtr CombinaBnBSolver::create_or_fathom_child_node(const NodePtr& parent_node,
unsigned int const b_active_child, std::vector<unsigned int> const & sigma_child,
std::vector<double> const & min_down_time_child,
std::vector<double> const & up_time_child,
Expand All @@ -319,8 +319,8 @@ NodePtr CombinaBnBSolver::create_or_fathom_child_node(const NodePtr& parent_node

if(sigma_child[i] > n_max_switches[i]) {

throw std::runtime_error(
std::string("Node switches exceeds n_max-switches, this should not happen.")
throw std::runtime_error(
std::string("Node switches exceeds n_max-switches, this should not happen.")
+ std::string("\n Please contact the developers."));
}
}
Expand All @@ -343,7 +343,7 @@ void CombinaBnBSolver::run_bnb() {
std::clock_t t_update;
std::clock_t t_current;
std::clock_t t_end;

if (verbosity > 0) {
py::gil_scoped_acquire lock;
py::print("Running Branch and Bound ... ");
Expand Down Expand Up @@ -428,7 +428,7 @@ void CombinaBnBSolver::run_bnb() {
}

streamObj << std::scientific << "\n\n Best solution: " << ub_bnb
<< "\n Total iterations: " << s_n_iter
<< "\n Total iterations: " << s_n_iter
<< "\n Total runtime: " << solution_time
<< " s";

Expand All @@ -445,7 +445,7 @@ void CombinaBnBSolver::run_bnb() {
user_interrupt = false;
terminate = false;
n_print = 0;

*/

}
Expand All @@ -455,7 +455,7 @@ bool CombinaBnBSolver::termination_criterion_reached(int n_iter, std::clock_t t_

std::clock_t t_current = clock();

return ((n_iter >= max_iter) ||
return ((n_iter >= max_iter) ||
((double(t_current - t_start) / CLOCKS_PER_SEC) >= max_cpu_time) ||
user_interrupt);
}
Expand Down Expand Up @@ -487,7 +487,7 @@ void CombinaBnBSolver::display_solution_update(bool solution_update, double runt
streamObj << std::scientific;

if (solution_update) {

streamObj << " U ";

} else {
Expand All @@ -498,9 +498,9 @@ void CombinaBnBSolver::display_solution_update(bool solution_update, double runt
streamObj << s_n_iter
<< " " << ub_bnb << " "
<< s_node_queue_size << " " << runtime;

if (verbosity > 1) {

py::print(streamObj.str());
}

Expand Down Expand Up @@ -612,7 +612,7 @@ void CombinaBnBSolver::retrieve_solution() {

active_node = std::move(parent_node);
}

best_node.reset();

#ifndef NDEBUG
Expand Down
10 changes: 5 additions & 5 deletions src/combina_bnb_solver/Monitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,35 +42,35 @@ void MonitorBase::on_stop_search() {}


void MultiMonitor::on_start_search() {
for(MonitorPtr p : monitors) {
for(const MonitorPtr& p : monitors) {
p->on_start_search();
}
}


void MultiMonitor::on_create(const NodePtr& node) {
for(MonitorPtr p : monitors) {
for(const MonitorPtr& p : monitors) {
p->on_create(node);
}
}


void MultiMonitor::on_select(const NodePtr& node) {
for(MonitorPtr p : monitors) {
for(const MonitorPtr& p : monitors) {
p->on_select(node);
}
}


void MultiMonitor::on_change(const NodePtr& node, NodeState state) {
for(MonitorPtr p : monitors) {
for(const MonitorPtr& p : monitors) {
p->on_change(node, state);
}
}


void MultiMonitor::on_stop_search() {
for(MonitorPtr p : monitors) {
for(const MonitorPtr& p : monitors) {
p->on_stop_search();
}
}
17 changes: 8 additions & 9 deletions src/combina_bnb_solver/NodeQueue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,18 @@
*
*/

#include <algorithm>
#include <iterator>
#include <map>
#include <memory>
#include <string>
#include <vector>

#include "NodeQueue.hpp"
#include "queues/BestFirstNodeQueue.hpp"
#include "queues/BestThenDiveNodeQueue.hpp"
#include "queues/DepthFirstNodeQueue.hpp"
#include "queues/DynamicBacktrackingNodeQueue.hpp"

#include <algorithm>
#include <iterator>
#include <map>
#include <memory>
#include <string>
#include <vector>

// data structures for type registry
static std::map<std::string, NodeQueueFactory> type_registry;
Expand Down Expand Up @@ -74,7 +73,7 @@ NodeQueuePtr NodeQueue::create(CombinaBnBSolver* solver, std::string type) {
* \param [in] factory factory function for the new type.
* \param [in] make_default indicates that the new type should be made
* the new default type.
*
*
* \note The first type to be registered is always made the default
* type, regardless of whether make_default is set.
*/
Expand All @@ -83,7 +82,7 @@ void NodeQueue::register_type(const std::string& type, const NodeQueueFactory& f
if(make_default || default_type_name.empty()) {
default_type_name = type;
}

type_names.clear();
std::transform(type_registry.cbegin(), type_registry.cend(), std::back_inserter(type_names), [](const auto& entry) {
return entry.first;
Expand Down
15 changes: 8 additions & 7 deletions src/combina_bnb_solver/PythonBindings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,17 @@
*
*/

#include <map>
#include <vector>

#include <pybind11/pybind11.h>
#include <pybind11/stl.h>

#include "CombinaBnBSolver.hpp"
#include "NodeQueue.hpp"
#include "monitors/VbcMonitor.hpp"

#include <pybind11/pybind11.h>
#include <pybind11/stl.h>

#include <map>
#include <vector>


namespace py = pybind11;


Expand Down Expand Up @@ -61,7 +62,7 @@ PYBIND11_MODULE(_combina_bnb_solver, m)
std::vector<double> const &,
std::vector<double> const &,
std::vector<double> const &,

std::vector<std::vector<unsigned int>> &,
std::vector<std::vector<unsigned int>> &,

Expand Down