diff --git a/grid.cabal b/grid.cabal --- a/grid.cabal +++ b/grid.cabal @@ -1,27 +1,38 @@ -name: grid -version: 7.6.1 -synopsis: Tools for working with regular grids (graphs, lattices). -description: Provides tools for working with regular arrangements - of tiles, such as might be used in a board game or some - other type of grid map. Currently supports triangular, - square, and hexagonal tiles, with various 2D and - toroidal layouts. - The userguide is available at - . -category: Math -cabal-version: >=1.8 -build-type: Simple -author: Amy de Buitléir -copyright: (c) Amy de Buitléir 2010-2012 -license: BSD3 -stability: experimental -maintainer: amy@nualeargais.ie -license-file: LICENSE +Name: grid +Version: 7.6.3 +Stability: experimental +Synopsis: Tools for working with regular grids (graphs, lattices). +Description: Provides tools for working with regular arrangements + of tiles, such as might be used in a board game or some + other type of grid map. Currently supports triangular, + square, and hexagonal tiles, with various 2D and + toroidal layouts. + The userguide is available at + . +Category: Math +License: BSD3 +License-file: LICENSE +Copyright: (c) Amy de Buitléir 2010-2014 +Homepage: https://github.com/mhwombat/creatur +Bug-reports: https://github.com/mhwombat/creatur/issues +Author: Amy de Buitléir +Maintainer: amy@nualeargais.ie +Build-Type: Simple +Cabal-Version: >=1.8 +source-repository head + type: git + location: https://github.com/mhwombat/grid.git + +source-repository this + type: git + location: https://github.com/mhwombat/grid.git + tag: 1.4.18 + + library hs-source-dirs: src build-depends: base ==4.*, - base-unicode-symbols ==0.2.*, cereal ==0.4.*, containers ==0.5.* ghc-options: -Wall @@ -43,9 +54,8 @@ test-suite grid-tests type: exitcode-stdio-1.0 build-depends: base ==4.*, - exact-combinatorics ==0.2.*, test-framework-quickcheck2 ==0.3.*, - QuickCheck ==2.6.*, + QuickCheck ==2.7.*, test-framework ==0.8.*, grid hs-source-dirs: test diff --git a/src/Math/Geometry/Grid.hs b/src/Math/Geometry/Grid.hs --- a/src/Math/Geometry/Grid.hs +++ b/src/Math/Geometry/Grid.hs @@ -1,7 +1,7 @@ ----------------------------------------------------------------------------- -- | -- Module : Math.Geometry.Grid --- Copyright : (c) Amy de Buitléir 2012 +-- Copyright : (c) Amy de Buitléir 2012-2014 -- License : BSD-style -- Maintainer : amy@nualeargais.ie -- Stability : experimental diff --git a/src/Math/Geometry/Grid/Hexagonal.hs b/src/Math/Geometry/Grid/Hexagonal.hs --- a/src/Math/Geometry/Grid/Hexagonal.hs +++ b/src/Math/Geometry/Grid/Hexagonal.hs @@ -1,7 +1,7 @@ ------------------------------------------------------------------------ -- | -- Module : Math.Geometry.HexGrid --- Copyright : (c) Amy de Buitléir 2012 +-- Copyright : (c) Amy de Buitléir 2012-2014 -- License : BSD-style -- Maintainer : amy@nualeargais.ie -- Stability : experimental diff --git a/src/Math/Geometry/Grid/Hexagonal2.hs b/src/Math/Geometry/Grid/Hexagonal2.hs --- a/src/Math/Geometry/Grid/Hexagonal2.hs +++ b/src/Math/Geometry/Grid/Hexagonal2.hs @@ -1,7 +1,7 @@ ------------------------------------------------------------------------ -- | -- Module : Math.Geometry.HexGrid --- Copyright : (c) Amy de Buitléir 2012 +-- Copyright : (c) Amy de Buitléir 2012-2014 -- License : BSD-style -- Maintainer : amy@nualeargais.ie -- Stability : experimental diff --git a/src/Math/Geometry/Grid/HexagonalInternal.hs b/src/Math/Geometry/Grid/HexagonalInternal.hs --- a/src/Math/Geometry/Grid/HexagonalInternal.hs +++ b/src/Math/Geometry/Grid/HexagonalInternal.hs @@ -1,7 +1,7 @@ ------------------------------------------------------------------------ -- | -- Module : Math.Geometry.HexGridInternal --- Copyright : (c) Amy de Buitléir 2012-2013 +-- Copyright : (c) Amy de Buitléir 2012-2014 -- License : BSD-style -- Maintainer : amy@nualeargais.ie -- Stability : experimental diff --git a/src/Math/Geometry/Grid/HexagonalInternal2.hs b/src/Math/Geometry/Grid/HexagonalInternal2.hs --- a/src/Math/Geometry/Grid/HexagonalInternal2.hs +++ b/src/Math/Geometry/Grid/HexagonalInternal2.hs @@ -1,7 +1,7 @@ ------------------------------------------------------------------------ -- | -- Module : Math.Geometry.HexGridInternal --- Copyright : (c) Amy de Buitléir 2012 +-- Copyright : (c) Amy de Buitléir 2012-2014 -- License : BSD-style -- Maintainer : amy@nualeargais.ie -- Stability : experimental diff --git a/src/Math/Geometry/Grid/Octagonal.hs b/src/Math/Geometry/Grid/Octagonal.hs --- a/src/Math/Geometry/Grid/Octagonal.hs +++ b/src/Math/Geometry/Grid/Octagonal.hs @@ -1,7 +1,7 @@ ------------------------------------------------------------------------ -- | -- Module : Math.Geometry.OctGrid --- Copyright : (c) Amy de Buitléir 2012 +-- Copyright : (c) Amy de Buitléir 2012-2014 -- License : BSD-style -- Maintainer : amy@nualeargais.ie -- Stability : experimental diff --git a/src/Math/Geometry/Grid/OctagonalInternal.hs b/src/Math/Geometry/Grid/OctagonalInternal.hs --- a/src/Math/Geometry/Grid/OctagonalInternal.hs +++ b/src/Math/Geometry/Grid/OctagonalInternal.hs @@ -1,7 +1,7 @@ ------------------------------------------------------------------------ -- | -- Module : Math.Geometry.OctGridInternal --- Copyright : (c) Amy de Buitléir 2012 +-- Copyright : (c) Amy de Buitléir 2012-2014 -- License : BSD-style -- Maintainer : amy@nualeargais.ie -- Stability : experimental diff --git a/src/Math/Geometry/Grid/Square.hs b/src/Math/Geometry/Grid/Square.hs --- a/src/Math/Geometry/Grid/Square.hs +++ b/src/Math/Geometry/Grid/Square.hs @@ -1,7 +1,7 @@ ------------------------------------------------------------------------ -- | -- Module : Math.Geometry.SquareGrid --- Copyright : (c) Amy de Buitléir 2012 +-- Copyright : (c) Amy de Buitléir 2012-2014 -- License : BSD-style -- Maintainer : amy@nualeargais.ie -- Stability : experimental diff --git a/src/Math/Geometry/Grid/SquareInternal.hs b/src/Math/Geometry/Grid/SquareInternal.hs --- a/src/Math/Geometry/Grid/SquareInternal.hs +++ b/src/Math/Geometry/Grid/SquareInternal.hs @@ -1,7 +1,7 @@ ------------------------------------------------------------------------ -- | -- Module : Math.Geometry.SquareGridInternal --- Copyright : (c) Amy de Buitléir 2012-2013 +-- Copyright : (c) Amy de Buitléir 2012-2014 -- License : BSD-style -- Maintainer : amy@nualeargais.ie -- Stability : experimental diff --git a/src/Math/Geometry/Grid/Triangular.hs b/src/Math/Geometry/Grid/Triangular.hs --- a/src/Math/Geometry/Grid/Triangular.hs +++ b/src/Math/Geometry/Grid/Triangular.hs @@ -1,7 +1,7 @@ ------------------------------------------------------------------------ -- | -- Module : Math.Geometry.TriGrid --- Copyright : (c) Amy de Buitléir 2012 +-- Copyright : (c) Amy de Buitléir 2012-2014 -- License : BSD-style -- Maintainer : amy@nualeargais.ie -- Stability : experimental diff --git a/src/Math/Geometry/Grid/TriangularInternal.hs b/src/Math/Geometry/Grid/TriangularInternal.hs --- a/src/Math/Geometry/Grid/TriangularInternal.hs +++ b/src/Math/Geometry/Grid/TriangularInternal.hs @@ -1,7 +1,7 @@ ------------------------------------------------------------------------ -- | -- Module : Math.Geometry.TriGridInternal --- Copyright : (c) Amy de Buitléir 2012-2013 +-- Copyright : (c) Amy de Buitléir 2012-2014 -- License : BSD-style -- Maintainer : amy@nualeargais.ie -- Stability : experimental diff --git a/src/Math/Geometry/GridInternal.hs b/src/Math/Geometry/GridInternal.hs --- a/src/Math/Geometry/GridInternal.hs +++ b/src/Math/Geometry/GridInternal.hs @@ -1,7 +1,7 @@ ------------------------------------------------------------------------ -- | -- Module : Math.Geometry.GridInternal --- Copyright : (c) Amy de Buitléir 2012 +-- Copyright : (c) Amy de Buitléir 2012-2014 -- License : BSD-style -- Maintainer : amy@nualeargais.ie -- Stability : experimental diff --git a/src/Math/Geometry/GridMap.hs b/src/Math/Geometry/GridMap.hs --- a/src/Math/Geometry/GridMap.hs +++ b/src/Math/Geometry/GridMap.hs @@ -1,7 +1,7 @@ ------------------------------------------------------------------------ -- | -- Module : Math.Geometry.GridMap --- Copyright : (c) Amy de Buitléir 2012-2013 +-- Copyright : (c) Amy de Buitléir 2012-2014 -- License : BSD-style -- Maintainer : amy@nualeargais.ie -- Stability : experimental @@ -31,8 +31,6 @@ ) where import Prelude hiding (lookup, map, foldr, foldl, foldr1, foldl1, null) - -import qualified Prelude as P (map) import Data.Foldable (Foldable) import qualified Data.Map as M --import qualified Data.Map.Strict as Strict (Map) diff --git a/src/Math/Geometry/GridMap/Lazy.hs b/src/Math/Geometry/GridMap/Lazy.hs --- a/src/Math/Geometry/GridMap/Lazy.hs +++ b/src/Math/Geometry/GridMap/Lazy.hs @@ -1,7 +1,7 @@ ------------------------------------------------------------------------ -- | -- Module : Math.Geometry.GridMap --- Copyright : (c) Amy de Buitléir 2012-2013 +-- Copyright : (c) Amy de Buitléir 2012-2014 -- License : BSD-style -- Maintainer : amy@nualeargais.ie -- Stability : experimental diff --git a/test/Main.hs b/test/Main.hs --- a/test/Main.hs +++ b/test/Main.hs @@ -1,3 +1,15 @@ +------------------------------------------------------------------------ +-- | +-- Module : Math.Geometry.Grid.Main +-- Copyright : (c) Amy de Buitléir 2012-2014 +-- License : BSD-style +-- Maintainer : amy@nualeargais.ie +-- Stability : experimental +-- Portability : portable +-- +-- QuickCheck tests. +-- +------------------------------------------------------------------------ module Main where import Math.Geometry.Grid.TriangularQC ( test ) diff --git a/test/Math/Geometry/GridQC.hs b/test/Math/Geometry/GridQC.hs --- a/test/Math/Geometry/GridQC.hs +++ b/test/Math/Geometry/GridQC.hs @@ -1,3 +1,15 @@ +------------------------------------------------------------------------ +-- | +-- Module : Math.Geometry.Grid.GridQC +-- Copyright : (c) Amy de Buitléir 2012-2014 +-- License : BSD-style +-- Maintainer : amy@nualeargais.ie +-- Stability : experimental +-- Portability : portable +-- +-- QuickCheck tests. +-- +------------------------------------------------------------------------ {-# LANGUAGE FlexibleContexts, ExistentialQuantification, TypeFamilies, MultiParamTypeClasses #-} {-# OPTIONS_GHC -fno-warn-orphans #-}