Add support for dunai 0.11

turion · Oct 5, 2023 · 7f6a500 · 7f6a500
1 parent 59efe9f
commit 7f6a500
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 19 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/rhine-bayes/rhine-bayes.cabal b/rhine-bayes/rhine-bayes.cabal
@@ -33,7 +33,7 @@ library
   build-depends:       base         >= 4.11 && < 4.18
                      , transformers >= 0.5
                      , rhine        == 1.0
-                     , dunai        ^>= 0.9
+                     , dunai        >= 0.9 && < 0.12
                      , log-domain   >= 0.12
                      , monad-bayes  >= 1.1.0
   hs-source-dirs:      src

diff --git a/rhine-gloss/rhine-gloss.cabal b/rhine-gloss/rhine-gloss.cabal
@@ -39,7 +39,7 @@ library
   build-depends:       base         >= 4.14 && < 4.18
                      , transformers >= 0.5
                      , rhine        == 1.0
-                     , dunai        ^>= 0.9
+                     , dunai        >= 0.9 && < 0.12
                      , gloss        >= 1.12
                      , mmorph       >= 1.1
                      , monad-schedule >= 0.1

diff --git a/rhine-terminal/rhine-terminal.cabal b/rhine-terminal/rhine-terminal.cabal
@@ -33,7 +33,7 @@ library
                      , exceptions   >= 0.10.4
                      , transformers >= 0.5
                      , rhine        == 1.0
-                     , dunai        ^>= 0.9
+                     , dunai        >= 0.9 && < 0.12
                      , terminal     >= 0.2.0.0
                      , time         >= 1.9.3
                      , monad-schedule >= 0.1.2

diff --git a/rhine/rhine.cabal b/rhine/rhine.cabal
@@ -129,16 +129,15 @@ library
 
   -- Other library packages from which modules are imported.
   build-depends:
-                     , dunai        ^>= 0.9
+                     , dunai        >= 0.9 && < 0.12
                      , transformers >= 0.5
                      , time         >= 1.8
                      , free         >= 5.1
                      , containers   >= 0.5
                      , deepseq      >= 1.4
                      , random       >= 1.1
                      , MonadRandom  >= 0.5
-                     -- Remove version pin when https://github.com/ivanperez-keera/dunai/issues/298 is resolved:
-                     , simple-affine-space == 0.1.1
+                     , simple-affine-space ^>= 0.2.1
                      , time-domain
                      , monad-schedule >= 0.1.2
 

diff --git a/rhine/src/FRP/Rhine/ClSF/Core.hs b/rhine/src/FRP/Rhine/ClSF/Core.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE Arrows #-}
 {-# LANGUAGE RankNTypes #-}
+{-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeFamilies #-}
 
 {- |

diff --git a/rhine/src/FRP/Rhine/ClSF/Util.hs b/rhine/src/FRP/Rhine/ClSF/Util.hs
@@ -27,6 +27,7 @@ import Control.Monad.Trans.Reader (ask, asks)
 
 -- dunai
 import Control.Monad.Trans.MSF.Reader (readerS)
+import Data.MonadicStreamFunction.Instances.Num ()
 import Data.MonadicStreamFunction.Instances.VectorSpace ()
 
 -- simple-affine-space
@@ -195,6 +196,7 @@ derivative = derivativeFrom zeroVector
 -}
 threePointDerivativeFrom ::
   ( Monad m
+    , Num s
   , VectorSpace v s
   , s ~ Diff td
   ) =>
@@ -211,6 +213,7 @@ threePointDerivativeFrom v0 = proc v -> do
 -}
 threePointDerivative ::
   ( Monad m
+    , Num s
   , VectorSpace v s
   , s ~ Diff td
   ) =>
@@ -229,6 +232,7 @@ threePointDerivative = threePointDerivativeFrom zeroVector
 -}
 weightedAverageFrom ::
   ( Monad m
+    , Fractional s
   , VectorSpace v s
   , s ~ Diff td
   ) =>
@@ -281,6 +285,7 @@ average = averageFrom zeroVector
 -}
 averageLinFrom ::
   ( Monad m
+  , Fractional s
   , VectorSpace v s
   , s ~ Diff td
   ) =>
@@ -298,6 +303,7 @@ averageLinFrom v0 t = proc v -> do
 -- | Linearised version of 'average'.
 averageLin ::
   ( Monad m
+  , Fractional s
   , VectorSpace v s
   , s ~ Diff td
   ) =>
@@ -322,8 +328,9 @@ lowPass = average
 -- | Filters out frequencies below @1 / (2 * pi * t)@.
 highPass ::
   ( Monad m
-  , VectorSpace v s
+  , Eq s
   , Floating s
+  , VectorSpace v s
   , s ~ Diff td
   ) =>
   -- | The time constant @t@
@@ -334,6 +341,7 @@ highPass t = clId ^-^ lowPass t
 -- | Filters out frequencies other than @1 / (2 * pi * t)@.
 bandPass ::
   ( Monad m
+  , Eq s
   , VectorSpace v s
   , Floating s
   , s ~ Diff td
@@ -346,6 +354,7 @@ bandPass t = lowPass t >>> highPass t
 -- | Filters out the frequency @1 / (2 * pi * t)@.
 bandStop ::
   ( Monad m
+  , Eq s
   , VectorSpace v s
   , Floating s
   , s ~ Diff td

diff --git a/rhine/src/FRP/Rhine/ResamplingBuffer/Interpolation.hs b/rhine/src/FRP/Rhine/ResamplingBuffer/Interpolation.hs
@@ -23,6 +23,7 @@ import FRP.Rhine.ResamplingBuffer.Util
 -- | A simple linear interpolation based on the last calculated position and velocity.
 linear ::
   ( Monad m
+  , Num s
   , Clock m cl1
   , Clock m cl2
   , VectorSpace v s
@@ -90,6 +91,7 @@ sinc windowSize =
 -}
 cubic ::
   ( Monad m
+  , Fractional s
   , VectorSpace v s
   , Floating v
   , Eq v