compensated 0.7.3 → 0.8

raw patch · 5 files changed

+88/−77 lines, 5 filesdep ~basedep ~log-domainPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: base, log-domain

API changes (from Hackage documentation)

Files

• .hlint.yaml +1/−0
• .travis.yml +62/−55
• CHANGELOG.markdown +7/−0
• compensated.cabal +5/−8
• src/Numeric/Compensated.hs +13/−14

@@ -0,0 +1,1 @@+- arguments: [--cpp-define=HLINT, --cpp-ansi]

@@ -4,7 +4,7 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci #-# version: 0.3.20190425+# version: 0.7.20191106 # language: c dist: xenial@@ -22,6 +22,7 @@   directories:     - $HOME/.cabal/packages     - $HOME/.cabal/store+    - $HOME/.hlint before_cache:   - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log   # remove files that are regenerated by 'cabal update'@@ -35,38 +36,29 @@   include:     - compiler: ghc-8.8.1       addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}}-      env: GHCHEAD=true     - compiler: ghc-8.6.5-      addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-2.4"]}}+      addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-3.0"]}}     - compiler: ghc-8.4.4-      addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-2.4"]}}+      addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-3.0"]}}     - compiler: ghc-8.2.2-      addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-2.4"]}}+      addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-3.0"]}}     - compiler: ghc-8.0.2-      addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-2.4"]}}-    - compiler: ghc-7.10.3-      addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.10.3","cabal-install-2.4"]}}-    - compiler: ghc-7.8.4-      addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.8.4","cabal-install-2.4"]}}-    - compiler: ghc-7.6.3-      addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.6.3","cabal-install-2.4"]}}-    - compiler: ghc-7.4.2-      addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-7.4.2","cabal-install-2.4"]}}+      addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-3.0"]}}     - compiler: ghc-head       addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-head","cabal-install-head"]}}-      env: GHCHEAD=true   allow_failures:     - compiler: ghc-head-    - compiler: ghc-8.8.1 before_install:   - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')+  - WITHCOMPILER="-w $HC"+  - HADDOCK=$(echo "/opt/$CC/bin/haddock" | sed 's/-/\//')   - HCPKG="$HC-pkg"   - unset CC   - CABAL=/opt/ghc/bin/cabal   - CABALHOME=$HOME/.cabal   - export PATH="$CABALHOME/bin:$PATH"   - TOP=$(pwd)-  - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))+  - "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"   - echo $HCNUMVER   - CABAL="$CABAL -vnormal+nowrap+markoutput"   - set -o pipefail@@ -93,54 +85,68 @@   - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"   - TEST=--enable-tests   - BENCH=--enable-benchmarks-  - GHCHEAD=${GHCHEAD-false}+  - HEADHACKAGE=false+  - if [ $HCNUMVER -gt 80801 ] ; then HEADHACKAGE=true ; fi   - rm -f $CABALHOME/config   - |-    echo "verbose: normal +nowrap +markoutput"          >> $CABALHOME/config-    echo "remote-build-reporting: anonymous"            >> $CABALHOME/config-    echo "remote-repo-cache: $CABALHOME/packages"       >> $CABALHOME/config-    echo "logs-dir:          $CABALHOME/logs"           >> $CABALHOME/config-    echo "world-file:        $CABALHOME/world"          >> $CABALHOME/config-    echo "extra-prog-path:   $CABALHOME/bin"            >> $CABALHOME/config-    echo "symlink-bindir:    $CABALHOME/bin"            >> $CABALHOME/config-    echo "installdir:        $CABALHOME/bin"            >> $CABALHOME/config-    echo "build-summary:     $CABALHOME/logs/build.log" >> $CABALHOME/config-    echo "store-dir:         $CABALHOME/store"          >> $CABALHOME/config-    echo "install-dirs user"                            >> $CABALHOME/config-    echo "  prefix: $CABALHOME"                         >> $CABALHOME/config-    echo "repository hackage.haskell.org"               >> $CABALHOME/config-    echo "  url: http://hackage.haskell.org/"           >> $CABALHOME/config+    echo "verbose: normal +nowrap +markoutput"                                  >> $CABALHOME/config+    echo "remote-build-reporting: anonymous"                                    >> $CABALHOME/config+    echo "write-ghc-environment-files: always"                                  >> $CABALHOME/config+    echo "remote-repo-cache: $CABALHOME/packages"                               >> $CABALHOME/config+    echo "logs-dir:          $CABALHOME/logs"                                   >> $CABALHOME/config+    echo "world-file:        $CABALHOME/world"                                  >> $CABALHOME/config+    echo "extra-prog-path:   $CABALHOME/bin"                                    >> $CABALHOME/config+    echo "symlink-bindir:    $CABALHOME/bin"                                    >> $CABALHOME/config+    echo "installdir:        $CABALHOME/bin"                                    >> $CABALHOME/config+    echo "build-summary:     $CABALHOME/logs/build.log"                         >> $CABALHOME/config+    echo "store-dir:         $CABALHOME/store"                                  >> $CABALHOME/config+    echo "install-dirs user"                                                    >> $CABALHOME/config+    echo "  prefix: $CABALHOME"                                                 >> $CABALHOME/config+    echo "repository hackage.haskell.org"                                       >> $CABALHOME/config+    echo "  url: http://hackage.haskell.org/"                                   >> $CABALHOME/config+    echo "  secure: True"                                                       >> $CABALHOME/config+    echo "  key-threshold: 3"                                                   >> $CABALHOME/config+    echo "  root-keys:"                                                         >> $CABALHOME/config+    echo "    fe331502606802feac15e514d9b9ea83fee8b6ffef71335479a2e68d84adc6b0" >> $CABALHOME/config+    echo "    1ea9ba32c526d1cc91ab5e5bd364ec5e9e8cb67179a471872f6e26f0ae773d42" >> $CABALHOME/config+    echo "    2c6c3627bd6c982990239487f1abd02e08a02e6cf16edb105a8012d444d870c3" >> $CABALHOME/config+    echo "    0a5c7ea47cd1b15f01f5f51a33adda7e655bc0f0b0615baa8e271f4c3351e21d" >> $CABALHOME/config+    echo "    51f0161b906011b52c6613376b1ae937670da69322113a246a09f807c62f6921" >> $CABALHOME/config   - |-    if $GHCHEAD; then+    if $HEADHACKAGE; then     echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1/g')" >> $CABALHOME/config-    -    echo "repository head.hackage"                                                        >> $CABALHOME/config-    echo "   url: http://head.hackage.haskell.org/"                                       >> $CABALHOME/config+    echo "repository head.hackage.ghc.haskell.org"                                        >> $CABALHOME/config+    echo "   url: https://ghc.gitlab.haskell.org/head.hackage/"                           >> $CABALHOME/config     echo "   secure: True"                                                                >> $CABALHOME/config-    echo "   root-keys: 07c59cb65787dedfaef5bd5f987ceb5f7e5ebf88b904bbd4c5cbdeb2ff71b740" >> $CABALHOME/config-    echo "              2e8555dde16ebd8df076f1a8ef13b8f14c66bad8eafefd7d9e37d0ed711821fb" >> $CABALHOME/config-    echo "              8f79fd2389ab2967354407ec852cbe73f2e8635793ac446d09461ffb99527f6e" >> $CABALHOME/config+    echo "   root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d" >> $CABALHOME/config+    echo "              26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329" >> $CABALHOME/config+    echo "              f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89" >> $CABALHOME/config     echo "   key-threshold: 3"                                                            >> $CABALHOME/config     fi+  - |+    echo "program-default-options"                >> $CABALHOME/config+    echo "  ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config   - cat $CABALHOME/config   - rm -fv cabal.project cabal.project.local cabal.project.freeze   - travis_retry ${CABAL} v2-update -v-  - if [ $HCNUMVER -eq 80801 ] ; then ${CABAL} v2-install -w ${HC} -j2 hlint --constraint='hlint ==2.1.*' | color_cabal_output ; fi+  - if [ $HCNUMVER -ge 80800 ] && [ $HCNUMVER -lt 80802 ] ; then HLINTVER=$(cd /tmp && (${CABAL} v2-install -v $WITHCOMPILER --dry-run hlint  --constraint='hlint ==2.2.*' |  perl -ne 'if (/\bhlint-(\d+(\.\d+)*)\b/) { print "$1"; last; }')); echo "HLint version $HLINTVER" ; fi+  - "if [ $HCNUMVER -ge 80800 ] && [ $HCNUMVER -lt 80802 ] ; then if [ ! -e $HOME/.hlint/hlint-$HLINTVER/hlint ]; then echo \"Downloading HLint version $HLINTVER\"; mkdir -p $HOME/.hlint; curl --write-out 'Status Code: %{http_code} Redirects: %{num_redirects} Total time: %{time_total} Total Dsize: %{size_download}\\n' --silent --location --output $HOME/.hlint/hlint-$HLINTVER.tar.gz \"https://github.com/ndmitchell/hlint/releases/download/v$HLINTVER/hlint-$HLINTVER-x86_64-linux.tar.gz\"; tar -xzv -f $HOME/.hlint/hlint-$HLINTVER.tar.gz -C $HOME/.hlint; fi ; fi"+  - if [ $HCNUMVER -ge 80800 ] && [ $HCNUMVER -lt 80802 ] ; then mkdir -p $CABALHOME/bin && ln -sf "$HOME/.hlint/hlint-$HLINTVER/hlint" $CABALHOME/bin/hlint ; fi+  - if [ $HCNUMVER -ge 80800 ] && [ $HCNUMVER -lt 80802 ] ; then hlint --version ; fi   # Generate cabal.project   - rm -rf cabal.project cabal.project.local cabal.project.freeze   - touch cabal.project   - |-    echo 'packages: "."' >> cabal.project+    echo "packages: ." >> cabal.project   - |-    echo "write-ghc-environment-files: always" >> cabal.project-  - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(compensated)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"+  - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(compensated)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"   - cat cabal.project || true   - cat cabal.project.local || true   - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi-  - ${CABAL} v2-freeze -w ${HC} ${TEST} ${BENCH} | color_cabal_output+  - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH} | color_cabal_output   - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"   - rm  cabal.project.freeze-  - ${CABAL} v2-build -w ${HC} ${TEST} ${BENCH} --dep -j2 all | color_cabal_output+  - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all | color_cabal_output script:   - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)   # Packaging...@@ -148,28 +154,29 @@   # Unpacking...   - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/   - cd ${DISTDIR} || false-  - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;+  - find . -maxdepth 1 -type f -name '*.tar.gz' -exec tar -xvf '{}' \;+  - find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm       '{}' \;+  - PKGDIR_compensated="$(find . -maxdepth 1 -type d -regex '.*/compensated-[0-9.]*')"   # Generate cabal.project   - rm -rf cabal.project cabal.project.local cabal.project.freeze   - touch cabal.project   - |-    echo 'packages: "compensated-*/*.cabal"' >> cabal.project+    echo "packages: ${PKGDIR_compensated}" >> cabal.project   - |-    echo "write-ghc-environment-files: always" >> cabal.project-  - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(compensated)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"+  - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(compensated)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"   - cat cabal.project || true   - cat cabal.project.local || true   # Building with tests and benchmarks...   # build & run tests, build benchmarks-  - ${CABAL} v2-build -w ${HC} ${TEST} ${BENCH} all | color_cabal_output+  - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output   # Testing...-  - ${CABAL} v2-test -w ${HC} ${TEST} ${BENCH} all | color_cabal_output+  - ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output   # HLint..-  - if [ $HCNUMVER -eq 80801 ] ; then (cd compensated-* && hlint --cpp-ansi --cpp-define=HLINT src) ; fi+  - if [ $HCNUMVER -ge 80800 ] && [ $HCNUMVER -lt 80802 ] ; then (cd ${PKGDIR_compensated} && hlint src) ; fi   # cabal check...-  - (cd compensated-* && ${CABAL} -vnormal check)+  - (cd ${PKGDIR_compensated} && ${CABAL} -vnormal check)   # haddock...-  - ${CABAL} v2-haddock -w ${HC} ${TEST} ${BENCH} all | color_cabal_output+  - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all | color_cabal_output -# REGENDATA ["--output=.travis.yml","--config=cabal.haskell-ci","cabal.project"]+# REGENDATA ("0.7.20191106",["--output=.travis.yml","--config=cabal.haskell-ci","cabal.project"]) # EOF

