[Joafip-svn] SF.net SVN: joafip:[3171] trunk/joafip-rbtree/src/main/java/net/sf/joafip/ redblacktr
Brought to you by:
luc_peuvrier
|
From: <luc...@us...> - 2012-11-28 12:32:31
|
Revision: 3171
http://joafip.svn.sourceforge.net/joafip/?rev=3171&view=rev
Author: luc_peuvrier
Date: 2012-11-28 12:32:19 +0000 (Wed, 28 Nov 2012)
Log Message:
-----------
cleanup
Modified Paths:
--------------
trunk/joafip-rbtree/src/main/java/net/sf/joafip/redblacktree/service/RedBlackTree.java
Modified: trunk/joafip-rbtree/src/main/java/net/sf/joafip/redblacktree/service/RedBlackTree.java
===================================================================
--- trunk/joafip-rbtree/src/main/java/net/sf/joafip/redblacktree/service/RedBlackTree.java 2012-11-28 12:17:40 UTC (rev 3170)
+++ trunk/joafip-rbtree/src/main/java/net/sf/joafip/redblacktree/service/RedBlackTree.java 2012-11-28 12:32:19 UTC (rev 3171)
@@ -1135,8 +1135,6 @@
rootNumberOfChild = numberOfElement - 1;
}
- // If strictly internal, copy successor's element to p and then make p
- // point to successor.
// if p has 2 children
if (!nodeToDelete.getLeft().isSentinel()
&& !nodeToDelete.getRight().isSentinel()) {
@@ -1144,7 +1142,6 @@
swap(nodeToDelete, successor);
}
- // Start fixup at replacement node, if it exists.
final IRBTNode<E> replacement = (!nodeToDelete.getLeft().isSentinel() ? nodeToDelete
.getLeft() : nodeToDelete.getRight());
@@ -1163,17 +1160,6 @@
} else {
parentOfNodeToDelete.setRight(replacement);
}
- // Null out links so they are OK to use by fixAfterDeletion.
- // FIXMELUC __________________________see detach
- nodeToDelete.setParent(null);
- IRBTNode<E> newSentinel = nodeManager.newSentinel();
- nodeToDelete.setLeft(newSentinel);
- newSentinel.setParent(nodeToDelete);
- newSentinel = nodeManager.newSentinel();
- nodeToDelete.setRight(newSentinel);
- newSentinel.setParent(nodeToDelete);
-
- // Fix replacement
if (nodeToDelete.getColor() == BLACK) {
deletionReorganize(replacement);
}
@@ -1195,8 +1181,6 @@
parentOfNodeToDelete.setRight(newSentinel);
}
newSentinel.setParent(parentOfNodeToDelete);
- // FIXMELUC __________________________see detach
- nodeToDelete.setParent(null);
}
}
nodeToDelete.detach();
@@ -1215,10 +1199,8 @@
throws RBTException {
if (node == null) {
return null;
- // } else if (t.right != null) {
} else if (!node.getRight().isSentinel()) {
IRBTNode<E> successor = node.getRight();
- // while (p.left != null)
int depth = 0;
while (!successor.getLeft().isSentinel()) {
successor = successor.getLeft();
@@ -1230,7 +1212,6 @@
} else {
IRBTNode<E> successor = node.getParent();
IRBTNode<E> child = node;
- // while (p != null && ch == p.right) {
int depth = 0;
while (successor != null && child == successor.getRight()) {
child = successor;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|