diff options
author | salinasd <salinasd@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-02-06 16:54:41 +0000 |
---|---|---|
committer | salinasd <salinasd@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-02-06 16:54:41 +0000 |
commit | e50f918673baf48d35c2e2ffa7bfc0e23206612f (patch) | |
tree | a6bdbb0a32b1f42cb622f673f55875b0eb421ea1 /src/Skeleton_blocker/test/TestSkeletonBlockerComplex.cpp | |
parent | 8802dc5353020c75012f6ae8c26afefb4c78b161 (diff) |
skbl nettoyage + suppression Skeleton_blocker_simplifiable_complex
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@464 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: d0d2441ac3f6e3c4d16b0f0da098b090ce8743dd
Diffstat (limited to 'src/Skeleton_blocker/test/TestSkeletonBlockerComplex.cpp')
-rw-r--r-- | src/Skeleton_blocker/test/TestSkeletonBlockerComplex.cpp | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/src/Skeleton_blocker/test/TestSkeletonBlockerComplex.cpp b/src/Skeleton_blocker/test/TestSkeletonBlockerComplex.cpp index ecc7649e..646db02a 100644 --- a/src/Skeleton_blocker/test/TestSkeletonBlockerComplex.cpp +++ b/src/Skeleton_blocker/test/TestSkeletonBlockerComplex.cpp @@ -26,11 +26,11 @@ #include <sstream> #include "gudhi/Utils.h" #include "gudhi/Test.h" -#include "gudhi/Skeleton_blocker_complex.h" -#include "gudhi/Skeleton_blocker_link_complex.h" -#include "gudhi/Skeleton_blocker/Skeleton_blocker_link_superior.h" -#include "gudhi/Skeleton_blocker/Skeleton_blocker_simple_traits.h" -#include "gudhi/Skeleton_blocker/internal/Trie.h" +#include "gudhi/Skeleton_blocker.h" +//#include "gudhi/Skeleton_blocker_link_complex.h" +//#include "gudhi/Skeleton_blocker/Skeleton_blocker_link_superior.h" +//#include "gudhi/Skeleton_blocker/Skeleton_blocker_simple_traits.h" +//#include "gudhi/Skeleton_blocker/internal/Trie.h" using namespace std; @@ -73,6 +73,7 @@ bool assert_blocker(Complex &complex,Root_vertex_handle a,Root_vertex_handle b,R } + void build_complete(int n,Complex& complex){ complex.clear(); for(int i=0;i<n;i++) @@ -410,6 +411,10 @@ bool test_link0(){ complex.add_edge(Vertex_handle(b),Vertex_handle(c));complex.add_edge(Vertex_handle(c),Vertex_handle(d)); Simplex_handle alpha = Simplex_handle(Vertex_handle(c)); Skeleton_blocker_link_complex<Complex> L(complex,alpha); + + auto L2 = complex.link(alpha); + if(L!=L2) return false; + PRINT(L.num_vertices()); PRINT(L.to_string()); @@ -437,6 +442,9 @@ bool test_link1(){ Skeleton_blocker_link_complex<Complex> L(complex,alpha); // Complexes built + auto L2 = complex.link(alpha); + if(L!=L2) return false; + // verification bool test1 = L.contains_vertex(*L.get_address(Root_vertex_handle(10))); bool test2 = L.contains_vertex(*L.get_address(Root_vertex_handle(11))); @@ -478,6 +486,10 @@ bool test_link2(){ cerr <<endl<<endl; cerr << "L= Link_complex("<<alpha<<") : \n"<<L.to_string(); + auto L2 = complex.link(alpha); + if(L!=L2) return false; + + // verification bool test1 = L.contains_vertex(*L.get_address(Root_vertex_handle(10))); bool test2 = L.contains_vertex(*L.get_address(Root_vertex_handle(11))); @@ -516,6 +528,10 @@ bool test_link3(){ cerr <<endl<<endl; cerr << "L= Link_complex("<<alpha<<") : \n"<<L.to_string(); + auto L2 = complex.link(alpha); + if(L!=L2) return false; + + // verification bool test = assert_vertex(L,*L.get_address(Root_vertex_handle(10))); test = test&& assert_vertex(L,*L.get_address(Root_vertex_handle(11))); |