Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix depth-preserving left subtree insertion #7

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix depth-preserving left subtree insertion #7

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4271c5
fix depth-preserving left subtree insertion
voila Jul 21, 2018
590351a
fix remove_min_elt for trees with only one element
voila Jul 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions avl.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ module RawAVLTree = struct
| Same -> Deeper (Tree (t', tv, r, More))
| Less -> PSameDepth (Tree (t', tv, r, Same))
end
| PSameDepth t' -> PSameDepth (Tree (t', v, r, diff))
| PSameDepth t' -> PSameDepth (Tree (t', tv, r, diff))
end
| Equal -> PSameDepth t
| GreaterThan -> begin
Expand All @@ -119,6 +119,7 @@ module RawAVLTree = struct

let rec remove_min_elt : type d. ('a, d s) atree -> ('a, d s) neg_result = function
| Tree (Empty, _, r, Less) -> Shallower r
| Tree (Empty, _, r, Same) -> Shallower r
| Tree (l, tv, r, Less) -> begin
match l with
| Empty -> raise Empty_tree
Expand All @@ -145,14 +146,11 @@ module RawAVLTree = struct
| NSameDepth t -> NSameDepth (Tree (t, tv, r, More))
| Shallower t -> Shallower (Tree (t, tv, r, Same))
end
| Tree (l, tv, r, Same) -> begin
match l with
| Empty -> raise Empty_tree
| Tree _ as l ->
let result = remove_min_elt l in
match result with
| NSameDepth t -> NSameDepth (Tree (t, tv, r, Same))
| Shallower t -> NSameDepth (Tree (t, tv, r, Less))
| Tree (Tree(_) as l, tv, r, Same) -> begin
let result = remove_min_elt l in
match result with
| NSameDepth t -> NSameDepth (Tree (t, tv, r, Same))
| Shallower t -> NSameDepth (Tree (t, tv, r, Less))
end

let merge : type m n o. ('a, m) atree -> ('a, n) atree -> (m, n, o) diff -> ('a, o) pos_result =
Expand Down