From 5854b60c83f2ea05de429179ad68f1f3f572e2d8 Mon Sep 17 00:00:00 2001
From: vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Mon, 15 Oct 2018 18:57:35 +0000
Subject: Remove Simplex tree edge contraction that seg fault

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

Former-commit-id: c2ac4648bed0cf72d1a1bfa0697708f04e258ec5
---
 src/Toplex_map/benchmark/chrono.cpp | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

(limited to 'src/Toplex_map')

diff --git a/src/Toplex_map/benchmark/chrono.cpp b/src/Toplex_map/benchmark/chrono.cpp
index db87e217..de6d701f 100644
--- a/src/Toplex_map/benchmark/chrono.cpp
+++ b/src/Toplex_map/benchmark/chrono.cpp
@@ -16,6 +16,11 @@ class ST_wrapper {
 
 public:
   void insert_simplex(const Simplex& tau) {
+    /*std::cout << "insert_simplex - " << simplexTree.num_simplices() << " - ";
+    for (auto v : tau)
+      std::cout << v << ", ";
+    std::cout << std::endl;
+    */
     simplexTree.insert_simplex_and_subfaces(tau);
   }
 
@@ -24,17 +29,7 @@ public:
   }
 
   Vertex contraction(const Vertex x, const Vertex y) {
-    Simplex sx; sx.insert(x);
-    auto hx = simplexTree.find(sx);
-    if(hx != simplexTree.null_simplex())
-      for(auto h : simplexTree.cofaces_simplex_range(hx,0)){
-        auto sr = simplexTree.simplex_vertex_range(h);
-        Simplex sigma(sr.begin(),sr.end());
-        erase_max(sigma);
-        sigma.erase(x);
-        sigma.insert(y);
-        insert_simplex(sigma);
-      }
+    // TODO (VR): edge contraction is not yet available for Simplex_tree
     return y;
   }
 
@@ -64,7 +59,7 @@ Simplex random_simplex(int n, std::size_t d){
     std::mt19937 gen(rd());
     std::uniform_int_distribution<std::size_t> dis(1, n);
     Simplex s;
-    while(s.size()!=d)
+    while(s.size() < d)
         s.insert(dis(gen));
     return s;
 }
@@ -95,7 +90,7 @@ void chrono(int n, int d){
         K.membership(s);
 
     start = std::chrono::system_clock::now();
-    for(int i = 0; i<=nb_contraction; i++)
+    for(int i = 1; i<=nb_contraction; i++)
         K.contraction(n-2*i,n-2*i-1);
     end = std::chrono::system_clock::now();
     auto c3 = std::chrono::duration_cast<std::chrono::milliseconds>(end-start).count();
-- 
cgit v1.2.3