wgaffa/deck-delta - Change U3PXWO2PKW4XI4NXYMEQT44SXBQDVFZBDBW6YYOFSMANGI53V4ZQC

Changed diff so that we compose category and quantity changes into one constructor

Created by wgaffa on February 16, 2024

U3PXWO2PKW4XI4NXYMEQT44SXBQDVFZBDBW6YYOFSMANGI53V4ZQC

Dependencies

In channels

main

Change contents

Insertion in src/Deck.hs at line 5 [6.191]
[4.32]
[5.133]
```
{-# LANGUAGE TypeApplications #-}
```

Replacement in src/Deck.hs at line 115 [6.191]

B:BD[3.383] → [3.383:468]

     in  argCard <$> (Data.Foldable.find ((== cname') . argName) . runDeckList $ xs)

[3.383]

[7.98]

     in argCard <$> (Data.Foldable.find ((== cname') . argName) . runDeckList $ xs)

Replacement in src/Deck.hs at line 121 [6.191]

∅:D[2.23] → [8.55:142]

B:BD[8.55] → [8.55:142]

    | ChangeQuantity !CardName !Int
    | ChangeCategory !CardName !Category !Category

[2.23]

[8.142]

    | ChangeCard
        !CardName
        !(PositiveNumber -> Maybe PositiveNumber)
        !(Category -> Category)

Replacement in src/Deck.hs at line 144 [6.191]

B:BD[8.230] → [8.230:380]

B:BD[8.380] → [9.205:510]

B:BD[9.510] → [5.1201:1266]

            let chQ = ChangeQuantity (name x) (runQuantity y - runQuantity x)
                chC = ChangeCategory (name x) (category x) (category y)
             in case (partialEqCard quantity x y, partialEqCard category x y) of
                    (True, True) -> go acc xs ys
                    (False, False) -> go (chQ : chC : acc) xs ys
                    (False, _) -> go (chQ : acc) xs ys
                    (_, False) -> go (chC : acc) xs ys
    runQuantity = fromIntegral . unrefine . runNumber . quantity

[8.230]

[10.47]

            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