nuttycom/aftok - Change 7KZP4RHZ3QSYTPPQ257A65Z5UPX44TF2LAI2U5EMULQCLDCEUK2AC

Switch from Data.Time to Data.Thyme

Created by Kris Nuttycombe on April 19, 2015

7KZP4RHZ3QSYTPPQ257A65Z5UPX44TF2LAI2U5EMULQCLDCEUK2AC

Dependencies

In channels

main

Change contents

Insertion in lib/Quixotic/Database/PostgreSQL.hs at line 10 [3.456]
[3.753]
[3.753]
```
import Data.Thyme.Clock as C
import Data.Thyme.Time
```
Insertion in lib/Quixotic/Database/PostgreSQL.hs at line 51 [3.456]
[4.51]
[3.1605]
```
utcParser :: FieldParser C.UTCTime
utcParser f v = toThyme <$> fromField f v 
```

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 57 [3.456]

B:BD[3.1646] → [2.225:303]

workEventParser = WorkEvent <$> fieldWith eventTypeParser <*> field <*> field

[3.1646]

[3.1715]

workEventParser = WorkEvent <$> fieldWith eventTypeParser <*> fieldWith utcParser <*> field

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 144 [3.456]
B:BD[3.3378] → [3.3378:3399]
```
    , e ^. eventTime
```
[3.3378]
[5.3666]
```
    , fromThyme $ e ^. eventTime
```
Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 153 [3.456]
B:BD[6.1920] → [6.1920:1951]
```
    ( eid, mt ^. _ModTime, t )
```
[6.1920]
[6.1951]
```
    ( eid, fromThyme $ mt ^. _ModTime, fromThyme t )
```
Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 158 [3.456]
B:BD[6.2108] → [6.2108:2154]
```
    ( eid, mt ^. _ModTime, addr ^. _BtcAddr )
```
[6.2108]
[6.2154]
```
    ( eid, fromThyme $ mt ^. _ModTime, addr ^. _BtcAddr )
```
Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 163 [3.456]
B:BD[6.2315] → [6.2315:2346]
```
    ( eid, mt ^. _ModTime, v )
```
[6.2315]
[6.2346]
```
    ( eid, fromThyme $ mt ^. _ModTime, v )
```
Insertion in lib/Quixotic/Interval.hs at line 12 [7.1422]
[6.3285]
[6.3285]
```
import Data.AffineSpace
```
Replacement in lib/Quixotic/Interval.hs at line 14 [7.1422]
∅:D[8.114] → [7.1494:1517]
∅:D[9.487] → [7.1494:1517]
∅:D[10.1747] → [7.1494:1517]
∅:D[6.3309] → [7.1494:1517]
B:BD[7.1494] → [7.1494:1517]
B:BD[7.1517] → [11.2546:2575]
```
import Data.Time.Clock
import Data.Time.LocalTime()
```
[6.3309]
[7.1544]
```
import Data.Thyme.Clock as C
import Data.Thyme.LocalTime()
import Data.Thyme.Format.Aeson()
```

Replacement in lib/Quixotic/Interval.hs at line 18 [7.1422]

B:BD[7.1545] → [10.1748:1839]

