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

2 files changed, 7 insertions, 5 deletions

diff --git a/src/Simplex_tree/concept/SimplexKey.h b/src/Simplex_tree/concept/SimplexKey.h
index 7fdbdd84..9fbed401 100644
--- a/src/Simplex_tree/concept/SimplexKey.h
+++ b/src/Simplex_tree/concept/SimplexKey.h
@@ -22,7 +22,7 @@
 
  /** \brief Key type used as simplex identifier.
   *
-  * Must be a signed integer type.
+  * Must be an integer type.
   */
  struct SimplexKey {};
  
diff --git a/src/Simplex_tree/concept/SimplexTreeOptions.h b/src/Simplex_tree/concept/SimplexTreeOptions.h
index a50a2bf1..89acdc18 100644
--- a/src/Simplex_tree/concept/SimplexTreeOptions.h
+++ b/src/Simplex_tree/concept/SimplexTreeOptions.h
@@ -31,11 +31,13 @@ struct SimplexTreeOptions {
   typedef VertexHandle Vertex_handle;
   /// Must be comparable with operator<.
   typedef FiltrationValue Filtration_value;
-  /// Must be a signed integer type.
+  /// Must be an integer type.
   typedef SimplexKey Simplex_key;
   /// If true, each simplex has extra storage for one `Simplex_key`. Necessary for `Persistent_cohomology`.
-  static constexpr bool store_key;
-  /// If true, each simplex has extra storage for one `Filtration_value`, and this value is propagated by operations like `Gudhi::Simplex_tree<SimplexTreeOptions>::expansion`. Without it, `Persistent_cohomology` degenerates to computing usual (non-persistent) cohomology.
-  static constexpr bool store_filtration;
+  static const bool store_key;
+  /// If true, each simplex has extra storage for one `Filtration_value`, and this value is propagated by operations like `Gudhi::Simplex_tree::expansion`. Without it, `Persistent_cohomology` degenerates to computing usual (non-persistent) cohomology.
+  static const bool store_filtration;
+  /// If true, the list of vertices present in the complex must always be 0, ..., num_vertices-1, without any hole.
+  static constexpr bool contiguous_vertices;
 };