hasufell/cga
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename Algorithms.RangeSearch.Core to Algorithms.RangeSearch.QuadTree

Browse Source
This commit is contained in:
hasufell 2014-11-15 00:49:44 +01:00
parent c964afee10
commit 75c45149d9
No known key found for this signature in database
GPG Key ID: 220CD1C5BDEED020
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Algorithms/RangeSearch/Core.hs → Algorithms/RangeSearch/QuadTree.hs
View File

@ -1,4 +1,4 @@
module Algorithms.RangeSearch.Core module Algorithms.RangeSearch.QuadTree
(quadTree, (quadTree,
quadTreeSquares, quadTreeSquares,
qtFoldl, qtFoldl,
@ -107,7 +107,7 @@ quadTreeSquares sq (TNode nw ne sw se) =
quadTreeSquares (swSq sq) sw ++ quadTreeSquares (seSq sq) se quadTreeSquares (swSq sq) sw ++ quadTreeSquares (seSq sq) se
-- |Get the current square of the zipper, relative to the to the given top -- |Get the current square of the zipper, relative to the given top
-- square. -- square.
getSquareByZipper :: Square -> Zipper a -> Square getSquareByZipper :: Square -> Zipper a -> Square
getSquareByZipper sq z = go sq (reverse . snd $ z) getSquareByZipper sq z = go sq (reverse . snd $ z)
@ -197,6 +197,9 @@ findNeighbor ot zr = case ot of
checkParent _ = Nothing checkParent _ = Nothing
lookupByNeighbors :: [Orient] -> Zipper a -> Maybe (Zipper a)
lookupByNeighbors = flip (foldlM (flip findNeighbor))
testArr :: [PT] testArr :: [PT]
testArr = [p2 (200.0, 450.0), testArr = [p2 (200.0, 450.0),

2
CG2.cabal
View File

@ -54,7 +54,7 @@ executable Gtk
main-is: GtkMain.hs main-is: GtkMain.hs
-- Modules included in this executable, other than Main. -- Modules included in this executable, other than Main.
other-modules: MyPrelude GUI.Gtk Graphics.Diagram.Gtk Graphics.Diagram.Types Graphics.Diagram.Plotter Parser.PathParser Parser.Meshparser Parser.Core System.FileSystem.FileExt Algebra.Vector Algorithms.ConvexHull.GrahamScan QueueEx Algorithms.PolygonIntersection.Core Algorithms.RangeSearch.Core other-modules: MyPrelude GUI.Gtk Graphics.Diagram.Gtk Graphics.Diagram.Types Graphics.Diagram.Plotter Parser.PathParser Parser.Meshparser Parser.Core System.FileSystem.FileExt Algebra.Vector Algorithms.ConvexHull.GrahamScan QueueEx Algorithms.PolygonIntersection.Core Algorithms.RangeSearch.QuadTree
-- LANGUAGE extensions used by modules in this package. -- LANGUAGE extensions used by modules in this package.
-- other-extensions: -- other-extensions:

2
Graphics/Diagram/Plotter.hs
View File

@ -4,7 +4,7 @@ module Graphics.Diagram.Plotter where
import Algebra.VectorTypes import Algebra.VectorTypes
import Algorithms.ConvexHull.GrahamScan import Algorithms.ConvexHull.GrahamScan
import Algorithms.RangeSearch.Core import Algorithms.RangeSearch.QuadTree
import Algorithms.PolygonIntersection.Core import Algorithms.PolygonIntersection.Core
import Data.Maybe import Data.Maybe
import Data.Monoid import Data.Monoid

2
Parser/PathParser.hs
View File

@ -4,7 +4,7 @@ module Parser.PathParser where
import Control.Applicative import Control.Applicative
import Parser.Core import Parser.Core
import Algorithms.RangeSearch.Core (Quad(NW, NE, SW, SE), Orient(North, South, West, East)) import Algorithms.RangeSearch.QuadTree (Quad(NW, NE, SW, SE), Orient(North, South, West, East))
-- |Parse a string such as "ne, n, sw, e" into -- |Parse a string such as "ne, n, sw, e" into