data Interval = Interval { _start :: UTCTime
                         , _end   :: UTCTime

[7.1545]

[7.1634]

data Interval = Interval { _start :: C.UTCTime
                         , _end   :: C.UTCTime

Replacement in lib/Quixotic/Interval.hs at line 23 [7.1422]
∅:D[8.335] → [11.2576:2619]
B:BD[7.1682] → [11.2576:2619]
```
interval :: UTCTime -> UTCTime -> Interval
```
[8.116]
[12.3]
```
interval :: C.UTCTime -> C.UTCTime -> Interval
```

Replacement in lib/Quixotic/Interval.hs at line 26 [7.1422]

B:BD[7.1745] → [13.45:81]

B:BD[13.81] → [10.1888:1929]

ilen :: Interval -> NominalDiffTime
ilen i = diffUTCTime (_end i) (_start i)

[7.1745]

[13.120]

ilen :: Interval -> C.NominalDiffTime
ilen i = (_end i) .-. (_start i)

Insertion in lib/Quixotic/TimeLog.hs at line 27 [15.846]
[14.3656]
[5.3855]
```
import Data.AdditiveGroup
```
Insertion in lib/Quixotic/TimeLog.hs at line 30 [15.846]
[6.5660]
[12.65]
```
import Data.AffineSpace
```
Replacement in lib/Quixotic/TimeLog.hs at line 34 [15.846]
∅:D[16.21] → [15.1028:1051]
∅:D[12.119] → [15.1028:1051]
∅:D[17.258] → [15.1028:1051]
∅:D[11.2665] → [15.1028:1051]
B:BD[15.1028] → [15.1028:1051]
```
import Data.Time.Clock
```
[11.2665]
[9.618]
```
import Data.Thyme.Clock as C
import Data.VectorSpace
```
Replacement in lib/Quixotic/TimeLog.hs at line 54 [15.846]
B:BD[14.4011] → [14.4011:4037]
```
  , _eventTime :: UTCTime
```
[14.4011]
[5.3879]
```
  , _eventTime :: C.UTCTime
```
Replacement in lib/Quixotic/TimeLog.hs at line 70 [15.846]
B:BD[6.5757] → [6.5757:5791]
```
newtype ModTime = ModTime UTCTime
```
[6.5757]
[6.5791]
```
newtype ModTime = ModTime C.UTCTime
```
Replacement in lib/Quixotic/TimeLog.hs at line 73 [15.846]
B:BD[6.5813] → [6.5813:5863]
```
data LogModification = TimeChange ModTime UTCTime
```
[6.5813]
[6.5863]
```
data LogModification = TimeChange ModTime C.UTCTime
```
Replacement in lib/Quixotic/TimeLog.hs at line 102 [15.846]
B:BD[8.434] → [18.50:77]
```
type NDT = NominalDiffTime
```
[8.434]
[12.350]
```
type NDT = C.NominalDiffTime
```

Replacement in lib/Quixotic/TimeLog.hs at line 111 [15.846]

B:BD[19.93] → [19.93:278]

B:BD[19.278] → [18.78:118]

  The depreciation function should return a value between 0 and 1;
  this result is multiplied by the length of an interval of work to determine
  the depreciated value of the work.
-}
type DepF = UTCTime -> Interval -> NDT

[19.93]

[15.2353]

 - The depreciation function should return a value between 0 and 1;
 - this result is multiplied by the length of an interval of work to determine
 - the depreciated value of the work.
 -}
type DepF = C.UTCTime -> Interval -> NDT

Replacement in lib/Quixotic/TimeLog.hs at line 118 [15.846]

B:BD[19.348] → [19.348:529]

B:BD[19.529] → [18.119:170]

  Payouts are determined by computing a depreciated duration value for
  each work interval. This function computes the percentage of the total
  work allocated to each address.
-}
payouts :: DepF -> UTCTime -> WorkIndex -> Payouts

[19.348]

[20.850]

 - Given a depreciation function, the "current" time, and a foldable functor of log intervals,
 - produce the total, depreciated length of work to be credited to an address.
 -}
workCredit :: (Functor f, Foldable f) => DepF -> C.UTCTime -> f Interval -> NDT
workCredit depf ptime ivals = getSum $ F.foldMap (Sum . depf ptime) ivals
{-|
 - Payouts are determined by computing a depreciated duration value for
 - each work interval. This function computes the percentage of the total
 - work allocated to each address.
 -}
payouts :: DepF -> C.UTCTime -> WorkIndex -> Payouts

Replacement in lib/Quixotic/TimeLog.hs at line 132 [15.846]

B:BD[20.960] → [20.960:1052]

B:BD[20.1052] → [8.435:516]

B:BD[8.516] → [6.6767:6834]

      addIntervalDiff total ivals = (\dt -> (dt + total, dt)) $ workCredit dep ptime ivals 
      (totalTime, keyTimes) = MS.mapAccum addIntervalDiff (fromInteger 0) $ widx
  in  Payouts $ fmap (\kt -> toRational $ kt / totalTime) keyTimes

