- 
                Notifications
    You must be signed in to change notification settings 
- Fork 78
Add AA Tree and tests #203
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.
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
          
     Open
      
      
            hummy123
  wants to merge
  11
  commits into
  fsprojects:master
  
    
      
        
          
  
    
      Choose a base branch
      
     
    
      
        
      
      
        
          
          
        
        
          
            
              
              
              
  
           
        
        
          
            
              
              
           
        
       
     
  
        
          
            
          
            
          
        
       
    
      
from
hummy123:master
  
      
      
   
  
    
  
  
  
 
  
      
    base: master
Could not load branches
            
              
  
    Branch not found: {{ refName }}
  
            
                
      Loading
              
            Could not load tags
            
            
              Nothing to show
            
              
  
            
                
      Loading
              
            Are you sure you want to change the base?
            Some commits from the old base branch may be removed from the timeline,
            and old review comments may become outdated.
          
          
  
     Open
                    Changes from all commits
      Commits
    
    
            Show all changes
          
          
            11 commits
          
        
        Select commit
          Hold shift + click to select a range
      
      434122d
              
                Add AA Tree and tests
              
              
                hummy123 7990983
              
                edit project file to include AaTree and tests, add labels for AaTree …
              
              
                hummy123 e7e1732
              
                one Expect assertion for each test in AaTreeTest.fs
              
              
                hummy123 50d31b6
              
                AAA structure for a couple of more tests
              
              
                hummy123 9053d20
              
                AaTree toSeq
              
              
                hummy123 8ccd82f
              
                fix incorrect functions in paper by Isabelle HOL proof below: https:/…
              
              
                hummy123 dda2bd0
              
                use isEmpty in delete case as in HOL proof
              
              
                hummy123 cb72994
              
                Merge branch 'fsprojects:master' into master
              
              
                hummy123 56bac48
              
                Merge branch 'fsprojects:master' into master
              
              
                hummy123 8d1a93c
              
                fix formatting using FAKE and fix typo in comment
              
              
                hummy123 171dd41
              
                fix my own implementation error in AaTree.splitMax (private function
              
              
                hummy123 File filter
Filter by extension
Conversations
          Failed to load comments.   
        
        
          
      Loading
        
  Jump to
        
          Jump to file
        
      
      
          Failed to load files.   
        
        
          
      Loading
        
  Diff view
Diff view
There are no files selected for viewing
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
              
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
              | Original file line number | Diff line number | Diff line change | 
|---|---|---|
| @@ -0,0 +1,209 @@ | ||
| namespace rec FSharpx.Collections.Experimental | ||
|  | ||
| open System.Collections | ||
| open FSharpx.Collections | ||
| open System.Collections.Generic | ||
|  | ||
| (* Implementation guided by following paper: https://arxiv.org/pdf/1412.4882.pdf *) | ||
|  | ||
| /// A balanced binary tree similar to a red-black tree which may have less predictable performance. | ||
| type AaTree<'T when 'T: comparison> = | ||
| | E | ||
| | T of length: int * leftSubtree: AaTree<'T> * value: 'T * rightSubtree: AaTree<'T> | ||
|  | ||
| member x.ToArray() = | ||
| AaTree.toArray x | ||
|  | ||
| member x.ToList() = | ||
| AaTree.toList x | ||
|  | ||
| member x.ToSeq() = | ||
| AaTree.toSeq x | ||
|  | ||
| interface IEnumerable<'T> with | ||
| member x.GetEnumerator() = | ||
| (x.ToSeq() :> _ seq).GetEnumerator() | ||
|  | ||
| interface System.Collections.IEnumerable with | ||
| member x.GetEnumerator() = | ||
| (x.ToSeq() :> _ seq).GetEnumerator() | ||
|  | ||
| [<RequireQualifiedAccess>] | ||
| module AaTree = | ||
| /// O(1): Returns a boolean if tree is empty. | ||
| let isEmpty = | ||
| function | ||
| | E -> true | ||
| | _ -> false | ||
|  | ||
| let private sngl = | ||
| function | ||
| | E -> false | ||
| | T(_, _, _, E) -> true | ||
| | T(lvx, _, _, T(lvy, _, _, _)) -> lvx > lvy | ||
|  | ||
| /// O(1): Returns an empty AaTree. | ||
| let empty = E | ||
|  | ||
| let private lvl = | ||
| function | ||
| | E -> 0 | ||
| | T(lvt, _, _, _) -> lvt | ||
|  | ||
| let private skew = | ||
| function | ||
| | T(lvx, T(lvy, a, ky, b), kx, c) when lvx = lvy -> T(lvx, a, ky, T(lvx, b, kx, c)) | ||
| | t -> t | ||
|  | ||
| let private split = | ||
| function | ||
| | T(lvx, a, kx, T(lvy, b, ky, T(lvz, c, kz, d))) when lvx = lvy && lvy = lvz -> T(lvx + 1, T(lvx, a, kx, b), ky, T(lvx, c, kz, d)) | ||
| | t -> t | ||
|  | ||
| /// O(log n): Returns a new AaTree with the parameter inserted. | ||
| let rec insert item = | ||
| function | ||
| | E -> T(1, E, item, E) | ||
| | T(h, l, v, r) as node -> | ||
| if item < v then | ||
| split <| (skew <| T(h, insert item l, v, r)) | ||
| elif item > v then | ||
| split <| (skew <| T(h, l, v, insert item r)) | ||
| else | ||
| node | ||
|  | ||
| (* nlvl function fixed according to Isabelle HOL proof below: *) | ||
| (* https://isabelle.in.tum.de/library/HOL/HOL-Data_Structures/AA_Set.html#:~:text=text%E2%80%B9In%20the%20paper%2C%20the%20last%20case%20of%20%5C%3C%5Econst%3E%E2%80%B9adjust%E2%80%BA%20is%20expressed%20with%20the%20help%20of%20an%0Aincorrect%20auxiliary%20function%20%5Ctexttt%7Bnlvl%7D. *) | ||
| let private nlvl = | ||
| function | ||
| | T(lvt, _, _, _) as t -> if sngl t then lvt else lvt + 1 | ||
| | _ -> failwith "unexpected nlvl case" | ||
|  | ||
| let private adjust = | ||
| function | ||
| | T(lvt, lt, kt, rt) as t when lvl lt >= lvt - 1 && lvl rt >= (lvt - 1) -> t | ||
| | T(lvt, lt, kt, rt) when lvl rt < lvt - 1 && sngl lt -> skew <| T(lvt - 1, lt, kt, rt) | ||
| | T(lvt, T(lv1, a, kl, T(lvb, lb, kb, rb)), kt, rt) when lvl rt < lvt - 1 -> T(lvb + 1, T(lv1, a, kl, lb), kb, T(lvt - 1, rb, kt, rt)) | ||
| | T(lvt, lt, kt, rt) when lvl rt < lvt -> split <| T(lvt - 1, lt, kt, rt) | ||
| | T(lvt, lt, kt, T(lvr, T(lva, c, ka, d), kr, b)) -> | ||
| let a = T(lva, c, ka, d) | ||
| T(lva + 1, T(lvt - 1, lt, kt, c), ka, (split(T(nlvl a, d, kr, b)))) | ||
| | _ -> failwith "unexpected adjust case" | ||
|  | ||
| (* splitMax fixed as in Isabelle HOL proof below: *) | ||
| (* https://isabelle.in.tum.de/library/HOL/HOL-Data_Structures/AA_Set.html#:~:text=Function%20%E2%80%B9split_max%E2%80%BA%20below%20is%20called%20%5Ctexttt%7Bdellrg%7D%20in%20the%20paper.%0AThe%20latter%20is%20incorrect%20for%20two%20reasons%3A%20%5Ctexttt%7Bdellrg%7D%20is%20meant%20to%20delete%20the%20largest%0Aelement%20but%20recurses%20on%20the%20left%20instead%20of%20the%20right%20subtree%3B%20the%20invariant%0Ais%20not%20restored.%E2%80%BA *) | ||
| let rec private splitMax = | ||
| function | ||
| | T(_, l, v, E) -> (l, v) | ||
| | T(h, l, v, r) as node -> let (r', b) = splitMax r in adjust <| T(h, l, v, r'), b | ||
| | _ -> failwith "unexpected dellrg case" | ||
|  | ||
| /// O(log n): Returns an AaTree with the parameter removed. | ||
| let rec delete item = | ||
| function | ||
| | E -> E | ||
| | T(_, E, v, rt) when item = v -> rt | ||
| | T(_, lt, v, E) when item = v -> lt | ||
| | T(h, l, v, r) as node -> | ||
| if item < v then | ||
| adjust <| T(h, delete item l, v, r) | ||
| elif item > v then | ||
| adjust <| T(h, l, v, delete item r) | ||
| elif isEmpty l then | ||
| r | ||
| else | ||
| let (newLeft, newVal) = splitMax l | ||
| adjust <| T(h, newLeft, newVal, r) | ||
|  | ||
| /// O(log n): Returns true if the given item exists in the tree. | ||
| let rec exists item = | ||
| function | ||
| | E -> false | ||
| | T(_, l, v, r) -> | ||
| if v = item then true | ||
| elif item < v then exists item l | ||
| else exists item r | ||
|  | ||
| /// O(log n): Returns true if the given item does not exist in the tree. | ||
| let rec notExists item tree = | ||
| not <| exists item tree | ||
|  | ||
| /// O(log n): Returns Some item if it was found in the tree; else, returns None. | ||
| let rec tryFind item = | ||
| function | ||
| | E -> None | ||
| | T(_, l, v, r) -> | ||
| if v = item then Some v | ||
| elif item < v then tryFind item l | ||
| else tryFind item r | ||
|  | ||
| /// O(log n): Returns an item if it was found in the tree; else, throws error. | ||
| let rec find item tree = | ||
| match tryFind item tree with | ||
| | None -> failwith <| sprintf "Item %A was not found in the tree." item | ||
| | Some x -> x | ||
|  | ||
| let rec private foldOpt (f: OptimizedClosures.FSharpFunc<_, _, _>) x t = | ||
| match t with | ||
| | E -> x | ||
| | T(_, l, v, r) -> | ||
| let x = foldOpt f x l | ||
| let x = f.Invoke(x, v) | ||
| foldOpt f x r | ||
|  | ||
| /// Executes a function on each element in order (for example: 1, 2, 3 or a, b, c). | ||
| let fold f x t = | ||
| foldOpt (OptimizedClosures.FSharpFunc<_, _, _>.Adapt (f)) x t | ||
|  | ||
| let rec private foldBackOpt (f: OptimizedClosures.FSharpFunc<_, _, _>) x t = | ||
| match t with | ||
| | E -> x | ||
| | T(_, l, v, r) -> | ||
| let x = foldBackOpt f x r | ||
| let x = f.Invoke(x, v) | ||
| foldBackOpt f x l | ||
|  | ||
| /// Executes a function on each element in reverse order (for example: 3, 2, 1 or c, b, a). | ||
| let foldBack f x t = | ||
| foldBackOpt (OptimizedClosures.FSharpFunc<_, _, _>.Adapt (f)) x t | ||
|  | ||
| /// O(n): Returns a list containing the elements in the tree. | ||
| let toList(tree: AaTree<'T>) = | ||
| foldBack (fun a e -> e :: a) [] tree | ||
|  | ||
| let toSeq(tree: AaTree<'T>) = | ||
| tree |> toList |> List.toSeq | ||
|  | ||
| let toArray(tree: AaTree<'T>) = | ||
| tree |> toList |> List.toArray | ||
|  | ||
| /// O(n log n): Builds an AaTree from the elements in the given list. | ||
| let ofList collection = | ||
| List.fold (fun acc item -> insert item acc) empty collection | ||
|  | ||
| let ofSeq collection = | ||
| Seq.fold (fun acc item -> insert item acc) empty collection | ||
|  | ||
| let ofArray collection = | ||
| Array.fold (fun acc item -> insert item acc) empty collection | ||
|  | ||
| type AaTree<'T when 'T: comparison> with | ||
|  | ||
| member x.Insert(y) = | ||
| insert y x | ||
|  | ||
| member x.Delete(y) = | ||
| delete y x | ||
|  | ||
| member x.Fold(folder, initialState) = | ||
| fold folder initialState x | ||
|  | ||
| member x.FoldBack(folder, initialState) = | ||
| foldBack folder initialState x | ||
|  | ||
| member x.Find(y) = find y x | ||
|  | ||
| member x.TryFind(y) = | ||
| tryFind y x | ||
|  | ||
| member x.IsEmpty() = isEmpty x | ||
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
              
      
      Oops, something went wrong.
        
    
  
  Add this suggestion to a batch that can be applied as a single commit.
  This suggestion is invalid because no changes were made to the code.
  Suggestions cannot be applied while the pull request is closed.
  Suggestions cannot be applied while viewing a subset of changes.
  Only one suggestion per line can be applied in a batch.
  Add this suggestion to a batch that can be applied as a single commit.
  Applying suggestions on deleted lines is not supported.
  You must change the existing code in this line in order to create a valid suggestion.
  Outdated suggestions cannot be applied.
  This suggestion has been applied or marked resolved.
  Suggestions cannot be applied from pending reviews.
  Suggestions cannot be applied on multi-line comments.
  Suggestions cannot be applied while the pull request is queued to merge.
  Suggestion cannot be applied right now. Please check back later.
  
    
  
    
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I will be able to familiarize myself with it on Tuesday.