Copy assignment for Simplex_tree and its tests (rules of 5)

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

Former-commit-id: 4ac0e87aaef3bf29369f25b8eb0c766a6f1b395b

3 files changed, 87 insertions, 0 deletions

diff --git a/src/Simplex_tree/include/gudhi/Simplex_tree.h b/src/Simplex_tree/include/gudhi/Simplex_tree.h
index ee96d5a2..ca3575ba 100644
--- a/src/Simplex_tree/include/gudhi/Simplex_tree.h
+++ b/src/Simplex_tree/include/gudhi/Simplex_tree.h
@@ -301,6 +301,7 @@ class Simplex_tree {
       root_(nullptr, null_vertex_ , simplex_source.root_.members_),
       filtration_vect_(),
       dimension_(simplex_source.dimension_) {
+    std::cout << "copy constructor" << std::endl;
     auto root_source = simplex_source.root_;
     rec_copy(&root_, &root_source);
   }
@@ -326,6 +327,7 @@ class Simplex_tree {
       root_(std::move(old.root_)),
       filtration_vect_(std::move(old.filtration_vect_)),
       dimension_(std::move(old.dimension_)) {
+    std::cout << "move constructor" << std::endl;
     old.dimension_ = -1;
     old.root_ = Siblings(nullptr, null_vertex_);
   }
@@ -338,6 +340,20 @@ class Simplex_tree {
       }
     }
   }
+
+  /** \brief User-defined copy assignment reproduces the whole tree structure. */
+  Simplex_tree& operator= (const Simplex_tree& simplex_source)
+  {
+    std::cout << "copy assignment" << std::endl;
+    this->null_vertex_ = simplex_source.null_vertex_;
+    root_ = Siblings(nullptr, null_vertex_ , simplex_source.root_.members_);
+    this->filtration_vect_.clear();
+    this->dimension_ = simplex_source.dimension_;
+    auto root_source = simplex_source.root_;
+    rec_copy(&(this->root_), &root_source);
+    return *this;
+  }
+
   /** @} */  // end constructor/destructor
  private:
   // Recursive deletion
diff --git a/src/Simplex_tree/test/CMakeLists.txt b/src/Simplex_tree/test/CMakeLists.txt
index c63d8532..5bea3938 100644
--- a/src/Simplex_tree/test/CMakeLists.txt
+++ b/src/Simplex_tree/test/CMakeLists.txt
@@ -28,3 +28,11 @@ if (TBB_FOUND)
 endif()
 
 gudhi_add_coverage_test(Simplex_tree_iostream_operator_test_unit)
+
+add_executable ( Simplex_tree_ctor_and_move_test_unit simplex_tree_ctor_and_move_unit_test.cpp )
+target_link_libraries(Simplex_tree_ctor_and_move_test_unit ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
+if (TBB_FOUND)
+  target_link_libraries(Simplex_tree_ctor_and_move_test_unit ${TBB_LIBRARIES})
+endif()
+
+gudhi_add_coverage_test(Simplex_tree_ctor_and_move_test_unit)
diff --git a/src/Simplex_tree/test/simplex_tree_ctor_and_move_unit_test.cpp b/src/Simplex_tree/test/simplex_tree_ctor_and_move_unit_test.cpp
new file mode 100644
index 00000000..c9439e65
--- /dev/null
+++ b/src/Simplex_tree/test/simplex_tree_ctor_and_move_unit_test.cpp
@@ -0,0 +1,63 @@
+#include <iostream>
+#include <fstream>
+#include <string>
+#include <algorithm>
+#include <utility> // std::pair, std::make_pair
+#include <cmath> // float comparison
+#include <limits>
+#include <functional> // greater
+
+#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE "simplex_tree_constructor_and_move"
+#include <boost/test/unit_test.hpp>
+#include <boost/mpl/list.hpp>
+
+//  ^
+// /!\ Nothing else from Simplex_tree shall be included to test includes are well defined.
+#include "gudhi/Simplex_tree.h"
+
+using namespace Gudhi;
+
+typedef boost::mpl::list<Simplex_tree<>, Simplex_tree<Simplex_tree_options_fast_persistence>> list_of_tested_variants;
+
+
+BOOST_AUTO_TEST_CASE_TEMPLATE(simplex_copy_constructor, Simplex_tree, list_of_tested_variants) {
+  std::cout << "********************************************************************" << std::endl;
+  std::cout << "TEST OF COPY CONSTRUCTOR" << std::endl;
+  Simplex_tree st;
+
+  st.insert_simplex_and_subfaces({2, 1, 0}, 3.0);
+  st.insert_simplex_and_subfaces({0, 1, 6, 7}, 4.0);
+  st.insert_simplex_and_subfaces({3, 0}, 2.0);
+  st.insert_simplex_and_subfaces({3, 4, 5}, 3.0);
+  /* Inserted simplex:        */
+  /*    1   6                 */
+  /*    o---o                 */
+  /*   /X\7/                  */
+  /*  o---o---o---o           */
+  /*  2   0   3\X/4           */
+  /*            o             */
+  /*            5             */
+  /*                          */
+  /* In other words:          */
+  /*   A facet [2,1,0]        */
+  /*   An edge [0,3]          */
+  /*   A facet [3,4,5]        */
+  /*   A cell  [0,1,6,7]      */
+
+  Simplex_tree st1(st);
+  Simplex_tree st2(st);
+  // Cross check
+  BOOST_CHECK(st1 == st2);
+  BOOST_CHECK(st == st2);
+  BOOST_CHECK(st1 == st);
+
+  std::cout << "********************************************************************" << std::endl;
+  std::cout << "TEST OF COPY ASSIGNMENT" << std::endl;
+  Simplex_tree st3 = st;
+  Simplex_tree st4 = st;
+  // Cross check
+  BOOST_CHECK(st3 == st4);
+  BOOST_CHECK(st == st4);
+  BOOST_CHECK(st3 == st);
+}