Add lane speed limit to graph parsing function (#124)

Signed-off-by: Luca Della Vedova <[email protected]> Signed-off-by: Arjo Chakravarty <[email protected]>
open-rmf · Oct 12, 2021 · 66c97cf · 66c97cf
1 parent 75c5729
commit 66c97cf
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 7 deletions.
diff --git a/rmf_fleet_adapter/src/rmf_fleet_adapter/agv/parse_graph.cpp b/rmf_fleet_adapter/src/rmf_fleet_adapter/agv/parse_graph.cpp
@@ -287,9 +287,15 @@ rmf_traffic::agv::Graph parse_graph(
         entry_event = Event::make(Lane::Dock(dock_name, duration));
       }
 
-      graph.add_lane(
+      auto& graph_lane = graph.add_lane(
         {begin, entry_event},
         {end, exit_event, std::move(constraint)});
+
+      if (const YAML::Node speed_limit_option = options["speed_limit"])
+      {
+        const double speed_limit = speed_limit_option.as<double>();
+        graph_lane.properties().speed_limit(speed_limit);
+      }
     }
     vnum += vnum_temp;
   }

diff --git a/rmf_fleet_adapter_python/src/graph/graph.cpp b/rmf_fleet_adapter_python/src/graph/graph.cpp
@@ -135,14 +135,18 @@ void bind_graph(py::module& m)
   // Lanes
   .def("add_lane",
     &Graph::add_lane,
+    py::arg("entry"),
+    py::arg("exit"),
+    py::arg("properties") = Lane::Properties(),
     py::call_guard<py::scoped_ostream_redirect,
     py::scoped_estream_redirect>())
   .def("add_dock_lane",
     [&](Graph& self,
     const std::size_t w0,
     const std::size_t w1,
     std::string dock_name,
-    int seconds)
+    int seconds,
+    Lane::Properties properties)
     {
       self.add_lane(
         {
@@ -151,13 +155,14 @@ void bind_graph(py::module& m)
             Lane::Dock(dock_name,
             std::chrono::seconds(seconds)))
         },
-        w1);
-      self.add_lane(w1, w0);
+        w1, properties);
+      self.add_lane(w1, w0, properties);
     },
     py::arg("w0"),
     py::arg("w1"),
     py::arg("dock_name"),
     py::arg("dock_seconds") = 10,
+    py::arg("properties") = Lane::Properties(),
     py::call_guard<py::scoped_ostream_redirect,
     py::scoped_estream_redirect>())
   .def("add_bidir_lane",

diff --git a/rmf_fleet_adapter_python/src/graph/lane.cpp b/rmf_fleet_adapter_python/src/graph/lane.cpp
@@ -1,4 +1,5 @@
 #include <pybind11/pybind11.h>
+#include <pybind11/stl.h>
 #include <pybind11/chrono.h>
 
 #include <memory>
@@ -36,7 +37,17 @@ void bind_lane(py::module& m)
   .def_property_readonly("exit",
     py::overload_cast<>(&Lane::exit),
     py::return_value_policy::reference_internal)
-  .def_property_readonly("index", &Lane::index);
+  .def_property_readonly("index", &Lane::index)
+  .def_property_readonly("properties",
+    py::overload_cast<>(&Lane::properties),
+    py::return_value_policy::reference_internal);
+
+  // LANE PROPERTIES ===========================================================
+  py::class_<Lane::Properties>(m_lane, "Properties")
+  .def(py::init<>())
+  .def_property("speed_limit",
+    py::overload_cast<>(&Lane::Properties::speed_limit, py::const_),
+    py::overload_cast<std::optional<double>>(&Lane::Properties::speed_limit));
 
   // DOORS =====================================================================
   py::class_<Lane::Door>(m_lane, "Door")

diff --git a/rmf_fleet_adapter_python/tests/unit/test_graph.py b/rmf_fleet_adapter_python/tests/unit/test_graph.py
@@ -332,9 +332,13 @@ def test_graph():
              [8, 9],
              [8, 10]]
 
+    # test speed limit std::optional lane property
+    properties = lane.Properties()
+    properties.speed_limit = 10.0
     # Test add_lane
-    rawr_graph.add_lane(lane.Node(0),
-                        lane.Node(1))
+    added_lane = rawr_graph.add_lane(lane.Node(0),
+                        lane.Node(1), properties)
+    assert added_lane.properties.speed_limit == 10.0
     assert rawr_graph.num_lanes == 1
 
     # Test add_bidir_lane