[20.960]

[19.1011]

      addIntervalDiff total ivals = (^+^ total) &&& id $ workCredit dep ptime ivals

Replacement in lib/Quixotic/TimeLog.hs at line 134 [15.846]

B:BD[19.1012] → [19.1012:1016]

B:BD[19.1016] → [20.1200:1372]

∅:D[20.1372] → [19.1019:1022]

B:BD[19.1019] → [19.1019:1022]

B:BD[19.1022] → [18.171:337]

{-|
  Given a depreciation function, the "current" time, and a foldable functor of log intervals,
  produce the total, depreciated length of work to be credited to an address.
-}
workCredit :: (Functor f, Foldable f) => DepF -> UTCTime -> f Interval -> NDT
workCredit depf ptime ivals = 
  F.foldl' (+) (fromInteger 0) $ fmap (depf ptime) ivals

[19.1012]

[19.1581]

      (totalTime, keyTimes) = MS.mapAccum addIntervalDiff zeroV $ widx
  in  Payouts $ fmap ((/ toSeconds totalTime) . toSeconds) keyTimes

Replacement in lib/Quixotic/TimeLog.hs at line 160 [15.846]

B:BD[16.57] → [16.57:162]

B:BD[16.162] → [18.338:444]

∅:D[18.444] → [16.261:375]

B:BD[16.261] → [16.261:375]

monthsLength :: Months -> NominalDiffTime
monthsLength (Months i) = fromInteger $ 60 * 60 * 24 * 30 * i
linearDepreciation :: Months -> Months -> DepF
linearDepreciation undepPeriod depPeriod = \ptime ival -> 
  let maxDepreciable :: NominalDiffTime
      maxDepreciable = monthsLength undepPeriod + monthsLength depPeriod

[16.57]

[21.323]

{-|
 - A very simple linear function for calculating depreciation.
 -
 -}
linearDepreciation :: Months -> -- ^ The number of initial months during which no depreciation occurs
                      Months -> -- ^ The number of months over which each logged interval will be depreciated
                      DepF
linearDepreciation undepPeriod depPeriod = 
  let monthsLength :: Months -> NDT
      monthsLength (Months i) = fromSeconds $ 60 * 60 * 24 * 30 * i

Replacement in lib/Quixotic/TimeLog.hs at line 171 [15.846]

B:BD[21.324] → [21.324:389]

      zeroTime :: NominalDiffTime
      zeroTime = fromInteger 0

[21.324]

[13.970]

      maxDepreciable :: NDT
      maxDepreciable = monthsLength undepPeriod ^+^ monthsLength depPeriod

Replacement in lib/Quixotic/TimeLog.hs at line 174 [15.846]
B:BD[13.971] → [18.445:489]
```
      depPct :: NominalDiffTime -> Rational
```
[13.971]
[18.489]
```
      depPct :: NDT -> Rational
```

Replacement in lib/Quixotic/TimeLog.hs at line 177 [15.846]

∅:D[18.556] → [21.497:586]

B:BD[21.497] → [21.497:586]

        else toRational (max zeroTime (maxDepreciable - dt)) / toRational maxDepreciable

[18.556]

[18.557]

        else toSeconds (max zeroV (maxDepreciable ^-^ dt)) / toSeconds maxDepreciable

Replacement in lib/Quixotic/TimeLog.hs at line 179 [15.846]

B:BD[18.558] → [10.2563:2687]

      depreciation = depPct $ diffUTCTime ptime (ival ^. end)
  in  fromRational $ depreciation * (toRational $ ilen ival)

[18.558]

  in  \ptime ival -> 
    let depreciation = depPct $ ptime .-. (ival ^. end)
    in  depreciation *^ (ilen ival)

