skbl constructor from list a simplices more efficient

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

Former-commit-id: 3e3b30cd496da0a96df0379b11acf554aad6b5ae

2 files changed, 94 insertions, 27 deletions

diff --git a/src/Skeleton_blocker/test/CMakeLists.txt b/src/Skeleton_blocker/test/CMakeLists.txt
index c341dcee..d70b5d7f 100644
--- a/src/Skeleton_blocker/test/CMakeLists.txt
+++ b/src/Skeleton_blocker/test/CMakeLists.txt
@@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 2.6)
 project(GUDHIskbl)
 
 if(NOT MSVC)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
+
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage")
   set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} --coverage")	
   set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} --coverage")
diff --git a/src/Skeleton_blocker/test/TestSkeletonBlockerComplex.cpp b/src/Skeleton_blocker/test/TestSkeletonBlockerComplex.cpp
index 865f6ff8..9392cc9e 100644
--- a/src/Skeleton_blocker/test/TestSkeletonBlockerComplex.cpp
+++ b/src/Skeleton_blocker/test/TestSkeletonBlockerComplex.cpp
@@ -1,24 +1,24 @@
- /*    This file is part of the Gudhi Library. The Gudhi library 
-  *    (Geometric Understanding in Higher Dimensions) is a generic C++ 
-  *    library for computational topology.
-  *
-  *    Author(s):       David Salinas
-  *
-  *    Copyright (C) 2014  INRIA Sophia Antipolis-Mediterranee (France)
-  *
-  *    This program is free software: you can redistribute it and/or modify
-  *    it under the terms of the GNU General Public License as published by
-  *    the Free Software Foundation, either version 3 of the License, or
-  *    (at your option) any later version.
-  *
-  *    This program is distributed in the hope that it will be useful,
-  *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-  *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  *    GNU General Public License for more details.
-  *
-  *    You should have received a copy of the GNU General Public License
-  *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
+/*    This file is part of the Gudhi Library. The Gudhi library
+ *    (Geometric Understanding in Higher Dimensions) is a generic C++
+ *    library for computational topology.
+ *
+ *    Author(s):       David Salinas
+ *
+ *    Copyright (C) 2014  INRIA Sophia Antipolis-Mediterranee (France)
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, either version 3 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string>
@@ -30,6 +30,7 @@
 #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;
 
@@ -77,9 +78,9 @@ void build_complete(int n,Complex& complex){
 	for(int i=0;i<n;i++)
 		complex.add_vertex();
 
-//	for(int i=n-1;i>=0;i--)
-//		for(int j=i-1;j>=0;j--)
-//			complex.add_edge(Vertex_handle(i),Vertex_handle(j));
+	//	for(int i=n-1;i>=0;i--)
+	//		for(int j=i-1;j>=0;j--)
+	//			complex.add_edge(Vertex_handle(i),Vertex_handle(j));
 
 	for(int i=0;i<n;i++)
 		for(int j=0;j<i;j++)
@@ -88,7 +89,7 @@ void build_complete(int n,Complex& complex){
 
 
 bool test_simplex(){
-//	PRINT("test simplex");
+	//	PRINT("test simplex");
 	Simplex_handle simplex(Vertex_handle(0),Vertex_handle(1),Vertex_handle(2),Vertex_handle(3));
 	for (auto i = simplex.begin() ; i != simplex.end() ; ++i){
 		PRINT(*i);
@@ -696,7 +697,7 @@ bool test_constructor(){
 	add_triangle(1,2,4,simplices);
 
 
-	Complex complex(simplices);
+	Complex complex(simplices.begin(),simplices.end());
 
 	PRINT(complex.to_string());
 
@@ -734,7 +735,7 @@ bool test_constructor2(){
 	list <Simplex_handle> simplices(subfaces(simplex));
 	simplices.remove(simplex);
 
-	Complex complex(simplices);
+	Complex complex(simplices.begin(),simplices.end());
 
 	PRINT(complex.to_string());
 
@@ -746,6 +747,67 @@ bool test_constructor2(){
 }
 
 
+bool test_constructor3(){
+	typedef Vertex_handle Vh;
+	typedef Simplex_handle Sh;
+	std::vector<Simplex_handle> simplices;
+	auto subf(subfaces(Sh(Vh(0),Vh(1),Vh(2))));
+	subf.pop_back(); //remove max face -> now a blocker 012
+	simplices.insert(simplices.begin(),subf.begin(),subf.end());
+	DBGCONT(simplices);
+	Complex complex(simplices.begin(),simplices.end());
+
+	DBGVALUE(complex.to_string());
+
+	return complex.num_vertices()==3 && complex.num_blockers()==1;
+}
+
+bool test_constructor4(){
+	typedef Vertex_handle Vh;
+	typedef Simplex_handle Sh;
+	std::vector<Simplex_handle> simplices;
+	auto subf(subfaces(Sh(Vh(0),Vh(1),Vh(2),Vh(3))));
+	//	subf.pop_back(); //remove max face -> now a blocker 012
+	simplices.insert(simplices.begin(),subf.begin(),subf.end());
+
+	simplices.push_back(Sh(Vh(4)));
+	simplices.push_back(Sh(Vh(4),Vh(1)));
+	simplices.push_back(Sh(Vh(4),Vh(0)));
+
+	DBGCONT(simplices);
+	Complex complex(simplices.begin(),simplices.end());
+
+	DBGVALUE(complex.to_string());
+
+	return complex.num_vertices()==5 && complex.num_blockers()==1 && complex.num_edges()==8;
+}
+
+
+
+bool test_constructor5(){
+	typedef Vertex_handle Vh;
+	typedef Simplex_handle Sh;
+	std::vector<Simplex_handle> simplices;
+	auto subf(subfaces(Sh(Vh(0),Vh(1),Vh(2))));
+	simplices.insert(simplices.begin(),subf.begin(),subf.end());
+
+	simplices.push_back(Sh(Vh(3)));
+	simplices.push_back(Sh(Vh(3),Vh(1)));
+	simplices.push_back(Sh(Vh(3),Vh(2)));
+	simplices.push_back(Sh(Vh(4)));
+	simplices.push_back(Sh(Vh(4),Vh(1)));
+	simplices.push_back(Sh(Vh(4),Vh(0)));
+	simplices.push_back(Sh(Vh(5)));
+	simplices.push_back(Sh(Vh(5),Vh(2)));
+	simplices.push_back(Sh(Vh(5),Vh(0)));
+
+	DBGCONT(simplices);
+	Complex complex(simplices.begin(),simplices.end());
+
+	DBGVALUE(complex.to_string());
+
+	return complex.num_vertices()==6 && complex.num_blockers()==3 && complex.num_edges()==9;
+}
 
 
 int main (int argc, char *argv[])
@@ -778,6 +840,9 @@ int main (int argc, char *argv[])
 
 	tests_complex.add("test_constructor_list_simplices",test_constructor);
 	tests_complex.add("test_constructor_list_simplices2",test_constructor2);
+	tests_complex.add("test_constructor_list_simplices3",test_constructor3);
+	tests_complex.add("test_constructor_list_simplices4",test_constructor4);
+	tests_complex.add("test_constructor_list_simplices5",test_constructor5);
 
 	if(tests_complex.run()){
 		return EXIT_SUCCESS;