Add insert_simplex_and_subfaces. Insert renamed insert_simplex. TU modified. Filtration propagation to be done.

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

Former-commit-id: 26cbe4f4abb3bdd5fb88959fd94f6ef30d283c3f

2 files changed, 13 insertions, 13 deletions

diff --git a/src/Simplex_tree/example/simple_simplex_tree.cpp b/src/Simplex_tree/example/simple_simplex_tree.cpp
index 11b96a0d..4ecad752 100644
--- a/src/Simplex_tree/example/simple_simplex_tree.cpp
+++ b/src/Simplex_tree/example/simple_simplex_tree.cpp
@@ -61,7 +61,7 @@ int main (int argc, char * const argv[])
 	firstSimplexVector.push_back(FIRST_VERTEX_HANDLE);
 	typeSimplex firstSimplex = std::make_pair(firstSimplexVector, Filtration_value(FIRST_FILTRATION_VALUE));
 	typePairSimplexBool returnValue =
-			simplexTree.insert ( firstSimplex.first, firstSimplex.second );
+			simplexTree.insert_simplex ( firstSimplex.first, firstSimplex.second );
 
 	if (returnValue.second == true)
 	{
@@ -80,7 +80,7 @@ int main (int argc, char * const argv[])
 	secondSimplexVector.push_back(SECOND_VERTEX_HANDLE);
 	typeSimplex secondSimplex = std::make_pair(secondSimplexVector, Filtration_value(FIRST_FILTRATION_VALUE));
 	returnValue =
-			simplexTree.insert ( secondSimplex.first, secondSimplex.second );
+			simplexTree.insert_simplex ( secondSimplex.first, secondSimplex.second );
 
 	if (returnValue.second == true)
 	{
@@ -100,7 +100,7 @@ int main (int argc, char * const argv[])
 	thirdSimplexVector.push_back(SECOND_VERTEX_HANDLE);
 	typeSimplex thirdSimplex = std::make_pair(thirdSimplexVector, Filtration_value(SECOND_FILTRATION_VALUE));
 	returnValue =
-			simplexTree.insert ( thirdSimplex.first, thirdSimplex.second );
+			simplexTree.insert_simplex ( thirdSimplex.first, thirdSimplex.second );
 
 	if (returnValue.second == true)
 	{
@@ -119,7 +119,7 @@ int main (int argc, char * const argv[])
 	fourthSimplexVector.push_back(THIRD_VERTEX_HANDLE);
 	typeSimplex fourthSimplex = std::make_pair(fourthSimplexVector, Filtration_value(FIRST_FILTRATION_VALUE));
 	returnValue =
-			simplexTree.insert ( fourthSimplex.first, fourthSimplex.second );
+			simplexTree.insert_simplex ( fourthSimplex.first, fourthSimplex.second );
 
 	if (returnValue.second == true)
 	{
@@ -139,7 +139,7 @@ int main (int argc, char * const argv[])
 	fifthSimplexVector.push_back(FIRST_VERTEX_HANDLE);
 	typeSimplex fifthSimplex = std::make_pair(fifthSimplexVector, Filtration_value(SECOND_FILTRATION_VALUE));
 	returnValue =
-			simplexTree.insert ( fifthSimplex.first, fifthSimplex.second );
+			simplexTree.insert_simplex ( fifthSimplex.first, fifthSimplex.second );
 
 	if (returnValue.second == true)
 	{
@@ -159,7 +159,7 @@ int main (int argc, char * const argv[])
 	sixthSimplexVector.push_back(SECOND_VERTEX_HANDLE);
 	typeSimplex sixthSimplex = std::make_pair(sixthSimplexVector, Filtration_value(SECOND_FILTRATION_VALUE));
 	returnValue =
-			simplexTree.insert ( sixthSimplex.first, sixthSimplex.second );
+			simplexTree.insert_simplex ( sixthSimplex.first, sixthSimplex.second );
 
 	if (returnValue.second == true)
 	{
@@ -180,7 +180,7 @@ int main (int argc, char * const argv[])
 	seventhSimplexVector.push_back(FIRST_VERTEX_HANDLE);
 	typeSimplex seventhSimplex = std::make_pair(seventhSimplexVector, Filtration_value(THIRD_FILTRATION_VALUE));
 	returnValue =
-			simplexTree.insert ( seventhSimplex.first, seventhSimplex.second );
+			simplexTree.insert_simplex ( seventhSimplex.first, seventhSimplex.second );
 
 	if (returnValue.second == true)
 	{
@@ -199,7 +199,7 @@ int main (int argc, char * const argv[])
 	eighthSimplexVector.push_back(FOURTH_VERTEX_HANDLE);
 	typeSimplex eighthSimplex = std::make_pair(eighthSimplexVector, Filtration_value(FIRST_FILTRATION_VALUE));
 	returnValue =
-			simplexTree.insert ( eighthSimplex.first, eighthSimplex.second );
+			simplexTree.insert_simplex ( eighthSimplex.first, eighthSimplex.second );
 
 	if (returnValue.second == true)
 	{
@@ -219,7 +219,7 @@ int main (int argc, char * const argv[])
 	ninethSimplexVector.push_back(FIRST_VERTEX_HANDLE);
 	typeSimplex ninethSimplex = std::make_pair(ninethSimplexVector, Filtration_value(SECOND_FILTRATION_VALUE));
 	returnValue =
-			simplexTree.insert ( ninethSimplex.first, ninethSimplex.second );
+			simplexTree.insert_simplex ( ninethSimplex.first, ninethSimplex.second );
 
 	if (returnValue.second == true)
 	{
@@ -238,7 +238,7 @@ int main (int argc, char * const argv[])
 	tenthSimplexVector.push_back(FIRST_VERTEX_HANDLE);
 	typeSimplex tenthSimplex = std::make_pair(tenthSimplexVector, Filtration_value(FOURTH_FILTRATION_VALUE)); // With a different filtration value
 	returnValue =
-			simplexTree.insert ( tenthSimplex.first, tenthSimplex.second );
+			simplexTree.insert_simplex ( tenthSimplex.first, tenthSimplex.second );
 
 	if (returnValue.second == true)
 	{
@@ -259,7 +259,7 @@ int main (int argc, char * const argv[])
 	eleventhSimplexVector.push_back(FIRST_VERTEX_HANDLE);
 	typeSimplex eleventhSimplex = std::make_pair(eleventhSimplexVector, Filtration_value(FOURTH_FILTRATION_VALUE));
 	returnValue =
-			simplexTree.insert ( eleventhSimplex.first, eleventhSimplex.second );
+			simplexTree.insert_simplex ( eleventhSimplex.first, eleventhSimplex.second );
 
 	if (returnValue.second == true)
 	{
diff --git a/src/Simplex_tree/example/simplex_tree_from_alpha_shapes_3.cpp b/src/Simplex_tree/example/simplex_tree_from_alpha_shapes_3.cpp
index d831e31e..5f797e93 100644
--- a/src/Simplex_tree/example/simplex_tree_from_alpha_shapes_3.cpp
+++ b/src/Simplex_tree/example/simplex_tree_from_alpha_shapes_3.cpp
@@ -200,7 +200,7 @@ int main (int argc, char * const argv[])
 				// alpha shape not found
 				Simplex_tree_vertex vertex = map_cgal_simplex_tree.size();
 #ifdef DEBUG_TRACES
-				std::cout << "vertex [" << the_alpha_shape_vertex->point() << "] not found - insert " << vertex << std::endl;
+				std::cout << "vertex [" << the_alpha_shape_vertex->point() << "] not found - insert_simplex " << vertex << std::endl;
 #endif // DEBUG_TRACES
 				the_simplex_tree.push_back(vertex);
 				map_cgal_simplex_tree.insert(Alpha_shape_simplex_tree_pair(the_alpha_shape_vertex,vertex));
@@ -218,7 +218,7 @@ int main (int argc, char * const argv[])
 #ifdef DEBUG_TRACES
 		std::cout << "filtration = " << *the_alpha_value_iterator << std::endl;
 #endif // DEBUG_TRACES
-		simplex_tree.insert(the_simplex_tree, std::sqrt(*the_alpha_value_iterator));
+		simplex_tree.insert_simplex(the_simplex_tree, std::sqrt(*the_alpha_value_iterator));
 		if (the_alpha_value_iterator != the_alpha_values.end())
 			++the_alpha_value_iterator;
 		else