Update to the new Hiraffe

hgeometry-examples/draw/Main.hs

@@ -16,7 +16,7 @@ import           Test.QuickCheck
 
 type R = RealNumber 5
 
-renderGraph    :: PlaneGraph QuickCheckWorld (Point 2 R) () () -> IpePage R
+renderGraph    :: CPlaneGraph QuickCheckWorld (Point 2 R) () () -> IpePage R
 renderGraph gr = fromContent $
                  concat [ [ iO $ defIO p   | p <- gr^..vertices ]
                         , [ iO $ defIO seg | seg <- gr^..edgeSegments ]

hgeometry-examples/skia/GeometryStore.hs

@@ -39,7 +39,7 @@ data Geom = G_Point      (Point 2 R :+ Attributes (Point 2 R))
 
 data MyWorld
 
-type PlaneGraph' r = PlaneGraph MyWorld (Point 2 r) PolygonEdgeType PolygonFaceData
+type PlaneGraph' r = CPlaneGraph MyWorld (Point 2 r) PolygonEdgeType PolygonFaceData
 
 --------------------------------------------------------------------------------
 

hgeometry-examples/skia/Model.hs

@@ -78,7 +78,7 @@ currentStatus m1 m2
 -- in planeGraphs
 data MyWorld
 
-type PlaneGraph' r = PlaneGraph MyWorld (Point 2 r) PolygonEdgeType PolygonFaceData
+type PlaneGraph' r = CPlaneGraph MyWorld (Point 2 r) PolygonEdgeType PolygonFaceData
 
 --------------------------------------------------------------------------------
 -- * Data Type representing all our modal data

hgeometry-examples/triangulateWorld/Main.hs

@@ -79,7 +79,7 @@ mainWith (Options inFile outFile) = do
           intersections' :: Set.Set (Point 2 R)
           intersections' = foldMap computeIntersections polies
 
-          subdivs :: [PlaneGraph PX (Point 2 R) _ _]
+          subdivs :: [CPlaneGraph PX (Point 2 R) _ _]
           subdivs = map (\(pg :+ _) -> triangulate pg) polies'
 
           triangles' :: [SimplePolygon (Point 2 R :+ _)]

hgeometry/hgeometry.cabal

@@ -75,7 +75,7 @@ common all-setup
       , file-io                   >= 0.1           && < 1
       , indexed-traversable       >= 0.1.3         && < 1
       , vector-builder            >= 0.3.8         && < 1
-      , HsYAML                    >= 0.2           && < 1
+      -- , HsYAML                    >= 0.2           && < 1
       , semialign                 >= 1.3           && < 1.4
       , these                     >= 1.0.1         && < 1.3
       , subcategories             >= 0.2           && < 0.3
@@ -356,6 +356,7 @@ library
 
         HGeometry.PlaneGraph
         HGeometry.PlaneGraph.Class
+        HGeometry.PlaneGraph.Connected
 
         HGeometry.Polygon
         HGeometry.Polygon.Class
@@ -446,7 +447,8 @@ library
         HGeometry.Polygon.Convex.MinkowskiSum
         HGeometry.Polygon.Triangulation.Types
 
-        HGeometry.PlaneGraph.Type
+        -- HGeometry.PlaneGraph.Type
+        HGeometry.PlaneGraph.Connected.Type
 
         HGeometry.LineSegment.Intersection.Types
 

hgeometry/point/src/HGeometry/Point/PointF.hs

@@ -24,7 +24,7 @@ import           Data.Proxy
 import qualified Data.Vector.Generic as G
 import qualified Data.Vector.Generic.Mutable as GM
 import qualified Data.Vector.Unboxed as U
-import           Data.YAML
+-- import           Data.YAML
 import           GHC.Generics (Generic)
 import           GHC.TypeLits
 import           HGeometry.Point.Class
@@ -38,7 +38,8 @@ import           Text.Read (Read (..), readListPrecDefault)
 -- | A Point wraps a vector
 newtype PointF v = Point { toVec :: v }
                  deriving stock   (Generic)
-                 deriving newtype ( Eq, Ord, Random, NFData, Bounded, Enum, FromYAML, ToYAML
+                 deriving newtype ( Eq, Ord, Random, NFData, Bounded, Enum
+                                  -- , FromYAML, ToYAML
                                   , ToJSON, FromJSON
                                   )
 -- don't derive functor, or so here. since that will be confusing.

hgeometry/src-quickcheck/HGeometry/PlaneGraph/Instances.hs

@@ -57,7 +57,7 @@ data QuickCheckWorld
 instance ( Arbitrary r
          , Ord r, Fractional r
          , Show r
-         ) => Arbitrary (PlaneGraph QuickCheckWorld (Point 2 r) () ()) where
+         ) => Arbitrary (CPlaneGraph QuickCheckWorld (Point 2 r) () ()) where
   arbitrary = arbitraryPlaneGraph Proxy
 
 -- general strategy:
@@ -73,7 +73,7 @@ arbitraryPlaneGraph       :: forall proxy s r.
                              ( Ord r, Fractional r, Arbitrary r
                              , Show r
                              )
-                          => proxy s -> Gen (PlaneGraph s (Point 2 r) () ())
+                          => proxy s -> Gen (CPlaneGraph s (Point 2 r) () ())
 arbitraryPlaneGraph proxy = do
     n                             <- scale (*2) arbitrary
     (pts :: NonEmpty (Point 2 r)) <- genNDistinct (max 10 n) arbitrary
@@ -137,8 +137,8 @@ witherGraphTo vs (Graph gr) = Graph $ fmap removeEdges m
 -- \(O(n\log n)\)
 toPlaneGraph             :: (Ord r, Foldable1 f)
                          => proxy s
-                         -> GGraph f (Point 2 r) v e -> PlaneGraph s (Point 2 r) () ()
-toPlaneGraph _ (Graph m) = PlaneGraph $ (planarGraph theDarts)&vertexData .~ vtxData
+                         -> GGraph f (Point 2 r) v e -> CPlaneGraph s (Point 2 r) () ()
+toPlaneGraph _ (Graph m) = CPlaneGraph $ (planarGraph theDarts)&vertexData .~ vtxData
   where
     vtxData = Vector.fromNonEmptyN1 (length m) (NEMap.keys m)
 

hgeometry/src/HGeometry/Plane/LowerEnvelope/Connected/Graph.hs

@@ -27,7 +27,7 @@ import           HGeometry.HyperPlane.Class
 import           HGeometry.HyperPlane.NonVertical
 import           HGeometry.Plane.LowerEnvelope.Connected.MonoidalMap
 import           HGeometry.Plane.LowerEnvelope.Connected.Type
-import           HGeometry.PlaneGraph.Type (E(..))
+import           HGeometry.PlaneGraph.Connected.Type (E(..))
 import           HGeometry.Point
 import           HGeometry.Vector
 import           Hiraffe.AdjacencyListRep.Map

hgeometry/src/HGeometry/PlaneGraph.hs

@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------
 -- |
--- Module      :  HGeometry.PlaneGraph
+-- Module      :  HGeometry.PlaneGraph.Connected
 -- Copyright   :  (C) Frank Staals
 -- License     :  see the LICENSE file
 -- Maintainer  :  Frank Staals
@@ -12,13 +12,13 @@ module HGeometry.PlaneGraph
   ( module Hiraffe.Graph.Class
   , module HGeometry.PlaneGraph.Class
   , module Hiraffe.PlanarGraph.Class
-  , PlaneGraph(..)
+  , CPlaneGraph(..)
   , fromAdjacencyRep
   , fromConnectedSegments
   ) where
 
 import HGeometry.PlaneGraph.Class
-import HGeometry.PlaneGraph.Type
+import HGeometry.PlaneGraph.Connected
 import Hiraffe.Graph.Class
 import Hiraffe.PlanarGraph.Class
 

hgeometry/src/HGeometry/PlaneGraph/Class.hs

@@ -50,6 +50,8 @@ class ( PlanarGraph_ planeGraph
       , vertex ~ Vertex planeGraph
       , Point_ vertex 2 (NumType vertex)
       , NumType vertex ~ NumType planeGraph
+      -- , HasVertices graph graph
+      , HasEdges planeGraph planeGraph
       ) => PlaneGraph_ planeGraph vertex | planeGraph -> vertex where
 
   {-# MINIMAL fromEmbedding #-}

hgeometry/src/HGeometry/PlaneGraph/Connected.hs

@@ -0,0 +1,26 @@
+--------------------------------------------------------------------------------
+-- |
+-- Module      :  HGeometry.PlaneGraph.Connected
+-- Copyright   :  (C) Frank Staals
+-- License     :  see the LICENSE file
+-- Maintainer  :  Frank Staals
+--
+-- Plane Graphs, i.e. embedded planar graphs.
+--
+--------------------------------------------------------------------------------
+module HGeometry.PlaneGraph.Connected
+  ( module Hiraffe.Graph.Class
+  , module HGeometry.PlaneGraph.Class
+  , module Hiraffe.PlanarGraph.Class
+  , CPlaneGraph(..)
+  , fromAdjacencyRep
+  , fromConnectedSegments
+  ) where
+
+import HGeometry.PlaneGraph.Class
+import HGeometry.PlaneGraph.Connected.Type
+import Hiraffe.Graph.Class
+import Hiraffe.PlanarGraph.Class
+
+
+--------------------------------------------------------------------------------