Merge branch 'release-0.14.12'. Refs #319.

ivanperez-keera · Dec 8, 2024 · 6f9c3a4 · 6f9c3a4
2 parents ac9003a + 0d486fa
commit 6f9c3a4
Show file tree

Hide file tree

Showing 14 changed files with 73 additions and 36 deletions.
diff --git a/yampa-test/CHANGELOG b/yampa-test/CHANGELOG
@@ -1,3 +1,11 @@
+2024-12-07 Ivan Perez <[email protected]>
+    * Version bump (0.14.12) (#319).
+    * Remove unused function Test.FRP.Yampa.Event.randomEventFunction (#314).
+    * Remove unused variables in Test.FRP.Yampa.Basic (#315).
+    * Remove redundant imports (#316).
+    * Import functions to test from FRP.Yampa (#317).
+    * Add version bounds to base (#320).
+
 2024-10-07 Ivan Perez <[email protected]>
     * Version bump (0.14.11) (#310).
     * Bump version bounds of dependencies (#309).

diff --git a/yampa-test/tests/Test/FRP/Yampa/Arrow.hs b/yampa-test/tests/Test/FRP/Yampa/Arrow.hs
@@ -13,8 +13,7 @@ import Test.Tasty            (TestTree, testGroup)
 import Test.Tasty.QuickCheck (testProperty)
 
 -- External modules: Yampa
-import FRP.Yampa       as Yampa
-import FRP.Yampa.Arrow as Yampa
+import FRP.Yampa as Yampa
 
 tests :: TestTree
 tests = testGroup "Regression tests for FRP.Yampa.Arrow"

diff --git a/yampa-test/tests/Test/FRP/Yampa/Basic.hs b/yampa-test/tests/Test/FRP/Yampa/Basic.hs
@@ -221,9 +221,6 @@ propModFirstOutput =
     myStream :: Gen (SignalSampleStream Float)
     myStream = uniDistStream
 
-    initialValueG :: Gen Float
-    initialValueG = arbitrary
-
 -- ** @(>=-)@
 
 -- | Test that @f -=> arr (^ 2)@, when applied to any signal, is initially
@@ -253,9 +250,6 @@ propModFirstInput =
     myStream :: Gen (SignalSampleStream Float)
     myStream = uniDistStream
 
-    initialValueG :: Gen Float
-    initialValueG = arbitrary
-
 -- ** initially
 
 basicsf_t4 :: [Double]

diff --git a/yampa-test/tests/Test/FRP/Yampa/Conditional.hs b/yampa-test/tests/Test/FRP/Yampa/Conditional.hs
@@ -19,10 +19,9 @@ import Test.Tasty (TestTree, testGroup)
 import Test.Tasty.QuickCheck (testProperty)
 
 import FRP.Yampa as Yampa
-import FRP.Yampa.Conditional (pause, provided)
-import FRP.Yampa.LTLFuture   (TPred (Always, SP), evalT)
-import FRP.Yampa.QuickCheck  (uniDistStream)
-import FRP.Yampa.Stream      (SignalSampleStream)
+import FRP.Yampa.LTLFuture  (TPred (Always, SP), evalT)
+import FRP.Yampa.QuickCheck (uniDistStream)
+import FRP.Yampa.Stream     (SignalSampleStream)
 
 import TestsCommon
 

diff --git a/yampa-test/tests/Test/FRP/Yampa/Delays.hs b/yampa-test/tests/Test/FRP/Yampa/Delays.hs
@@ -18,7 +18,6 @@ import Test.Tasty (TestTree, testGroup)
 import Test.Tasty.QuickCheck (testProperty)
 
 import FRP.Yampa as Yampa
-import FRP.Yampa.Delays (fby)
 import FRP.Yampa.Stream
 import FRP.Yampa.QuickCheck
 import FRP.Yampa.LTLFuture

diff --git a/yampa-test/tests/Test/FRP/Yampa/Event.hs b/yampa-test/tests/Test/FRP/Yampa/Event.hs
@@ -9,7 +9,7 @@ module Test.FRP.Yampa.Event
   where
 
 import Control.Applicative ((<|>))
-import Control.Monad       (guard, join)
+import Control.Monad       (join)
 
 #if !MIN_VERSION_base(4,8,0)
 import Control.Applicative (pure, (<*>))
@@ -20,11 +20,10 @@ import Test.QuickCheck       hiding (once, sample)
 import Test.Tasty            (TestTree, testGroup)
 import Test.Tasty.QuickCheck (testProperty)
 
-import FRP.Yampa       (Event (..))
-import FRP.Yampa.Event (attach, catEvents, event, filterE, fromEvent, gate,
-                        isEvent, isNoEvent, joinE, lMerge, mapFilterE, mapMerge,
-                        maybeToEvent, merge, mergeBy, mergeEvents, noEvent,
-                        noEventFst, noEventSnd, rMerge, splitE, tag, tagWith)
+import FRP.Yampa (Event (..), attach, catEvents, event, filterE, fromEvent,
+                  gate, isEvent, isNoEvent, joinE, lMerge, mapFilterE, mapMerge,
+                  maybeToEvent, merge, mergeBy, mergeEvents, noEvent,
+                  noEventFst, noEventSnd, rMerge, splitE, tag, tagWith)
 
 tests :: TestTree
 tests = testGroup "Regression tests for FRP.Yampa.Event"
@@ -464,12 +463,6 @@ randomEventPair = arbitrary
 randomEvents :: Gen [Event Integer]
 randomEvents = arbitrary
 
-randomEventFunction :: Gen (Event Integer -> Event Integer)
-randomEventFunction = do
-  def <- arbitrary
-  f   <- applyFun <$> arbitrary
-  return $ event def f
-
 randomEventFunctionIn :: Gen (Event (Integer -> Integer))
 randomEventFunctionIn =
   oneof [ return noEvent

diff --git a/yampa-test/tests/Test/FRP/Yampa/EventS.hs b/yampa-test/tests/Test/FRP/Yampa/EventS.hs
@@ -27,7 +27,6 @@ import Test.Tasty (TestTree, testGroup)
 import Test.Tasty.QuickCheck (testProperty)
 
 import FRP.Yampa as Yampa
-import FRP.Yampa.EventS (snap, sampleWindow, recur, andThen, snapAfter, sample)
 import FRP.Yampa.Stream
 import FRP.Yampa.QuickCheck
 import FRP.Yampa.LTLFuture

diff --git a/yampa-test/tests/Test/FRP/Yampa/Hybrid.hs b/yampa-test/tests/Test/FRP/Yampa/Hybrid.hs
@@ -16,7 +16,6 @@ import Test.Tasty (TestTree, testGroup)
 import Test.Tasty.QuickCheck (testProperty)
 
 import FRP.Yampa as Yampa
-import FRP.Yampa.Hybrid as Yampa
 
 import FRP.Yampa.LTLFuture (evalT, TPred (Next, Always, SP))
 import FRP.Yampa.QuickCheck (uniDistStream, uniDistStreamMaxDT)

diff --git a/yampa-test/tests/Test/FRP/Yampa/Switches.hs b/yampa-test/tests/Test/FRP/Yampa/Switches.hs
@@ -27,9 +27,6 @@ import Test.Tasty (TestTree, testGroup)
 import Test.Tasty.QuickCheck (testProperty)
 
 import FRP.Yampa as Yampa
-import FRP.Yampa.Switches (dpSwitchZ, drpSwitchZ, pSwitchZ, parC, parZ,
-                           rpSwitchZ)
-import FRP.Yampa.EventS (snap)
 import FRP.Yampa.Stream
 import FRP.Yampa.QuickCheck
 import FRP.Yampa.LTLFuture

diff --git a/yampa-test/tests/Test/FRP/Yampa/Task.hs b/yampa-test/tests/Test/FRP/Yampa/Task.hs
@@ -18,7 +18,6 @@ import Test.Tasty (TestTree, testGroup)
 import Test.Tasty.QuickCheck (testProperty)
 
 import FRP.Yampa as Yampa
-import FRP.Yampa.Task
 
 import FRP.Yampa.LTLFuture  (TPred (Always, SP), evalT)
 import FRP.Yampa.QuickCheck (uniDistStream)

diff --git a/yampa-test/yampa-test.cabal b/yampa-test/yampa-test.cabal
@@ -31,7 +31,7 @@ cabal-version: >= 1.10
 build-type:    Simple
 
 name:          yampa-test
-version:       0.14.11
+version:       0.14.12
 author:        Ivan Perez
 maintainer:    [email protected]
 homepage:      http://github.com/ivanperez-keera/Yampa
@@ -84,7 +84,7 @@ library
       base               >= 4       && < 5
     , normaldistribution >= 1.1.0.1 && < 1.2
     , QuickCheck         >= 2.12    && < 2.16
-    , Yampa              >= 0.14.11 && < 0.15
+    , Yampa              >= 0.14.12 && < 0.15
 
   default-language:
     Haskell2010
@@ -163,5 +163,5 @@ test-suite space
       False
   else
     build-depends:
-        base
+        base  >= 4 && < 5
       , Yampa
diff --git a/yampa/CHANGELOG b/yampa/CHANGELOG
@@ -1,3 +1,7 @@
+2024-12-07 Ivan Perez <[email protected]>
+    * Version bump (0.14.12) (#319).
+    * Re-export missing definitions (#318).
+
 2024-10-07 Ivan Perez <[email protected]>
     * Version bump (0.14.11) (#310).
     * Add new publications by Schmidli et al. (#306).

diff --git a/yampa/Yampa.cabal b/yampa/Yampa.cabal
@@ -30,7 +30,7 @@ cabal-version: >= 1.10
 build-type:    Simple
 
 name:          Yampa
-version:       0.14.11
+version:       0.14.12
 author:        Henrik Nilsson, Antony Courtney
 maintainer:    Ivan Perez ([email protected])
 homepage:      https://github.com/ivanperez-keera/Yampa/

diff --git a/yampa/src/FRP/Yampa.hs b/yampa/src/FRP/Yampa.hs
@@ -204,6 +204,16 @@ module FRP.Yampa
     , takeEvents
     , dropEvents
 
+      -- ** Hybrid SF combinators
+    , snap
+    , snapAfter
+    , sample
+    , sampleWindow
+
+      -- ** Repetition and switching
+    , recur
+    , andThen
+
       -- ** Pointwise functions on events
     , noEvent
     , noEventFst
@@ -245,11 +255,21 @@ module FRP.Yampa
     , pSwitch,  dpSwitch
     , rpSwitch, drpSwitch
 
+      -- ** Parallel composition/switching (lists)
+      -- *** Parallel composition/switching with zip routing (lists)
+    , parZ
+    , pSwitchZ,  dpSwitchZ
+    , rpSwitchZ, drpSwitchZ
+
+      -- *** Parallel composition/switching with replication (lists)
+    , parC
+
       -- * Discrete to continuous-time signal functions
       -- ** Wave-form generation
     , hold
     , dHold
     , trackAndHold
+    , dTrackAndHold
 
       -- ** Accumulators
     , accum
@@ -264,10 +284,15 @@ module FRP.Yampa
       -- ** Basic delays
     , pre
     , iPre
+    , fby
 
       -- ** Timed delays
     , delay
 
+      -- * Conditional
+      -- ** Guards and automata-oriented combinators
+    , provided
+
       -- ** Variable delay
     , pause
 
@@ -314,9 +339,30 @@ module FRP.Yampa
     , evalAt
     , evalFuture
 
+      -- * Tasks
+      -- ** The Task type
+    , Task
+    , mkTask
+    , runTask
+    , runTask_
+    , taskToSF
+
+      -- ** Basic tasks
+    , constT
+    , sleepT
+    , snapT
+
+    -- ** Basic tasks combinators
+    , timeOut
+    , abortWhen
+
       -- * Auxiliary definitions
       --   Reverse function composition and arrow plumbing aids
     , dup
+    , arr2
+    , arr3
+    , arr4
+    , arr5
 
       -- * Re-exported module, classes, and types
     , module Control.Arrow
@@ -329,7 +375,7 @@ import Control.Arrow
 import Data.VectorSpace
 
 -- Internal modules
-import FRP.Yampa.Arrow (dup)
+import FRP.Yampa.Arrow
 import FRP.Yampa.Basic
 import FRP.Yampa.Conditional
 import FRP.Yampa.Delays
@@ -343,4 +389,5 @@ import FRP.Yampa.Random
 import FRP.Yampa.Scan
 import FRP.Yampa.Simulation
 import FRP.Yampa.Switches
+import FRP.Yampa.Task
 import FRP.Yampa.Time