satchmo-toysat 0.2.0.0 → 0.2.1.0
raw patch · 4 files changed
+14/−12 lines, 4 filesdep ~basedep ~containersdep ~toysolverPVP ok
version bump matches the API change (PVP)
Dependency ranges changed: base, containers, toysolver
API changes (from Hackage documentation)
Files
- .travis.yml +1/−5
- README.md +1/−1
- satchmo-toysat.cabal +5/−4
- src/Satchmo/SAT/Toysat.hs +7/−2
.travis.yml view
@@ -17,12 +17,8 @@ # - CABALVER=1.18 GHCVER=7.8.1 # see note about Alex/Happy for GHC >= 7.8 # - CABALVER=1.18 GHCVER=7.8.2 - CABALVER=1.18 GHCVER=7.8.3- - CABALVER=1.22 GHCVER=7.10.1+ - CABALVER=1.22 GHCVER=7.10.2 # - CABALVER=head GHCVER=head # see section about GHC HEAD snapshots--matrix:- allow_failures:- - env: CABALVER=1.22 GHCVER=7.10.1 # Note: the distinction between `before_install` and `install` is not important. before_install:
README.md view
@@ -1,6 +1,6 @@ satchmo-toysat ============== -[](http://travis-ci.org/msakai/satchmo-toysat)+[](http://travis-ci.org/msakai/satchmo-toysat) [](https://hackage.haskell.org/package/satchmo-toysat) toysat driver as backend for satchmo
satchmo-toysat.cabal view
@@ -2,7 +2,7 @@ -- http://haskell.org/cabal/users-guide/ name: satchmo-toysat-version: 0.2.0.0+version: 0.2.1.0 synopsis: toysat driver as backend for satchmo description: toysat driver as backend for satchmo homepage: https://github.com/msakai/satchmo-toysat@@ -23,15 +23,16 @@ library exposed-modules: Satchmo.SAT.Toysat build-depends:- base >=4.5 && <4.9,+ base >=4.6 && <4.9, array >= 0.4 && < 0.6, containers >= 0.5.0.0 && < 0.6, satchmo >=2.8.1 && <2.9,- toysolver >=0.2.0 && <0.3.0+ toysolver >=0.2.0 && <0.4.0 hs-source-dirs: src default-language: Haskell2010 other-extensions: ScopedTypeVariables, MultiParamTypeClasses, TypeFamilies,- TypeSynonymInstances+ TypeSynonymInstances,+ CPP
src/Satchmo/SAT/Toysat.hs view
@@ -1,4 +1,4 @@-{-# LANGUAGE ScopedTypeVariables, TypeFamilies, MultiParamTypeClasses, TypeSynonymInstances #-}+{-# LANGUAGE ScopedTypeVariables, TypeFamilies, MultiParamTypeClasses, TypeSynonymInstances, CPP #-} {-# OPTIONS_GHC -Wall #-} -------------------------------------------------------------------- -- |@@ -6,7 +6,7 @@ -- License : BSD3 -- Maintainer: Masahiro Sakai <masahiro.sakai@gmail.com> -- Stability : experimental--- Portability: portable+-- Portability: non-portable (ScopedTypeVariables, TypeFamilies, MultiParamTypeClasses, TypeSynonymInstances, CPP) -- -------------------------------------------------------------------- @@ -105,8 +105,13 @@ s <- API.newSolver hPutStrLn stderr $ "start producing CNF" SAT decoder <- unSAT action s+#if MIN_VERSION_toysolver(0,3,0)+ v <- API.getNVars s+ c <- API.getNConstraints s+#else v <- API.nVars s c <- API.nConstraints s+#endif hPutStrLn stderr $ unwords [ "CNF finished", "vars", show v, "clauses", show c ] hPutStrLn stderr $ "starting solver"