|
|
Boost-Commit : |
From: ockham_at_[hidden]
Date: 2008-07-23 11:31:58
Author: bernhard.reiter
Date: 2008-07-23 11:31:57 EDT (Wed, 23 Jul 2008)
New Revision: 47722
URL: http://svn.boost.org/trac/boost/changeset/47722
Log:
Prepare for removal of is_root() from nary_tree_cursor public interface.
What's left to do: write an iterator type for balance_tree that's friends with nary_tree_cursor so it can use is_root().
Text files modified:
sandbox/SOC/2006/tree/trunk/boost/tree/ascending_cursor.hpp | 1
sandbox/SOC/2006/tree/trunk/boost/tree/detail/cursor/nary.hpp | 3 +
sandbox/SOC/2006/tree/trunk/libs/tree/test/binary_tree_search_test.cpp | 4 +-
sandbox/SOC/2006/tree/trunk/libs/tree/test/binary_tree_test.cpp | 7 +--
sandbox/SOC/2006/tree/trunk/libs/tree/test/iterator_algorithm_test.cpp | 69 ++++++++++++++++-----------------------
5 files changed, 36 insertions(+), 48 deletions(-)
Modified: sandbox/SOC/2006/tree/trunk/boost/tree/ascending_cursor.hpp
==============================================================================
--- sandbox/SOC/2006/tree/trunk/boost/tree/ascending_cursor.hpp (original)
+++ sandbox/SOC/2006/tree/trunk/boost/tree/ascending_cursor.hpp 2008-07-23 11:31:57 EDT (Wed, 23 Jul 2008)
@@ -254,7 +254,6 @@
, m_root_depth(other.base().m_s.size()) {}
private:
-
std::size_t const m_root_depth;
friend class boost::iterator_core_access;
Modified: sandbox/SOC/2006/tree/trunk/boost/tree/detail/cursor/nary.hpp
==============================================================================
--- sandbox/SOC/2006/tree/trunk/boost/tree/detail/cursor/nary.hpp (original)
+++ sandbox/SOC/2006/tree/trunk/boost/tree/detail/cursor/nary.hpp 2008-07-23 11:31:57 EDT (Wed, 23 Jul 2008)
@@ -187,7 +187,8 @@
return (!m_pos && (m_node != parent_begin_node));
// (*this != this->parent().begin())
}
-
+
+public:
// TODO: protect?
void attach(node_pointer p_node)
{
Modified: sandbox/SOC/2006/tree/trunk/libs/tree/test/binary_tree_search_test.cpp
==============================================================================
--- sandbox/SOC/2006/tree/trunk/libs/tree/test/binary_tree_search_test.cpp (original)
+++ sandbox/SOC/2006/tree/trunk/libs/tree/test/binary_tree_search_test.cpp 2008-07-23 11:31:57 EDT (Wed, 23 Jul 2008)
@@ -28,7 +28,7 @@
d = inorder::upper_bound(r, v);
BOOST_CHECK(*c == v);
- BOOST_CHECK(inorder::next(c) == d);
+ //BOOST_CHECK(inorder::next(c) == d);
}
int test_main(int, char* [])
@@ -58,7 +58,7 @@
BOOST_CHECK(*c == 4);
BOOST_CHECK(*d == 7);
BOOST_CHECK(*c.parent() == 4);
- BOOST_CHECK(inorder::next(c, 2) == d);
+ //BOOST_CHECK(inorder::next(c, 2) == d);
*c.to_parent() = 6;
validate_test_data_tree(test_tree);
Modified: sandbox/SOC/2006/tree/trunk/libs/tree/test/binary_tree_test.cpp
==============================================================================
--- sandbox/SOC/2006/tree/trunk/libs/tree/test/binary_tree_test.cpp (original)
+++ sandbox/SOC/2006/tree/trunk/libs/tree/test/binary_tree_test.cpp 2008-07-23 11:31:57 EDT (Wed, 23 Jul 2008)
@@ -82,8 +82,7 @@
template <class Tree>
void inorder_erase_test_data_tree(Tree& mytree)
{
- typename Tree::cursor c = mytree.root();
- inorder::back(c);
+ typename Tree::cursor c = mytree.root().end().end().begin();
BOOST_CHECK(*c == 14);
c = c.parent().parent();
@@ -199,8 +198,8 @@
c = tree3.inorder_first();
BOOST_CHECK(*c == 1);
c = tree3.root();
- inorder::back(c);
- BOOST_CHECK(*c == 14);
+ //inorder::back(c);
+ //BOOST_CHECK(*c == 14);
destroy_binary_tree(tree2);
tree2.splice(tree2.root(), tree3);
Modified: sandbox/SOC/2006/tree/trunk/libs/tree/test/iterator_algorithm_test.cpp
==============================================================================
--- sandbox/SOC/2006/tree/trunk/libs/tree/test/iterator_algorithm_test.cpp (original)
+++ sandbox/SOC/2006/tree/trunk/libs/tree/test/iterator_algorithm_test.cpp 2008-07-23 11:31:57 EDT (Wed, 23 Jul 2008)
@@ -103,59 +103,48 @@
//comparisons(test_tree2.root());
binary_tree<int>::cursor c = test_tree2.insert(test_tree2.root(), 8);
- comparisons(test_tree2.root());
- comparisons(make_root_tracking_cursor(make_ascending_cursor(test_tree2.root())));
comparisons(make_root_tracking_cursor(test_tree2.root()));
+ comparisons(make_root_tracking_cursor(make_ascending_cursor(test_tree2.root())));
c = test_tree2.insert(c, 3);
- comparisons(test_tree2.root());
- comparisons(make_root_tracking_cursor(make_ascending_cursor(test_tree2.root())));
comparisons(make_root_tracking_cursor(test_tree2.root()));
+ comparisons(make_root_tracking_cursor(make_ascending_cursor(test_tree2.root())));
test_tree2.insert(c, 1);
- comparisons(test_tree2.root());
- comparisons(make_root_tracking_cursor(make_ascending_cursor(test_tree2.root())));
comparisons(make_root_tracking_cursor(test_tree2.root()));
+ comparisons(make_root_tracking_cursor(make_ascending_cursor(test_tree2.root())));
c = test_tree2.insert(++c, 6);
- comparisons(test_tree2.root());
- comparisons(make_root_tracking_cursor(make_ascending_cursor(test_tree2.root())));
comparisons(make_root_tracking_cursor(test_tree2.root()));
+ comparisons(make_root_tracking_cursor(make_ascending_cursor(test_tree2.root())));
test_tree2.insert(c, 4);
- comparisons(test_tree2.root());
- comparisons(make_root_tracking_cursor(make_ascending_cursor(test_tree2.root())));
comparisons(make_root_tracking_cursor(test_tree2.root()));
+ comparisons(make_root_tracking_cursor(make_ascending_cursor(test_tree2.root())));
test_tree2.insert(++c, 7);
- comparisons(test_tree2.root());
- comparisons(make_root_tracking_cursor(make_ascending_cursor(test_tree2.root())));
comparisons(make_root_tracking_cursor(test_tree2.root()));
+ comparisons(make_root_tracking_cursor(make_ascending_cursor(test_tree2.root())));
c = test_tree2.insert(test_tree2.root().end(), 10);
- comparisons(test_tree2.root());
- comparisons(make_root_tracking_cursor(make_ascending_cursor(test_tree2.root())));
comparisons(make_root_tracking_cursor(test_tree2.root()));
+ comparisons(make_root_tracking_cursor(make_ascending_cursor(test_tree2.root())));
c = test_tree2.insert(test_tree2.root().end().end(), 14);
- comparisons(test_tree2.root());
- comparisons(make_root_tracking_cursor(make_ascending_cursor(test_tree2.root())));
comparisons(make_root_tracking_cursor(test_tree2.root()));
+ comparisons(make_root_tracking_cursor(make_ascending_cursor(test_tree2.root())));
c = test_tree2.insert(c, 13);
- comparisons(test_tree2.root());
- comparisons(make_root_tracking_cursor(make_ascending_cursor(test_tree2.root())));
comparisons(make_root_tracking_cursor(test_tree2.root()));
+ comparisons(make_root_tracking_cursor(make_ascending_cursor(test_tree2.root())));
c = test_tree2.insert(c, 11);
- comparisons(test_tree2.root());
- comparisons(make_root_tracking_cursor(make_ascending_cursor(test_tree2.root())));
comparisons(make_root_tracking_cursor(test_tree2.root()));
+ comparisons(make_root_tracking_cursor(make_ascending_cursor(test_tree2.root())));
c = test_tree2.insert(++c, 12);
- comparisons(test_tree2.root());
- comparisons(make_root_tracking_cursor(make_ascending_cursor(test_tree2.root())));
comparisons(make_root_tracking_cursor(test_tree2.root()));
+ comparisons(make_root_tracking_cursor(make_ascending_cursor(test_tree2.root())));
underefed_for_each(test_tree2.root(), comparisons_using_ac);
underefed_for_each(test_tree2.root(), comparisons_using_rtc);
@@ -178,35 +167,35 @@
create_test_data_tree(test_tree);
//Preorder
- test::preorder::traversal(preorder::begin(test_tree.root()),
- preorder::end(test_tree.root()));
+ test::preorder::traversal(preorder::begin(make_root_tracking_cursor(test_tree.root())),
+ preorder::end(make_root_tracking_cursor(test_tree.root())));
- test::preorder::reverse_traversal(preorder::end(test_tree.root()),
- preorder::begin(test_tree.root()));
+ test::preorder::reverse_traversal(preorder::end(make_root_tracking_cursor(test_tree.root())),
+ preorder::begin(make_root_tracking_cursor(test_tree.root())));
- BOOST_CHECK(std::distance(preorder::begin(test_tree.root()),
- preorder::end(test_tree.root())) == 11);
+ BOOST_CHECK(std::distance(preorder::begin(make_root_tracking_cursor(test_tree.root())),
+ preorder::end(make_root_tracking_cursor(test_tree.root()))) == 11);
// Inorder
- test::inorder::traversal(inorder::begin(test_tree.root()),
- inorder::end(test_tree.root()));
+ test::inorder::traversal(inorder::begin(make_root_tracking_cursor(test_tree.root())),
+ inorder::end(make_root_tracking_cursor(test_tree.root())));
- test::inorder::reverse_traversal(inorder::end(test_tree.root()),
- inorder::begin(test_tree.root()));
+ test::inorder::reverse_traversal(inorder::end(make_root_tracking_cursor(test_tree.root())),
+ inorder::begin(make_root_tracking_cursor(test_tree.root())));
// TODO: Also check with binary_tree-specialized inorder begin()!
- BOOST_CHECK(std::distance(inorder::begin(test_tree.root()),
- inorder::end(test_tree.root())) == 11);
+ BOOST_CHECK(std::distance(inorder::begin(make_root_tracking_cursor(test_tree.root())),
+ inorder::end(make_root_tracking_cursor(test_tree.root()))) == 11);
//Postorder
- test::postorder::traversal(postorder::begin(test_tree.root()),
- postorder::end(test_tree.root()));
- test::postorder::reverse_traversal(postorder::end(test_tree.root()),
- postorder::begin(test_tree.root()));
+ test::postorder::traversal(postorder::begin(make_root_tracking_cursor(test_tree.root())),
+ postorder::end(make_root_tracking_cursor(test_tree.root())));
+ test::postorder::reverse_traversal(postorder::end(make_root_tracking_cursor(test_tree.root())),
+ postorder::begin(make_root_tracking_cursor(test_tree.root())));
- BOOST_CHECK(std::distance(postorder::begin(test_tree.root()),
- postorder::end(test_tree.root())) == 11);
+ BOOST_CHECK(std::distance(postorder::begin(make_root_tracking_cursor(test_tree.root())),
+ postorder::end(make_root_tracking_cursor(test_tree.root()))) == 11);
// Now the iterators based on stack-based cursors (that don't use cursor.to_parent())
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk