Code cleanup
This commit is contained in:
parent
ab1af2ead0
commit
4eeed5ee9b
@ -37,7 +37,6 @@ void RB::ins(Node* node, Node* newnode){
|
|||||||
node -> set_rchild(newnode);
|
node -> set_rchild(newnode);
|
||||||
newnode -> set_parent(node);
|
newnode -> set_parent(node);
|
||||||
newnode -> set_color(red);
|
newnode -> set_color(red);
|
||||||
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
this -> ins(node -> get_rchild(), newnode);
|
this -> ins(node -> get_rchild(), newnode);
|
||||||
@ -57,10 +56,8 @@ void RB::ins(Node* node, Node* newnode){
|
|||||||
gp -> set_color(red);
|
gp -> set_color(red);
|
||||||
gp -> get_rchild() -> set_color(black);
|
gp -> get_rchild() -> set_color(black);
|
||||||
p -> set_color(black);
|
p -> set_color(black);
|
||||||
//GP is our new "newnode"
|
|
||||||
newnode = gp;
|
newnode = gp;
|
||||||
p = newnode -> get_parent();
|
p = newnode -> get_parent();
|
||||||
//gp = p -> get_parent();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//Case 2:
|
//Case 2:
|
||||||
@ -70,7 +67,6 @@ void RB::ins(Node* node, Node* newnode){
|
|||||||
//gp = p -> get_parent();
|
//gp = p -> get_parent();
|
||||||
left_rot(newnode);
|
left_rot(newnode);
|
||||||
p = newnode -> get_parent();
|
p = newnode -> get_parent();
|
||||||
gp = p -> get_parent();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//Case 3:
|
//Case 3:
|
||||||
@ -80,7 +76,6 @@ void RB::ins(Node* node, Node* newnode){
|
|||||||
gp -> set_color(red);
|
gp -> set_color(red);
|
||||||
right_rot(gp);
|
right_rot(gp);
|
||||||
p = newnode -> get_parent();
|
p = newnode -> get_parent();
|
||||||
gp = p -> get_parent();
|
|
||||||
}
|
}
|
||||||
} //end if p = lchild of gp
|
} //end if p = lchild of gp
|
||||||
else{
|
else{
|
||||||
@ -90,17 +85,14 @@ void RB::ins(Node* node, Node* newnode){
|
|||||||
gp -> set_color(red);
|
gp -> set_color(red);
|
||||||
gp -> get_lchild() -> set_color(black);
|
gp -> get_lchild() -> set_color(black);
|
||||||
p -> set_color(black);
|
p -> set_color(black);
|
||||||
//GP is our new "newnode"
|
|
||||||
newnode = gp;
|
newnode = gp;
|
||||||
p = newnode -> get_parent();
|
p = newnode -> get_parent();
|
||||||
//gp = p -> get_parent();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//Case 2:
|
//Case 2:
|
||||||
else if(newnode == p -> get_lchild()){
|
else if(newnode == p -> get_lchild()){
|
||||||
newnode = p;
|
newnode = p;
|
||||||
p = newnode -> get_parent();
|
p = newnode -> get_parent();
|
||||||
//gp = p -> get_parent();
|
|
||||||
left_rot(newnode);
|
left_rot(newnode);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -112,10 +104,8 @@ void RB::ins(Node* node, Node* newnode){
|
|||||||
gp -> set_color(red);
|
gp -> set_color(red);
|
||||||
right_rot(gp);
|
right_rot(gp);
|
||||||
p = newnode -> get_parent();
|
p = newnode -> get_parent();
|
||||||
gp = p -> get_parent();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//this -> get_root() -> set_color(black);
|
|
||||||
}
|
}
|
||||||
this -> get_root() -> set_color(black);
|
this -> get_root() -> set_color(black);
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user