diff options
| author | anmoreau <anmoreau@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-08-24 14:56:23 +0000 |
|---|---|---|
| committer | anmoreau <anmoreau@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-08-24 14:56:23 +0000 |
| commit | fa7f116a662bf8cff80402ad0011bcb83296c182 (patch) | |
| tree | f139f8faecb77d1c49c7d69e6f9a57215ebd3182 /src | |
| parent | 84ab537dccbec5eefa28f47f9a40f1ec1a83bf25 (diff) | |
Fixes
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/copy_move@757 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 88bfc9b672be26ed97bea4aecdcfbafb24259553
Diffstat (limited to 'src')
| -rw-r--r-- | src/Simplex_tree/include/gudhi/Simplex_tree.h | 2 | ||||
| -rw-r--r-- | src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_siblings.h | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/Simplex_tree/include/gudhi/Simplex_tree.h b/src/Simplex_tree/include/gudhi/Simplex_tree.h index b32b525b..51c39801 100644 --- a/src/Simplex_tree/include/gudhi/Simplex_tree.h +++ b/src/Simplex_tree/include/gudhi/Simplex_tree.h @@ -288,7 +288,7 @@ class Simplex_tree { /** \brief Copy; copy the whole tree structure. */ Simplex_tree(Simplex_tree& copy) : null_vertex_(copy.null_vertex_), threshold_(copy.threshold_), - root_(NULL, -1, std::vector<std::pair<Vertex_handle, Node>> (copy.root_.members().begin(), copy.root_.members().end())), + root_(NULL, -1, copy.root_.members()), filtration_vect_(copy.filtration_vect_), dimension_(copy.dimension_) { rec_copy(&root_, ©.root_); diff --git a/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_siblings.h b/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_siblings.h index de350f2d..b9f8dcc1 100644 --- a/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_siblings.h +++ b/src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_siblings.h @@ -71,15 +71,16 @@ class Simplex_tree_siblings { /* \brief Constructor with initialized set of members. * * 'members' must be sorted and unique.*/ + template<typename RandomAccessVertexRange> Simplex_tree_siblings(Simplex_tree_siblings * oncles, Vertex_handle parent, - const std::vector<std::pair<Vertex_handle, Node> > & members) + RandomAccessVertexRange members) : oncles_(oncles), parent_(parent), members_(boost::container::ordered_unique_range, members.begin(), members.end()) { for (auto& map_el : members_) { map_el.second.assign_children(this); - } + } } /* |