summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskachano <skachano@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2016-02-18 13:02:25 +0000
committerskachano <skachano@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2016-02-18 13:02:25 +0000
commit67f7ecf8e35b51256304b5120daf2827450b6dcd (patch)
tree60786f8c4e0339f6e23b602f15bc3dcbf2915eae
parentc5469621436305badbc4c5a64380881b6571f7bc (diff)
The rest of changes
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/witness@1031 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: af29326bd4293697211c20001fc120108a38b3f4
-rw-r--r--src/Witness_complex/include/gudhi/Landmark_choice_by_furthest_point.h7
-rw-r--r--src/Witness_complex/include/gudhi/Landmark_choice_by_random_point.h4
2 files changed, 9 insertions, 2 deletions
diff --git a/src/Witness_complex/include/gudhi/Landmark_choice_by_furthest_point.h b/src/Witness_complex/include/gudhi/Landmark_choice_by_furthest_point.h
index 2491b319..472cc0f7 100644
--- a/src/Witness_complex/include/gudhi/Landmark_choice_by_furthest_point.h
+++ b/src/Witness_complex/include/gudhi/Landmark_choice_by_furthest_point.h
@@ -39,6 +39,11 @@ namespace witness_complex {
* current landmark set as the new landmark.
* \details It chooses nbL landmarks from a random access range `points` and
* writes {witness}*{closest landmarks} matrix in `knn`.
+ *
+ * The type KNearestNeighbors can be seen as
+ * Witness_range<Closest_landmark_range<Vertex_handle>>, where
+ * Witness_range and Closest_landmark_range are random access ranges
+ *
*/
template <typename KNearestNeighbours,
@@ -82,7 +87,7 @@ namespace witness_complex {
curr_max_w = i;
}
}
- for (unsigned i = 0; i < points.size(); ++i)
+ for (unsigned i = 0; i < nb_points; ++i)
std::sort(knn[i].begin(),
knn[i].end(),
[&wit_land_dist, i](int a, int b) {
diff --git a/src/Witness_complex/include/gudhi/Landmark_choice_by_random_point.h b/src/Witness_complex/include/gudhi/Landmark_choice_by_random_point.h
index 617c0258..7da74066 100644
--- a/src/Witness_complex/include/gudhi/Landmark_choice_by_random_point.h
+++ b/src/Witness_complex/include/gudhi/Landmark_choice_by_random_point.h
@@ -32,7 +32,9 @@ namespace Gudhi {
namespace witness_complex {
- /** \brief Landmark choice strategy by taking random vertices for landmarks.
+ /**
+ * \ingroup witness_complex
+ * \brief Landmark choice strategy by taking random vertices for landmarks.
* \details It chooses nbL distinct landmarks from a random access range `points`
* and outputs a matrix {witness}*{closest landmarks} in knn.
*