Merge branch 'release-0.10.0'. Refs #342.

ivanperez-keera · Feb 22, 2023 · f0585fe · f0585fe
2 parents 4dcd776 + 629fa31
commit f0585fe
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 16 deletions.
diff --git a/dunai-frp-bearriver/CHANGELOG b/dunai-frp-bearriver/CHANGELOG
@@ -1,3 +1,6 @@
+2023-02-21 Ivan Perez <[email protected]>
+        * Version bump (0.14.1) (#342).
+
 2022-12-21 Ivan Perez <[email protected]>
         * bearriver.cabal: Version bump (0.14) (#340).
         * Bump version bounds for MonadRandom (#337).

diff --git a/dunai-frp-bearriver/bearriver.cabal b/dunai-frp-bearriver/bearriver.cabal
@@ -30,7 +30,7 @@ cabal-version: >= 1.10
 build-type:    Simple
 
 name:          bearriver
-version:       0.14
+version:       0.14.1
 author:        Ivan Perez, Manuel Bärenz
 maintainer:    [email protected]
 homepage:      https://github.com/ivanperez-keera/dunai
@@ -81,7 +81,7 @@ library
   build-depends:
       base >= 4.6 && <5
     , deepseq             >= 1.3.0.0 && < 1.5
-    , dunai >= 0.6.0 && < 0.10
+    , dunai >= 0.6.0 && < 0.11
     , MonadRandom         >= 0.2   && < 0.7
     , mtl                 >= 2.1.2 && < 2.3
     , simple-affine-space >= 0.1   && < 0.3

diff --git a/dunai-test/CHANGELOG b/dunai-test/CHANGELOG
@@ -1,3 +1,7 @@
+2023-02-21 Ivan Perez <[email protected]>
+        * Version bump (0.10.0) (#342).
+        * Remove the function FRP.Dunai.LTLPast.prev (#341).
+
 2022-12-21 Ivan Perez <[email protected]>
         * Version bump (0.9.2) (#340).
 

diff --git a/dunai-test/dunai-test.cabal b/dunai-test/dunai-test.cabal
@@ -30,7 +30,7 @@ cabal-version: >= 1.10
 build-type:    Simple
 
 name:          dunai-test
-version:       0.9.2
+version:       0.10.0
 author:        Ivan Perez
 maintainer:    [email protected]
 homepage:      https://github.com/ivanperez-keera/dunai
@@ -74,7 +74,7 @@ library
 
   build-depends:
       base >= 4 && < 5
-    , dunai >= 0.5 && < 0.10
+    , dunai >= 0.5 && < 0.11
     , normaldistribution
     , QuickCheck
 

diff --git a/dunai-test/src/FRP/Dunai/LTLPast.hs b/dunai-test/src/FRP/Dunai/LTLPast.hs
@@ -138,12 +138,6 @@ ever' sf = feedback False $ proc (a, last) -> do
 
 -- | Output True at a time if the input at the last time was True.
 prev' :: Monad m => SPred m a -> SPred m a
-prev' = prev True
-
--- | Delay output of an MSF by one sample, using the provided argument for the
--- first sample.
-{-# DEPRECATED prev "This function is deprecated in dunai-test 0.9 and will be removed." #-}
-prev :: Monad m => b -> MSF m a b -> MSF m a b
-prev b sf = feedback b $ proc (a, last) -> do
+prev' sf = feedback True $ proc (a, last) -> do
   b <- sf -< a
   returnA -< (last, b)
diff --git a/dunai/CHANGELOG b/dunai/CHANGELOG
@@ -1,3 +1,7 @@
+2023-02-21 Ivan Perez <[email protected]>
+        * Version bump (0.10.0) (#342).
+        * Implement dot in MSF's instance of VectorSpace (#298).
+
 2022-12-21 Ivan Perez <[email protected]>
         * Version bump (0.9.2) (#340).
         * Bump version bounds for MonadRandom (#337).

diff --git a/dunai/dunai.cabal b/dunai/dunai.cabal
@@ -30,7 +30,7 @@ cabal-version: >= 1.10
 build-type:    Simple
 
 name:          dunai
-version:       0.9.2
+version:       0.10.0
 author:        Ivan Perez, Manuel Bärenz
 maintainer:    [email protected]
 homepage:      https://github.com/ivanperez-keera/dunai

diff --git a/dunai/src/Data/MonadicStreamFunction/Instances/VectorSpace.hs b/dunai/src/Data/MonadicStreamFunction/Instances/VectorSpace.hs
@@ -43,12 +43,18 @@ import Control.Arrow.Util              (constantly, elementwise2)
 import Data.MonadicStreamFunction.Core (MSF)
 
 -- | Vector-space instance for 'MSF's.
-instance (Monad m, VectorSpace v s, Eq s, Floating s)
-      => VectorSpace (MSF m a v) s
+instance (Monad m, Eq s, Num s, VectorSpace v s, Floating (MSF m a s))
+      => VectorSpace (MSF m a v) (MSF m a s)
   where
     zeroVector   = constantly zeroVector
-    r *^ msf     = msf >>^ (r *^)
-    msf ^/ r     = msf >>^ (^/ r)
+    (*^)         = elementwise2 (*^)
+    (^/)         = elementwise2 (^/)
     (^+^)        = elementwise2 (^+^)
     (^-^)        = elementwise2 (^-^)
     negateVector = (>>^ negateVector)
+    dot          = elementwise2 dot
+    normalize v  = elementwise2 f v (norm v)
+      where
+        f v' nv'
+          | nv' /= 0  = v' ^/ nv'
+          | otherwise = error "normalize: zero vector"