From e5e408fc6c12ee8bbe411844515196727ee8e8e6 Mon Sep 17 00:00:00 2001 From: stla Date: Wed, 18 Oct 2023 12:27:33 +0200 Subject: [PATCH] v0.1.3.0 --- CHANGELOG.md | 5 +++++ jacobi-elliptic.cabal | 4 ++-- jacobi-elliptic.code-workspace | 8 ++++---- src/Math/JacobiElliptic.hs | 9 +++++++++ src/Math/NevilleTheta.hs | 13 +++++++++++-- stack.yaml | 2 +- stack.yaml.lock | 6 +++--- tests/Main.hs | 4 ++-- 8 files changed, 37 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c0bde8..2a2aa41 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog for `jacobi-elliptic` +## 0.1.3.0 - 2023-10-18 + +Increased lower bound of the version of 'jacobi-theta' dependency. + + ## 0.1.2.0 - 2023-10-16 Increased lower bound of the version of 'jacobi-theta' dependency. diff --git a/jacobi-elliptic.cabal b/jacobi-elliptic.cabal index 4d9edc0..2baf932 100644 --- a/jacobi-elliptic.cabal +++ b/jacobi-elliptic.cabal @@ -1,5 +1,5 @@ name: jacobi-elliptic -version: 0.1.2.0 +version: 0.1.3.0 synopsis: Neville Theta Functions and Jacobi Elliptic Functions description: Evaluation of the Neville theta functions and the Jacobi elliptic functions. homepage: https://github.com/stla/jacobi-elliptic#readme @@ -19,7 +19,7 @@ library exposed-modules: Math.NevilleTheta , Math.JacobiElliptic build-depends: base >= 4.7 && < 5 - , jacobi-theta >= 0.2.0.0 + , jacobi-theta >= 0.2.1.0 , elliptic-integrals >= 0.1.0.0 default-language: Haskell2010 ghc-options: -Wall diff --git a/jacobi-elliptic.code-workspace b/jacobi-elliptic.code-workspace index 374af43..95698de 100644 --- a/jacobi-elliptic.code-workspace +++ b/jacobi-elliptic.code-workspace @@ -6,13 +6,13 @@ ], "settings": { "haskell.serverEnvironment": { - "PATH": "/home/stla/.ghcup/bin:/usr/bin:$PATH" + "PATH": "C:\\ghcup\\bin" }, "haskell.toolchain": { - "ghc": "9.0.2", - "hls": "1.7.0.0", + "ghc": "9.2.8", + "hls": null, "cabal": "3.6.2.0", - "stack": "2.9.3" + "stack": "2.11.1" } } } \ No newline at end of file diff --git a/src/Math/JacobiElliptic.hs b/src/Math/JacobiElliptic.hs index b16f41a..5446085 100644 --- a/src/Math/JacobiElliptic.hs +++ b/src/Math/JacobiElliptic.hs @@ -1,3 +1,12 @@ +{-| +Module : Math.JacobiElliptic +Description : Jacobi elliptic functions. +Copyright : (c) Stéphane Laurent, 2023 +License : BSD3 +Maintainer : laurent_step@outlook.fr + +Provides the Jacobi elliptic functions and the amplitude function. +-} module Math.JacobiElliptic ( jellip, jellip', diff --git a/src/Math/NevilleTheta.hs b/src/Math/NevilleTheta.hs index e2259b1..c6d5235 100644 --- a/src/Math/NevilleTheta.hs +++ b/src/Math/NevilleTheta.hs @@ -1,3 +1,12 @@ +{-| +Module : Math.NevilleTheta +Description : Neville theta functions. +Copyright : (c) Stéphane Laurent, 2023 +License : BSD3 +Maintainer : laurent_step@outlook.fr + +Provides the theta Neville functions. +-} module Math.NevilleTheta ( theta_c, theta_d, @@ -11,7 +20,7 @@ module Math.NevilleTheta import Data.Complex ( Complex(..) ) import Math.EllipticIntegrals ( ellipticF ) import Math.JacobiTheta - ( jtheta1, jtheta1Dash, jtheta2, jtheta3, jtheta4 ) + ( jtheta1, jtheta1Dash0, jtheta2, jtheta3, jtheta4 ) i_ :: Complex Double @@ -62,7 +71,7 @@ theta_s :: -> Complex Double -- ^ q, the nome -> Complex Double theta_s z q = - j3sq * jtheta1 z' q / jtheta1Dash 0 q + j3sq * jtheta1 z' q / jtheta1Dash0 q where j3 = jtheta3 0 q j3sq = j3 * j3 diff --git a/stack.yaml b/stack.yaml index 13dc17c..f6768b5 100644 --- a/stack.yaml +++ b/stack.yaml @@ -5,4 +5,4 @@ packages: extra-deps: - elliptic-integrals-0.1.0.0 -- jacobi-theta-0.2.0.0 +- jacobi-theta-0.2.1.0 diff --git a/stack.yaml.lock b/stack.yaml.lock index bf2cab2..b432531 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -12,12 +12,12 @@ packages: original: hackage: elliptic-integrals-0.1.0.0 - completed: - hackage: jacobi-theta-0.1.1.0@sha256:7ac0c1f1d4edf8adaf06b625fd63c1a69fd127b1d6248dba62d4858b26c05045,1533 + hackage: jacobi-theta-0.2.1.0@sha256:a97a3e57236f9e05d2d12b13ba0d775fb26bb6b70b447bdca0d2639ea8699936,1577 pantry-tree: - sha256: be6eea8149ad479c98e0a1323b68c2072eb86648b6710542ff5a36fdb6d719aa + sha256: f423c8d366a811dbdc369e3e8d936921eb312dc5def22dc0044fac11cc62e798 size: 429 original: - hackage: jacobi-theta-0.1.1.0 + hackage: jacobi-theta-0.2.1.0 snapshots: - completed: sha256: adbc602422dde10cc330175da7de8609e70afc41449a7e2d6e8b1827aa0e5008 diff --git a/tests/Main.hs b/tests/Main.hs index 92b66df..4b52d62 100644 --- a/tests/Main.hs +++ b/tests/Main.hs @@ -139,8 +139,8 @@ main = defaultMain $ testCase "amplitude function" $ do let phi = 1 :+ 1 - ell = ellipticF phi 2 - obtained = am ell 2 + ell = ellipticF phi 0.2 + obtained = am ell 0.2 assertApproxEqual "" 14 obtained phi ]