X-Git-Url: http://git.euphorik.ch/?p=master-thesis.git;a=blobdiff_plain;f=Parasitemia%2FParasitemiaCore%2FKdTree.fs;h=ec21a0f35d28491dd91c40149f26ee1a3363d896;hp=451320854fa2d701c81a8e7a73c5950a06d76f62;hb=6250f10c807301a760b8659f9c00ca6dbbd4c7b7;hpb=94fbffc758bf0299b077e344ebcbecca408ae564 diff --git a/Parasitemia/ParasitemiaCore/KdTree.fs b/Parasitemia/ParasitemiaCore/KdTree.fs index 4513208..ec21a0f 100644 --- a/Parasitemia/ParasitemiaCore/KdTree.fs +++ b/Parasitemia/ParasitemiaCore/KdTree.fs @@ -1,28 +1,29 @@ module ParasitemiaCore.KdTree open System +open System.Collections.Generic type I2DCoords = abstract X : float32 abstract Y : float32 // Compare 'e1' and 'e2' by X. -let cmpX (e1: I2DCoords) (e2: I2DCoords) : int = - match e1.X.CompareTo(e2.X) with - | 0 -> match e1.Y.CompareTo(e2.Y) with - | 0 -> e1.GetHashCode().CompareTo(e2.GetHashCode()) +let cmpX (e1 : I2DCoords) (e2 : I2DCoords) : int = + match e1.X.CompareTo e2.X with + | 0 -> match e1.Y.CompareTo e2.Y with + | 0 -> e1.GetHashCode().CompareTo (e2.GetHashCode ()) | v -> v | v -> v // Compare 'e1' and 'e2' by Y. -let cmpY (e1: I2DCoords) (e2: I2DCoords) : int = - match e1.Y.CompareTo(e2.Y) with - | 0 -> match e1.X.CompareTo(e2.X) with - | 0 -> e1.GetHashCode().CompareTo(e2.GetHashCode()) +let cmpY (e1 : I2DCoords) (e2 : I2DCoords) : int = + match e1.Y.CompareTo e2.Y with + | 0 -> match e1.X.CompareTo e2.X with + | 0 -> e1.GetHashCode().CompareTo (e2.GetHashCode ()) | v -> v | v -> v -type Region = { minX: float32; maxX: float32; minY: float32; maxY: float32 } with +type Region = { minX : float32; maxX : float32; minY : float32; maxY : float32 } with member this.Contains px py : bool = px >= this.minX && px <= this.maxX && py >= this.minY && py <= this.maxY @@ -39,53 +40,81 @@ type Tree<'a when 'a :> I2DCoords> = | Node of float32 * Tree<'a> * Tree<'a> | Leaf of 'a - static member BuildTree (l: 'a list) : Tree<'a> = + static member BuildTree (l : 'a list) : Tree<'a> = let xSorted = List.toArray l let ySorted = List.toArray l Array.sortInPlaceWith cmpX xSorted Array.sortInPlaceWith cmpY ySorted - let rec buildTreeFromSortedArray (pXSorted: 'a[]) (pYSorted: 'a[]) (depth: int) : Tree<'a> = - if pXSorted.Length = 1 - then + let rec buildTreeFromSortedArray (pXSorted : 'a[]) (pYSorted : 'a[]) (depth : int) : Tree<'a> = + if pXSorted.Length = 1 then Leaf pXSorted.[0] else - if depth % 2 = 1 // 'depth' is odd -> vertical splitting else horizontal splitting. - then + if depth % 2 = 1 then // 'depth' is odd -> vertical splitting else horizontal splitting. let leftX, rightX = Array.splitAt ((pXSorted.Length + 1) / 2) pXSorted let splitElement = Array.last leftX - let leftY, rightY = Array.partition (fun (e: 'a) -> cmpX e splitElement <= 0) pYSorted // FIXME: Maybe this operation can be optimized. + let leftY, rightY = Array.partition (fun (e : 'a) -> cmpX e splitElement <= 0) pYSorted // FIXME: Maybe this operation can be optimized. Node (splitElement.X, buildTreeFromSortedArray leftX leftY (depth + 1), buildTreeFromSortedArray rightX rightY (depth + 1)) else let downY, upY = Array.splitAt ((pYSorted.Length + 1) / 2) pYSorted let splitElement = Array.last downY - let downX, upX = Array.partition (fun (e: 'a) -> cmpY e splitElement <= 0) pXSorted // FIXME: Maybe this operation can be optimized. + let downX, upX = Array.partition (fun (e : 'a) -> cmpY e splitElement <= 0) pXSorted // FIXME: Maybe this operation can be optimized. Node (splitElement.Y, buildTreeFromSortedArray downX downY (depth + 1), buildTreeFromSortedArray upX upY (depth + 1)) buildTreeFromSortedArray xSorted ySorted 1 - member this.Search (searchRegion: Region) : 'a list = - let rec valuesFrom (tree: Tree<'a>) : 'a list = + member this.Search (searchRegion : Region) : List<'a> = + let result = List<'a> () + let rec valuesFrom (tree : Tree<'a>) = match tree with - | Node (_, part1, part2) -> (valuesFrom part1) @ (valuesFrom part2) - | Leaf v -> [v] + | Node (_, left, right) -> + valuesFrom right + valuesFrom left + | Leaf v -> + result.Add v - let rec searchWithRegion (tree: Tree<'a>) (currentRegion: Region) (depth: int) : 'a list = + let rec searchWithRegion (tree : Tree<'a>) (currentRegion : Region) (depth : int) = match tree with - | Leaf v -> if searchRegion.Contains v.X v.Y then [v] else [] + | Leaf v -> + if searchRegion.Contains v.X v.Y then + result.Add v | Node (splitValue, part1, part2) -> - let valuesInRegion (region: Region) (treeRegion: Tree<'a>) = - if region.IsSub searchRegion - then + let inline valuesInRegion (region : Region) (treeRegion : Tree<'a>) = + if region.IsSub searchRegion then valuesFrom treeRegion - elif region.Intersects searchRegion - then + elif region.Intersects searchRegion then + searchWithRegion treeRegion region (depth + 1) + + if depth % 2 = 1 then // Vertical splitting. + valuesInRegion { currentRegion with maxX = splitValue } part1 // Left region. + valuesInRegion { currentRegion with minX = splitValue } part2 // Right region. + else // Horizontal splitting. + valuesInRegion { currentRegion with maxY = splitValue } part1 // Down region. + valuesInRegion { currentRegion with minY = splitValue } part2 // Up region. + + searchWithRegion this { minX = Single.MinValue; maxX = Single.MaxValue; minY = Single.MinValue; maxY = Single.MaxValue } 1 + result + + [] + member this.SearchOld (searchRegion : Region) : 'a list = + let rec valuesFrom (tree : Tree<'a>) (acc : 'a list) : 'a list = + match tree with + | Node (_, left, right) -> (valuesFrom right (valuesFrom left acc)) + | Leaf v -> v :: acc + + let rec searchWithRegion (tree : Tree<'a>) (currentRegion : Region) (depth : int) : 'a list = + match tree with + | Leaf v -> if searchRegion.Contains v.X v.Y then [v] else [] + | Node (splitValue, part1, part2) -> + let valuesInRegion (region : Region) (treeRegion : Tree<'a>) = + if region.IsSub searchRegion then + valuesFrom treeRegion [] + elif region.Intersects searchRegion then searchWithRegion treeRegion region (depth + 1) else [] - if depth % 2 = 1 // Vertical splitting. - then + if depth % 2 = 1 then // Vertical splitting. let leftRegion = { currentRegion with maxX = splitValue } let rightRegion = { currentRegion with minX = splitValue } (valuesInRegion leftRegion part1) @ (valuesInRegion rightRegion part2) @@ -95,59 +124,3 @@ type Tree<'a when 'a :> I2DCoords> = (valuesInRegion downRegion part1) @ (valuesInRegion upRegion part2) searchWithRegion this { minX = Single.MinValue; maxX = Single.MaxValue; minY = Single.MinValue; maxY = Single.MaxValue } 1 - -///// Tests. TODO: to put in a unit test. - -type Point (x: float32, y: float32) = - interface I2DCoords with - member this.X = x - member this.Y = y - - override this.ToString () = - sprintf "(%.1f, %.1f)" x y - -// TODO: test with identical X or Y coords -let test () = - let pts = [ - Point(1.0f, 1.0f) - Point(2.0f, 2.0f) - Point(1.5f, 3.6f) - Point(3.0f, 3.2f) - Point(4.0f, 4.0f) - Point(3.5f, 1.5f) - Point(2.5f, 0.5f) ] - - let tree = Tree.BuildTree pts - Utils.dprintfn "Tree: %A" tree - - let s1 = tree.Search { minX = 0.0f; maxX = 5.0f; minY = 0.0f; maxY = 5.0f } // All points. - Utils.dprintfn "s1: %A" s1 - - let s2 = tree.Search { minX = 2.8f; maxX = 4.5f; minY = 3.0f; maxY = 4.5f } - Utils.dprintfn "s2: %A" s2 - - let s3 = tree.Search { minX = 2.0f; maxX = 2.0f; minY = 2.0f; maxY = 2.0f } - Utils.dprintfn "s3: %A" s3 - -let test2 () = - let pts = [ - Point(1.0f, 1.0f) - Point(1.0f, 2.0f) - Point(1.0f, 3.0f) ] - - let tree = Tree.BuildTree pts - Utils.dprintfn "Tree: %A" tree - - let s1 = tree.Search { minX = 1.0f; maxX = 1.0f; minY = 1.0f; maxY = 1.0f } - Utils.dprintfn "s1: %A" s1 - - let s2 = tree.Search { minX = 1.0f; maxX = 1.0f; minY = 2.0f; maxY = 2.0f } - Utils.dprintfn "s2: %A" s2 - - // This case result is wrong: FIXME - let s3 = tree.Search { minX = 1.0f; maxX = 1.0f; minY = 3.0f; maxY = 3.0f } - Utils.dprintfn "s3: %A" s3 - - let s4 = tree.Search { minX = 0.0f; maxX = 2.0f; minY = 0.0f; maxY = 4.0f } - Utils.dprintfn "s4: %A" s4 -