Fixed the print bug

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

Former-commit-id: 89201b558bfb27542e9e187b53a2307fb0054fbc

3 files changed, 16 insertions, 6 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0c8f6ea3..f3b29994 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -84,6 +84,7 @@ else()
   add_subdirectory(src/Skeleton_blocker/example) 
   add_subdirectory(src/Contraction/example)
   add_subdirectory(src/Hasse_complex/example)
+  add_subdirectory(src/Witness_complex/test)
   add_subdirectory(src/Witness_complex/example)
 
 endif()  
diff --git a/src/Simplex_tree/include/gudhi/Simplex_tree.h b/src/Simplex_tree/include/gudhi/Simplex_tree.h
index a1758680..e52fe1ae 100644
--- a/src/Simplex_tree/include/gudhi/Simplex_tree.h
+++ b/src/Simplex_tree/include/gudhi/Simplex_tree.h
@@ -35,6 +35,7 @@
 #include <algorithm>
 #include <utility>
 #include <vector>
+#include <iostream>
 
 namespace Gudhi {
   
diff --git a/src/Witness_complex/include/gudhi/Witness_complex.h b/src/Witness_complex/include/gudhi/Witness_complex.h
index 3deb8bc3..e999928f 100644
--- a/src/Witness_complex/include/gudhi/Witness_complex.h
+++ b/src/Witness_complex/include/gudhi/Witness_complex.h
@@ -174,14 +174,14 @@ void witness_complex(KNearestNeighbours & knn)
         /* TODO Filtration */
         //simplex = std::make_pair(vv, Filtration_value(0.0));
         //returnValue = this->insert_simplex(simplex.first, simplex.second);
-        //returnValue = insert_simplex(vv, Filtration_value(0.0));
+        returnValue = insert_simplex(vv, Filtration_value(0.0));
         /* TODO Error if not inserted : normally no need here though*/
     }
-    vv = {0};
-    returnValue = insert_simplex(vv,Filtration_value(0.0));
+    //vv = {0};
+    //returnValue = insert_simplex(vv,Filtration_value(0.0));
     std::cout << "Successfully added landmarks" << std::endl;
     // PRINT2
-    print_sc(root());
+    print_sc(root()); std::cout << std::endl;
     int u,v;     // two extremities of an edge
     if (nbL > 1) // if the supposed dimension of the complex is >0
       /*
@@ -215,6 +215,7 @@ void witness_complex(KNearestNeighbours & knn)
         //vh = (Vertex_handle)i;
         vv = {u,v};
         returnValue = this->insert_simplex(vv,Filtration_value(0.0));
+        print_sc(root()); std::cout << std::endl;
         //std::cout << "Added edges" << std::endl;
       }
       //print_sc(root());
@@ -272,14 +273,21 @@ private:
     if (!map.empty())
       {
         std::cout << map.begin()->first;
-        print_sc(map.begin()->second.children());
+        if (map.begin()->second.children() == root())
+          std::cout << "Sweet potato";
+        if (has_children(map.begin()))
+          print_sc(map.begin()->second.children());
         typename Dictionary::iterator it;
         for (it = map.begin()+1; it != map.end(); ++it)
           {
             std::cout << "," << it->first;
+            if (map.begin()->second.children() == root())
+              std::cout << "Sweet potato";
+            if (has_children(it))
+              print_sc(it->second.children());
           }
       }
-    std::cout << ")\n";
+    std::cout << ")";
   }