First test version

1 files changed, 29 insertions, 28 deletions

diff --git a/src/Collapse/test/collapse_unit_test.cpp b/src/Collapse/test/collapse_unit_test.cpp
index c2f08e57..508d5aa9 100644
--- a/src/Collapse/test/collapse_unit_test.cpp
+++ b/src/Collapse/test/collapse_unit_test.cpp
@@ -27,19 +27,22 @@
 // /!\ Nothing else from Simplex_tree shall be included to test includes are well defined.
 #include "gudhi/FlagComplexSpMatrix.h"
 #include "gudhi/Rips_edge_list.h"
+#include "gudhi/graph_simplicial_complex.h"
+#include "gudhi/distance_functions.h"
 
 using namespace Gudhi;
 
 // Types definition
 using Vector_of_points = std::vector<std::vector<double>>;
 
-using Simplex_tree = Gudhi::Simplex_tree<Gudhi::Simplex_tree_options_fast_persistence>;
+//using Simplex_tree = Gudhi::Simplex_tree<Gudhi::Simplex_tree_options_fast_persistence>;
 using Filtration_value = double;
-using Rips_complex = Gudhi::rips_complex::Rips_complex<Filtration_value>;
-using Rips_edge_list = Gudhi::rips_edge_list::Rips_edge_list<Filtration_value>;
+using Rips_edge_list = Gudhi::rips_edge_list::Rips_edge_list<double>;
+/*using Rips_complex = Gudhi::rips_complex::Rips_complex<Filtration_value>;
 using Field_Zp = Gudhi::persistent_cohomology::Field_Zp;
 using Persistent_cohomology = Gudhi::persistent_cohomology::Persistent_cohomology<Simplex_tree, Field_Zp>;
-using Distance_matrix = std::vector<std::vector<Filtration_value>>;
+*/
+using Distance_matrix = std::vector<std::vector<double>>;
 
 
 BOOST_AUTO_TEST_CASE(collapse) {
@@ -49,9 +52,6 @@ BOOST_AUTO_TEST_CASE(collapse) {
   std::size_t number_of_points;
   std::string off_file_points;
   std::string filediag;
-  int dim_max;
-  int p;
-  double min_persistence;
 
   Map map_empty;
 
@@ -60,34 +60,35 @@ BOOST_AUTO_TEST_CASE(collapse) {
 
   Vector_of_points point_vector {{0., 0.},{0., 1.},{1., 0.},{1., 1.}};
 
-  int dimension = point_vector[0].dimension();
+  int dimension = point_vector[0].size();
   number_of_points = point_vector.size();
   std::cout << "Successfully read " << number_of_points << " point_vector.\n";
   std::cout << "Ambient dimension is " << dimension << ".\n";
 
   std::cout << "Point Set Generated." << std::endl;
 
-  double threshold = 1.;
-  Filtered_sorted_edge_list edge_t;
-  std::cout << "Computing the one-skeleton for threshold: " << threshold << std::endl;
-
-  Rips_edge_list Rips_edge_list_from_file(point_vector, threshold, Gudhi::Euclidean_distance());
-  Rips_edge_list_from_file.create_edges(edge_t);
-
-  std::cout << "Sorted edge list computed" << std::endl;
-  std::cout << "Total number of edges before collapse are: " << edge_t.size() << std::endl;
-
-  if (edge_t.size() <= 0) {
-    std::cerr << "Total number of egdes are zero." << std::endl;
-    exit(-1);
+  for (double threshold = 1. ; threshold <= 2.; threshold +=1.) {
+    Filtered_sorted_edge_list edge_t;
+    std::cout << "Computing the one-skeleton for threshold: " << threshold << std::endl;
+  
+    Rips_edge_list Rips_edge_list_from_file(point_vector, threshold, Gudhi::Euclidean_distance());
+    Rips_edge_list_from_file.create_edges(edge_t);
+  
+    std::cout << "Sorted edge list computed" << std::endl;
+    std::cout << "Total number of edges before collapse are: " << edge_t.size() << std::endl;
+  
+    if (edge_t.size() <= 0) {
+      std::cerr << "Total number of egdes are zero." << std::endl;
+      exit(-1);
+    }
+  
+    // Now we will perform filtered edge collapse to sparsify the edge list edge_t.
+    std::cout << "Filtered edge collapse begins" << std::endl;
+    FlagComplexSpMatrix mat_filt_edge_coll(number_of_points, edge_t);
+    std::cout << "Matrix instansiated" << std::endl;
+    Filtered_sorted_edge_list collapse_edges;
+    collapse_edges = mat_filt_edge_coll.filtered_edge_collapse();
   }
-
-  // Now we will perform filtered edge collapse to sparsify the edge list edge_t.
-  std::cout << "Filtered edge collapse begins" << std::endl;
-  FlagComplexSpMatrix mat_filt_edge_coll(number_of_points, edge_t);
-  std::cout << "Matrix instansiated" << std::endl;
-  Filtered_sorted_edge_list collapse_edges;
-  collapse_edges = mat_filt_edge_coll.filtered_edge_collapse();
  
 }