From 09eeaeda27d04465e498ea9c2f52238ffbfe6cb1 Mon Sep 17 00:00:00 2001
From: hasufell <hasufell@hasufell.de>
Date: Mon, 13 Oct 2014 20:14:50 +0200
Subject: [PATCH] Refactor function names, split out some functions

---
 Graphics/Diagram/Gif.hs     |  8 +++---
 Graphics/Diagram/Gtk.hs     |  4 +--
 Graphics/Diagram/Plotter.hs | 49 ++++++++++++++++++++-----------------
 3 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/Graphics/Diagram/Gif.hs b/Graphics/Diagram/Gif.hs
index a1e1006..2e29499 100644
--- a/Graphics/Diagram/Gif.hs
+++ b/Graphics/Diagram/Gif.hs
@@ -16,14 +16,14 @@ gifDiag :: DiagProp -> [PT] -> [(Diagram Cairo R2, GifDelay)]
 gifDiag p xs =
   fmap ((\x -> (x, 100)) . (<> nonChDiag))      .
     flip (++)
-      [mkDiag (convexHullPointsText `mappend`
-        convexHullPoints)
+      [mkDiag (convexHPText `mappend`
+        convexHP)
         p xs <> lastUpperHull <> lastLowerHull] $
     (lowerHullList ++ ((<> lastLowerHull) <$> upperHullList))
   where
-    upperHullList = convexHullLinesIntervalUpper p xs
+    upperHullList = convexUHStepsLs p xs
     lastUpperHull = last upperHullList
-    lowerHullList = convexHullLinesIntervalLower p xs
+    lowerHullList = convexLHStepsLs p xs
     lastLowerHull = last lowerHullList
     -- add the x-axis and the other default stuff
     nonChDiag =
diff --git a/Graphics/Diagram/Gtk.hs b/Graphics/Diagram/Gtk.hs
index 13a8a20..b7f46a5 100644
--- a/Graphics/Diagram/Gtk.hs
+++ b/Graphics/Diagram/Gtk.hs
@@ -22,8 +22,8 @@ diag p = case alg p of
   1 ->
     mkDiag
       (mconcat
-        [maybeDiag (ct p) convexHullPointsText,
-        convexHullPoints, convexHullLines,
+        [maybeDiag (ct p) convexHPText,
+        convexHP, convexHLs,
         coordPoints, xAxis, yAxis,
         maybeDiag (gd p) grid, whiteRectB])
       p
diff --git a/Graphics/Diagram/Plotter.hs b/Graphics/Diagram/Plotter.hs
index b1764bf..aba42e0 100644
--- a/Graphics/Diagram/Plotter.hs
+++ b/Graphics/Diagram/Plotter.hs
@@ -44,8 +44,8 @@ coordPointsText = Diag cpt
 
 
 -- |Create a diagram which shows the points of the convex hull.
-convexHullPoints :: Diag
-convexHullPoints = Diag chp
+convexHP :: Diag
+convexHP = Diag chp
   where
     chp p vt =
       position (zip (filter (inRange (dX p) (dY p)) vtch)
@@ -56,8 +56,8 @@ convexHullPoints = Diag chp
 
 
 -- |Show coordinates as text above the convex hull points.
-convexHullPointsText :: Diag
-convexHullPointsText = Diag chpt
+convexHPText :: Diag
+convexHPText = Diag chpt
   where
     chpt p vt =
       position $
@@ -69,8 +69,8 @@ convexHullPointsText = Diag chpt
 
 -- |Create a diagram which shows the lines along the convex hull
 -- points.
-convexHullLines :: Diag
-convexHullLines = Diag chl
+convexHLs :: Diag
+convexHLs = Diag chl
   where
     chl _ [] = mempty
     chl p vt =
@@ -85,32 +85,37 @@ convexHullLines = Diag chl
         vtf = filter (inRange (dX p) (dY p)) vt
 
 
-convexHullLinesIntervalLower :: DiagProp -> [PT] -> [Diagram Cairo R2]
-convexHullLinesIntervalLower p xs =
-  fmap mkChDiag (grahamLHSteps xs)
+-- |Create list of diagrama which describe the lines along points of a half
+-- convex hull, for each iteration of the algorithm. Which half is chosen
+-- depends on the input.
+convexHStepsLs :: Colour Double
+               -> ([PT] -> [[PT]])
+               -> DiagProp
+               -> [PT]
+               -> [Diagram Cairo R2]
+convexHStepsLs col f p xs =
+  fmap mkChDiag (f xs)
   where
     mkChDiag vt =
       (strokeTrail         .
           fromVertices     $
           vtf)            #
         moveTo (head vtf) #
-        lc orange
+        lc col
       where
         vtf = filter (inRange (dX p) (dY p)) vt
 
 
-convexHullLinesIntervalUpper :: DiagProp -> [PT] -> [Diagram Cairo R2]
-convexHullLinesIntervalUpper p xs =
-  fmap mkChDiag (grahamUHSteps xs)
-  where
-    mkChDiag vt =
-      (strokeTrail         .
-          fromVertices     $
-          vtf)            #
-        moveTo (head vtf) #
-        lc purple
-      where
-        vtf = filter (inRange (dX p) (dY p)) vt
+-- |Create list of diagrama which describe the lines along the lower
+-- convex hull points, for each iteration of the algorithm.
+convexLHStepsLs :: DiagProp -> [PT] -> [Diagram Cairo R2]
+convexLHStepsLs = convexHStepsLs orange grahamLHSteps
+
+
+-- |Create list of diagrama which describe the lines along the upper
+-- convex hull points, for each iteration of the algorithm.
+convexUHStepsLs :: DiagProp -> [PT] -> [Diagram Cairo R2]
+convexUHStepsLs = convexHStepsLs purple grahamUHSteps
 
 
 -- |Creates a Diagram that shows an XAxis which is bound