wgaffa/deck-delta - Change XBFPOITOZLMUZROJCW2YAUHFTVKPZMRO5GQL36BACBS2ELIU4R4QC

Diff refactoring using the Tagless Final approach

Created by wgaffa on March 17, 2024

XBFPOITOZLMUZROJCW2YAUHFTVKPZMRO5GQL36BACBS2ELIU4R4QC

Dependencies

In channels

main

Change contents

Deletion in src/Deck.hs at line 23 [5.191]
∅:D[3.36] → [4.1:11]
B:BD[4.1] → [4.1:11]
```
    diff,
```
Insertion in src/Deck.hs at line 27 [5.191]
[6.87]
[4.11]
```
    runDeckList,
    partialEqCard,
```
Insertion in src/Deck.hs at line 31 [5.191]
[7.86]
[8.135]
```
import Control.Monad
```
Deletion in src/Deck.hs at line 35 [5.191]
B:BD[8.249] → [6.88:109]
```
import Data.Foldable
```

Replacement in src/Deck.hs at line 36 [5.191]

∅:D[9.19] → [10.0:91]

B:BD[11.38] → [10.0:91]

import Data.Semigroup hiding (diff)
import Data.Set (Set)
import qualified Data.Set as Set

[9.19]

[7.105]

import Data.Map (Map)
import qualified Data.Map as Map

Deletion in src/Deck.hs at line 43 [5.191]
B:BD[7.130] → [8.297:319]
```
import Control.Monad
```
Replacement in src/Deck.hs at line 45 [5.191]
B:BD[7.146] → [7.146:170]
```
import Numeric.Natural
```
[7.146]
[8.320]
```
import GHC.Natural
```

Replacement in src/Deck.hs at line 89 [5.191]

B:BD[12.41] → [10.92:157]

newtype DeckList = DeckList {runDeckList :: Set (Arg Text Card)}

[12.41]

[10.157]

newtype DeckList = DeckList {runDeckList :: Map Text Card}

Replacement in src/Deck.hs at line 96 [5.191]

B:BD[6.292] → [6.292:350]

     in DeckList . Set.insert (Arg t a) . runDeckList $ b

[6.292]

[6.350]

     in DeckList . Map.insert t a . runDeckList $ b

Replacement in src/Deck.hs at line 102 [5.191]

B:BD[6.495] → [13.0:81]

     in DeckList . Set.delete (Arg cardName (error "unreachable")) . runDeckList

[6.495]

[6.575]

     in DeckList . Map.delete cardName . runDeckList

Replacement in src/Deck.hs at line 123 [5.191]
B:BD[14.323] → [14.323:383]
B:BD[14.383] → [2.35:119]
∅:D[12.41] → [4.98:99]
∅:D[2.119] → [4.98:99]
∅:D[10.186] → [4.98:99]
∅:D[13.235] → [4.98:99]
∅:D[14.468] → [4.98:99]
∅:D[6.1219] → [4.98:99]
B:BD[4.98] → [4.98:99]
B:BD[4.99] → [3.312:355]
∅:D[3.355] → [15.0:36]
B:BD[4.99] → [15.0:36]
B:BD[15.36] → [16.0:23]
B:BD[16.23] → [2.120:237]
∅:D[2.237] → [15.142:143]
B:BD[15.142] → [15.142:143]
∅:D[17.69] → [4.146:179]
∅:D[15.143] → [4.146:179]
B:BD[4.146] → [4.146:179]
```
        argName (Arg x _) = x
        argCard (Arg _ x) = x
     in argCard <$> (Data.Foldable.find ((== cname') . argName) . runDeckList $ xs)
-- | Type to track changes in a `DeckList`
data DeckDifference
    = Add !Card
    | Remove !CardName
    | ChangeCard
        !CardName
        !(PositiveNumber -> Maybe PositiveNumber)
        !(Category -> Category)
type DeckDiff = [DeckDifference]
```
[14.323]
[4.179]
```
     in (Map.lookup cname' . runDeckList $ xs)
```

Replacement in src/Deck.hs at line 128 [5.191]

B:BD[4.424] → [4.424:465]

B:BD[4.465] → [11.39:57]

B:BD[11.57] → [10.187:310]

∅:D[11.157] → [4.518:526]

∅:D[10.310] → [4.518:526]

B:BD[4.518] → [4.518:526]

B:BD[4.526] → [10.311:362]

∅:D[10.362] → [4.581:604]

B:BD[4.581] → [4.581:604]

B:BD[4.604] → [16.24:75]

∅:D[16.75] → [4.646:685]

B:BD[4.646] → [4.646:685]

B:BD[4.685] → [17.165:200]

B:BD[17.200] → [16.76:137]

∅:D[16.137] → [17.254:305]

B:BD[17.254] → [17.254:305]

B:BD[17.305] → [15.208:230]

B:BD[15.230] → [2.238:978]

diff :: DeckList -> DeckList -> DeckDiff
diff left right =
    let deckSort = map (\(Arg _ x) -> x) . Set.toDescList . runDeckList
     in go mempty (deckSort left) (deckSort right)
  where
    go :: DeckDiff -> [Card] -> [Card] -> DeckDiff
    go acc [] [] = acc
    go acc xs [] = acc ++ (Remove <$> map name xs)
    go acc [] ys = acc ++ (Add <$> ys)
    go acc lx@(x : xs) ly@(y : ys)
        | name x < name y = go (Remove (name x) : acc) xs ly
        | name x > name y = go (Add x : acc) lx ys
        | otherwise =
            case (partialEqCard quantity x y, partialEqCard category x y) of
                (True, True) -> go acc xs ys
                (False, False) -> go (ChangeCard (name x) (calcQuantity x y) (const $ category y) : acc) xs ys
                (False, _) -> go (ChangeCard (name x) (calcQuantity x y) id : acc) xs ys
                (_, False) -> go (ChangeCard (name x) Just (const $ category y) : acc) xs ys
    runQuantity = fromIntegral @_ @Int . unrefine . runNumber . quantity
    delta x y = runQuantity y - runQuantity x
    newQuantity a
        | a < 1 = Nothing
        | otherwise = PositiveNumber <$> (refineFail . fromIntegral $ a)
    calcQuantity x y = newQuantity . (+ delta x y) . fromIntegral . unrefine . runNumber

[4.424]

[2.978]

Diff refactoring using the Tagless Final approach

Dependencies

In channels

Change contents

Deletion in src/Deck.hs at line 23 [5.191]

Insertion in src/Deck.hs at line 27 [5.191]

Insertion in src/Deck.hs at line 31 [5.191]

Deletion in src/Deck.hs at line 35 [5.191]

Replacement in src/Deck.hs at line 36 [5.191]

Deletion in src/Deck.hs at line 43 [5.191]

Replacement in src/Deck.hs at line 45 [5.191]

Replacement in src/Deck.hs at line 89 [5.191]

Replacement in src/Deck.hs at line 96 [5.191]

Replacement in src/Deck.hs at line 102 [5.191]

Replacement in src/Deck.hs at line 123 [5.191]

Replacement in src/Deck.hs at line 128 [5.191]