mgrettondann/ocaml-aoc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename functions to be more idiomatic.

Browse Source
This commit is contained in:
Matthew Gretton-Dann
2024-12-03 08:53:02 +00:00
parent 5d99f413de
commit 2ee7f6a3d3
5 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bin/day2401.ml
View File

@@ -1,7 +1,7 @@
(** [pair_nums_from_string s] takes a string of two numbers separated by (** [pair_nums_from_string s] takes a string of two numbers separated by
whitespace and returns the pair of the numbers *) whitespace and returns the pair of the numbers *)
let pair_nums_from_string s = let pair_ints_of_string s =
match Aoc.nums_from_string s with match Aoc.ints_of_string s with
| [ h; h' ] -> (h, h') | [ h; h' ] -> (h, h')
| _ -> raise (Invalid_argument "pair_nums_from_string") | _ -> 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 (** [lists_from_file fname] Read two lists of integers from [fname] and return
as a pair. *) as a pair. *)
let lists_from_file fname = let lists_of_file fname =
Aoc.strings_from_file fname |> List.map pair_nums_from_string |> rev_split Aoc.strings_of_file fname |> List.map pair_ints_of_string |> rev_split
let day2401a (a, b) = let day2401a (a, b) =
List.map2 Aoc.distance1 (List.sort Int.compare a) (List.sort Int.compare 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 day2401b (a, b) = List.map (count b) a |> List.map2 ( * ) a |> accumulate
let _ = let _ =
Aoc.main lists_from_file Aoc.main lists_of_file
[ (string_of_int, day2401a); (string_of_int, day2401b) ] [ (string_of_int, day2401a); (string_of_int, day2401b) ]

7
bin/day2402.ml
View File

@@ -15,12 +15,11 @@ let is_safe_dampened lst =
in in
impl [] lst impl [] lst
let nums_from_file fname = let ints_of_file fname =
Aoc.strings_from_file fname |> List.map Aoc.nums_from_string Aoc.strings_of_file fname |> List.map Aoc.ints_of_string
let day2402a lsts = List.filter is_safe lsts |> List.length let day2402a lsts = List.filter is_safe lsts |> List.length
let day2402b lsts = List.filter is_safe_dampened lsts |> List.length let day2402b lsts = List.filter is_safe_dampened lsts |> List.length
let _ = let _ =
Aoc.main nums_from_file Aoc.main ints_of_file [ (string_of_int, day2402a); (string_of_int, day2402b) ]
[ (string_of_int, day2402a); (string_of_int, day2402b) ]

2
bin/day2403.ml
View File

@@ -22,7 +22,7 @@ let instrs_of_string s =
List.rev (impl [] 0) List.rev (impl [] 0)
let instrs_of_file fname = 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 (** [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]. *) [b = Some b']. If either [a] or [b] are [None] then the result is [acc]. *)

4
lib/aoc.ml
View File

@@ -1,7 +1,7 @@
let nums_from_string s = List.map int_of_string (Str.split (Str.regexp " +") s) let ints_of_string s = List.map int_of_string (Str.split (Str.regexp " +") s)
let distance1 a b = abs (a - b) let distance1 a b = abs (a - b)
let strings_from_file fname = let strings_of_file fname =
In_channel.with_open_text fname In_channel.input_lines In_channel.with_open_text fname In_channel.input_lines
let main prep parts = let main prep parts =

4
lib/aoc.mli
View File

@@ -1,11 +1,11 @@
val nums_from_string : string -> int list val ints_of_string : string -> int list
(** [nums_from_string s] takes a string of space separated integers and gives (** [nums_from_string s] takes a string of space separated integers and gives
back a list of the integers. *) back a list of the integers. *)
val distance1 : int -> int -> int val distance1 : int -> int -> int
(** [distance1 a b] returns the absolute difference between [a] and [b]. *) (** [distance1 a b] returns the absolute difference between [a] and [b]. *)
val strings_from_file : string -> string list val strings_of_file : string -> string list
(** [strings_from_file fname] returns a list of strings from the file (** [strings_from_file fname] returns a list of strings from the file
[fname]. Each string represents a line from the file. *) [fname]. Each string represents a line from the file. *)