Refactor function names, split out some functions

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`
+      [mkDiag (convexHPText `mappend`
-        convexHullPoints)
+        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 =

Graphics/Diagram/Gtk.hs

@@ -22,8 +22,8 @@ diag p = case alg p of
   1 ->
     mkDiag
       (mconcat
-        [maybeDiag (ct p) convexHullPointsText,
+        [maybeDiag (ct p) convexHPText,
-        convexHullPoints, convexHullLines,
+        convexHP, convexHLs,
         coordPoints, xAxis, yAxis,
         maybeDiag (gd p) grid, whiteRectB])
       p

Graphics/Diagram/Plotter.hs

@@ -44,8 +44,8 @@ coordPointsText = Diag cpt
 
 
 -- |Create a diagram which shows the points of the convex hull.
-convexHullPoints :: Diag
+convexHP :: Diag
-convexHullPoints = Diag chp
+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
+convexHPText :: Diag
-convexHullPointsText = Diag chpt
+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
+convexHLs :: Diag
-convexHullLines = Diag chl
+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]
+-- |Create list of diagrama which describe the lines along points of a half
-convexHullLinesIntervalLower p xs =
+-- convex hull, for each iteration of the algorithm. Which half is chosen
-  fmap mkChDiag (grahamLHSteps xs)
+-- 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]
+-- |Create list of diagrama which describe the lines along the lower
-convexHullLinesIntervalUpper p xs =
+-- convex hull points, for each iteration of the algorithm.
-  fmap mkChDiag (grahamUHSteps xs)
+convexLHStepsLs :: DiagProp -> [PT] -> [Diagram Cairo R2]
-  where
+convexLHStepsLs = convexHStepsLs orange grahamLHSteps
-    mkChDiag vt =
+
-      (strokeTrail         .
+
-          fromVertices     $
+-- |Create list of diagrama which describe the lines along the upper
-          vtf)            #
+-- convex hull points, for each iteration of the algorithm.
-        moveTo (head vtf) #
+convexUHStepsLs :: DiagProp -> [PT] -> [Diagram Cairo R2]
-        lc purple
+convexUHStepsLs = convexHStepsLs purple grahamUHSteps
-      where
-        vtf = filter (inRange (dX p) (dY p)) vt
 
 
 -- |Creates a Diagram that shows an XAxis which is bound