Modified Witness_complex.h + more doc

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

Former-commit-id: 771e0a9cbfd0035738aee1a07b5f7c1f56bf13fc

1 files changed, 22 insertions, 16 deletions

diff --git a/src/Witness_complex/example/simple_witness_complex.cpp b/src/Witness_complex/example/simple_witness_complex.cpp
index e95f67a8..6731f135 100644
--- a/src/Witness_complex/example/simple_witness_complex.cpp
+++ b/src/Witness_complex/example/simple_witness_complex.cpp
@@ -23,30 +23,36 @@
 #include <iostream>
 #include <ctime>
 //#include "gudhi/graph_simplicial_complex.h"
+#include "gudhi/Simplex_tree.h"
 #include "gudhi/Witness_complex.h"
 
 using namespace Gudhi;
 
 typedef std::vector< Vertex_handle > typeVectorVertex;
+typedef Witness_complex<Simplex_tree<>> WitnessComplex;
 //typedef std::pair<typeVectorVertex, Filtration_value> typeSimplex;
 //typedef std::pair< Simplex_tree<>::Simplex_handle, bool > typePairSimplexBool;
 
 int main (int argc, char * const argv[])
 {
-  Witness_complex<> witnessComplex = Witness_complex<>();
-  std::vector< typeVectorVertex > KNN;
-  typeVectorVertex witness0  = {1,0,5,2,6,3,4}; KNN.push_back(witness0 );
-  typeVectorVertex witness1  = {2,6,4,5,0,1,3}; KNN.push_back(witness1 );
-  typeVectorVertex witness2  = {3,4,2,1,5,6,0}; KNN.push_back(witness2 );
-  typeVectorVertex witness3  = {4,2,1,3,5,6,0}; KNN.push_back(witness3 );
-  typeVectorVertex witness4  = {5,1,6,0,2,3,4}; KNN.push_back(witness4 );
-  typeVectorVertex witness5  = {6,0,5,2,1,3,4}; KNN.push_back(witness5 );
-  typeVectorVertex witness6  = {0,5,6,1,2,3,4}; KNN.push_back(witness6 );
-  typeVectorVertex witness7  = {2,6,4,5,3,1,0}; KNN.push_back(witness7 );
-  typeVectorVertex witness8  = {1,2,5,4,3,6,0}; KNN.push_back(witness8 );
-  typeVectorVertex witness9  = {3,4,0,6,5,1,2}; KNN.push_back(witness9 );
-  typeVectorVertex witness10 = {5,0,1,3,6,2,4}; KNN.push_back(witness10);
-  typeVectorVertex witness11 = {5,6,1,0,2,3,4}; KNN.push_back(witness11);
-  typeVectorVertex witness12 = {1,6,0,5,2,3,4}; KNN.push_back(witness12);
-  witnessComplex.witness_complex(KNN);
+  Simplex_tree<> complex;
+  std::vector< typeVectorVertex > knn;
+  typeVectorVertex witness0  = {1,0,5,2,6,3,4}; knn.push_back(witness0 );
+  typeVectorVertex witness1  = {2,6,4,5,0,1,3}; knn.push_back(witness1 );
+  typeVectorVertex witness2  = {3,4,2,1,5,6,0}; knn.push_back(witness2 );
+  typeVectorVertex witness3  = {4,2,1,3,5,6,0}; knn.push_back(witness3 );
+  typeVectorVertex witness4  = {5,1,6,0,2,3,4}; knn.push_back(witness4 );
+  typeVectorVertex witness5  = {6,0,5,2,1,3,4}; knn.push_back(witness5 );
+  typeVectorVertex witness6  = {0,5,6,1,2,3,4}; knn.push_back(witness6 );
+  typeVectorVertex witness7  = {2,6,4,5,3,1,0}; knn.push_back(witness7 );
+  typeVectorVertex witness8  = {1,2,5,4,3,6,0}; knn.push_back(witness8 );
+  typeVectorVertex witness9  = {3,4,0,6,5,1,2}; knn.push_back(witness9 );
+  typeVectorVertex witness10 = {5,0,1,3,6,2,4}; knn.push_back(witness10);
+  typeVectorVertex witness11 = {5,6,1,0,2,3,4}; knn.push_back(witness11);
+  typeVectorVertex witness12 = {1,6,0,5,2,3,4}; knn.push_back(witness12);
+  WitnessComplex witnessComplex(knn, complex, 7);
+  if (witnessComplex.is_witness_complex(knn))
+    std::cout << "Witness complex is good\n";
+  else
+    std::cout << "Witness complex is bad\n";
 }