@@ -1,3 +1,10 @@+0.8 [2019.11.24]+----------------+* Support building with `log-domain-0.13` by removing the `Precise` superclass+  from `Compensable`. `log-domain-0.13` has removed the `Precise` class since+  its methods are now available in `Floating` as of `base-4.9`/GHC 8.0. As a+  result, this release drops support for earlier versions of `base`/GHC.+ 0.7.3 [2019.09.13] ------------------ * Allow building with `safecopy-0.10`.

@@ -1,6 +1,6 @@ name:          compensated category:      Numeric-version:       0.7.3+version:       0.8 license:       BSD3 cabal-version: >= 1.8 license-file:  LICENSE@@ -11,11 +11,7 @@ bug-reports:   http://github.com/analytics/compensated/issues copyright:     Copyright (C) 2013 Edward A. Kmett build-type:    Custom-tested-with:   GHC == 7.4.2-             , GHC == 7.6.3-             , GHC == 7.8.4-             , GHC == 7.10.3-             , GHC == 8.0.2+tested-with:   GHC == 8.0.2              , GHC == 8.2.2              , GHC == 8.4.4              , GHC == 8.6.5@@ -27,6 +23,7 @@   .travis.yml   .ghci   .gitignore+  .hlint.yaml   .vim.custom   travis/cabal-apt-install   travis/config@@ -46,13 +43,13 @@  custom-setup   setup-depends:-    base          >= 4.3 && <5,+    base          >= 4.9 && <5,     Cabal         >= 1.10,     cabal-doctest >= 1 && <1.1  library   build-depends:-    base                      >= 4.3      && < 5,+    base                      >= 4.9      && < 5,     bifunctors                >= 5        && < 6,     binary                    >= 0.5      && < 0.9,     bytes                     >= 0.7      && < 1,

