-- 
cgit v1.2.3

From f98b5a5f13d9657eb6ca924ca9909d4d29c9641a Mon Sep 17 00:00:00 2001
From: glisse <glisse@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Sat, 15 Aug 2015 09:03:52 +0000
Subject: Optionally provide a dummy key/filtration interface instead of
 storing them for real.

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

Former-commit-id: ea7237a7b5c3d8e2dde49ea8356b142f3efa8089
---
 src/Simplex_tree/include/gudhi/Simplex_tree.h      | 54 ++++++++++++++++++----
 .../Simplex_tree_node_explicit_storage.h           | 42 +++--------------
 2 files changed, 51 insertions(+), 45 deletions(-)

diff --git a/src/Simplex_tree/include/gudhi/Simplex_tree.h b/src/Simplex_tree/include/gudhi/Simplex_tree.h
index 153401d6..11c41d1b 100644
--- a/src/Simplex_tree/include/gudhi/Simplex_tree.h
+++ b/src/Simplex_tree/include/gudhi/Simplex_tree.h
@@ -85,35 +85,71 @@ namespace Gudhi {
  * \implements FilteredComplex
  *
  */
-template<typename IndexingTag = linear_indexing_tag,
-typename FiltrationValue = double, typename SimplexKey = int  // must be a signed integer type
-, typename VertexHandle = int  // must be a signed integer type, int convertible to it
->
+
+struct Simplex_tree_options_full_featured {
+  typedef linear_indexing_tag Indexing_tag;
+  typedef int Vertex_handle;
+  typedef double Filtration_value;
+  typedef int Simplex_key;
+  static constexpr bool store_key = true;
+  static constexpr bool store_filtration = true;
+};
+
+template<typename Options = Simplex_tree_options_full_featured>
 class Simplex_tree {
  public:
-  typedef IndexingTag Indexing_tag;
+  typedef typename Options::Indexing_tag Indexing_tag;
   /** \brief Type for the value of the filtration function.
    *
    * Must be comparable with <. */
-  typedef FiltrationValue Filtration_value;
+  typedef typename Options::Filtration_value Filtration_value;
   /** \brief Key associated to each simplex.
    *
    * Must be a signed integer type. */
-  typedef SimplexKey Simplex_key;
+  typedef typename Options::Simplex_key Simplex_key;
   /** \brief Type for the vertex handle.
    *
    * Must be a signed integer type. It admits a total order <. */
-  typedef VertexHandle Vertex_handle;
+  typedef typename Options::Vertex_handle Vertex_handle;
 
   /* Type of node in the simplex tree. */
   typedef Simplex_tree_node_explicit_storage<Simplex_tree> Node;
   /* Type of dictionary Vertex_handle -> Node for traversing the simplex tree. */
+  // FIXME: this wastes space when Vertex_handle is 32 bits and Node is aligned on 64 bits. It would be better to use a flat_set (with our own comparator) where we can control the layout of the struct (put Vertex_handle and Simplex_key next to each other).
   typedef typename boost::container::flat_map<Vertex_handle, Node> Dictionary;
 
   /* \brief Set of nodes sharing a same parent in the simplex tree. */
   /* \brief Set of nodes sharing a same parent in the simplex tree. */
   typedef Simplex_tree_siblings<Simplex_tree, Dictionary> Siblings;
 
+  struct Key_simplex_base_real {
+    Key_simplex_base_real() : key_(-1) {}
+    void assign_key(Simplex_key k) { key_ = k; }
+    Simplex_key key() const { return key_; }
+    private:
+    Simplex_key key_;
+  };
+  struct Key_simplex_base_dummy {
+    Key_simplex_base_dummy() {}
+    void assign_key(Simplex_key) { }
+    Simplex_key key() const { assert(false); return -1; }
+  };
+  typedef typename std::conditional<Options::store_key, Key_simplex_base_real, Key_simplex_base_dummy>::type Key_simplex_base;
+
+  struct Filtration_simplex_base_real {
+    Filtration_simplex_base_real() : filt_(0) {}
+    void assign_filtration(Filtration_value f) { filt_ = f; }
+    Filtration_value filtration() const { return filt_; }
+    private:
+    Filtration_value filt_;
+  };
+  struct Filtration_simplex_base_dummy {
+    Filtration_simplex_base_dummy() {}
+    void assign_filtration(Filtration_value f) { assert(f == 0); }
+    Filtration_value filtration() const { return 0; }
+  };
+  typedef typename std::conditional<Options::store_filtration, Filtration_simplex_base_real, Filtration_simplex_base_dummy>::type Filtration_simplex_base;
+
  public:
   /** \brief Handle type to a simplex contained in the simplicial complex represented
    * by the simplex tree. */
@@ -456,7 +492,7 @@ class Simplex_tree {
    * .end() return random access iterators, with 'value_type' Vertex_handle. */
   template<class RandomAccessVertexRange>
   std::pair<Simplex_handle, bool> insert_simplex(RandomAccessVertexRange & simplex,
-                                                 Filtration_value filtration) {
+                                                 Filtration_value filtration = 0) {
     if (simplex.empty()) {
       return std::pair<Simplex_handle, bool>(null_simplex(), true);
     }
diff --git a/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_node_explicit_storage.h b/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_node_explicit_storage.h
index 1f1a34cc..26d18098 100644
--- a/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_node_explicit_storage.h
+++ b/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_node_explicit_storage.h
@@ -39,62 +39,32 @@ namespace Gudhi {
  * It stores explicitely its own filtration value and its own Simplex_key.
  */
 template<class SimplexTree>
-class Simplex_tree_node_explicit_storage {
+struct Simplex_tree_node_explicit_storage : SimplexTree::Filtration_simplex_base, SimplexTree::Key_simplex_base {
  public:
   typedef typename SimplexTree::Siblings Siblings;
   typedef typename SimplexTree::Filtration_value Filtration_value;
   typedef typename SimplexTree::Simplex_key Simplex_key;
 
-  // Default constructor.
-  Simplex_tree_node_explicit_storage()
-      : children_(NULL),
-        simplex_key_(-1),
-        filtration_(0) {
-  }
-
-  Simplex_tree_node_explicit_storage(Siblings * sib,
-                                     Filtration_value filtration)
-      : children_(sib),
-        simplex_key_(-1),
-        filtration_(filtration) {
-  }
-
-  void assign_key(Simplex_key key) {
-    simplex_key_ = key;
+  Simplex_tree_node_explicit_storage(Siblings * sib = nullptr,
+                                     Filtration_value filtration = 0)
+      : children_(sib) {
+	  this->assign_filtration(filtration);
   }
 
   /*
-   * Assign a children to the node
+   * Assign children to the node
    */
   void assign_children(Siblings * children) {
     children_ = children;
   }
-  /*
-   *
-   */
-  void assign_filtration(double filtration_value) {
-    filtration_ = filtration_value;
-  }
-
-  Filtration_value filtration() {
-    return filtration_;
-  }
 
   /* Careful -> children_ can be NULL*/
   Siblings * children() {
     return children_;
   }
 
-  Simplex_key key() {
-    return simplex_key_;
-  }
-
  private:
   Siblings * children_;
-
-  // Data attached to simplex, explicit storage
-  Simplex_key simplex_key_;
-  Filtration_value filtration_;   // value in the filtration
 };
 
 /* @} */  // end addtogroup simplex_tree
-- 
cgit v1.2.3


From 683fbc62a3640361b1e204ac52ed61059df1d52f Mon Sep 17 00:00:00 2001
From: glisse <glisse@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Thu, 20 Aug 2015 12:10:59 +0000
Subject: Some doc for SimplexTreeOptions.

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

Former-commit-id: 2560e01a832071e13486bfaabfdf166b705d5a70
---
 src/Simplex_tree/concept/IndexingTag.h        |  2 +-
 src/Simplex_tree/concept/SimplexKey.h         |  4 +--
 src/Simplex_tree/concept/SimplexTreeOptions.h | 41 +++++++++++++++++++++++++++
 src/Simplex_tree/concept/VertexHandle.h       |  3 +-
 src/Simplex_tree/include/gudhi/Simplex_tree.h | 22 +++++++-------
 5 files changed, 58 insertions(+), 14 deletions(-)
 create mode 100644 src/Simplex_tree/concept/SimplexTreeOptions.h

diff --git a/src/Simplex_tree/concept/IndexingTag.h b/src/Simplex_tree/concept/IndexingTag.h
index d690da11..1dcdd756 100644
--- a/src/Simplex_tree/concept/IndexingTag.h
+++ b/src/Simplex_tree/concept/IndexingTag.h
@@ -25,6 +25,6 @@
   * continuous maps to a cell complex, and compute its persistent
   * homology.
   *
-  * Must be linear_indexing_tag. 
+  * Must be `Gudhi::linear_indexing_tag`. 
   */
 struct IndexingTag {};
diff --git a/src/Simplex_tree/concept/SimplexKey.h b/src/Simplex_tree/concept/SimplexKey.h
index ce5b2382..7fdbdd84 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 <CODE>int</CODE>
+  * Must be a signed integer type.
   */
  struct SimplexKey {};
- 
\ No newline at end of file
+ 
diff --git a/src/Simplex_tree/concept/SimplexTreeOptions.h b/src/Simplex_tree/concept/SimplexTreeOptions.h
new file mode 100644
index 00000000..9415a471
--- /dev/null
+++ b/src/Simplex_tree/concept/SimplexTreeOptions.h
@@ -0,0 +1,41 @@
+ /*    This file is part of the Gudhi Library. The Gudhi library 
+  *    (Geometric Understanding in Higher Dimensions) is a generic C++ 
+  *    library for computational topology.
+  *
+  *    Author(s):       Marc Glisse
+  *
+  *    Copyright (C) 2015  INRIA Saclay - Ile-de-France (France)
+  *
+  *    This program is free software: you can redistribute it and/or modify
+  *    it under the terms of the GNU General Public License as published by
+  *    the Free Software Foundation, either version 3 of the License, or
+  *    (at your option) any later version.
+  *
+  *    This program is distributed in the hope that it will be useful,
+  *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+  *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  *    GNU General Public License for more details.
+  *
+  *    You should have received a copy of the GNU General Public License
+  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+  
+/** \brief Concept of the template parameter for the class `Gudhi::Simplex_tree<SimplexTreeOptions>`.
+ *
+ * One model for this is `Gudhi::Simplex_tree_options_full_featured`. If you want to provide your own, it is recommended that you derive from it and override some parts instead of writing a class from scratch.
+ */
+struct SimplexTreeOptions {
+  /// Forced for now.
+  typedef IndexingTag Indexing_tag;
+  /// Must be a signed integer type. It admits a total order <.
+  typedef VertexHandle Vertex_handle;
+  /// Must be comparable with operator<.
+  typedef FiltrationValue Filtration_value;
+  /// Must be a signed 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`. Necessary for `Persistent_cohomology`.
+  static constexpr bool store_filtration;
+};
+
diff --git a/src/Simplex_tree/concept/VertexHandle.h b/src/Simplex_tree/concept/VertexHandle.h
index 491f0f56..3efbba61 100644
--- a/src/Simplex_tree/concept/VertexHandle.h
+++ b/src/Simplex_tree/concept/VertexHandle.h
@@ -22,5 +22,6 @@
   
 /** \brief Handle type for the vertices of a cell complex.
   * 
-  * Must be int.*/
+  * Must be a signed integer type. <code>operator&lt;</code> defines a total order on it.
+  */
 struct VertexHandle {};
diff --git a/src/Simplex_tree/include/gudhi/Simplex_tree.h b/src/Simplex_tree/include/gudhi/Simplex_tree.h
index 11c41d1b..44ee7693 100644
--- a/src/Simplex_tree/include/gudhi/Simplex_tree.h
+++ b/src/Simplex_tree/include/gudhi/Simplex_tree.h
@@ -74,6 +74,16 @@ namespace Gudhi {
  * @{
  */
 
+/// Model of SimplexTreeOptions.
+struct Simplex_tree_options_full_featured {
+  typedef linear_indexing_tag Indexing_tag;
+  typedef int Vertex_handle;
+  typedef double Filtration_value;
+  typedef int Simplex_key;
+  static constexpr bool store_key = true;
+  static constexpr bool store_filtration = true;
+};
+
 /**
  * \brief Simplex Tree data structure for representing simplicial complexes.
  *
@@ -86,18 +96,10 @@ namespace Gudhi {
  *
  */
 
-struct Simplex_tree_options_full_featured {
-  typedef linear_indexing_tag Indexing_tag;
-  typedef int Vertex_handle;
-  typedef double Filtration_value;
-  typedef int Simplex_key;
-  static constexpr bool store_key = true;
-  static constexpr bool store_filtration = true;
-};
-
-template<typename Options = Simplex_tree_options_full_featured>
+template<typename SimplexTreeOptions = Simplex_tree_options_full_featured>
 class Simplex_tree {
  public:
+  typedef SimplexTreeOptions Options;
   typedef typename Options::Indexing_tag Indexing_tag;
   /** \brief Type for the value of the filtration function.
    *
-- 
cgit v1.2.3


From 05a215d2d8fed0961daf0b48e9e63973a12b9315 Mon Sep 17 00:00:00 2001
From: glisse <glisse@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Thu, 20 Aug 2015 14:07:31 +0000
Subject: A bit more doc for SimplexTreeOptions.

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

Former-commit-id: 1631ac5e9c4eb9f074fe7468f14cda1f122b63ad
---
 src/Simplex_tree/include/gudhi/Simplex_tree.h | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/Simplex_tree/include/gudhi/Simplex_tree.h b/src/Simplex_tree/include/gudhi/Simplex_tree.h
index 44ee7693..c3f913fa 100644
--- a/src/Simplex_tree/include/gudhi/Simplex_tree.h
+++ b/src/Simplex_tree/include/gudhi/Simplex_tree.h
@@ -266,7 +266,7 @@ class Simplex_tree {
    * order is used.
    *
    * The filtration must be valid. If the filtration has not been initialized yet, the
-   * method initializes it (i.e. order the simplices). */
+   * method initializes it (i.e. order the simplices). If the complex has changed since the last time the filtration was initialized, please call `initialize_filtration()` to recompute it. */
   Filtration_simplex_range filtration_simplex_range(Indexing_tag) {
     if (filtration_vect_.empty()) {
       initialize_filtration();
@@ -346,21 +346,27 @@ class Simplex_tree {
  public:
   /** \brief Returns the key associated to a simplex.
    *
-   * The filtration must be initialized. */
+   * The filtration must be initialized.
+   * \pre SimplexTreeOptions::store_key
+   */
   static Simplex_key key(Simplex_handle sh) {
     return sh->second.key();
   }
 
   /** \brief Returns the simplex associated to a key.
    *
-   * The filtration must be initialized. */
+   * The filtration must be initialized.
+   * \pre SimplexTreeOptions::store_key
+   */
   Simplex_handle simplex(Simplex_key key) const {
     return filtration_vect_[key];
   }
 
   /** \brief Returns the filtration value of a simplex.
    *
-   * Called on the null_simplex, returns INFINITY. */
+   * Called on the null_simplex, returns INFINITY.
+   * If SimplexTreeOptions::store_filtration is false, returns 0.
+   */
   static Filtration_value filtration(Simplex_handle sh) {
     if (sh != null_simplex()) {
       return sh->second.filtration();
-- 
cgit v1.2.3


From 2fb35dc2204d97b512951cf4b4432cf20df28ee3 Mon Sep 17 00:00:00 2001
From: glisse <glisse@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Sat, 22 Aug 2015 08:51:16 +0000
Subject: Add an example showing how to use different options for Simplex_tree.

It has a few FIXMEs for things that are already in progress elsewhere and should be fixed before the release.


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

Former-commit-id: dda65a6af3112dc14843d764881c22a04ff4b90e
---
 src/Simplex_tree/example/CMakeLists.txt        |  9 ++--
 src/Simplex_tree/example/mini_simplex_tree.cpp | 71 ++++++++++++++++++++++++++
 2 files changed, 77 insertions(+), 3 deletions(-)
 create mode 100644 src/Simplex_tree/example/mini_simplex_tree.cpp

diff --git a/src/Simplex_tree/example/CMakeLists.txt b/src/Simplex_tree/example/CMakeLists.txt
index 1a3cdfbf..2f924490 100644
--- a/src/Simplex_tree/example/CMakeLists.txt
+++ b/src/Simplex_tree/example/CMakeLists.txt
@@ -7,15 +7,18 @@ add_test(simplex_tree_from_file_3 ${CMAKE_CURRENT_BINARY_DIR}/simplex_tree_from_
 
 add_executable ( simple_simplex_tree simple_simplex_tree.cpp )
 add_test(simple_simplex_tree ${CMAKE_CURRENT_BINARY_DIR}/simple_simplex_tree)
-   
+
+add_executable ( mini_simplex_tree mini_simplex_tree.cpp )
+add_test(mini_simplex_tree ${CMAKE_CURRENT_BINARY_DIR}/mini_simplex_tree)
+
 
 # An example with Simplex-tree using CGAL alpha_shapes_3
 if(GMP_FOUND AND CGAL_FOUND)
    message("CGAL_lib = ${CGAL_LIBRARIES_DIR}")
-   message("GMP_LIBRARIES = ${GMP_LIBRARIES}")   
+   message("GMP_LIBRARIES = ${GMP_LIBRARIES}")
    INCLUDE_DIRECTORIES(${GMP_INCLUDE_DIR})
    INCLUDE_DIRECTORIES(${CGAL_INCLUDE_DIRS})
    add_executable ( simplex_tree_from_alpha_shapes_3 simplex_tree_from_alpha_shapes_3.cpp )
    target_link_libraries(simplex_tree_from_alpha_shapes_3 ${GMP_LIBRARIES} ${CGAL_LIBRARY})
    add_test(simplex_tree_from_alpha_shapes_3 ${CMAKE_CURRENT_BINARY_DIR}/simplex_tree_from_alpha_shapes_3 ${CMAKE_SOURCE_DIR}/data/points/bunny_5000)
-endif()  
+endif()
diff --git a/src/Simplex_tree/example/mini_simplex_tree.cpp b/src/Simplex_tree/example/mini_simplex_tree.cpp
new file mode 100644
index 00000000..a7e4c27d
--- /dev/null
+++ b/src/Simplex_tree/example/mini_simplex_tree.cpp
@@ -0,0 +1,71 @@
+/*    This file is part of the Gudhi Library. The Gudhi library
+ *    (Geometric Understanding in Higher Dimensions) is a generic C++
+ *    library for computational topology.
+ *
+ *    Author(s):       Marc Glisse
+ *
+ *    Copyright (C) 2015  INRIA Saclay - Ile-de-France (France)
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, either version 3 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+// FIXME: remove the first include
+#include <gudhi/graph_simplicial_complex.h>
+#include <gudhi/Simplex_tree.h>
+#include <iostream>
+#include <initializer_list>
+
+using namespace Gudhi;
+
+struct MyOptions : Simplex_tree_options_full_featured {
+  // Not doing persistence, so we don't need those
+  static constexpr bool store_key = false;
+  static constexpr bool store_filtration = false;
+  // I have few vertices
+  typedef short Vertex_handle;
+};
+typedef Simplex_tree<MyOptions> ST;
+
+// Dictionary should be private, but for now this is the easiest way.
+static_assert(sizeof(ST::Dictionary::value_type) < sizeof(Simplex_tree<>::Dictionary::value_type),
+    "Not storing the filtration and key should save some space");
+
+int main() {
+  ST st;
+
+  /* Complex to build. */
+  /*    1              */
+  /*    o              */
+  /*   /X\             */
+  /*  o---o---o        */
+  /*  2   0   3        */
+
+  // FIXME: Replace std::vector<short> with auto
+  std::vector<short> triangle012 = {0, 1, 2};
+  std::vector<short> edge03 = {0, 3};
+  st.insert_simplex_and_subfaces(triangle012);
+  st.insert_simplex_and_subfaces(edge03);
+  // FIXME: Remove this line
+  st.set_dimension(2);
+
+  std::vector<short> edge02 = {0, 2};
+  ST::Simplex_handle e = st.find(edge02);
+  assert(st.filtration(e) == 0); // We are not using filtrations so everything has value 0
+  for(ST::Simplex_handle t : st.cofaces_simplex_range(e, 1)) // Only coface is 012
+    {
+      for(ST::Vertex_handle v : st.simplex_vertex_range(t)) // v in { 0, 1, 2 }
+        std::cout << v;
+      std::cout << '\n';
+    }
+}
-- 
cgit v1.2.3


From 436bd9f4465e75d1d35f31f239537e227beafd2a Mon Sep 17 00:00:00 2001
From: glisse <glisse@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Sat, 22 Aug 2015 15:19:29 +0000
Subject: Tweak doc to mention that we can compute cohomology without
 filtration.

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

Former-commit-id: 2b07c162b17b5e35432e0f12eaac283043953b2c
---
 src/Simplex_tree/concept/SimplexTreeOptions.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Simplex_tree/concept/SimplexTreeOptions.h b/src/Simplex_tree/concept/SimplexTreeOptions.h
index 9415a471..a50a2bf1 100644
--- a/src/Simplex_tree/concept/SimplexTreeOptions.h
+++ b/src/Simplex_tree/concept/SimplexTreeOptions.h
@@ -35,7 +35,7 @@ struct SimplexTreeOptions {
   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`. Necessary for `Persistent_cohomology`.
+  /// 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;
 };
 
-- 
cgit v1.2.3


From 79425a986879662b217672cf693e3ca570e501ee Mon Sep 17 00:00:00 2001
From: glisse <glisse@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Wed, 2 Sep 2015 09:07:41 +0000
Subject: constexpr is only supported in extremely recent VS. Unnecessary
 "public:".

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

Former-commit-id: 62c7733f0d3236a0d919be049dc09b824435a198
---
 src/Simplex_tree/include/gudhi/Simplex_tree.h                         | 4 ++--
 .../include/gudhi/Simplex_tree/Simplex_tree_node_explicit_storage.h   | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Simplex_tree/include/gudhi/Simplex_tree.h b/src/Simplex_tree/include/gudhi/Simplex_tree.h
index bf9b3e13..aeb0364f 100644
--- a/src/Simplex_tree/include/gudhi/Simplex_tree.h
+++ b/src/Simplex_tree/include/gudhi/Simplex_tree.h
@@ -80,8 +80,8 @@ struct Simplex_tree_options_full_featured {
   typedef int Vertex_handle;
   typedef double Filtration_value;
   typedef int Simplex_key;
-  static constexpr bool store_key = true;
-  static constexpr bool store_filtration = true;
+  static const bool store_key = true;
+  static const bool store_filtration = true;
 };
 
 /**
diff --git a/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_node_explicit_storage.h b/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_node_explicit_storage.h
index 26d18098..c49e30b9 100644
--- a/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_node_explicit_storage.h
+++ b/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_node_explicit_storage.h
@@ -40,7 +40,6 @@ namespace Gudhi {
  */
 template<class SimplexTree>
 struct Simplex_tree_node_explicit_storage : SimplexTree::Filtration_simplex_base, SimplexTree::Key_simplex_base {
- public:
   typedef typename SimplexTree::Siblings Siblings;
   typedef typename SimplexTree::Filtration_value Filtration_value;
   typedef typename SimplexTree::Simplex_key Simplex_key;
-- 
cgit v1.2.3


From ced542bf2d07c4db3b31ff9c752c792044cf74f8 Mon Sep 17 00:00:00 2001
From: vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Fri, 4 Sep 2015 12:48:33 +0000
Subject: remove constexpr

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

Former-commit-id: 30a30bb0ad79aef360f11bca6dea16bcaa5bc64b
---
 src/Simplex_tree/example/mini_simplex_tree.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Simplex_tree/example/mini_simplex_tree.cpp b/src/Simplex_tree/example/mini_simplex_tree.cpp
index a7e4c27d..9c07f15f 100644
--- a/src/Simplex_tree/example/mini_simplex_tree.cpp
+++ b/src/Simplex_tree/example/mini_simplex_tree.cpp
@@ -30,8 +30,8 @@ using namespace Gudhi;
 
 struct MyOptions : Simplex_tree_options_full_featured {
   // Not doing persistence, so we don't need those
-  static constexpr bool store_key = false;
-  static constexpr bool store_filtration = false;
+  static const bool store_key = false;
+  static const bool store_filtration = false;
   // I have few vertices
   typedef short Vertex_handle;
 };
-- 
cgit v1.2.3


From 2fcfb64cecea616c3a12f1f3bbd475ee33bb35b3 Mon Sep 17 00:00:00 2001
From: glisse <glisse@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Wed, 9 Sep 2015 16:35:51 +0000
Subject: FIXME -> Note.

This is not a huge/trivial bug that has to be fixed immediately.


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

Former-commit-id: a4cb89782dc6d14ff1fc4a567e510ec4f40e0ac9
---
 src/Simplex_tree/include/gudhi/Simplex_tree.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Simplex_tree/include/gudhi/Simplex_tree.h b/src/Simplex_tree/include/gudhi/Simplex_tree.h
index aeb0364f..03e15a7d 100644
--- a/src/Simplex_tree/include/gudhi/Simplex_tree.h
+++ b/src/Simplex_tree/include/gudhi/Simplex_tree.h
@@ -117,7 +117,7 @@ class Simplex_tree {
   /* Type of node in the simplex tree. */
   typedef Simplex_tree_node_explicit_storage<Simplex_tree> Node;
   /* Type of dictionary Vertex_handle -> Node for traversing the simplex tree. */
-  // FIXME: this wastes space when Vertex_handle is 32 bits and Node is aligned on 64 bits. It would be better to use a flat_set (with our own comparator) where we can control the layout of the struct (put Vertex_handle and Simplex_key next to each other).
+  // Note: this wastes space when Vertex_handle is 32 bits and Node is aligned on 64 bits. It would be better to use a flat_set (with our own comparator) where we can control the layout of the struct (put Vertex_handle and Simplex_key next to each other).
   typedef typename boost::container::flat_map<Vertex_handle, Node> Dictionary;
 
   /* \brief Set of nodes sharing a same parent in the simplex tree. */
-- 
cgit v1.2.3