From 73e1673c63cdd787b8e52e4367aa4b7f0c9207d0 Mon Sep 17 00:00:00 2001 From: hasufell Date: Wed, 3 Dec 2014 21:26:35 +0100 Subject: [PATCH] Restructure Algorithms subdir and module names No subdirs in Algorithms, just the module files --- Algorithms/{ConvexHull => }/GrahamScan.hs | 2 +- Algorithms/{KDTree => }/KDTree.hs | 26 +++++++++---------- .../Core.hs => PolygonIntersection.hs} | 2 +- Algorithms/{QuadTree => }/QuadTree.hs | 2 +- .../UB2_einfachCCW.obj | 0 .../UB2_einfachCW.obj | 0 Algorithms/{QuadTree => }/UB3_T3.obj | 0 Algorithms/{QuadTree => }/UB4_Punkte.obj | 0 Algorithms/{QuadTree => }/UB4_Suchbereich.obj | 0 .../{QuadTree => }/UB4_alles_zusammen.obj | 0 CG2.cabal | 16 ++++++------ Graphics/Diagram/Gif.hs | 2 +- Graphics/Diagram/Plotter.hs | 8 +++--- Parser/PathParser.hs | 2 +- PerformanceTest.hs | 2 +- 15 files changed, 31 insertions(+), 31 deletions(-) rename Algorithms/{ConvexHull => }/GrahamScan.hs (98%) rename Algorithms/{KDTree => }/KDTree.hs (91%) rename Algorithms/{PolygonIntersection/Core.hs => PolygonIntersection.hs} (99%) rename Algorithms/{QuadTree => }/QuadTree.hs (99%) rename Algorithms/{PolygonIntersection => }/UB2_einfachCCW.obj (100%) rename Algorithms/{PolygonIntersection => }/UB2_einfachCW.obj (100%) rename Algorithms/{QuadTree => }/UB3_T3.obj (100%) rename Algorithms/{QuadTree => }/UB4_Punkte.obj (100%) rename Algorithms/{QuadTree => }/UB4_Suchbereich.obj (100%) rename Algorithms/{QuadTree => }/UB4_alles_zusammen.obj (100%) diff --git a/Algorithms/ConvexHull/GrahamScan.hs b/Algorithms/GrahamScan.hs similarity index 98% rename from Algorithms/ConvexHull/GrahamScan.hs rename to Algorithms/GrahamScan.hs index 8a75926..4aa8d93 100644 --- a/Algorithms/ConvexHull/GrahamScan.hs +++ b/Algorithms/GrahamScan.hs @@ -1,6 +1,6 @@ {-# OPTIONS_HADDOCK ignore-exports #-} -module Algorithms.ConvexHull.GrahamScan where +module Algorithms.GrahamScan where import Algebra.Vector import Algebra.VectorTypes diff --git a/Algorithms/KDTree/KDTree.hs b/Algorithms/KDTree.hs similarity index 91% rename from Algorithms/KDTree/KDTree.hs rename to Algorithms/KDTree.hs index 5b2a866..7e03a42 100644 --- a/Algorithms/KDTree/KDTree.hs +++ b/Algorithms/KDTree.hs @@ -1,18 +1,18 @@ {-# OPTIONS_HADDOCK ignore-exports #-} -module Algorithms.KDTree.KDTree (kdTree - , kdFoldl - , kdFoldr - , kdTreeToRoseTree - , rangeSearch - , getValS - , isLeaf - , getVal - , getDirection - , goLeft - , goRight - , Direction(Vertical, Horizontal) - , KDTree(KTNil, KTNode)) +module Algorithms.KDTree (kdTree + , kdFoldl + , kdFoldr + , kdTreeToRoseTree + , rangeSearch + , getValS + , isLeaf + , getVal + , getDirection + , goLeft + , goRight + , Direction(Vertical, Horizontal) + , KDTree(KTNil, KTNode)) where diff --git a/Algorithms/PolygonIntersection/Core.hs b/Algorithms/PolygonIntersection.hs similarity index 99% rename from Algorithms/PolygonIntersection/Core.hs rename to Algorithms/PolygonIntersection.hs index d22477e..592fc5f 100644 --- a/Algorithms/PolygonIntersection/Core.hs +++ b/Algorithms/PolygonIntersection.hs @@ -1,4 +1,4 @@ -module Algorithms.PolygonIntersection.Core where +module Algorithms.PolygonIntersection where import Algebra.Vector diff --git a/Algorithms/QuadTree/QuadTree.hs b/Algorithms/QuadTree.hs similarity index 99% rename from Algorithms/QuadTree/QuadTree.hs rename to Algorithms/QuadTree.hs index 1aaf157..3bfa037 100644 --- a/Algorithms/QuadTree/QuadTree.hs +++ b/Algorithms/QuadTree.hs @@ -1,4 +1,4 @@ -module Algorithms.QuadTree.QuadTree +module Algorithms.QuadTree (quadTree, quadTreeSquares, qtFoldl, diff --git a/Algorithms/PolygonIntersection/UB2_einfachCCW.obj b/Algorithms/UB2_einfachCCW.obj similarity index 100% rename from Algorithms/PolygonIntersection/UB2_einfachCCW.obj rename to Algorithms/UB2_einfachCCW.obj diff --git a/Algorithms/PolygonIntersection/UB2_einfachCW.obj b/Algorithms/UB2_einfachCW.obj similarity index 100% rename from Algorithms/PolygonIntersection/UB2_einfachCW.obj rename to Algorithms/UB2_einfachCW.obj diff --git a/Algorithms/QuadTree/UB3_T3.obj b/Algorithms/UB3_T3.obj similarity index 100% rename from Algorithms/QuadTree/UB3_T3.obj rename to Algorithms/UB3_T3.obj diff --git a/Algorithms/QuadTree/UB4_Punkte.obj b/Algorithms/UB4_Punkte.obj similarity index 100% rename from Algorithms/QuadTree/UB4_Punkte.obj rename to Algorithms/UB4_Punkte.obj diff --git a/Algorithms/QuadTree/UB4_Suchbereich.obj b/Algorithms/UB4_Suchbereich.obj similarity index 100% rename from Algorithms/QuadTree/UB4_Suchbereich.obj rename to Algorithms/UB4_Suchbereich.obj diff --git a/Algorithms/QuadTree/UB4_alles_zusammen.obj b/Algorithms/UB4_alles_zusammen.obj similarity index 100% rename from Algorithms/QuadTree/UB4_alles_zusammen.obj rename to Algorithms/UB4_alles_zusammen.obj diff --git a/CG2.cabal b/CG2.cabal index 0a03274..dd8176d 100644 --- a/CG2.cabal +++ b/CG2.cabal @@ -55,10 +55,10 @@ executable Gtk -- Modules included in this executable, other than Main. other-modules: Algebra.Vector - Algorithms.ConvexHull.GrahamScan - Algorithms.PolygonIntersection.Core - Algorithms.QuadTree.QuadTree - Algorithms.KDTree.KDTree + Algorithms.GrahamScan + Algorithms.PolygonIntersection + Algorithms.QuadTree + Algorithms.KDTree Graphics.Diagram.Gtk Graphics.Diagram.Plotter Graphics.Diagram.Types @@ -102,10 +102,10 @@ executable Gif -- Modules included in this executable, other than Main. other-modules: Algebra.Vector - Algorithms.ConvexHull.GrahamScan - Algorithms.PolygonIntersection.Core - Algorithms.QuadTree.QuadTree - Algorithms.KDTree.KDTree + Algorithms.GrahamScan + Algorithms.PolygonIntersection + Algorithms.QuadTree + Algorithms.KDTree Graphics.Diagram.Gif Graphics.Diagram.Plotter Graphics.Diagram.Types diff --git a/Graphics/Diagram/Gif.hs b/Graphics/Diagram/Gif.hs index 765bc1d..5bd955e 100644 --- a/Graphics/Diagram/Gif.hs +++ b/Graphics/Diagram/Gif.hs @@ -3,7 +3,7 @@ module Graphics.Diagram.Gif where import Algebra.VectorTypes -import Algorithms.ConvexHull.GrahamScan +import Algorithms.GrahamScan import Codec.Picture.Gif import qualified Data.ByteString.Char8 as B import Data.Monoid diff --git a/Graphics/Diagram/Plotter.hs b/Graphics/Diagram/Plotter.hs index 7179527..f580c8b 100644 --- a/Graphics/Diagram/Plotter.hs +++ b/Graphics/Diagram/Plotter.hs @@ -3,10 +3,10 @@ module Graphics.Diagram.Plotter where import Algebra.VectorTypes -import Algorithms.ConvexHull.GrahamScan -import Algorithms.QuadTree.QuadTree -import Algorithms.KDTree.KDTree -import Algorithms.PolygonIntersection.Core +import Algorithms.GrahamScan +import Algorithms.QuadTree +import Algorithms.KDTree +import Algorithms.PolygonIntersection import Data.Maybe import Data.Monoid import Data.Tree diff --git a/Parser/PathParser.hs b/Parser/PathParser.hs index 6725a15..6ca4645 100644 --- a/Parser/PathParser.hs +++ b/Parser/PathParser.hs @@ -2,7 +2,7 @@ module Parser.PathParser where -import Algorithms.QuadTree.QuadTree (Quad(NW, NE, SW, SE), Orient(North, South, West, East)) +import Algorithms.QuadTree (Quad(NW, NE, SW, SE), Orient(North, South, West, East)) import Control.Applicative import Data.Attoparsec.ByteString.Char8 import qualified Data.ByteString.Char8 as B diff --git a/PerformanceTest.hs b/PerformanceTest.hs index 0f4fc10..2adec93 100644 --- a/PerformanceTest.hs +++ b/PerformanceTest.hs @@ -1,4 +1,4 @@ -import Algorithms.ConvexHull.GrahamScan +import Algorithms.GrahamScan import Parser.Meshparser import System.Environment import System.FileSystem.FileExt