Skip to content
Snippets Groups Projects
Commit e51da794 authored by Jakub Janák's avatar Jakub Janák
Browse files

unnecessary public methods changed to private

parent fda0dc48
No related branches found
No related tags found
No related merge requests found
......@@ -83,6 +83,7 @@ add_executable(run_tests
controller/Controller.h
helper/Helper.cpp
helper/Helper.h
test/catch.hpp
)
# Link the test executable with Google Test, Graphviz, and Boost
......
......@@ -13,13 +13,8 @@ class Controller {
std::deque<std::unique_ptr<TSInstance>> unsolvedInstances;
boost::program_options::options_description desc = {"Arguments"};
public:
Controller();
static void print_header();
int run(int argc, char *argv[]);
void load_instance(const std::string& file_name);
void auto_load_instances();
......@@ -29,6 +24,12 @@ public:
void solve(int num_of_threads = 1); // not multithreaded by default
void heuristic_combo();
public:
Controller();
int run(int argc, char *argv[]);
};
......
......@@ -20,39 +20,39 @@ class TSInstance : public Graph {
std::vector<std::vector<Node> > bestHamiltonianPaths;
std::chrono::duration<long long, std::ratio<1, 1000000000> > elapsed{};
public:
TSInstance(std::vector<std::shared_ptr<Node> > nodes, std::vector<std::shared_ptr<Edge> > edges);
static std::unique_ptr<TSInstance> create_synthetic_instance(int numOfNodes);
std::vector<std::vector<Node> > solve(int num_of_threads = 1); // not multithreaded by default
void branch(std::vector<Node> visitedNodes, double cost, Node &currentNode);
void start_branch_parallel(const std::vector<Node> &visitedNodes, double cost, Node &currentNode, int numberOfThreads);
void branch_parallel(std::vector<Node> visitedNodes, double cost, Node &currentNode);
[[nodiscard]] std::vector<std::vector<Node>> brute_force_solve() const;
[[nodiscard]] double get_lower_bound(std::vector<Node> subPath) const;
void nearest_neighbour(std::vector<Node>& greedyPath) const;
double two_opt(std::vector<Node> greedyPath);
[[nodiscard]] double heuristic_combo();
[[nodiscard]] double get_min_cost();
[[nodiscard]] bool is_solved() const;
void set_min_cost(double minCost);
void clear_best_hams();
void add_best_hamiltonian(const std::vector<Node> &path);
public:
TSInstance(std::vector<std::shared_ptr<Node> > nodes, std::vector<std::shared_ptr<Edge> > edges);
static std::unique_ptr<TSInstance> create_synthetic_instance(int numOfNodes);
std::vector<std::vector<Node> > solve(int num_of_threads = 1); // not multithreaded by default
[[nodiscard]] std::vector<std::vector<Node>> brute_force_solve() const;
[[nodiscard]] double heuristic_combo();
[[nodiscard]] bool is_solved() const;
void print_statistics() const;
void save(const std::string &fileName) const;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment