summaryrefslogtreecommitdiff
path: root/src/Bottleneck_distance/include/gudhi/Neighbors_finder.h
diff options
context:
space:
mode:
authorfgodi <fgodi@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2016-11-23 16:02:39 +0000
committerfgodi <fgodi@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2016-11-23 16:02:39 +0000
commit33ce062bf29b9bb7db9e83cde39cab6411d613dc (patch)
tree0d37464abbbe810904644692093af14206ff3d15 /src/Bottleneck_distance/include/gudhi/Neighbors_finder.h
parentd93bbddf7692569c69e3f477914b6def597942fa (diff)
functions no longer return smart pointers
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/bottleneck_integration@1779 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: bc5e1b480774441c9af5e0ed902c455c6453c480
Diffstat (limited to 'src/Bottleneck_distance/include/gudhi/Neighbors_finder.h')
-rw-r--r--src/Bottleneck_distance/include/gudhi/Neighbors_finder.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Bottleneck_distance/include/gudhi/Neighbors_finder.h b/src/Bottleneck_distance/include/gudhi/Neighbors_finder.h
index 1bd5879c..e8560559 100644
--- a/src/Bottleneck_distance/include/gudhi/Neighbors_finder.h
+++ b/src/Bottleneck_distance/include/gudhi/Neighbors_finder.h
@@ -46,7 +46,7 @@ public:
/** \internal \brief Returns and remove a V point near to the U point given as parameter, null_point_index() if there isn't such a point. */
int pull_near(int u_point_index);
/** \internal \brief Returns and remove all the V points near to the U point given as parameter. */
- std::shared_ptr< std::list<int> > pull_all_near(int u_point_index);
+ std::vector<int> pull_all_near(int u_point_index);
private:
const double r;
@@ -118,11 +118,11 @@ inline int Neighbors_finder::pull_near(int u_point_index) {
return tmp;
}
-inline std::shared_ptr< std::list<int> > Neighbors_finder::pull_all_near(int u_point_index) {
- std::shared_ptr< std::list<int> > all_pull(planar_neighbors_f.pull_all_near(u_point_index));
+inline std::vector<int> Neighbors_finder::pull_all_near(int u_point_index) {
+ std::vector<int> all_pull(planar_neighbors_f.pull_all_near(u_point_index));
int last_pull = pull_near(u_point_index);
while (last_pull != null_point_index()) {
- all_pull->emplace_back(last_pull);
+ all_pull.emplace_back(last_pull);
last_pull = pull_near(u_point_index);
}
return all_pull;