Changeset 4075

Timestamp:

Aug 20, 2021, 8:54:37 AM (3 months ago)

Author:

Peter

Message:

fix some docs and get rid of function not used. refs #710

Location:

branches/kendall-score/yat/utility/ranking

Files:

• Impl.cc (modified) (3 diffs)
• Impl.h (modified) (2 diffs)

branches/kendall-score/yat/utility/ranking/Impl.cc

@@ -70 +70 @@
   void Impl::move_data(Impl&& from)
   {
-    // FIXME we need to clean up before the move
+    assert(empty());
 
     head_.parent_ = from.head_.parent_;
@@ -147 +147 @@
   void Impl::reset(void)
   {
-    // FIXME do we need to destruct parent and rest of tree?
     head_.parent_ = nullptr;
     head_.left_ = nullptr;
@@ -355 +354 @@
 
 
-  NodeBase* Impl::rebalance_old_root(NodeBase* node)
-  {
-    if (node->balance() > 1) {
-      // height(y) > height(T4) + 1
-      // i.e. height(x) > height(T4)
-
-      // left left case
-      if (node->left_->balance() >= 0) {
-        assert(height(node->left_) > height(node->right_) + 1);
-        // height(x) > height(T4)
-        assert(height(node->left_->left_) > height(node->right_));
-        // y is balanced, so:
-        //  height(T3) <= height(x) <= height(T3)+1
-        assert(height(node->left_->left_) >= height(node->left_->right_));
-        assert(height(node->left_->left_) <= height(node->left_->right_)+1);
-        // x is balanced, so |height(T1)-height(T2)| <= 1
-
-        node = right_rotate(node);
-      }
-      else { // left right case
-        left_rotate(node->left_);
-        node = right_rotate(node);
-      }
-      return rebalance_old_root(node);
-    }
-
-    if (node->balance() >= -1)
-      return node;
-
-    assert(0);
-    return node;
-  }
-
-
   NodeBase* Impl::right_rotate(NodeBase* y)
   {

branches/kendall-score/yat/utility/ranking/Impl.h

@@ -48 +48 @@
       Impl& operator=(Impl&& rhs);
 
-      // FIXME
-      // Head is the only node with no value. Its parent is the root
-      // node and the rest of the tree is in the left branch from the
-      // root. Also, it holds a link to the leftmost node, which
-      // corresponds to begin()
+      // Head is the only node with no parent; it is also the node
+      // with no value. All other nodes are NodeValue<T> pointers. Its
+      // left child is the root node and it also holds a short cut to
+      // the leftmost node to allow constant access and creating of
+      // the begin() iterator.
       NodeBase head_;
 
@@ -62 +62 @@
       NodeBase*& left_most(void);
       const NodeBase* left_most(void) const;
-
-
-      /*
-
-       */
-      NodeBase* rebalance_old_root(NodeBase* node);
 
       /*