Merge from trunk.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/qt5@1848 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: c8e1376894207c8c08896f750f71c115e07f6d95

1 files changed, 9 insertions, 8 deletions

diff --git a/src/Persistent_cohomology/concept/FilteredComplex.h b/src/Persistent_cohomology/concept/FilteredComplex.h
index 1834903b..c19698df 100644
--- a/src/Persistent_cohomology/concept/FilteredComplex.h
+++ b/src/Persistent_cohomology/concept/FilteredComplex.h
@@ -43,7 +43,7 @@ struct FilteredComplex
   * is model of IndexingTag. */
   typedef unspecified      Indexing_tag;
 
-/** Returns a Simplex_hanlde that is different from all simplex handles 
+/** Returns a Simplex_handle that is different from all simplex handles 
   * of the simplices. */
   Simplex_handle           null_simplex();
 /** \brief Returns the number of simplices in the complex.
@@ -61,13 +61,14 @@ struct FilteredComplex
 /** \brief Returns a key that is different from the keys associated 
   * to the simplices. */
   Simplex_key              null_key ();
-/** \brief Returns the key associated to a simplex. */  
+/** \brief Returns the key associated to a simplex.
+ *
+ * This is never called on null_simplex(). */
   Simplex_key              key      ( Simplex_handle sh );
-/** \brief Returns the simplex associated to a key.
-  *
-  * If key is different from null_key(), there must be a unique 
-  * simplex having this key. */  
-  Simplex_handle           simplex  ( Simplex_key key );
+/** \brief Returns the simplex that has index idx in the filtration.
+ *
+ * This is never called on null_key(). */
+  Simplex_handle           simplex  ( Simplex_key idx );
 /** \brief Assign a key to a simplex. */
   void                     assign_key(Simplex_handle sh, Simplex_key key);
  
@@ -138,6 +139,6 @@ Filtration_simplex_range filtration_simplex_range();
 * @todo use an enum? Just a bool?
 */
 //int is_before_in_filtration(Simplex_handle s, Simplex_handle t);
-/*************************************************/     
+/*************************************************/
 
 };