Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Purge 'mapping_2d::'. #927

Merged
merged 5 commits into from
Feb 21, 2018
Merged

Purge 'mapping_2d::'. #927

merged 5 commits into from
Feb 21, 2018

Conversation

pifon2a
Copy link
Contributor

@pifon2a pifon2a commented Feb 21, 2018

@pifon2a pifon2a requested a review from gaschler February 21, 2018 15:16
gaschler
gaschler approved these changes Feb 21, 2018
View reviewed changes
cartographer/internal/mapping/global_trajectory_builder.cc Outdated
@@ -48,7 +48,7 @@ class GlobalTrajectoryBuilder : public mapping::TrajectoryBuilderInterface {
const std::string& sensor_id,
const sensor::TimedPointCloudData& timed_point_cloud_data) override {
CHECK(local_trajectory_builder_)
<< "Cannot add TimedPointCloudData without a LocalTrajectoryBuilder.";
<< "Cannot add TimedPointCloudData without a LocalTrajectoryBuilder2D.";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LocalTrajectoryBuilder2D/3D

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

cartographer/mapping_3d/local_trajectory_builder_options_3d.cc Outdated
@@ -17,7 +17,7 @@
#include "cartographer/mapping_3d/local_trajectory_builder_options_3d.h"

#include "cartographer/internal/mapping/motion_filter.h"
#include "cartographer/mapping_2d/scan_matching/real_time_correlative_scan_matcher.h"
#include "cartographer/mapping_2d/scan_matching/real_time_correlative_scan_matcher_2d.h"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mapping_3d includes 2d?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done, moved to a separate file.

cartographer/mapping_2d/scan_matching/translation_delta_cost_functor_2d.h Outdated
@@ -44,23 +45,23 @@ class TranslationDeltaCostFunctor {
private:
// Constructs a new TranslationDeltaCostFunctor from the given
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TranslationDeltaCostFunctor2D

cartographer/mapping_2d/pose_graph/spa_cost_function_2d.h
public:
using Constraint = mapping::PoseGraph::Constraint;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unrelated change?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After removing 'mapping::' from this typedef, there seems to be no reason to keep it at all. Inlined it.

cartographer/mapping/trajectory_builder_interface.h Outdated
@@ -107,7 +107,7 @@ class TrajectoryBuilderInterface {
const sensor::LandmarkData& landmark_data) = 0;
// Allows to directly add local SLAM results to the 'PoseGraph'. Note that it
// is invalid to add local SLAM results for a trajectory that has a
// 'LocalTrajectoryBuilder'.
// 'LocalTrajectoryBuilder2D'.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2D or 3D

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@pifon2a pifon2a merged commit 94fce13 into cartographer-project:master Feb 21, 2018
@pifon2a pifon2a deleted the scan_rename branch February 21, 2018 18:45
pifon2a added a commit to pifon2a/cartographer that referenced this pull request Feb 21, 2018
@pifon2a
Purge 'mapping_3d::'. (cartographer-project#927)
44b1708 
[Code structure RFC](https://github.com/pifon2a/rfcs/blob/e11bca586f8cc733063ea9c94bdade71086ed9ea/text/0000-code-structure.md)
pifon2a added a commit to pifon2a/cartographer that referenced this pull request Feb 21, 2018
@pifon2a
Purge 'mapping_3d::'. (cartographer-project#927)
fcf3a4f 
[Code structure RFC](https://github.com/pifon2a/rfcs/blob/e11bca586f8cc733063ea9c94bdade71086ed9ea/text/0000-code-structure.md)
pifon2a added a commit to pifon2a/cartographer that referenced this pull request Feb 21, 2018
@pifon2a
Purge 'mapping_3d::'. (cartographer-project#927)
f3133ba 
[Code structure RFC](https://github.com/pifon2a/rfcs/blob/e11bca586f8cc733063ea9c94bdade71086ed9ea/text/0000-code-structure.md)
cschuet pushed a commit to cschuet/cartographer_ros that referenced this pull request Feb 23, 2018
Follow cartographer-project/cartographer#927
0678c5b
cschuet pushed a commit to cartographer-project/cartographer_ros that referenced this pull request Feb 23, 2018
Follow cartographer-project/cartographer#922 (#734)
caac1b3 
* Follow  cartographer-project/cartographer#927
ojura pushed a commit to larics/cartographer_combined that referenced this pull request Feb 23, 2018
[cartographer_ros] Follow cartographer-project/cartographer#922 (#734)
922180d 
* Follow  cartographer-project/cartographer#927

Original commit:
cartographer-project/cartographer_ros@caac1b3
pifon2a added a commit to pifon2a/cartographer that referenced this pull request Feb 26, 2018
@pifon2a
Purge 'mapping_3d::'. (cartographer-project#927)
783078c 
[Code structure RFC](https://github.com/pifon2a/rfcs/blob/e11bca586f8cc733063ea9c94bdade71086ed9ea/text/0000-code-structure.md)
pifon2a added a commit to pifon2a/cartographer that referenced this pull request Feb 26, 2018
@pifon2a
Purge 'mapping_3d::'. (cartographer-project#927)
6638a86 
[Code structure RFC](https://github.com/pifon2a/rfcs/blob/e11bca586f8cc733063ea9c94bdade71086ed9ea/text/0000-code-structure.md)
pifon2a added a commit that referenced this pull request Feb 26, 2018
@pifon2a
Purge 'mapping_3d::'. (#927) (#928)
e75e023 
[Code structure RFC](https://github.com/googlecartographer/rfcs/blob/master/text/0016-code-structure.md)
pifon2a added a commit to pifon2a/cartographer that referenced this pull request Feb 26, 2018
@pifon2a
Purge 'mapping_3d::'. (cartographer-project#927)
3118f01 
[Code structure RFC](https://github.com/pifon2a/rfcs/blob/e11bca586f8cc733063ea9c94bdade71086ed9ea/text/0000-code-structure.md)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gaschler gaschler gaschler approved these changes

Assignees
No one assigned
Labels
cla: yes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@pifon2a @gaschler @googlebot