From f26e4366c9589d565f33154e0debf4e3f4659730 Mon Sep 17 00:00:00 2001 From: Jihoon Lee Date: Mon, 15 May 2017 16:06:20 +0200 Subject: [PATCH] Make SparsePoseGraph::constraints() public. (#284) --- cartographer/mapping/sparse_pose_graph.h | 2 +- cartographer/mapping_2d/sparse_pose_graph.h | 2 +- cartographer/mapping_3d/sparse_pose_graph.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cartographer/mapping/sparse_pose_graph.h b/cartographer/mapping/sparse_pose_graph.h index a82eac8..c1c9fa0 100644 --- a/cartographer/mapping/sparse_pose_graph.h +++ b/cartographer/mapping/sparse_pose_graph.h @@ -99,10 +99,10 @@ class SparsePoseGraph { // Serializes the constraints and trajectories. proto::SparsePoseGraph ToProto(); - protected: // Returns the collection of constraints. virtual std::vector constraints() = 0; + protected: // Returns the mapping from Submaps* to trajectory IDs. virtual const std::unordered_map& trajectory_ids() = 0; }; diff --git a/cartographer/mapping_2d/sparse_pose_graph.h b/cartographer/mapping_2d/sparse_pose_graph.h index 0c76acd..bb615ed 100644 --- a/cartographer/mapping_2d/sparse_pose_graph.h +++ b/cartographer/mapping_2d/sparse_pose_graph.h @@ -88,9 +88,9 @@ class SparsePoseGraph : public mapping::SparsePoseGraph { EXCLUDES(mutex_) override; std::vector GetTrajectoryNodes() override EXCLUDES(mutex_); + std::vector constraints() override EXCLUDES(mutex_); protected: - std::vector constraints() override EXCLUDES(mutex_); const std::unordered_map& trajectory_ids() override EXCLUDES(mutex_); diff --git a/cartographer/mapping_3d/sparse_pose_graph.h b/cartographer/mapping_3d/sparse_pose_graph.h index ae45126..807b6a9 100644 --- a/cartographer/mapping_3d/sparse_pose_graph.h +++ b/cartographer/mapping_3d/sparse_pose_graph.h @@ -90,9 +90,9 @@ class SparsePoseGraph : public mapping::SparsePoseGraph { EXCLUDES(mutex_) override; std::vector GetTrajectoryNodes() override EXCLUDES(mutex_); + std::vector constraints() override EXCLUDES(mutex_); protected: - std::vector constraints() override EXCLUDES(mutex_); const std::unordered_map& trajectory_ids() override EXCLUDES(mutex_);