Replacement in quixotic.cabal at line 50 [23.1]
B:BD[22.1981] → [22.1981:2029]
```
    , time                 >= 1.4.2    && < 1.5
```
[22.1981]
[22.2029]
```
    , thyme                >= 0.3.5
```
Insertion in quixotic.cabal at line 55 [23.1]
[24.1200]
[25.1070]
```
    , vector-space
```
Insertion in quixotic.cabal at line 71 [23.1]
[22.2159]
[26.3090]
```
    , QuickCheck >= 2.7
```
Replacement in quixotic.cabal at line 78 [23.1]
B:BD[22.2199] → [22.2199:2210]
```
    , time
```
[22.2199]
[26.3130]
```
    , thyme
```
Insertion in quixotic.cabal at line 81 [23.1]
[22.2231]
[23.1706]
```
    , vector-space
```
Replacement in quixotic.cabal at line 104 [23.1]
B:BD[27.233] → [27.233:244]
```
    , time
```
[27.233]
[28.73]
```
    , thyme
```
Replacement in quixotic.cabal at line 136 [23.1]
B:BD[26.3567] → [26.3567:3578]
```
    , time
```
[26.3567]
[26.3578]
```
    , thyme
```
Insertion in server/Quixotic/Snaplet/WorkLog.hs at line 8 [29.5424]
[29.5625]
[29.5641]
```
import Data.Thyme.Clock as C
```
Replacement in server/Quixotic/Snaplet/WorkLog.hs at line 28 [29.5424]
∅:D[5.4361] → [29.6005:6042]
B:BD[29.6005] → [29.6005:6042]
```
  timestamp <- liftIO getCurrentTime
```
[5.4361]
[2.550]
```
  timestamp <- liftIO C.getCurrentTime
```
Replacement in server/Quixotic/Snaplet/WorkLog.hs at line 48 [29.5424]
∅:D[30.3780] → [29.6744:6779]
B:BD[29.6744] → [29.6744:6779]
```
  ptime <- liftIO $ getCurrentTime
```
[30.3780]
[31.1705]
```
  ptime <- liftIO $ C.getCurrentTime
```
Insertion in test/Quixotic/TimeLogSpec.hs at line 2 [15.3665]
[9.1658]
[32.148]
```
{-# OPTIONS_GHC -Wwarn -fno-warn-orphans #-}
```
Insertion in test/Quixotic/TimeLogSpec.hs at line 13 [15.3665]
[32.270]
[33.201]
```
import Data.AffineSpace
```

Insertion in test/Quixotic/TimeLogSpec.hs at line 16 [15.3665]

[32.357]

[7.2088]

import Data.Thyme.Clock
import Data.Thyme.Time
import qualified Data.Text as T
import Test.QuickCheck
instance Arbitrary EventType where
  arbitrary = elements [StartWork, StopWork]
newtype EventLog = EventLog [LogEntry]
instance Arbitrary BtcAddr where
  arbitrary = BtcAddr . T.pack <$> vectorOf 34 arbitrary

Insertion in test/Quixotic/TimeLogSpec.hs at line 29 [15.3665]

[7.2089]

[32.358]

instance Arbitrary Interval where
  arbitrary = do
    start <- arbitrary
    delta <- arbitrary
    pure $ I.interval start (start .+^ delta)

Replacement in test/Quixotic/TimeLogSpec.hs at line 43 [15.3665]

B:BD[15.4127] → [32.619:761]

          starts    = catMaybes [ parseISO8601 "2014-01-01T00:08:00Z"
                                , parseISO8601 "2014-02-12T00:12:00Z" ]

[15.4127]

[15.4253]

          starts    = toThyme <$> catMaybes [ parseISO8601 "2014-01-01T00:08:00Z"
                                            , parseISO8601 "2014-02-12T00:12:00Z" ]

Replacement in test/Quixotic/TimeLogSpec.hs at line 46 [15.3665]

B:BD[15.4254] → [32.762:904]

          ends      = catMaybes [ parseISO8601 "2014-01-01T00:12:00Z"
                                , parseISO8601 "2014-02-12T00:18:00Z" ]

[15.4254]

