From ef2c5b53e88321f07ad93496f00dde16dc20f018 Mon Sep 17 00:00:00 2001
From: ROUVREAU Vincent <vincent.rouvreau@inria.fr>
Date: Tue, 28 Jan 2020 11:05:39 +0100
Subject: Code review: rename get_simplex_filtration with
 get_simplex_and_filtration. Remove exception raise. Fix failed tests. Reword
 documentation

---
 src/python/include/Simplex_tree_interface.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/python/include/Simplex_tree_interface.h')

diff --git a/src/python/include/Simplex_tree_interface.h b/src/python/include/Simplex_tree_interface.h
index 843966cd..c0bbc3d9 100644
--- a/src/python/include/Simplex_tree_interface.h
+++ b/src/python/include/Simplex_tree_interface.h
@@ -33,8 +33,8 @@ class Simplex_tree_interface : public Simplex_tree<SimplexTreeOptions> {
   using Simplex_handle = typename Base::Simplex_handle;
   using Insertion_result = typename std::pair<Simplex_handle, bool>;
   using Simplex = std::vector<Vertex_handle>;
-  using Filtered_simplex = std::pair<Simplex, Filtration_value>;
-  using Filtered_simplices = std::vector<Filtered_simplex>;
+  using Simplex_and_filtration = std::pair<Simplex, Filtration_value>;
+  using Filtered_simplices = std::vector<Simplex_and_filtration>;
 
  public:
   bool find_simplex(const Simplex& vh) {
@@ -83,7 +83,7 @@ class Simplex_tree_interface : public Simplex_tree<SimplexTreeOptions> {
     Base::initialize_filtration();
   }
 
-  Filtered_simplex get_simplex_filtration(Simplex_handle f_simplex) {
+  Simplex_and_filtration get_simplex_and_filtration(Simplex_handle f_simplex) {
     Simplex simplex;
     for (auto vertex : Base::simplex_vertex_range(f_simplex)) {
       simplex.insert(simplex.begin(), vertex);
-- 
cgit v1.2.3