Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add property test comparing getDiffBy to the reference implementation #11

Merged
merged 1 commit into from
Jan 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Diff.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ test-suite diff-tests
, pretty, QuickCheck, test-framework
, test-framework-quickcheck2, process
, directory
if impl(ghc < 8.0)
build-depends: semigroups
other-modules:
Data.Algorithm.Diff,
Data.Algorithm.DiffOutput
Expand Down
65 changes: 64 additions & 1 deletion test/Test.hs
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
{-# LANGUAGE LambdaCase #-}
{-# LANGUAGE ScopedTypeVariables #-}

module Main where

import Test.Framework (defaultMain, testGroup)
Expand All @@ -6,6 +9,9 @@ import Test.QuickCheck
import Data.Algorithm.Diff
import Data.Algorithm.DiffContext
import Data.Algorithm.DiffOutput
import qualified Data.Array as A
import Data.Foldable
import Data.Semigroup (Arg(..))
import Text.PrettyPrint

import System.IO
Expand All @@ -32,7 +38,8 @@ main = defaultMain [ testGroup "sub props" [
slTest2 "lcsBoth" prop_lcsBoth,
slTest2 "recover first" prop_recoverFirst,
slTest2 "recover second" prop_recoverSecond,
slTest2 "lcs" prop_lcs
slTest2 "lcs" prop_lcs,
testProperty "compare random with reference" prop_compare_with_reference
],
testGroup "output props" [
testProperty "self generates empty" $ forAll shortLists prop_ppDiffEqual,
Expand Down Expand Up @@ -210,3 +217,59 @@ prop_context_diff =
actual = getContextDiff 2 (lines textA) (lines textB)
textA = "a\nb\nc\nd\ne\nf\ng\nh\ni\nj\nk\n"
textB = "a\nb\nd\ne\nf\ng\nh\ni\nj\n"

-- | Reference implementation, very slow.
naiveGetDiffBy :: forall a b. (a -> b -> Bool) -> [a] -> [b] -> [PolyDiff a b]
naiveGetDiffBy eq as bs = reverse $ (\(Arg _ ds) -> ds) $ tbl A.! (length us, length vs)
where
us = A.listArray (0, length as - 1) as
vs = A.listArray (0, length bs - 1) bs

-- Indices run up to length us/vs *inclusive*
tbl :: A.Array (Int, Int) (Arg Word [PolyDiff a b])
tbl = A.listArray ((0, 0), (length us, length vs))
[ gen ui vi | ui <- [0..length us], vi <- [0..length vs] ]

gen :: Int -> Int -> Arg Word [PolyDiff a b]
gen ui vi
| ui == 0, vi == 0 = Arg 0 []
| ui == 0
= left'
| vi == 0
= top'
| otherwise
= if eq u v
then min (min left' top') diag'
else min left' top'
where
Arg leftL leftP = tbl A.! (ui, vi - 1)
Arg diagL diagP = tbl A.! (ui - 1, vi - 1)
Arg topL topP = tbl A.! (ui - 1, vi)

u = us A.! (ui - 1)
v = vs A.! (vi - 1)

left' = Arg (leftL + 1) (Second v : leftP)
top' = Arg (topL + 1) (First u : topP)
diag' = Arg diagL (Both u v : diagP)

prop_compare_with_reference :: Positive Word -> [(Int, Int)] -> Property
prop_compare_with_reference (Positive x) ixs' =
counterexample (show (as, bs, d1, d2)) $
length (notBoth d1) === length (notBoth d2)
where
as = [0 .. max 100 x]
len = length as
ixs = filter (uncurry (/=)) $ map (\(i, j) -> (i `mod` len, j `mod` len)) $ take 100 ixs'
bs = foldl' applySwap as ixs
d1 = getDiffBy (==) as bs
d2 = naiveGetDiffBy (==) as bs

applySwap xs (i, j) = zipWith
(\k x -> (if k == i then xs !! j else if k == j then xs !! i else x))
[0..]
xs

notBoth = filter $ \case
Both{} -> False
_ -> True