Rename functions to be more idiomatic.
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
(** [pair_nums_from_string s] takes a string of two numbers separated by
|
||||
whitespace and returns the pair of the numbers *)
|
||||
let pair_nums_from_string s =
|
||||
match Aoc.nums_from_string s with
|
||||
let pair_ints_of_string s =
|
||||
match Aoc.ints_of_string s with
|
||||
| [ h; h' ] -> (h, h')
|
||||
| _ -> raise (Invalid_argument "pair_nums_from_string")
|
||||
|
||||
@@ -25,8 +25,8 @@ let accumulate = List.fold_left ( + ) 0
|
||||
|
||||
(** [lists_from_file fname] Read two lists of integers from [fname] and return
|
||||
as a pair. *)
|
||||
let lists_from_file fname =
|
||||
Aoc.strings_from_file fname |> List.map pair_nums_from_string |> rev_split
|
||||
let lists_of_file fname =
|
||||
Aoc.strings_of_file fname |> List.map pair_ints_of_string |> rev_split
|
||||
|
||||
let day2401a (a, b) =
|
||||
List.map2 Aoc.distance1 (List.sort Int.compare a) (List.sort Int.compare b)
|
||||
@@ -35,5 +35,5 @@ let day2401a (a, b) =
|
||||
let day2401b (a, b) = List.map (count b) a |> List.map2 ( * ) a |> accumulate
|
||||
|
||||
let _ =
|
||||
Aoc.main lists_from_file
|
||||
Aoc.main lists_of_file
|
||||
[ (string_of_int, day2401a); (string_of_int, day2401b) ]
|
||||
|
@@ -15,12 +15,11 @@ let is_safe_dampened lst =
|
||||
in
|
||||
impl [] lst
|
||||
|
||||
let nums_from_file fname =
|
||||
Aoc.strings_from_file fname |> List.map Aoc.nums_from_string
|
||||
let ints_of_file fname =
|
||||
Aoc.strings_of_file fname |> List.map Aoc.ints_of_string
|
||||
|
||||
let day2402a lsts = List.filter is_safe lsts |> List.length
|
||||
let day2402b lsts = List.filter is_safe_dampened lsts |> List.length
|
||||
|
||||
let _ =
|
||||
Aoc.main nums_from_file
|
||||
[ (string_of_int, day2402a); (string_of_int, day2402b) ]
|
||||
Aoc.main ints_of_file [ (string_of_int, day2402a); (string_of_int, day2402b) ]
|
||||
|
@@ -22,7 +22,7 @@ let instrs_of_string s =
|
||||
List.rev (impl [] 0)
|
||||
|
||||
let instrs_of_file fname =
|
||||
Aoc.strings_from_file fname |> List.map instrs_of_string |> List.concat
|
||||
Aoc.strings_of_file fname |> List.map instrs_of_string |> List.concat
|
||||
|
||||
(** [mac_opt acc a b] returns [acc + a' * b'] if [a = Some a'] and
|
||||
[b = Some b']. If either [a] or [b] are [None] then the result is [acc]. *)
|
||||
|
Reference in New Issue
Block a user