From 41fc7e38cccfc184604fa245cdc3890bdd384574 Mon Sep 17 00:00:00 2001 From: Alexander Belyaev <32522095+pifon2a@users.noreply.github.com> Date: Tue, 3 Apr 2018 18:56:44 +0200 Subject: [PATCH] Rename the setters according to style-guide. (#1032) just a nit --- cartographer/cloud/internal/map_builder_context.cc | 4 ++-- cartographer/mapping/2d/submap_2d.cc | 12 ++++++------ cartographer/mapping/3d/submap_3d.cc | 12 ++++++------ cartographer/mapping/submaps.h | 10 ++++------ 4 files changed, 18 insertions(+), 20 deletions(-) diff --git a/cartographer/cloud/internal/map_builder_context.cc b/cartographer/cloud/internal/map_builder_context.cc index 3437196..6631b17 100644 --- a/cartographer/cloud/internal/map_builder_context.cc +++ b/cartographer/cloud/internal/map_builder_context.cc @@ -97,7 +97,7 @@ std::shared_ptr MapBuilderContext::UpdateSubmap2D( } else { // If the submap is unfinished set the 'num_range_data' to 0 since we // haven't changed the HybridGrid. - submap_2d_ptr->SetNumRangeData(0); + submap_2d_ptr->set_num_range_data(0); } } return submap_2d_ptr; @@ -131,7 +131,7 @@ std::shared_ptr MapBuilderContext::UpdateSubmap3D( } else { // If the submap is unfinished set the 'num_range_data' to 0 since we // haven't changed the HybridGrid. - submap_3d_ptr->SetNumRangeData(0); + submap_3d_ptr->set_num_range_data(0); } } return submap_3d_ptr; diff --git a/cartographer/mapping/2d/submap_2d.cc b/cartographer/mapping/2d/submap_2d.cc index 2016af7..b769c9f 100644 --- a/cartographer/mapping/2d/submap_2d.cc +++ b/cartographer/mapping/2d/submap_2d.cc @@ -70,8 +70,8 @@ Submap2D::Submap2D(const MapLimits& limits, const Eigen::Vector2f& origin) Submap2D::Submap2D(const proto::Submap2D& proto) : Submap(transform::ToRigid3(proto.local_pose())), probability_grid_(ProbabilityGrid(proto.probability_grid())) { - SetNumRangeData(proto.num_range_data()); - SetFinished(proto.finished()); + set_num_range_data(proto.num_range_data()); + set_finished(proto.finished()); } void Submap2D::ToProto(proto::Submap* const proto, @@ -88,8 +88,8 @@ void Submap2D::ToProto(proto::Submap* const proto, void Submap2D::UpdateFromProto(const proto::Submap& proto) { CHECK(proto.has_submap_2d()); const auto& submap_2d = proto.submap_2d(); - SetNumRangeData(submap_2d.num_range_data()); - SetFinished(submap_2d.finished()); + set_num_range_data(submap_2d.num_range_data()); + set_finished(submap_2d.finished()); if (submap_2d.has_probability_grid()) { probability_grid_ = ProbabilityGrid(submap_2d.probability_grid()); } @@ -147,13 +147,13 @@ void Submap2D::InsertRangeData(const sensor::RangeData& range_data, const RangeDataInserter2D& range_data_inserter) { CHECK(!finished()); range_data_inserter.Insert(range_data, &probability_grid_); - SetNumRangeData(num_range_data() + 1); + set_num_range_data(num_range_data() + 1); } void Submap2D::Finish() { CHECK(!finished()); probability_grid_ = ComputeCroppedProbabilityGrid(probability_grid_); - SetFinished(true); + set_finished(true); } ActiveSubmaps2D::ActiveSubmaps2D(const proto::SubmapsOptions2D& options) diff --git a/cartographer/mapping/3d/submap_3d.cc b/cartographer/mapping/3d/submap_3d.cc index 816de4a..af57a30 100644 --- a/cartographer/mapping/3d/submap_3d.cc +++ b/cartographer/mapping/3d/submap_3d.cc @@ -209,8 +209,8 @@ Submap3D::Submap3D(const proto::Submap3D& proto) common::make_unique(proto.high_resolution_hybrid_grid())), low_resolution_hybrid_grid_( common::make_unique(proto.low_resolution_hybrid_grid())) { - SetNumRangeData(proto.num_range_data()); - SetFinished(proto.finished()); + set_num_range_data(proto.num_range_data()); + set_finished(proto.finished()); } void Submap3D::ToProto(proto::Submap* const proto, @@ -230,8 +230,8 @@ void Submap3D::ToProto(proto::Submap* const proto, void Submap3D::UpdateFromProto(const proto::Submap& proto) { CHECK(proto.has_submap_3d()); const auto& submap_3d = proto.submap_3d(); - SetNumRangeData(submap_3d.num_range_data()); - SetFinished(submap_3d.finished()); + set_num_range_data(submap_3d.num_range_data()); + set_finished(submap_3d.finished()); if (submap_3d.has_high_resolution_hybrid_grid()) { high_resolution_hybrid_grid_ = submap_3d.has_high_resolution_hybrid_grid() @@ -271,12 +271,12 @@ void Submap3D::InsertRangeData(const sensor::RangeData& range_data, high_resolution_hybrid_grid_.get()); range_data_inserter.Insert(transformed_range_data, low_resolution_hybrid_grid_.get()); - SetNumRangeData(num_range_data() + 1); + set_num_range_data(num_range_data() + 1); } void Submap3D::Finish() { CHECK(!finished()); - SetFinished(true); + set_finished(true); } ActiveSubmaps3D::ActiveSubmaps3D(const proto::SubmapsOptions3D& options) diff --git a/cartographer/mapping/submaps.h b/cartographer/mapping/submaps.h index 8919b49..cca356e 100644 --- a/cartographer/mapping/submaps.h +++ b/cartographer/mapping/submaps.h @@ -76,15 +76,13 @@ class Submap { // Number of RangeData inserted. int num_range_data() const { return num_range_data_; } - - // Whether the submap is finished or not. - bool finished() const { return finished_; } - - void SetNumRangeData(const int num_range_data) { + void set_num_range_data(const int num_range_data) { num_range_data_ = num_range_data; } - void SetFinished(bool finished) { finished_ = finished; } + // Whether the submap is finished or not. + bool finished() const { return finished_; } + void set_finished(bool finished) { finished_ = finished; } private: const transform::Rigid3d local_pose_;