[20.2686]

          ends      = toThyme <$> catMaybes [ parseISO8601 "2014-01-01T00:12:00Z"
                                            , parseISO8601 "2014-02-12T00:18:00Z" ]

Insertion in test/Quixotic/TimeLogSpec.hs at line 68 [15.3665]

[26.4083]

[13.974]


  describe "EventType serialization" $ do
    it "serialization is invertible" $ property $
      \e -> (nameEvent . eventName) e == Just e

Switch from Data.Time to Data.Thyme

Dependencies

In channels

Change contents

Insertion in lib/Quixotic/Database/PostgreSQL.hs at line 10 [3.456]

Insertion in lib/Quixotic/Database/PostgreSQL.hs at line 51 [3.456]

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 57 [3.456]

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 144 [3.456]

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 153 [3.456]

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 158 [3.456]

Replacement in lib/Quixotic/Database/PostgreSQL.hs at line 163 [3.456]

Insertion in lib/Quixotic/Interval.hs at line 12 [7.1422]

Replacement in lib/Quixotic/Interval.hs at line 14 [7.1422]

Replacement in lib/Quixotic/Interval.hs at line 18 [7.1422]

Replacement in lib/Quixotic/Interval.hs at line 23 [7.1422]

Replacement in lib/Quixotic/Interval.hs at line 26 [7.1422]

Insertion in lib/Quixotic/TimeLog.hs at line 27 [15.846]

Insertion in lib/Quixotic/TimeLog.hs at line 30 [15.846]

Replacement in lib/Quixotic/TimeLog.hs at line 34 [15.846]

Replacement in lib/Quixotic/TimeLog.hs at line 54 [15.846]

Replacement in lib/Quixotic/TimeLog.hs at line 70 [15.846]

Replacement in lib/Quixotic/TimeLog.hs at line 73 [15.846]

Replacement in lib/Quixotic/TimeLog.hs at line 102 [15.846]

Replacement in lib/Quixotic/TimeLog.hs at line 111 [15.846]

Replacement in lib/Quixotic/TimeLog.hs at line 118 [15.846]

Replacement in lib/Quixotic/TimeLog.hs at line 132 [15.846]

Replacement in lib/Quixotic/TimeLog.hs at line 134 [15.846]

Replacement in lib/Quixotic/TimeLog.hs at line 160 [15.846]

Replacement in lib/Quixotic/TimeLog.hs at line 171 [15.846]

Replacement in lib/Quixotic/TimeLog.hs at line 174 [15.846]

Replacement in lib/Quixotic/TimeLog.hs at line 177 [15.846]

Replacement in lib/Quixotic/TimeLog.hs at line 179 [15.846]

Replacement in quixotic.cabal at line 50 [23.1]

Insertion in quixotic.cabal at line 55 [23.1]

Insertion in quixotic.cabal at line 71 [23.1]

Replacement in quixotic.cabal at line 78 [23.1]

Insertion in quixotic.cabal at line 81 [23.1]

Replacement in quixotic.cabal at line 104 [23.1]

Replacement in quixotic.cabal at line 136 [23.1]

Insertion in server/Quixotic/Snaplet/WorkLog.hs at line 8 [29.5424]

Replacement in server/Quixotic/Snaplet/WorkLog.hs at line 28 [29.5424]

Replacement in server/Quixotic/Snaplet/WorkLog.hs at line 48 [29.5424]

Insertion in test/Quixotic/TimeLogSpec.hs at line 2 [15.3665]

Insertion in test/Quixotic/TimeLogSpec.hs at line 13 [15.3665]

Insertion in test/Quixotic/TimeLogSpec.hs at line 16 [15.3665]

Insertion in test/Quixotic/TimeLogSpec.hs at line 29 [15.3665]

Replacement in test/Quixotic/TimeLogSpec.hs at line 43 [15.3665]

Replacement in test/Quixotic/TimeLogSpec.hs at line 46 [15.3665]

Insertion in test/Quixotic/TimeLogSpec.hs at line 68 [15.3665]