diff options
| -rw-r--r-- | challenge-183/mark-anderson/raku/ch-1.raku | 4 | ||||
| -rw-r--r-- | challenge-183/mark-anderson/raku/ch-2.raku | 62 |
2 files changed, 35 insertions, 31 deletions
diff --git a/challenge-183/mark-anderson/raku/ch-1.raku b/challenge-183/mark-anderson/raku/ch-1.raku index b92a096f41..acddde7ed1 100644 --- a/challenge-183/mark-anderson/raku/ch-1.raku +++ b/challenge-183/mark-anderson/raku/ch-1.raku @@ -1,5 +1,5 @@ #!/usr/bin/env raku use Test; -is ([1,2], [3,4], [5,6], [1,2]).unique(:with(&[eqv])), ([1,2], [3,4], [5,6]); -is ([9,1], [3,7], [2,5], [2,5]).unique(:with(&[eqv])), ([9,1], [3,7], [2,5]); +is-deeply ([1,2], [3,4], [5,6], [1,2]).unique(:with(&[eqv])), ([1,2], [3,4], [5,6]); +is-deeply ([9,1], [3,7], [2,5], [2,5]).unique(:with(&[eqv])), ([9,1], [3,7], [2,5]); diff --git a/challenge-183/mark-anderson/raku/ch-2.raku b/challenge-183/mark-anderson/raku/ch-2.raku index 4030bdad03..fa1dd23c56 100644 --- a/challenge-183/mark-anderson/raku/ch-2.raku +++ b/challenge-183/mark-anderson/raku/ch-2.raku @@ -1,33 +1,42 @@ #!/usr/bin/env raku use Test; +# Disclaimer: This is my interpretation of years/days differences and I could be totally wrong. + is-deeply date-diff('2019-02-10', '2022-11-01'), (3, 264); -is-deeply date-diff('2020-09-15', '2022-03-29'), (1, 195); +is-deeply date-diff('2020-09-15', '2022-03-29'), (1, 195); is-deeply date-diff('2019-12-31', '2020-01-01'), (0, 1); -is-deeply date-diff('2019-12-01', '2019-12-31'), (0, 30); +is-deeply date-diff('2019-12-01', '2019-12-31'), (0, 30); is-deeply date-diff('2019-12-31', '2020-12-31'), (1, 0); -is-deeply date-diff('2019-12-31', '2021-12-31'), (2, 0); +is-deeply date-diff('2019-12-31', '2021-12-31'), (2, 0); is-deeply date-diff('2020-09-15', '2021-09-16'), (1, 1); -is-deeply date-diff('2019-09-15', '2021-09-16'), (2, 1); +is-deeply date-diff('2019-09-15', '2021-09-16'), (2, 1); is-deeply date-diff('2014-02-10', '2015-03-10'), (1, 28); -is-deeply date-diff('2020-03-01', '2023-03-10'), (3, 9); +is-deeply date-diff('2020-03-01', '2023-03-10'), (3, 9); is-deeply date-diff('2020-03-01', '2024-03-10'), (4, 9); -is-deeply date-diff('2020-02-27', '2021-02-28'), (1, 1); -is-deeply date-diff('2000-02-01', '2008-02-01'), (8, 0); -is-deeply date-diff('2020-02-29', '2024-02-29'), (4, 0); -is-deeply date-diff('2000-02-10', '2000-03-10'), (0, 29); -is-deeply date-diff('2020-02-29', '2021-02-27'), (0, 364); +is-deeply date-diff('2019-03-01', '2024-03-01'), (5, 0); +is-deeply date-diff('2020-02-27', '2021-02-28'), (1, 1); +is-deeply date-diff('2000-02-01', '2008-02-01'), (8, 0); +is-deeply date-diff('2000-02-10', '2000-03-10'), (0, 29); +is-deeply date-diff('2020-02-10', '2025-02-08'), (4, 363); +is-deeply date-diff('2020-02-10', '2025-02-28'), (5, 18); +is-deeply date-diff('2020-02-28', '2025-02-23'), (4, 360); +is-deeply date-diff('2020-01-01', '2020-01-01'), (0, 0); +is-deeply date-diff('2020-02-29', '2024-02-29'), (4, 0); +is-deeply date-diff('2020-02-29', '2021-02-27'), (0, 364); is-deeply date-diff('2020-02-29', '2025-02-27'), (4, 364); -is-deeply date-diff('2020-02-29', '2021-02-28'), (0, 365); +is-deeply date-diff('2020-02-10', '2028-02-29'), (8, 19); +is-deeply date-diff('2019-03-01', '2024-02-29'), (4, 365); +is-deeply date-diff('2020-02-29', '2021-02-28'), (0, 365); is-deeply date-diff('2020-02-29', '2029-02-28'), (8, 365); -is-deeply date-diff('2020-02-29', '2029-03-01'), (9, 1); -is-deeply date-diff('2020-02-10', '2025-02-08'), (4, 363); -is-deeply date-diff('2020-02-10', '2025-02-28'), (5, 18); -is-deeply date-diff('2020-02-10', '2028-02-29'), (8, 19); +is-deeply date-diff('2020-02-29', '2029-03-01'), (9, 1); +is-deeply date-diff('2019-01-01', '2028-12-31'), (9, 364); +is-deeply date-diff('2019-01-01', '3018-12-31'), (999, 364); +is-deeply date-diff('2019-12-01', '3019-11-16'), (999, 350); multi date-diff(Str $s1, Str $s2) { - date-diff(Date.new($s1), Date.new($s2)); + date-diff(Date.new($s1), Date.new($s2)) } multi date-diff($d1, $d2 where {$d1.month == $d2.month and $d1.day == $d2.day}) @@ -40,19 +49,14 @@ multi date-diff($d1, $d2 where $d2 - $d1 < 365) (0, $d2 - $d1) } -multi date-diff($d1, $d2 is copy where {$d1.month == 2 and $d1.day == 29}) -{ - my $y = $d2.year - $d1.year; - $y-- if $d1.month == $d2.month; - $d2 .= earlier(years => $y); - ($y, $d2 - $d1); -} - multi date-diff($d1, $d2) { - my $days = $d2 - $d1; - my $leap-years := ($d1.year..$d2.year).grep({ Date.new(year => $_).is-leap-year }); - my $leap-ds := $leap-years.map({ Date.new(year => $_, month => 2, day => 29) }); - $days -= $leap-ds.grep({ $d1 < $_ < $d2 }); - $days.polymod(365)[1,0]; + my $days = $d2 - $d1; + my $leap-years := ($d1.year..$d2.year).grep({ Date.new(:year($_)).is-leap-year }); + my $leap-ds := $leap-years.map({ Date.new(:year($_), :month(2), :day(29)) }); + $days -= $leap-ds.grep({ $_ ~~ $d1..$d2 }); + my ($y, $d) = $days.polymod(365)[1,0]; + $d++ if $d1.month == 2 and $d1.day == 29; + $d++ if $d2.month == 2 and $d2.day == 29; + ($y, $d) } |