@@ -79,7 +79,7 @@ import Data.Vector.Generic.Mutable as M import Foreign.Ptr import Foreign.Storable-import Numeric.Log+import Numeric (Floating(..)) import Text.Read as T import Text.Show as T @@ -206,7 +206,7 @@   renorm x3 x4 (y4 + y2) {-# INLINE (*^) #-} -class (RealFrac a, Precise a, Floating a) => Compensable a where+class (RealFrac a, Floating a) => Compensable a where   -- | This provides a numeric data type with effectively doubled precision by   -- using Knuth's error free transform and a number of custom compensated   -- arithmetic circuits.@@ -288,7 +288,7 @@ {-# NOINLINE compensatedDataType #-}  instance (Compensable a, NFData a) => NFData (Compensated a) where-  rnf m = with m $ \x y -> rnf x `seq` rnf y `seq` ()+  rnf m = with m $ \x y -> rnf x `seq` rnf y   {-# INLINE rnf #-}  instance (Compensable a, Show a) => Show (Compensated a) where@@ -679,17 +679,7 @@     z3 = with (z2 + m/z2) $ on compensated (/2)     z4 = with (z3 + m/z3) $ on compensated (/2) -  -- (**)    = error "TODO"-  pi      = error "TODO"-  asin    = error "TODO"-  atan    = error "TODO"-  acos    = error "TODO"-  asinh   = error "TODO"-  atanh   = error "TODO"-  acosh   = error "TODO"---- | TODO: do this right!-instance (Compensable a, Precise a) => Precise (Compensated a) where+  -- TODO: do log1p, expm1, log1mexp, log1pexp right!   log1p a = log (1 + a)   {-# INLINE log1p #-}   expm1 a = exp a - 1@@ -702,3 +692,12 @@     | a <= 100  = a + exp (negate a)     | otherwise = a   {-# INLINE log1pexp #-}++  -- (**)    = error "TODO"+  pi      = error "TODO"+  asin    = error "TODO"+  atan    = error "TODO"+  acos    = error "TODO"+  asinh   = error "TODO"+  atanh   = error "TODO"+  acosh   = error "TODO"