Merge pull request #28 from haskell-works/fix-add-function

Fix add function. Add test for add function.

Author: newhoggy

src/HaskellWorks/Data/Streams/Stream/Ops.hs

@@ -38,4 +38,7 @@ bitwiseShiftDown n as = HW.zipWith splice bs (HW.drop 1 bs `append` HW.singleton
         splice a b = (a .>. o) .|. (b .<. (64 - o))
 
 add :: Stream Word64 -> Stream Word64 -> Stream Word64
-add = HW.zipWithState (\a b c -> let d = a + b in (c + d, d `ltWord` a)) 0
+add = HW.zipWithState (\a b c ->
+    let d = a + b + c     in
+    let e = d `ltWord` a  in
+    (d, e)) 0

test/HaskellWorks/Data/Streams/Stream/OpsSpec.hs

@@ -0,0 +1,28 @@
+{-# LANGUAGE OverloadedStrings   #-}
+{-# LANGUAGE ScopedTypeVariables #-}
+
+module HaskellWorks.Data.Streams.Stream.OpsSpec
+  ( spec
+  ) where
+
+import Data.Semigroup              ((<>))
+import Data.Word
+import HaskellWorks.Hspec.Hedgehog
+import Hedgehog
+import Test.Hspec
+
+import qualified Data.Vector.Storable                      as DVS
+import qualified HaskellWorks.Data.Streams.Stream.Ops      as S
+import qualified HaskellWorks.Data.Streams.Vector.Storable as SDVS
+
+{-# ANN module ("HLint: Ignore Redundant do" :: String) #-}
+
+spec :: Spec
+spec = describe "HaskellWorks.Data.Stream.Vector.StorableSpec" $ do
+  it "map" $ requireTest $ do
+    u <- forAll $ pure $ DVS.fromList $ replicate 4 (0xffffffffffffffff :: Word64)
+    v <- forAll $ pure $ DVS.fromList $ [0x0000000000000001 :: Word64] <> replicate 3 0
+
+    let result = SDVS.unstream (S.add (SDVS.stream u) (SDVS.stream v))
+
+    result === DVS.replicate 4 (0x0000000000000000 :: Word64)

test/HaskellWorks/Data/Stream/Vector/StorableSpec.hs renamed to test/HaskellWorks/Data/Streams/Vector/StorableSpec.hs

@@ -1,7 +1,7 @@
 {-# LANGUAGE OverloadedStrings   #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 
-module HaskellWorks.Data.Stream.Vector.StorableSpec
+module HaskellWorks.Data.Streams.Vector.StorableSpec
   ( spec
   ) where
 

test/Test/Gen.hs

@@ -1,9 +1,7 @@
 module Test.Gen where
 
-import Data.Vector.Storable        (Storable)
-import HaskellWorks.Hspec.Hedgehog
+import Data.Vector.Storable (Storable)
 import Hedgehog
-import Test.Hspec
 
 import qualified Data.Vector.Storable as DVS
 import qualified Hedgehog.Gen         as G