Skip to content

Fix property tests & update CI #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
konsumlamm wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix property tests & update CI #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 30 additions & 20 deletions .github/workflows/haskell-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
#
# For more information, see https://github.com/haskell-CI/haskell-ci
#
# version: 0.19.20240708
# version: 0.19.20250330
#
# REGENDATA ("0.19.20240708",["github","cabal.project"])
# REGENDATA ("0.19.20250330",["github","cabal.project"])
#
name: Haskell-CI
on:
Expand All @@ -19,7 +19,7 @@ on:
jobs:
linux:
name: Haskell-CI - Linux - ${{ matrix.compiler }}
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
timeout-minutes:
60
container:
Expand All @@ -28,19 +28,24 @@ jobs:
strategy:
matrix:
include:
- compiler: ghc-9.12.2
compilerKind: ghc
compilerVersion: 9.12.2
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.10.1
compilerKind: ghc
compilerVersion: 9.10.1
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.8.2
- compiler: ghc-9.8.4
compilerKind: ghc
compilerVersion: 9.8.2
compilerVersion: 9.8.4
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.6.6
- compiler: ghc-9.6.7
compilerKind: ghc
compilerVersion: 9.6.6
compilerVersion: 9.6.7
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.4.8
Expand Down Expand Up @@ -75,15 +80,29 @@ jobs:
allow-failure: false
fail-fast: false
steps:
- name: apt
- name: apt-get install
run: |
apt-get update
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
- name: Install GHCup
run: |
mkdir -p "$HOME/.ghcup/bin"
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
curl -sL https://downloads.haskell.org/ghcup/0.1.50.1/x86_64-linux-ghcup-0.1.50.1 > "$HOME/.ghcup/bin/ghcup"
chmod a+x "$HOME/.ghcup/bin/ghcup"
- name: Install cabal-install
run: |
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.1-p1 || (cat "$HOME"/.ghcup/logs/*.* && false)
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1-p1 -vnormal+nowrap" >> "$GITHUB_ENV"
- name: Install GHC (GHCup)
if: matrix.setup-method == 'ghcup'
run: |
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
echo "HC=$HC" >> "$GITHUB_ENV"
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
env:
HCKIND: ${{ matrix.compilerKind }}
HCNAME: ${{ matrix.compiler }}
Expand All @@ -94,21 +113,12 @@ jobs:
echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
HCDIR=/opt/$HCKIND/$HCVER
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
echo "HC=$HC" >> "$GITHUB_ENV"
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
env:
HCKIND: ${{ matrix.compilerKind }}
HCNAME: ${{ matrix.compiler }}
Expand Down Expand Up @@ -239,8 +249,8 @@ jobs:
rm -f cabal.project.local
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
- name: save cache
uses: actions/cache/save@v4
if: always()
uses: actions/cache/save@v4
with:
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
path: ~/.cabal/store
4 changes: 2 additions & 2 deletions poly.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ copyright: 2019-2020 Andrew Lelechenko
category: Math, Numerical
build-type: Simple
cabal-version: 2.0
tested-with: GHC ==8.6.5 GHC ==8.8.4 GHC ==8.10.7 GHC ==9.0.2 GHC ==9.2.8 GHC ==9.4.8 GHC ==9.6.6 GHC ==9.8.2 GHC ==9.10.1
tested-with: GHC ==8.6.5 GHC ==8.8.4 GHC ==8.10.7 GHC ==9.0.2 GHC ==9.2.8 GHC ==9.4.8 GHC ==9.6.7 GHC ==9.8.4 GHC ==9.10.1 GHC ==9.12.2
extra-source-files:
changelog.md
README.md
Expand Down Expand Up @@ -102,7 +102,7 @@ test-suite poly-tests
base >=4.10 && <5,
mod >=0.1.2,
poly,
QuickCheck >=2.12 && <2.14.3,
QuickCheck >=2.12,
quickcheck-classes-base,
quickcheck-classes >=0.6.3,
semirings >= 0.5.2,
Expand Down
6 changes: 3 additions & 3 deletions test/DenseLaurent.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,14 +125,14 @@ evalTests = testGroup "eval" $ concat

evalTestGroup
:: forall v a.
(Eq a, Field a, Arbitrary a, Show a, Eq (v a), Show (v a), G.Vector v a)
(Eq a, Field a, Num a, Arbitrary a, Show a, Eq (v a), Show (v a), G.Vector v a)
=> Proxy (Laurent v a)
-> [TestTree]
evalTestGroup _ =
[ testProperty "eval (p + q) r = eval p r + eval q r" $
\(ShortPoly p) (ShortPoly q) r -> e (p `plus` q) r === e p r `plus` e q r
\(ShortPoly p) (ShortPoly q) (NonZero r) -> e (p `plus` q) r === e p r `plus` e q r
, testProperty "eval (p * q) r = eval p r * eval q r" $
\(ShortPoly p) (ShortPoly q) r -> e (p `times` q) r === e p r `times` e q r
\(ShortPoly p) (ShortPoly q) (NonZero r) -> e (p `times` q) r === e p r `times` e q r
, testProperty "eval x p = p" $
\p -> e X p === p
, testProperty "eval (monomial 0 c) p = c" $
Expand Down
6 changes: 3 additions & 3 deletions test/MultiLaurent.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,14 +139,14 @@ evalTests = testGroup "eval" $ concat

evalTestGroup
:: forall v a.
(Eq a, Field a, Arbitrary a, Show a, G.Vector v (Word, a), G.Vector v (SU.Vector 3 Word, a), G.Vector v (Data.Poly.Multi.Monom 3 a))
(Eq a, Field a, Num a, Arbitrary a, Show a, G.Vector v (Word, a), G.Vector v (SU.Vector 3 Word, a), G.Vector v (Data.Poly.Multi.Monom 3 a))
=> Proxy (MultiLaurent v 3 a)
-> [TestTree]
evalTestGroup _ =
[ testProperty "eval (p + q) r = eval p r + eval q r" $
\(ShortPoly p) (ShortPoly q) r -> e (p `plus` q) r === e p r `plus` e q r
\(ShortPoly p) (ShortPoly q) r -> let r' = fmap getNonZero r in e (p `plus` q) r' === e p r' `plus` e q r'
, testProperty "eval (p * q) r = eval p r * eval q r" $
\(ShortPoly p) (ShortPoly q) r -> e (p `times` q) r === e p r `times` e q r
\(ShortPoly p) (ShortPoly q) r -> let r' = fmap getNonZero r in e (p `times` q) r' === e p r' `times` e q r'
, testProperty "eval x p = p" $
\p -> e X (SV.fromTuple (p, undefined, undefined)) === p
, testProperty "eval (monomial 0 c) p = c" $
Expand Down
8 changes: 4 additions & 4 deletions test/Orthogonal.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ testSuite = testGroup "Orthogonal"
]
]

prop_jacobi_de :: Rational -> Rational -> Property
prop_jacobi_de a b = foldl' (.&&.) (property True) $
prop_jacobi_de :: NonNegative Rational -> NonNegative Rational -> Property
prop_jacobi_de (NonNegative a) (NonNegative b) = foldl' (.&&.) (property True) $

@Bodigrim Bodigrim Apr 8, 2025

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Jacobi polynomials are defined for negative arguments, but our implementation is faulty. When a+b is integer, one can probably directly compute via the second formula at https://en.wikipedia.org/wiki/Jacobi_polynomials#Via_the_hypergeometric_function - two gamma functions degenerate to factorials and the ratio of other two is a Pochhammer symbol.

zipWith (((=== 0) .) . de) [0..limit] (jacobi a b)
where
de :: Rational -> VPoly Rational -> VPoly Rational
Expand Down Expand Up @@ -104,8 +104,8 @@ prop_laguerreGen_de a = foldl' (.&&.) (property True) $
de :: Rational -> VPoly Rational -> VPoly Rational
de n y = [0, 1] * deriv (deriv y) + [1 + a, -1] * deriv y + [n] * y

prop_jacobi_norm :: Rational -> Rational -> Property
prop_jacobi_norm a b = foldl' (.&&.) (property True) $
prop_jacobi_norm :: NonNegative Rational -> NonNegative Rational -> Property
prop_jacobi_norm (NonNegative a) (NonNegative b) = foldl' (.&&.) (property True) $
zipWith (\n y -> norm n === eval y 1) [0..limit] (jacobi a b :: [VPoly Rational])
where
prod n x = product $ take n $ iterate (subtract 1) (fromIntegral n + x)
Expand Down
6 changes: 3 additions & 3 deletions test/SparseLaurent.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,14 +142,14 @@ evalTests = testGroup "eval" $ concat

evalTestGroup
:: forall v a.
(Eq a, Field a, Arbitrary a, Show a, G.Vector v (Word, a), G.Vector v (SU.Vector 1 Word, a), G.Vector v (Monom 1 a))
(Eq a, Field a, Num a, Arbitrary a, Show a, G.Vector v (Word, a), G.Vector v (SU.Vector 1 Word, a), G.Vector v (Monom 1 a))
=> Proxy (Laurent v a)
-> [TestTree]
evalTestGroup _ =
[ testProperty "eval (p + q) r = eval p r + eval q r" $
\(ShortPoly p) (ShortPoly q) r -> e (p `plus` q) r === e p r `plus` e q r
\(ShortPoly p) (ShortPoly q) (NonZero r) -> e (p `plus` q) r === e p r `plus` e q r
, testProperty "eval (p * q) r = eval p r * eval q r" $
\(ShortPoly p) (ShortPoly q) r -> e (p `times` q) r === e p r `times` e q r
\(ShortPoly p) (ShortPoly q) (NonZero r) -> e (p `times` q) r === e p r `times` e q r
, testProperty "eval x p = p" $
\p -> e X p === p
, testProperty "eval (monomial 0 c) p = c" $
Expand Down