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

Former-commit-id: e5795ee2fb4837e4df98a9d62b741a263d15a776

7 files changed, 18 insertions, 32 deletions

diff --git a/src/Nerve_GIC/example/CoordGIC.cpp b/src/Nerve_GIC/example/CoordGIC.cpp
index 53689762..e24943df 100644
--- a/src/Nerve_GIC/example/CoordGIC.cpp
+++ b/src/Nerve_GIC/example/CoordGIC.cpp
@@ -42,7 +42,7 @@ int main(int argc, char **argv) {
   // Init of a functional GIC from an OFF file
   // -----------------------------------------
 
-  Gudhi::graph_induced_complex::Graph_induced_complex<Point> GIC;
+  Gudhi::cover_complex::Cover_complex<Point> GIC;
   GIC.set_verbose(verb);
 
   bool check = GIC.read_point_cloud(off_file_name);
diff --git a/src/Nerve_GIC/example/FuncGIC.cpp b/src/Nerve_GIC/example/FuncGIC.cpp
index a891136f..99e3fb78 100644
--- a/src/Nerve_GIC/example/FuncGIC.cpp
+++ b/src/Nerve_GIC/example/FuncGIC.cpp
@@ -42,7 +42,7 @@ int main(int argc, char **argv) {
   // Init of a functional GIC from an OFF file
   // -----------------------------------------
 
-  Gudhi::graph_induced_complex::Graph_induced_complex<Point> GIC;
+  Gudhi::cover_complex::Cover_complex<Point> GIC;
   GIC.set_verbose(verb);
 
   bool check = GIC.read_point_cloud(off_file_name);
diff --git a/src/Nerve_GIC/example/Nerve.cpp b/src/Nerve_GIC/example/Nerve.cpp
index 4dc5496e..70424cda 100644
--- a/src/Nerve_GIC/example/Nerve.cpp
+++ b/src/Nerve_GIC/example/Nerve.cpp
@@ -44,7 +44,7 @@ int main(int argc, char **argv) {
   // Init of a Nerve from an OFF file
   // --------------------------------
 
-  Gudhi::graph_induced_complex::Graph_induced_complex<Point> SC;
+  Gudhi::cover_complex::Cover_complex<Point> SC;
   SC.set_verbose(verb);
 
   bool check = SC.read_point_cloud(off_file_name);
diff --git a/src/Nerve_GIC/example/VoronoiGIC.cpp b/src/Nerve_GIC/example/VoronoiGIC.cpp
index 10d60218..73a776a6 100644
--- a/src/Nerve_GIC/example/VoronoiGIC.cpp
+++ b/src/Nerve_GIC/example/VoronoiGIC.cpp
@@ -42,7 +42,7 @@ int main(int argc, char **argv) {
   // Init of a graph induced complex from an OFF file
   // ----------------------------------------------------------------------------
 
-  Gudhi::graph_induced_complex::Graph_induced_complex<Point> GIC;
+  Gudhi::cover_complex::Cover_complex<Point> GIC;
   GIC.set_verbose(verb);
 
   bool check = GIC.read_point_cloud(off_file_name);
diff --git a/src/Nerve_GIC/include/gudhi/GIC.h b/src/Nerve_GIC/include/gudhi/GIC.h
index e506cd9d..50f0f0b7 100644
--- a/src/Nerve_GIC/include/gudhi/GIC.h
+++ b/src/Nerve_GIC/include/gudhi/GIC.h
@@ -43,7 +43,7 @@
 
 namespace Gudhi {
 
-namespace graph_induced_complex {
+namespace cover_complex {
 
 using Simplex_tree = Gudhi::Simplex_tree<>;
 using Filtration_value = Simplex_tree::Filtration_value;
@@ -71,7 +71,7 @@ using Rips_complex = Gudhi::rips_complex::Rips_complex<Filtration_value>;
  *
  */
 template<typename Point>
-class Graph_induced_complex {
+class Cover_complex {
 
  private:
    //Graph_induced_complex(std::map<int, double> fun){func = fun;}
diff --git a/src/Nerve_GIC/test/data/cloud b/src/Nerve_GIC/test/data/cloud
index 82fc5c79..4a0c170d 100644
--- a/src/Nerve_GIC/test/data/cloud
+++ b/src/Nerve_GIC/test/data/cloud
@@ -1,4 +1,5 @@
-OFF
+nOFF
+3
 3 0 0
 0 0 0
 2 1 0
diff --git a/src/Nerve_GIC/test/test_GIC.cpp b/src/Nerve_GIC/test/test_GIC.cpp
index 0b4b6ea7..e8c6ed4a 100644
--- a/src/Nerve_GIC/test/test_GIC.cpp
+++ b/src/Nerve_GIC/test/test_GIC.cpp
@@ -36,37 +36,22 @@
 BOOST_AUTO_TEST_CASE(check_nerve) {
 
   using Point = std::vector<float>;
-  Gudhi::graph_induced_complex::Graph_induced_complex<Point> GIC;
-  std::string cloud_file_name("data/cloud"); GIC.read_point_cloud(cloud_file_name);
-  std::string graph_file_name("data/graph"); GIC.set_graph_from_file(graph_file_name);
-  std::string cover_file_name("data/cover"); GIC.set_cover_from_file(cover_file_name);
-  GIC.set_color_from_coordinate();
-  GIC.find_simplices(); Gudhi::Simplex_tree<> stree; GIC.create_complex(stree);
+  Gudhi::cover_complex::Cover_complex<Point> N; N.set_type("Nerve");
+  std::string cloud_file_name("data/cloud"); N.read_point_cloud(cloud_file_name);
+  std::string graph_file_name("data/graph"); N.set_graph_from_file(graph_file_name);
+  std::string cover_file_name("data/cover"); N.set_cover_from_file(cover_file_name);
+  N.find_simplices(); Gudhi::Simplex_tree<> stree; N.create_complex(stree);
 
   BOOST_CHECK(stree.num_vertices() == 3);
   BOOST_CHECK((stree.num_simplices()-stree.num_vertices()) == 0);
   BOOST_CHECK(stree.dimension() == 0);
 }
 
-BOOST_AUTO_TEST_CASE(check_funcGIC) {
-
-  using Point = std::vector<float>;
-  Gudhi::graph_induced_complex::Graph_induced_complex<Point> GIC;
-  std::string cloud_file_name("data/cloud"); GIC.read_point_cloud(cloud_file_name); GIC.set_color_from_coordinate();
-  std::string graph_file_name("data/graph"); GIC.set_graph_from_file(graph_file_name);
-  std::string cover_file_name("data/cover"); GIC.set_cover_from_file(cover_file_name);
-  GIC.find_simplices(); Gudhi::Simplex_tree<> stree; GIC.create_complex(stree);
-
-  BOOST_CHECK(stree.num_vertices() == 3);
-  BOOST_CHECK((stree.num_simplices()-stree.num_vertices()) == 2);
-  BOOST_CHECK(stree.dimension() == 1);
-}
-
-BOOST_AUTO_TEST_CASE(check_regGIC) {
+BOOST_AUTO_TEST_CASE(check_GIC) {
 
   using Point = std::vector<float>;
-  Gudhi::graph_induced_complex::Graph_induced_complex<Point> GIC;
-  std::string cloud_file_name("data/cloud"); GIC.read_point_cloud(cloud_file_name); GIC.set_color_from_coordinate();
+  Gudhi::cover_complex::Cover_complex<Point> GIC; GIC.set_type("GIC");
+  std::string cloud_file_name("data/cloud"); GIC.read_point_cloud(cloud_file_name);
   std::string graph_file_name("data/graph"); GIC.set_graph_from_file(graph_file_name);
   std::string cover_file_name("data/cover"); GIC.set_cover_from_file(cover_file_name);
   GIC.find_simplices(); Gudhi::Simplex_tree<> stree; GIC.create_complex(stree);
@@ -80,8 +65,8 @@ BOOST_AUTO_TEST_CASE(check_regGIC) {
 BOOST_AUTO_TEST_CASE(check_voronoiGIC) {
 
   using Point = std::vector<float>;
-  Gudhi::graph_induced_complex::Graph_induced_complex<Point> GIC;
-  std::string cloud_file_name("data/cloud"); GIC.read_point_cloud(cloud_file_name); GIC.set_color_from_coordinate();
+  Gudhi::cover_complex::Cover_complex<Point> GIC; GIC.set_type("GIC");
+  std::string cloud_file_name("data/cloud"); GIC.read_point_cloud(cloud_file_name);
   std::string graph_file_name("data/graph"); GIC.set_graph_from_file(graph_file_name);
   GIC.set_cover_from_Voronoi(Gudhi::Euclidean_distance(),2);
   GIC.find_simplices(); Gudhi::Simplex_tree<> stree; GIC.create_complex(stree);