Fix bench

Author: Jaro Reinders

bench/Bench.hs

@@ -1,18 +1,17 @@
 {-# OPTIONS_GHC -ddump-simpl -ddump-to-file -dsuppress-all -dno-typeable-binds -dno-suppress-type-signatures #-}
 import qualified Array
 import Test.Tasty.Bench
-import qualified Fleet.Array as DiffArray
-import Fleet.Array (DiffArray)
+import qualified Fleet.Array as Fleet
 import Quicksort (quicksort)
 import qualified QuicksortA
 
 class Indexable a where
   (!) :: a -> Int -> Int
 
+instance Indexable (Fleet.Array Int) where
+  (!) = (Fleet.!)
 instance Indexable (Array.Array Int) where
   (!) = (Array.!)
-instance Indexable (DiffArray Int) where
-  (!) = (DiffArray.!)
 
 loop :: Indexable a => a -> Int -> Int -> Int
 loop _ 1 s = s
@@ -23,7 +22,7 @@ fooA :: Array.Array Int -> Int
 fooA arr = loop arr (arr ! 1) 0
 
 {-# NOINLINE fooDA #-}
-fooDA :: DiffArray Int -> Int
+fooDA :: Fleet.Array Int -> Int
 fooDA arr = loop arr (arr ! 1) 0
 
 list :: [Int]
@@ -33,31 +32,31 @@ main :: IO ()
 main = do
   let
     arrA = Array.fromList list
-    arrDA = DiffArray.fromList list
+    arrDA = Fleet.fromList list
   print $ fooA arrA
   print $ fooDA arrDA
   let
-    !arr10 = DiffArray.fromList list
-    !arr9 = DiffArray.set 0 0 arr10
-    !arr8 = DiffArray.set 0 0 arr9
-    !arr7 = DiffArray.set 0 0 arr8
-    !arr6 = DiffArray.set 0 0 arr7
-    !arr5 = DiffArray.set 0 0 arr6
-    !arr4 = DiffArray.set 0 0 arr5
-    !arr3 = DiffArray.set 0 0 arr4
-    !arr2 = DiffArray.set 0 0 arr3
-    !arr1 = DiffArray.set 0 0 arr2
-    !arr0 = DiffArray.set 0 0 arr1
+    !arr10 = Fleet.fromList list
+    !arr9 = Fleet.set 0 0 arr10
+    !arr8 = Fleet.set 0 0 arr9
+    !arr7 = Fleet.set 0 0 arr8
+    !arr6 = Fleet.set 0 0 arr7
+    !arr5 = Fleet.set 0 0 arr6
+    !arr4 = Fleet.set 0 0 arr5
+    !arr3 = Fleet.set 0 0 arr4
+    !arr2 = Fleet.set 0 0 arr3
+    !arr1 = Fleet.set 0 0 arr2
+    !arr0 = Fleet.set 0 0 arr1
   !marr <- QuicksortA.fromList list
   defaultMain
     [ bench "array" $ whnf fooA (Array.fromList list)
-    , bench "diffarray" $ whnf fooDA arr0
-    , bench "diffarray 1" $ whnf fooDA arr1
-    , bench "diffarray 2" $ whnf fooDA arr2
-    , bench "diffarray 5" $ whnf fooDA arr5
-    , bench "diffarray 7" $ whnf fooDA arr7
-    , bench "diffarray 10" $ whnf fooDA arr10
+    , bench "fleet" $ whnf fooDA arr0
+    , bench "fleet 1" $ whnf fooDA arr1
+    , bench "fleet 2" $ whnf fooDA arr2
+    , bench "fleet 5" $ whnf fooDA arr5
+    , bench "fleet 7" $ whnf fooDA arr7
+    , bench "fleet 10" $ whnf fooDA arr10
     , bench "quicksort array" $ whnfIO (QuicksortA.clone marr >>= \marr' -> QuicksortA.quicksort marr' 0 9973)
-    , bench "quicksort diffarray" $ whnf (Quicksort.quicksort 0 9973) (DiffArray.copy arr0)
-    , bench "quicksort diffarray copy" $ whnf (Quicksort.quicksort 0 9973 . DiffArray.copy) arr0
+    , bench "quicksort fleet" $ whnf (Quicksort.quicksort 0 9973) (Fleet.copy arr0)
+    , bench "quicksort fleet copy" $ whnf (Quicksort.quicksort 0 9973 . Fleet.copy) arr0
     ]

bench/Quicksort.hs

@@ -4,10 +4,10 @@ module Quicksort (quicksort) where
 import Fleet.Array
 import Data.Tuple (Solo (..))
 
--- swap :: Int -> Int -> DiffArray a -> DiffArray a
+-- swap :: Int -> Int -> Array a -> Array a
 -- swap !i !j !xs = set i (xs ! j) (set j (xs ! i) xs)
 
--- swap :: Int -> Int -> DiffArray a -> DiffArray a
+-- swap :: Int -> Int -> Array a -> Array a
 -- swap !i !j !xs =
 --   let
 --     -- using this strict matching on MkSolo we
@@ -19,7 +19,7 @@ import Data.Tuple (Solo (..))
 --   in set i y (set j x xs)
 
 {-# INLINEABLE quicksort #-}
-quicksort :: Ord a => Int -> Int -> DiffArray a -> DiffArray a
+quicksort :: Ord a => Int -> Int -> Array a -> Array a
 quicksort !l !r !xs
   | r - l <= 1 = xs
   | otherwise =
@@ -28,7 +28,7 @@ quicksort !l !r !xs
       (xs, m) -> quicksort l m (quicksort (m + 1) r (swap (r - 1) m xs))
 
 {-# INLINEABLE partition #-}
-partition :: Ord a => Int -> Int -> DiffArray a -> a -> (DiffArray a, Int)
+partition :: Ord a => Int -> Int -> Array a -> a -> (Array a, Int)
 partition l r xs x = go xs l l where
   go !xs !m !i
     | i == r = (xs, m)