pushing for 1.15 support

VROOM-Project · Nov 23, 2024 · 4ecd998 · 4ecd998
1 parent 495526c
commit 4ecd998
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/src/_vroom.cpp b/src/_vroom.cpp
@@ -42,7 +42,7 @@
 #include "structures/typedefs.h"
 
 #include "structures/generic/edge.cpp"
-#include "structures/generic/matrix.cpp"
+#include "structures/generic/matrix.h"
 #include "structures/generic/undirected_graph.cpp"
 
 #include "structures/vroom/cost_wrapper.cpp"

diff --git a/src/bind/enums.cpp b/src/bind/enums.cpp
@@ -29,7 +29,6 @@ void init_enums(py::module_ &m) {
   py::enum_<vroom::HEURISTIC>(m, "HEURISTIC")
       .value("BASIC", vroom::HEURISTIC::BASIC)
       .value("DYNAMIC", vroom::HEURISTIC::DYNAMIC)
-      .value("INIT_ROUTES", vroom::HEURISTIC::INIT_ROUTES)
       .export_values();
 
   py::enum_<vroom::INIT>(m, "INIT")

diff --git a/src/bind/input/input.cpp b/src/bind/input/input.cpp
@@ -13,17 +13,18 @@ void init_input(py::module_ &m) {
 
   py::class_<vroom::Input>(m, "Input")
       .def(
-          py::init([](const vroom::io::Servers &servers, vroom::ROUTER router) {
-            return new vroom::Input(servers, router);
+          py::init([](const vroom::io::Servers &servers, vroom::ROUTER router, bool apply_TSPFix) {
+            return new vroom::Input(servers, router, apply_TSPFix);
           }),
           "Class initializer.",
           py::arg("servers") = std::map<std::string, vroom::io::Servers>(),
-          py::arg("router") = vroom::ROUTER::OSRM)
+          py::arg("router") = vroom::ROUTER::OSRM,
+          py::arg("apply_TSPFix") = false)
       .def_readonly("jobs", &vroom::Input::jobs)
       .def_readonly("vehicles", &vroom::Input::vehicles)
-      .def("_from_json", &vroom::io::parse, py::arg("json_string"),
-           py::arg("geometry"))
-      .def("_set_amount_size", &vroom::Input::set_amount_size)
+      /* .def("_from_json", &vroom::io::parse, py::arg("json_string"), */
+      /*      py::arg("geometry")) */
+      /* .def("_set_amount_size", &vroom::Input::set_amount_size) */
       .def("_set_geometry", &vroom::Input::set_geometry)
       .def("_add_job", &vroom::Input::add_job)
       .def("_add_shipment", &vroom::Input::add_shipment)
@@ -51,9 +52,12 @@ void init_input(py::module_ &m) {
       .def("has_homogeneous_locations",
            &vroom::Input::has_homogeneous_locations)
       .def("has_homogeneous_profiles", &vroom::Input::has_homogeneous_profiles)
+      .def("has_homogeneous_costs", &vroom::Input::has_homogeneous_costs)
       // .def("vehicle_ok_with_job", &vroom::Input::vehicle_ok_with_job)
       .def("_solve", &vroom::Input::solve, "Solve problem.",
-           py::arg("exploration_level"), py::arg("nb_threads") = 1,
+           py::arg("nb_searches"),
+           py::arg("depth"),
+           py::arg("nb_threads") = 1,
            py::arg("timeout") = vroom::Timeout(),
            py::arg("h_param") = std::vector<vroom::HeuristicParameters>())
       .def("check", &vroom::Input::check);