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

Use transparent functors #3224

Merged
merged 1 commit into from
Jul 16, 2019
Merged

Use transparent functors #3224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/pipeline/global_nn_recognizer_crh.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ namespace pcl

bool use_cache_;
std::map<std::pair<std::string, int>, Eigen::Matrix4f,
std::less<std::pair<std::string, int> >,
std::less<>,
Eigen::aligned_allocator<std::pair<const std::pair<std::string, int>, Eigen::Matrix4f> > > poses_cache_;
std::map<std::pair<std::string, int>, Eigen::Vector3f > centroids_cache_;

Expand Down
2 changes: 1 addition & 1 deletion apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/pipeline/global_nn_recognizer_cvfh.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ namespace pcl

bool use_cache_;
std::map<std::pair<std::string, int>, Eigen::Matrix4f,
std::less<std::pair<std::string, int> >,
std::less<>,
Eigen::aligned_allocator<std::pair<const std::pair<std::string, int>, Eigen::Matrix4f> > > poses_cache_;
std::map<std::pair<std::string, int>, Eigen::Vector3f> centroids_cache_;

Expand Down
2 changes: 1 addition & 1 deletion ...ec_framework/include/pcl/apps/3d_rec_framework/pipeline/impl/global_nn_recognizer_crh.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ template<template<class > class Distance, typename PointInT, typename FeatureT>
mv_pair pair_model_view = std::make_pair (model.id_, view_id);

std::map<mv_pair, Eigen::Matrix4f,
std::less<mv_pair>,
std::less<>,
Eigen::aligned_allocator<std::pair<const mv_pair, Eigen::Matrix4f> > >::iterator it = poses_cache_.find (pair_model_view);

if (it != poses_cache_.end ())
Expand Down
2 changes: 1 addition & 1 deletion ...c_framework/include/pcl/apps/3d_rec_framework/pipeline/impl/global_nn_recognizer_cvfh.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ template<template<class > class Distance, typename PointInT, typename FeatureT>
mv_pair pair_model_view = std::make_pair (model.id_, view_id);

std::map<mv_pair, Eigen::Matrix4f,
std::less<mv_pair>,
std::less<>,
Eigen::aligned_allocator<std::pair<const mv_pair, Eigen::Matrix4f> > >::iterator it = poses_cache_.find (pair_model_view);

if (it != poses_cache_.end ())
Expand Down
2 changes: 1 addition & 1 deletion apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/pipeline/impl/local_recognizer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ template<template<class > class Distance, typename PointInT, typename FeatureT>
mv_pair pair_model_view = std::make_pair (model.id_, view_id);

std::map<mv_pair, Eigen::Matrix4f,
std::less<mv_pair>,
std::less<>,
Eigen::aligned_allocator<std::pair<const mv_pair, Eigen::Matrix4f> > >::iterator it = poses_cache_.find (pair_model_view);

if (it != poses_cache_.end ())
Expand Down
2 changes: 1 addition & 1 deletion apps/3d_rec_framework/include/pcl/apps/3d_rec_framework/pipeline/local_recognizer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ namespace pcl

bool use_cache_;
std::map<std::pair<std::string, int>, Eigen::Matrix4f,
std::less<std::pair<std::string, int> >,
std::less<>,
Eigen::aligned_allocator<std::pair<const std::pair<std::string, int>, Eigen::Matrix4f> > > poses_cache_;
std::map<std::pair<std::string, int>, typename pcl::PointCloud<PointInT>::Ptr> keypoints_cache_;

Expand Down
2 changes: 1 addition & 1 deletion features/include/pcl/features/impl/pfh.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ pcl::PFHEstimation<PointInT, PointNT, PointOutT>::computePointPFHSignature (
key = std::pair<int, int> (p1, p2);

// Check to see if we already estimated this pair in the global hashmap
std::map<std::pair<int, int>, Eigen::Vector4f, std::less<std::pair<int, int> >, Eigen::aligned_allocator<std::pair<const std::pair<int, int>, Eigen::Vector4f> > >::iterator fm_it = feature_map_.find (key);
std::map<std::pair<int, int>, Eigen::Vector4f, std::less<>, Eigen::aligned_allocator<std::pair<const std::pair<int, int>, Eigen::Vector4f> > >::iterator fm_it = feature_map_.find (key);
if (fm_it != feature_map_.end ())
{
pfh_tuple_ = fm_it->second;
Expand Down
2 changes: 1 addition & 1 deletion features/include/pcl/features/pfh.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ namespace pcl
float d_pi_;

/** \brief Internal hashmap, used to optimize efficiency of redundant computations. */
std::map<std::pair<int, int>, Eigen::Vector4f, std::less<std::pair<int, int> >, Eigen::aligned_allocator<std::pair<const std::pair<int, int>, Eigen::Vector4f> > > feature_map_;
std::map<std::pair<int, int>, Eigen::Vector4f, std::less<>, Eigen::aligned_allocator<std::pair<const std::pair<int, int>, Eigen::Vector4f> > > feature_map_;

/** \brief Queue of pairs saved, used to constrain memory usage. */
std::queue<std::pair<int, int> > key_list_;
Expand Down
2 changes: 1 addition & 1 deletion surface/include/pcl/surface/grid_projection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ namespace pcl
Eigen::Vector3f vect_at_grid_pt;
};

typedef std::unordered_map<int, Leaf, std::hash<int>, std::equal_to<int>, Eigen::aligned_allocator<std::pair<const int, Leaf>>> HashMap;
typedef std::unordered_map<int, Leaf, std::hash<int>, std::equal_to<>, Eigen::aligned_allocator<std::pair<const int, Leaf>>> HashMap;

/** \brief Constructor. */
GridProjection ();
Expand Down