battleship-combinatorics 0.0.0.1 → 0.0.0.2
raw patch · 2 files changed
+7/−3 lines, 2 filesdep ~containersPVP: major bump suggested
API removals or changes: PVP suggests a major version bump
Dependency ranges changed: containers
API changes (from Hackage documentation)
- Combinatorics.Battleship.Count.CountMap: instance (GHC.Classes.Eq a, Foreign.Storable.Storable a) => GHC.Classes.Eq (Combinatorics.Battleship.Count.CountMap.T w a)
- Combinatorics.Battleship.Count.CountMap: instance (GHC.Show.Show a, Combinatorics.Battleship.Size.Nat w) => GHC.Show.Show (Combinatorics.Battleship.Count.CountMap.Element w a)
- Combinatorics.Battleship.Count.Counter: instance (GHC.Classes.Eq lo, GHC.Classes.Eq hi) => GHC.Classes.Eq (Combinatorics.Battleship.Count.Counter.Composed hi lo)
- Combinatorics.Battleship.Count.Counter: instance (GHC.Classes.Ord lo, GHC.Classes.Ord hi) => GHC.Classes.Ord (Combinatorics.Battleship.Count.Counter.Composed hi lo)
- Combinatorics.Battleship.Count.Counter: zero, one :: C a => a
- Combinatorics.Battleship.Fleet: instance Data.Semigroup.Semigroup Combinatorics.Battleship.Fleet.T
+ Combinatorics.Battleship.Count.CountMap: instance (Combinatorics.Battleship.Count.Counter.C a, Foreign.Storable.Storable a) => GHC.Base.Semigroup (Combinatorics.Battleship.Count.CountMap.T w a)
+ Combinatorics.Battleship.Count.CountMap: instance (Combinatorics.Battleship.Size.Nat w, GHC.Show.Show a) => GHC.Show.Show (Combinatorics.Battleship.Count.CountMap.Element w a)
+ Combinatorics.Battleship.Count.CountMap: instance (Foreign.Storable.Storable a, GHC.Classes.Eq a) => GHC.Classes.Eq (Combinatorics.Battleship.Count.CountMap.T w a)
+ Combinatorics.Battleship.Count.Counter: instance (GHC.Classes.Eq hi, GHC.Classes.Eq lo) => GHC.Classes.Eq (Combinatorics.Battleship.Count.Counter.Composed hi lo)
+ Combinatorics.Battleship.Count.Counter: instance (GHC.Classes.Ord hi, GHC.Classes.Ord lo) => GHC.Classes.Ord (Combinatorics.Battleship.Count.Counter.Composed hi lo)
+ Combinatorics.Battleship.Count.Counter: one :: C a => a
+ Combinatorics.Battleship.Count.Counter: zero :: C a => a
+ Combinatorics.Battleship.Fleet: instance GHC.Base.Semigroup Combinatorics.Battleship.Fleet.T
Files
battleship-combinatorics.cabal view
@@ -1,5 +1,5 @@ Name: battleship-combinatorics-Version: 0.0.0.1+Version: 0.0.0.2 License: BSD3 License-File: LICENSE Author: Henning Thielemann <haskell@henning-thielemann.de>@@ -17,7 +17,7 @@ Build-Type: Simple Source-Repository this- Tag: 0.0.0.1+ Tag: 0.0.0.2 Type: darcs Location: http://hub.darcs.net/thielema/battleship-combinatorics/ @@ -37,7 +37,7 @@ random >=1.0 && <1.2, storable-record >=0.0.3 && <0.1, storablevector >=0.2.11 && <0.3,- containers >=0.4.2 && <0.6,+ containers >=0.4.2 && <0.7, deepseq >=1.3 && <1.5, non-empty >=0.2.1 && <0.4, semigroups >=0.1 && <1.0,
src/Combinatorics/Battleship/Count/CountMap.hs view
@@ -46,6 +46,7 @@ import qualified Data.NonEmpty as NonEmpty import qualified Data.List.Match as Match import Data.Monoid (Monoid, mempty, mappend, mconcat, )+import Data.Semigroup (Semigroup, (<>)) import Data.List.HT (sliceVertical, ) import Text.Printf (printf, ) @@ -263,6 +264,9 @@ {-# INLINEABLE mergeMany #-} mergeMany :: (Counter.C a, Storable a) => [T w a] -> T w a mergeMany = maybe empty (NonEmpty.foldBalanced merge) . NonEmpty.fetch++instance (Counter.C a, Storable a) => Semigroup (T w a) where+ (<>) = merge instance (Counter.C a, Storable a) => Monoid (T w a) where mempty = empty