diff --git a/cabal.project b/cabal.project index 989077c60..ac7bd6ae2 100644 --- a/cabal.project +++ b/cabal.project @@ -9,12 +9,6 @@ packages: -- ../miso-bulma allow-newer: - vector-circular:vector, - vector-circular:base, - vector-circular:template-haskell, - vector-circular:semigroupoids, - vector-circular:primitive, - vector-circular:deepseq, pretty:deepseq, pretty:dlist, geojson:deepseq, @@ -51,10 +45,6 @@ source-repository-package -- location: https://github.com/noinia/miso -- tag: 1d16ba220bcd6be28d1e89d141330cd6875c70ff -source-repository-package - type: git - location: https://github.com/noinia/vector-circular - tag: 98090784e9ed97cf761cf69ad3f32b88dbdd30a2 package miso flags: +jsaddle diff --git a/hgeometry-combinatorial/hgeometry-combinatorial.cabal b/hgeometry-combinatorial/hgeometry-combinatorial.cabal index bc590e06a..34718f210 100644 --- a/hgeometry-combinatorial/hgeometry-combinatorial.cabal +++ b/hgeometry-combinatorial/hgeometry-combinatorial.cabal @@ -44,7 +44,6 @@ common setup , vector-builder >= 0.3.7 && < 1 , vector-algorithms >= 0.8 && < 1 , nonempty-vector >= 0.2.3 && < 1 - , vector-circular >= 0.1.4 && < 1 , linear >= 1.20 && < 2 , HsYAML >= 0.2 && < 1 , aeson >= 2.0 && < 3 diff --git a/hgeometry-combinatorial/src/HGeometry/Cyclic.hs b/hgeometry-combinatorial/src/HGeometry/Cyclic.hs index 0b72dd95a..dfec82ae7 100644 --- a/hgeometry-combinatorial/src/HGeometry/Cyclic.hs +++ b/hgeometry-combinatorial/src/HGeometry/Cyclic.hs @@ -13,7 +13,6 @@ -------------------------------------------------------------------------------- module HGeometry.Cyclic ( Cyclic(..) - , toCircularVector , HasDirectedTraversals(..) , ShiftedEq(..) ) where @@ -29,7 +28,6 @@ import qualified Data.List.NonEmpty as NonEmpty import Data.Maybe (isJust) import Data.Semigroup.Foldable import qualified Data.Vector as V -import Data.Vector.Circular (CircularVector(..)) import qualified Data.Vector.Mutable as MV import qualified Data.Vector.NonEmpty as NV import GHC.Generics (Generic) @@ -78,11 +76,6 @@ instance (Index (v a) ~ Int, Foldable v, Ixed (v a)) => Ixed (Cyclic v a) where instance Reversing (v a) => Reversing (Cyclic v a) where reversing (Cyclic v) = Cyclic (reversing v) --- | Turn the cyclic vector into a circular Vector -toCircularVector :: Cyclic NV.NonEmptyVector a -> CircularVector a -toCircularVector (Cyclic v) = CircularVector v 0 - - -- | Class that models that some type has a cyclic traversal starting -- from a particular index. class HasDirectedTraversals v where diff --git a/hgeometry/src/HGeometry/Polygon/Convex/Tangents.hs b/hgeometry/src/HGeometry/Polygon/Convex/Tangents.hs index bbf8f8b4d..9c50d44c4 100644 --- a/hgeometry/src/HGeometry/Polygon/Convex/Tangents.hs +++ b/hgeometry/src/HGeometry/Polygon/Convex/Tangents.hs @@ -23,15 +23,13 @@ import Data.Monoid import Data.Ord (comparing) import Data.Semigroup.Foldable (Foldable1 (..)) import HGeometry.Ext --- import Data.Vector.Circular (CircularVector) --- import qualified Data.Vector.Circular as CV --- import qualified Data.Vector.Circular.Util as CV import HGeometry.LineSegment import HGeometry.Point import HGeometry.Polygon.Class import HGeometry.Polygon.Convex.Class -import HGeometry.Vector import HGeometry.Polygon.Convex.Implementation (findMaxWith) +import HGeometry.Vector + -------------------------------------------------------------------------------- -- | Given a convex polygon poly, and a point outside the polygon, find the