summaryrefslogtreecommitdiff
path: root/src/Skeleton_blocker/test
diff options
context:
space:
mode:
authorsalinasd <salinasd@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2014-12-16 14:18:30 +0000
committersalinasd <salinasd@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2014-12-16 14:18:30 +0000
commit54c6bc50795f53ff1a1227c098f0d4fe84a8d885 (patch)
treec4ef9cd1b9dfdc83e2e54c89be9affae3a4dc940 /src/Skeleton_blocker/test
parent8c98ccb2c339e6817b8deed732cdffb216ed2cf2 (diff)
doc + problem test
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@356 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Diffstat (limited to 'src/Skeleton_blocker/test')
-rw-r--r--src/Skeleton_blocker/test/TestSimplifiable.cpp10
-rw-r--r--src/Skeleton_blocker/test/TestSkeletonBlockerComplex.cpp20
2 files changed, 15 insertions, 15 deletions
diff --git a/src/Skeleton_blocker/test/TestSimplifiable.cpp b/src/Skeleton_blocker/test/TestSimplifiable.cpp
index 8df4dade..2dafda52 100644
--- a/src/Skeleton_blocker/test/TestSimplifiable.cpp
+++ b/src/Skeleton_blocker/test/TestSimplifiable.cpp
@@ -74,8 +74,8 @@ bool test_contraction1(){
Complex complex(n);
build_complete(n,complex);
complex.remove_edge(Vertex_handle(b),Vertex_handle(z));
- complex.add_blocker(Vertex_handle(a),Vertex_handle(x),Vertex_handle(y));
- complex.add_blocker(Vertex_handle(b),Vertex_handle(x),Vertex_handle(y));
+ complex.add_blocker(Simplex_handle(Vertex_handle(a),Vertex_handle(x),Vertex_handle(y)));
+ complex.add_blocker(Simplex_handle(Vertex_handle(b),Vertex_handle(x),Vertex_handle(y)));
// Print result
cerr << "complex before complex"<< complex.to_string()<<endl;
@@ -136,7 +136,7 @@ bool test_link_condition1(){
Complex complex(0);
// Build the complexes
build_complete(4,complex);
- complex.add_blocker(Vertex_handle(0),Vertex_handle(1),Vertex_handle(2));
+ complex.add_blocker(Simplex_handle(Vertex_handle(0),Vertex_handle(1),Vertex_handle(2)));
// Print result
@@ -183,7 +183,7 @@ bool test_collapse2(){
complex.add_edge(Vertex_handle(1),Vertex_handle(4));
complex.add_edge(Vertex_handle(2),Vertex_handle(4));
complex.add_edge(Vertex_handle(3),Vertex_handle(4));
- complex.add_blocker(Vertex_handle(1),Vertex_handle(2),Vertex_handle(3),Vertex_handle(4));
+ complex.add_blocker(Simplex_handle(Vertex_handle(1),Vertex_handle(2),Vertex_handle(3),Vertex_handle(4)));
// Print result
cerr << "initial complex :\n"<< complex.to_string();
cerr <<endl<<endl;
@@ -206,7 +206,7 @@ bool test_collapse3(){
complex.add_edge(Vertex_handle(1),Vertex_handle(4));
complex.add_edge(Vertex_handle(2),Vertex_handle(4));
complex.add_edge(Vertex_handle(3),Vertex_handle(4));
- complex.add_blocker(Vertex_handle(1),Vertex_handle(2),Vertex_handle(3),Vertex_handle(4));
+ complex.add_blocker(Simplex_handle(Vertex_handle(1),Vertex_handle(2),Vertex_handle(3),Vertex_handle(4)));
// Print result
cerr << "initial complex:\n"<< complex.to_string();
cerr <<endl<<endl;
diff --git a/src/Skeleton_blocker/test/TestSkeletonBlockerComplex.cpp b/src/Skeleton_blocker/test/TestSkeletonBlockerComplex.cpp
index 1ebb7f6d..f7bf289a 100644
--- a/src/Skeleton_blocker/test/TestSkeletonBlockerComplex.cpp
+++ b/src/Skeleton_blocker/test/TestSkeletonBlockerComplex.cpp
@@ -224,7 +224,7 @@ bool test_iterator_triangles(){
complex.add_vertex();
complex.add_edge(Vertex_handle(4),Vertex_handle(7));
complex.add_edge(Vertex_handle(3),Vertex_handle(7));
- complex.add_blocker(Vertex_handle(0),Vertex_handle(1),Vertex_handle(6));
+ complex.add_blocker(Simplex_handle(Vertex_handle(0),Vertex_handle(1),Vertex_handle(6)));
num_triangles_seen=0;
TEST("triangles (should be 6 of them):");
@@ -255,7 +255,7 @@ bool test_iterator_simplices(){
complex.add_edge(Vertex_handle(4),Vertex_handle(5));
complex.add_edge(Vertex_handle(3),Vertex_handle(4));
- complex.add_blocker(Vertex_handle(2),Vertex_handle(3),Vertex_handle(4),Vertex_handle(5));
+ complex.add_blocker(Simplex_handle(Vertex_handle(2),Vertex_handle(3),Vertex_handle(4),Vertex_handle(5)));
bool correct_number_simplices = true;
@@ -322,7 +322,7 @@ bool test_iterator_simplices3(){
complex.add_edge(Vertex_handle(0),Vertex_handle(1));
complex.add_edge(Vertex_handle(1),Vertex_handle(2));
complex.add_edge(Vertex_handle(2),Vertex_handle(0));
- complex.add_blocker(Vertex_handle(0),Vertex_handle(1),Vertex_handle(2));
+ complex.add_blocker(Simplex_handle(Vertex_handle(0),Vertex_handle(1),Vertex_handle(2)));
unsigned num_simplices = 0 ;
@@ -470,7 +470,7 @@ bool test_link2(){
for (int j=i+1;j<15;j++)
complex.add_edge(Vertex_handle(i),Vertex_handle(j));
}
- complex.add_blocker(Vertex_handle(10),Vertex_handle(11),Vertex_handle(13));
+ complex.add_blocker(Simplex_handle(Vertex_handle(10),Vertex_handle(11),Vertex_handle(13)));
alpha = Simplex_handle(Vertex_handle(12),Vertex_handle(14));
Skeleton_blocker_link_complex<Complex> L(complex,alpha);
// Complexes built
@@ -508,7 +508,7 @@ bool test_link3(){
for (int j=i+1;j<15;j++)
complex.add_edge(Vertex_handle(i),Vertex_handle(j));
}
- complex.add_blocker(Vertex_handle(10),Vertex_handle(11),Vertex_handle(12));
+ complex.add_blocker(Simplex_handle(Vertex_handle(10),Vertex_handle(11),Vertex_handle(12)));
alpha = Simplex_handle(Vertex_handle(12),Vertex_handle(14));
Skeleton_blocker_link_complex<Complex> L(complex,alpha);
// Complexes built
@@ -540,7 +540,7 @@ bool test_link4(){
for (int j=i+1;j<15;j++)
complex.add_edge(Vertex_handle(i),Vertex_handle(j));
}
- complex.add_blocker(Vertex_handle(10),Vertex_handle(11),Vertex_handle(12),Vertex_handle(13));
+ complex.add_blocker(Simplex_handle(Vertex_handle(10),Vertex_handle(11),Vertex_handle(12),Vertex_handle(13)));
Simplex_handle alpha(Vertex_handle(12),Vertex_handle(14));
Skeleton_blocker_link_complex<Complex> L(complex,alpha);
// Complexes built
@@ -565,7 +565,7 @@ bool test_link5(){
Complex complex(0,new Print_complex_visitor<Vertex_handle>());
// Build the complexes
build_complete(4,complex);
- complex.add_blocker(Vertex_handle(0),Vertex_handle(1),Vertex_handle(2),Vertex_handle(3));
+ complex.add_blocker(Simplex_handle(Vertex_handle(0),Vertex_handle(1),Vertex_handle(2),Vertex_handle(3)));
Simplex_handle alpha(Vertex_handle(0),Vertex_handle(1),Vertex_handle(2));
@@ -585,7 +585,7 @@ bool test_link6(){
Complex complex(0,new Print_complex_visitor<Vertex_handle>());
// Build the complexes
build_complete(4,complex);
- complex.add_blocker(Vertex_handle(0),Vertex_handle(1),Vertex_handle(2));
+ complex.add_blocker(Simplex_handle(Vertex_handle(0),Vertex_handle(1),Vertex_handle(2)));
Simplex_handle alpha(Vertex_handle(0),Vertex_handle(1),Vertex_handle(2));
@@ -614,8 +614,8 @@ bool test_link7(){
complex.add_edge(Vertex_handle(i),Vertex_handle(7));
}
complex.add_edge(Vertex_handle(6),Vertex_handle(7));
- complex.add_blocker(Vertex_handle(0),Vertex_handle(1),Vertex_handle(2));
- complex.add_blocker(Vertex_handle(3),Vertex_handle(4),Vertex_handle(5));
+ complex.add_blocker(Simplex_handle(Vertex_handle(0),Vertex_handle(1),Vertex_handle(2)));
+ complex.add_blocker(Simplex_handle(Vertex_handle(3),Vertex_handle(4),Vertex_handle(5)));
Simplex_handle alpha(Vertex_handle(3),Vertex_handle(4),Vertex_handle(5));